rename files, sort asm into subdirectories

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;
 

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);
 

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"

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"

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*);
 

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*);
 

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"

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;

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"