Merge branch 'upstream/master' into main

This commit is contained in:
theo3
2021-01-31 11:24:17 -08:00
22 changed files with 5896 additions and 6131 deletions
-1
View File
@@ -4,7 +4,6 @@
extern void sub_080A2CC0();
extern void sub_0806F69C();
extern void EnqueueSFX();
extern Entity* GetCurrentRoomProperty();
void BladeTrap(Entity* ent) {
u16 uVar1;