rename files, sort asm into subdirectories

src/code_0808091C.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "structures.h"
 #include "functions.h"
-#include "overworld.h"
+#include "game.h"
 
 extern void sub_08080BC4(void);
 

src/code_080A29BC.c

@@ -1,58 +0,0 @@
-#include "global.h"
-#include "entity.h"
-#include "room.h"
-#include "object.h"
-
-void sub_080A29C8(s32 xOff, s32 yOff, u32 layer) {
-    Entity* pEVar1;
-
-    pEVar1 = CreateObject(SPECIAL_FX, 2, 0);
-    if (pEVar1 != NULL) {
-        pEVar1->x.HALF.HI = gRoomControls.roomOriginX + xOff;
-        pEVar1->y.HALF.HI = gRoomControls.roomOriginY + yOff;
-        pEVar1->collisionLayer = layer;
-    }
-}
-
-void sub_080A29FC(Entity* parent) {
-    CreateFx(parent, FX_DASH, 0);
-}
-
-void sub_080A2A08(Entity* parent) {
-    CreateFx(parent, FX_6, 0);
-}
-
-void sub_080A2A14(Entity* parent) {
-    CreateFx(parent, FX_WATER_SPLASH, 0);
-}
-
-Entity* sub_080A2A20(Entity* parent, u32 form, u32 parameter) {
-    Entity* pEVar1;
-
-    pEVar1 = CreateObjectWithParent(parent, GROUND_ITEM, form, parameter);
-    if (pEVar1 != NULL) {
-        pEVar1->actionDelay = 5;
-    }
-    return pEVar1;
-}
-
-Entity* sub_080A2A3C(Entity* parent, u32 form, u32 subtype, u32 param_4) {
-    Entity* ent;
-
-    ent = CreateObjectWithParent(parent, GROUND_ITEM, form, subtype);
-    if (ent != NULL) {
-        ent->actionDelay = 5;
-        *(u32*)(&ent->field_0x86) = param_4;
-    }
-    return ent;
-}
-
-Entity* sub_080A2A64(Entity* parent) {
-    Entity* pEVar1;
-
-    pEVar1 = CreateFx(parent, FX_SPARKLE2, 0);
-    if (pEVar1 != NULL) {
-        pEVar1->spritePriority.b0 = 7;
-    }
-    return pEVar1;
-}

src/collision.c

@@ -7,7 +7,7 @@
 #include "functions.h"
 #include "enemy.h"
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 
 extern u8 gCollidableCount;
 extern u8 gUnk_080B3740[];

src/coord.c

@@ -3,7 +3,7 @@
 #include "player.h"
 #include "coord.h"
 #include "utils.h"
-#include "audio.h"
+#include "sound.h"
 #include "room.h"
 #include "functions.h"
 

src/debugScreen.c

@@ -1,11 +1,11 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "utils.h"
 #include "functions.h"
 #include "main.h"
 #include "menu.h"
 #include "screen.h"
-#include "textbox.h"
+#include "message.h"
 
 extern void (*const gUnk_08109A30[])();
 

src/demoScreen.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "main.h"
 #include "utils.h"
-#include "textbox.h"
+#include "message.h"
 #include "fileScreen.h"
 #include "screen.h"
 

src/enemy/bladeTrap.c

@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "functions.h"

src/enemy/bobomb.c

@@ -1,5 +1,5 @@
 #include "asm.h"
-#include "audio.h"
+#include "sound.h"
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"

src/enemy/businessScrub.c

@@ -1,10 +1,10 @@
 #include "asm.h"
 #include "enemy.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "npc.h"
 #include "functions.h"
-#include "overworld.h"
+#include "game.h"
 
 extern Entity* sub_08049DF4(u32);
 extern bool32 sub_08056338(void);

src/enemy/doorMimic.c

@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "enemy.h"
 #include "functions.h"
 

src/enemy/likeLike.c

@@ -1,5 +1,5 @@
 #include "enemy.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "object.h"
 #include "functions.h"

src/enemy/octorokBoss.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "object.h"
 #include "projectile.h"
-#include "overworld.h"
+#include "game.h"
 
 extern void sub_08078AC0(u32, u32, u32);
 extern u32 GetRandomByWeight(const u8*);

src/enemy/pesto.c

@@ -1,6 +1,6 @@
 #include "enemy.h"
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 #include "functions.h"
 #include "save.h"
 

src/enemy/rupeeLike.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "asm.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "enemy.h"
 #include "object.h"

src/enemy/vaatiTransfiguredEye.c

@@ -1,6 +1,6 @@
 #include "entity.h"
 #include "enemy.h"
-#include "textbox.h"
+#include "message.h"
 #include "coord.h"
 #include "functions.h"
 

src/enemy/vaatiWrath.c

@@ -1,6 +1,6 @@
 #include "enemy.h"
 #include "object.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 #include "save.h"
 #include "screen.h"

src/entity.c

@@ -2,7 +2,7 @@
 #include "utils.h"
 #include "functions.h"
 #include "area.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern u8 gUnk_081091F8[];

src/ezloNag.c

@@ -1,6 +1,6 @@
 #include "global.h"
-#include "audio.h"
-#include "textbox.h"
+#include "sound.h"
+#include "message.h"
 
 typedef struct {
     s8 unk0;

src/fileScreen.c

@@ -3,7 +3,7 @@
 #include "utils.h"
 #include "screen.h"
 #include "menu.h"
-#include "textbox.h"
+#include "message.h"
 #include "object.h"
 #include "functions.h"
 

src/game.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "screen.h"
 #include "entity.h"
 #include "player.h"
@@ -12,8 +12,8 @@
 #include "menu.h"
 #include "functions.h"
 #include "area.h"
-#include "textbox.h"
-#include "overworld.h"
+#include "message.h"
+#include "game.h"
 
 extern u32 gUnk_03003FC0;
 

src/interrupts.c

@@ -1,10 +1,10 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "main.h"
 #include "player.h"
 #include "structures.h"
 #include "save.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 #include "screen.h"
 #include "gba/m4a.h"

src/intro.c

@@ -1,10 +1,10 @@
-#include "audio.h"
+#include "sound.h"
 #include "main.h"
 #include "entity.h"
 #include "utils.h"
 #include "screen.h"
 #include "object.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 
 typedef struct {

src/item/itemBomb.c

@@ -1,6 +1,6 @@
 #include "item.h"
 #include "coord.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 
 extern void (*const gUnk_0811BD98[])(ItemBehavior*, u32);

src/item/itemLantern.c

@@ -1,6 +1,6 @@
 #include "item.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 #include "object.h"
 
 extern void (*const gUnk_0811BD68[])(ItemBehavior*, u32);

src/item/itemMoleMitts.c

@@ -1,7 +1,7 @@
 
 #include "item.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 
 extern void (*const gUnk_0811BE04[])(ItemBehavior*, u32);
 

src/item/itemOcarina.c

@@ -1,5 +1,5 @@
 #include "item.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 
 extern void (*const gOcarinaStates[4])(ItemBehavior*, u32);

src/item/itemPegasusBoots.c

@@ -1,6 +1,6 @@
 #include "asm.h"
 #include "item.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 #include "effects.h"
 

src/item/itemRocsCape.c

@@ -1,5 +1,5 @@
 #include "item.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 
 void sub_08076758(ItemBehavior*, u32);

src/item/itemSword.c

@@ -1,6 +1,6 @@
 #include "item.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 #include "object.h"
 
 extern void (*const gUnk_0811BD44[])(ItemBehavior*, u32);

src/main.c

@@ -1,10 +1,10 @@
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 #include "main.h"
 #include "screen.h"
 #include "utils.h"
 #include "save.h"
-#include "textbox.h"
+#include "message.h"
 #include "interrupts.h"
 
 extern u32 gRand;

src/manager/manager10.c

@@ -3,7 +3,7 @@
 #include "manager.h"
 #include "room.h"
 #include "area.h"
-#include "audio.h"
+#include "sound.h"
 #include "screen.h"
 #include "utils.h"
 #include "fileScreen.h"

src/manager/manager15.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "flags.h"
 #include "screen.h"
 #include "manager.h"

src/manager/manager23.c

@@ -4,7 +4,7 @@
 #include "functions.h"
 #include "flags.h"
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 
 extern void (*const gUnk_08108CCC[])(Manager*);
 

src/manager/manager24.c

@@ -1,8 +1,8 @@
 #include "entity.h"
 #include "functions.h"
 #include "flags.h"
-#include "audio.h"
-#include "overworld.h"
+#include "sound.h"
+#include "game.h"
 #include "object.h"
 
 extern void (*const gUnk_08108CDC[])(Manager24*);

src/manager/manager27.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"

src/manager/manager2E.c

@@ -3,7 +3,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 
 typedef struct {
     Manager manager;

src/manager/manager3.c

@@ -5,7 +5,7 @@
 #include "area.h"
 #include "room.h"
 #include "player.h"
-#include "audio.h"
+#include "sound.h"
 #include "object.h"
 
 // Facilitates the usage of minish portals.

src/manager/manager30.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "asm.h"
-#include "audio.h"
+#include "sound.h"
 #include "manager.h"
 #include "flags.h"
 #include "functions.h"

src/manager/manager32.c

@@ -4,7 +4,7 @@
 #include "functions.h"
 #include "area.h"
 #include "utils.h"
-#include "overworld.h"
+#include "game.h"
 
 typedef struct {
     Manager manager;

src/manager/manager33.c

@@ -1,7 +1,7 @@
 #include "manager.h"
 #include "room.h"
 #include "player.h"
-#include "audio.h"
+#include "sound.h"
 #include "object.h"
 
 void Manager33_Main(Manager* this) {

src/manager/manager34.c

@@ -1,7 +1,7 @@
 #include "manager.h"
 #include "structures.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 
 typedef struct {
     Manager manager;

src/manager/manager36.c

@@ -1,5 +1,5 @@
 #include "manager.h"
-#include "audio.h"
+#include "sound.h"
 #include "script.h"
 
 typedef struct {

src/manager/manager37.c

@@ -2,8 +2,8 @@
 #include "structures.h"
 #include "functions.h"
 #include "flags.h"
-#include "textbox.h"
-#include "audio.h"
+#include "message.h"
+#include "sound.h"
 #include "save.h"
 #include "object.h"
 #include "area.h"

src/manager/manager39.c

@@ -2,9 +2,9 @@
 #include "manager.h"
 #include "screen.h"
 #include "area.h"
-#include "textbox.h"
+#include "message.h"
 #include "utils.h"
-#include "overworld.h"
+#include "game.h"
 #include "functions.h"
 
 typedef struct {

src/manager/manager5.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "manager.h"
 #include "flags.h"
 #include "functions.h"

src/manager/managerB.c

@@ -4,7 +4,7 @@
 #include "room.h"
 #include "area.h"
 #include "utils.h"
-#include "audio.h"
+#include "sound.h"
 
 /*
  * Manager B is used to create fights:

src/manager/managerC.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "manager.h"
 #include "flags.h"
 #include "structures.h"

src/manager/managerE.c

@@ -2,7 +2,7 @@
 #include "manager.h"
 #include "flags.h"
 #include "room.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 
 void ManagerE_Main(ManagerE* this) {

src/manager/managerF.c

@@ -1,12 +1,12 @@
 #include "global.h"
 #include "manager.h"
 #include "flags.h"
-#include "audio.h"
+#include "sound.h"
 #include "room.h"
 #include "player.h"
 #include "functions.h"
 #include "area.h"
-#include "textbox.h"
+#include "message.h"
 #include "utils.h"
 #include "tiles.h"
 #include "object.h"

src/message.c

@@ -1,10 +1,10 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "asm.h"
 #include "room.h"
 #include "utils.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 
 #define MESSAGE_ADVANCE_KEYS (A_BUTTON | B_BUTTON | DPAD_ANY | R_BUTTON)

src/npc/beedle.c

@@ -1,10 +1,10 @@
 #include "global.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "room.h"
 #include "script.h"
 #include "npc.h"
-#include "overworld.h"
+#include "game.h"
 
 typedef struct {
     u32 unk_00;

src/npc/bladeBrothers.c

@@ -3,7 +3,7 @@
 #include "flags.h"
 #include "player.h"
 #include "room.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "script.h"
 #include "npc.h"

src/npc/brocco.c

@@ -1,5 +1,5 @@
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "npc.h"
 

src/npc/carlov.c

@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "npc.h"

src/npc/castleMaid.c

@@ -2,7 +2,7 @@
 #include "script.h"
 #include "save.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 #include "manager.h"
 

src/npc/castorWildsStatue.c

@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "script.h"
 #include "functions.h"

src/npc/cat.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "functions.h"
 #include "save.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void sub_08067C44();

src/npc/cow.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "player.h"
 #include "npc.h"

src/npc/dampe.c

@@ -3,7 +3,7 @@
 #include "player.h"
 #include "room.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern u16 gUnk_08113344[];

src/npc/epona.c

@@ -1,7 +1,7 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 #include "functions.h"
 

src/npc/ghostBrothers.c

@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "save.h"
 #include "screen.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_0811017C[])(Entity*);

src/npc/goron.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "effects.h"
 #include "npc.h"
 

src/npc/goronMerchant.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "flags.h"
 #include "save.h"
 #include "npc.h"

src/npc/guard.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "player.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 #include "room.h"
 #include "script.h"
 #include "functions.h"

src/npc/kid.c

@@ -1,5 +1,5 @@
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_0810BE0C[])(Entity*);

src/npc/librarians.c

@@ -2,8 +2,8 @@
 #include "script.h"
 #include "functions.h"
 #include "flags.h"
-#include "textbox.h"
-#include "audio.h"
+#include "message.h"
+#include "sound.h"
 
 extern u16 gUnk_08113078[];
 

src/npc/mailbox.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "effects.h"
 #include "npc.h"
 

src/npc/marcy.c

@@ -1,7 +1,7 @@
 #include "entity.h"
 #include "functions.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 
 extern u16 gUnk_0810C34C[];
 

src/npc/minishEzlo.c

@@ -1,6 +1,6 @@
 #include "entity.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 
 extern SpriteLoadData gUnk_0810C48C;
 

src/npc/ministerPotho.c

@@ -1,6 +1,6 @@
 #include "entity.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_08110644[])(Entity*);

src/npc/mountainMinish.c

@@ -1,7 +1,7 @@
 #include "entity.h"
 #include "script.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "flags.h"
 #include "npc.h"
 

src/npc/mutoh.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "player.h"
 #include "flags.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern SpriteLoadData gUnk_08110C00;

src/npc/npc23.c

@@ -2,7 +2,7 @@
 #include "player.h"
 #include "structures.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_081104C8[])(Entity*);

src/npc/npc4E.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 #include "save.h"
 #include "flags.h"
 #include "object.h"

src/npc/npc5.c

@@ -1,5 +1,5 @@
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_0810AC1C[])(Entity*);

src/npc/npc9.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "npc.h"
 
 extern void (*const gUnk_0810C290[])(Entity*);

src/npc/picolyteBottle.c

@@ -2,7 +2,7 @@
 #include "script.h"
 #include "structures.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "object.h"
 
 extern ScreenTransitionData gUnk_0813AD4C;

src/npc/pina.c

@@ -1,6 +1,6 @@
 #include "entity.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "npc.h"
 

src/npc/postman.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "functions.h"
 #include "npc.h"

src/npc/simon.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "flags.h"

src/npc/stamp.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 #include "effects.h"
 #include "npc.h"

src/npc/stockwell.c

@@ -1,7 +1,7 @@
 #include "entity.h"
 #include "script.h"
 #include "room.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 #include "npc.h"
 

src/npc/vaati.c

@@ -1,7 +1,7 @@
 #include "global.h"
 #include "entity.h"
 #include "script.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 
 extern void sub_08095CB0(Entity*);

src/npc/windTribespeople.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "npc.h"
 

src/npc/zelda.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "functions.h"
 #include "flags.h"

src/object/archway.c

@@ -1,5 +1,5 @@
 #include "entity.h"
-#include "overworld.h"
+#include "game.h"
 
 void Archway(Entity* this) {
     if (this->action == 0) {

src/object/book.c

@@ -1,6 +1,6 @@
 #include "object.h"
 #include "functions.h"
-#include "textbox.h"
+#include "message.h"
 
 extern void (*const BookActionFuncs[])(Entity*);
 extern s8 const gUnk_08123D94[];

src/object/heartContainer.c

@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"

src/object/houseDoorExterior.c

@@ -3,7 +3,7 @@
 #include "flags.h"
 #include "room.h"
 #include "script.h"
-#include "audio.h"
+#include "sound.h"
 #include "object.h"
 #include "functions.h"
 #include "npc.h"

src/object/itemOnGround.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "player.h"

src/object/jailBars.c

@@ -2,7 +2,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "room.h"
-#include "audio.h"
+#include "sound.h"
 
 extern void sub_080A0960(Entity*, u32);
 extern void sub_0801AF18(u8*, u32, u32);

src/object/lightableSwitch.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "asm.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "flags.h"

src/object/lockedDoor.c

@@ -2,10 +2,10 @@
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 #include "effects.h"
-#include "overworld.h"
+#include "game.h"
 
 void sub_08083338(Entity*);
 void sub_080834B4(Entity*);

src/object/metalDoor.c

@@ -3,7 +3,7 @@
 #include "entity.h"
 #include "room.h"
 #include "flags.h"
-#include "audio.h"
+#include "sound.h"
 #include "functions.h"
 #include "effects.h"
 

src/object/minishSizedArchway.c

@@ -1,5 +1,5 @@
 #include "entity.h"
-#include "overworld.h"
+#include "game.h"
 
 void MinishSizedArchway(Entity* this) {
     if (this->action == 0) {

src/object/minishSizedEntrance.c

@@ -1,5 +1,5 @@
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 #include "functions.h"
 
 extern void (*const gUnk_08122254[])(Entity*);

src/object/object2A.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "functions.h"
 #include "flags.h"

src/object/object6A.c

@@ -2,7 +2,7 @@
 #include "object.h"
 #include "area.h"
 #include "script.h"
-#include "textbox.h"
+#include "message.h"
 #include "functions.h"
 #include "screen.h"
 

src/object/objectA.c

@@ -4,7 +4,7 @@
 #include "flags.h"
 #include "object.h"
 #include "functions.h"
-#include "overworld.h"
+#include "game.h"
 
 extern Hitbox gHitbox_2;