rename files, sort asm into subdirectories

22 files changed, 23 insertions, 23 deletions

diff --git a/src/object/archway.c b/src/object/archway.c
index a8f659dc..e05095d5 100644
--- a/src/object/archway.c
+++ b/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) {
diff --git a/src/object/book.c b/src/object/book.c
index 9f3a5396..2ad7a40b 100644
--- a/src/object/book.c
+++ b/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[];
diff --git a/src/object/heartContainer.c b/src/object/heartContainer.c
index a8868df2..433fb87e 100644
--- a/src/object/heartContainer.c
+++ b/src/object/heartContainer.c
@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "functions.h"
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c
index 137b19a5..77736989 100644
--- a/src/object/houseDoorExterior.c
+++ b/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"
diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c
index a7fa6987..d0874cba 100644
--- a/src/object/itemOnGround.c
+++ b/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"
diff --git a/src/object/jailBars.c b/src/object/jailBars.c
index da5844e5..84b44b61 100644
--- a/src/object/jailBars.c
+++ b/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);
diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c
index 14364188..639ffa17 100644
--- a/src/object/lightableSwitch.c
+++ b/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"
diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c
index b7fc357a..6f23a9d8 100644
--- a/src/object/lockedDoor.c
+++ b/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*);
diff --git a/src/object/metalDoor.c b/src/object/metalDoor.c
index b8506bd8..ed89d276 100644
--- a/src/object/metalDoor.c
+++ b/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"
 
diff --git a/src/object/minishSizedArchway.c b/src/object/minishSizedArchway.c
index ad109449..d087c8dc 100644
--- a/src/object/minishSizedArchway.c
+++ b/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) {
diff --git a/src/object/minishSizedEntrance.c b/src/object/minishSizedEntrance.c
index 5b891dd0..36d8e27a 100644
--- a/src/object/minishSizedEntrance.c
+++ b/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*);
diff --git a/src/object/object2A.c b/src/object/object2A.c
index 9e36b439..5ef7ba3e 100644
--- a/src/object/object2A.c
+++ b/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"
diff --git a/src/object/object6A.c b/src/object/object6A.c
index 456c28f2..13b93cce 100644
--- a/src/object/object6A.c
+++ b/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"
 
diff --git a/src/object/objectA.c b/src/object/objectA.c
index 8578c1be..c302382e 100644
--- a/src/object/objectA.c
+++ b/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;
 
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index 0e1caf10..9a50f902 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -1,6 +1,6 @@
 #include "functions.h"
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 
 extern void sub_0807B9B8(s32, s32, s32);
 
diff --git a/src/object/pot.c b/src/object/pot.c
index fae971d8..bf94a8be 100644
--- a/src/object/pot.c
+++ b/src/object/pot.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "player.h"
diff --git a/src/object/railtrack.c b/src/object/railtrack.c
index 3344feaf..d92a9546 100644
--- a/src/object/railtrack.c
+++ b/src/object/railtrack.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"
diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c
index 1cca2ba0..d71fd1f8 100644
--- a/src/object/swordsmanNewsletter.c
+++ b/src/object/swordsmanNewsletter.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 
 extern void sub_080787B4(Entity*);
 
diff --git a/src/object/thoughtBubble.c b/src/object/thoughtBubble.c
index e90cfbd7..57ba5cae 100644
--- a/src/object/thoughtBubble.c
+++ b/src/object/thoughtBubble.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "entity.h"
-#include "audio.h"
+#include "sound.h"
 
 extern void (*const ThoughtBubble_Behaviors[])(Entity*);
 
diff --git a/src/object/treeHidingPortal.c b/src/object/treeHidingPortal.c
index de23744d..d88f1c8e 100644
--- a/src/object/treeHidingPortal.c
+++ b/src/object/treeHidingPortal.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "flags.h"
 #include "player.h"
diff --git a/src/object/warpPoint.c b/src/object/warpPoint.c
index 893ddddd..bfa09ca0 100644
--- a/src/object/warpPoint.c
+++ b/src/object/warpPoint.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "object.h"
-#include "overworld.h"
+#include "game.h"
 #include "functions.h"
 
 extern Hitbox gHitbox_1;
diff --git a/src/object/windcrest.c b/src/object/windcrest.c
index edbe2e75..15828253 100644
--- a/src/object/windcrest.c
+++ b/src/object/windcrest.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "save.h"
 #include "script.h"