rename files, sort asm into subdirectories

35 files changed, 38 insertions, 38 deletions

diff --git a/src/npc/beedle.c b/src/npc/beedle.c
index 54eedff3..703773ff 100644
--- a/src/npc/beedle.c
+++ b/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;
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 09eec8d5..d0620938 100644
--- a/src/npc/bladeBrothers.c
+++ b/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"
diff --git a/src/npc/brocco.c b/src/npc/brocco.c
index 22c3dedb..b960237c 100644
--- a/src/npc/brocco.c
+++ b/src/npc/brocco.c
@@ -1,5 +1,5 @@
 #include "entity.h"
-#include "textbox.h"
+#include "message.h"
 #include "save.h"
 #include "npc.h"
 
diff --git a/src/npc/carlov.c b/src/npc/carlov.c
index 25aa49ca..6fc9ad81 100644
--- a/src/npc/carlov.c
+++ b/src/npc/carlov.c
@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "npc.h"
diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c
index 75533301..cfd0dd9e 100644
--- a/src/npc/castleMaid.c
+++ b/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"
 
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index b621b86f..c0637c96 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -1,4 +1,4 @@
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "script.h"
 #include "functions.h"
diff --git a/src/npc/cat.c b/src/npc/cat.c
index af53d0c3..09ec72d2 100644
--- a/src/npc/cat.c
+++ b/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();
diff --git a/src/npc/cow.c b/src/npc/cow.c
index 0437072f..5f0bcc0a 100644
--- a/src/npc/cow.c
+++ b/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"
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index d1009033..31eb8c7b 100644
--- a/src/npc/dampe.c
+++ b/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[];
diff --git a/src/npc/epona.c b/src/npc/epona.c
index 9a43655b..b4840bbe 100644
--- a/src/npc/epona.c
+++ b/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"
 
diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c
index 96130800..192509ff 100644
--- a/src/npc/ghostBrothers.c
+++ b/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*);
diff --git a/src/npc/goron.c b/src/npc/goron.c
index 144cc808..22a217ca 100644
--- a/src/npc/goron.c
+++ b/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"
 
diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c
index b00f3898..503717a6 100644
--- a/src/npc/goronMerchant.c
+++ b/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"
diff --git a/src/npc/guard.c b/src/npc/guard.c
index c456d95e..50f559c7 100644
--- a/src/npc/guard.c
+++ b/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"
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 1655b279..c5b5872a 100644
--- a/src/npc/kid.c
+++ b/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*);
diff --git a/src/npc/librarians.c b/src/npc/librarians.c
index 9b134e7a..95d1fd2f 100644
--- a/src/npc/librarians.c
+++ b/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[];
 
diff --git a/src/npc/mailbox.c b/src/npc/mailbox.c
index 89901625..9dc5df22 100644
--- a/src/npc/mailbox.c
+++ b/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"
 
diff --git a/src/npc/marcy.c b/src/npc/marcy.c
index ae888d2e..c187fd76 100644
--- a/src/npc/marcy.c
+++ b/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[];
 
diff --git a/src/npc/minishEzlo.c b/src/npc/minishEzlo.c
index 08e255bb..3ae0b056 100644
--- a/src/npc/minishEzlo.c
+++ b/src/npc/minishEzlo.c
@@ -1,6 +1,6 @@
 #include "entity.h"
 #include "functions.h"
-#include "audio.h"
+#include "sound.h"
 
 extern SpriteLoadData gUnk_0810C48C;
 
diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c
index eb38d37f..70e012eb 100644
--- a/src/npc/ministerPotho.c
+++ b/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*);
diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c
index 6616a452..ed76f1e1 100644
--- a/src/npc/mountainMinish.c
+++ b/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"
 
diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c
index 6106baf2..7d0751c7 100644
--- a/src/npc/mutoh.c
+++ b/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;
diff --git a/src/npc/npc23.c b/src/npc/npc23.c
index 3fc78f64..df0786e4 100644
--- a/src/npc/npc23.c
+++ b/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*);
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index ca9f114b..23afefed 100644
--- a/src/npc/npc4E.c
+++ b/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"
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 350e1630..05d2c7e0 100644
--- a/src/npc/npc5.c
+++ b/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*);
diff --git a/src/npc/npc9.c b/src/npc/npc9.c
index e4f879f9..df8cc07e 100644
--- a/src/npc/npc9.c
+++ b/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*);
diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c
index fa39f1b9..962ca337 100644
--- a/src/npc/picolyteBottle.c
+++ b/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;
diff --git a/src/npc/pina.c b/src/npc/pina.c
index 179ee9d5..a36763ae 100644
--- a/src/npc/pina.c
+++ b/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"
 
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 79a12f3a..f72ec6d3 100644
--- a/src/npc/postman.c
+++ b/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"
diff --git a/src/npc/simon.c b/src/npc/simon.c
index 3fffc8cc..c5e40ce5 100644
--- a/src/npc/simon.c
+++ b/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"
diff --git a/src/npc/stamp.c b/src/npc/stamp.c
index 193ae976..645fe1cc 100644
--- a/src/npc/stamp.c
+++ b/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"
diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c
index e6beed01..40ad8706 100644
--- a/src/npc/stockwell.c
+++ b/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"
 
diff --git a/src/npc/vaati.c b/src/npc/vaati.c
index a550c1a8..9db43d90 100644
--- a/src/npc/vaati.c
+++ b/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*);
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index 76b73c07..ff20d96d 100644
--- a/src/npc/windTribespeople.c
+++ b/src/npc/windTribespeople.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "audio.h"
+#include "sound.h"
 #include "entity.h"
 #include "npc.h"
 
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 296e27e0..b66b879a 100644
--- a/src/npc/zelda.c
+++ b/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"