rename files, sort asm into subdirectories

include/enemy.h

@@ -4,7 +4,7 @@
 #include "global.h"
 #include "asm.h"
 
-#include "audio.h"
+#include "sound.h"
 #include "effects.h"
 #include "flags.h"
 #include "utils.h"

include/fileScreen.h

@@ -1,7 +1,7 @@
 #ifndef FILESELECT_H
 #define FILESELECT_H
 
-#include "audio.h"
+#include "sound.h"
 #include "global.h"
 #include "save.h"
 

include/game.h

@@ -1,5 +1,5 @@
-#ifndef OVERWORLD_H
-#define OVERWORLD_H
+#ifndef GAME_H
+#define GAME_H
 
 #include "global.h"
 #include "area.h"
@@ -58,4 +58,4 @@ void sub_08053500(void);
 
 u32 GetBottleContaining(u32);
 
-#endif // OVERWORLD_H
+#endif // GAME_H

include/message.h

@@ -1,5 +1,5 @@
-#ifndef TEXTBOX_H
-#define TEXTBOX_H
+#ifndef MESSAGE_H
+#define MESSAGE_H
 
 #include "global.h"
 #include "entity.h"
@@ -128,4 +128,4 @@ void MessageAtHeight(u32 index, u32 y);
 
 void DispMessageFrame(u16*, u32, u32, u32);
 
-#endif
+#endif // MESSAGE_H

include/npc.h

@@ -5,12 +5,12 @@
 #include "asm.h"
 #include "utils.h"
 
-#include "audio.h"
+#include "sound.h"
 #include "effects.h"
 #include "room.h"
 #include "flags.h"
 #include "coord.h"
-#include "textbox.h"
+#include "message.h"
 #include "script.h"
 #include "save.h"
 

include/object.h

@@ -5,7 +5,7 @@
 #include "asm.h"
 #include "utils.h"
 
-#include "audio.h"
+#include "sound.h"
 #include "flags.h"
 #include "effects.h"
 #include "room.h"

include/sound.h

@@ -1,5 +1,5 @@
-#ifndef AUDIO_H
-#define AUDIO_H
+#ifndef SOUND_H
+#define SOUND_H
 
 #include "global.h"
 
@@ -597,4 +597,4 @@ typedef enum {
     SONG_BGM_0 = 0x80110000,
 } Sound;
 
-#endif // AUDIO_H
+#endif // SOUND_H