rename files, sort asm into subdirectories

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"