Translate all .include to #include

This decision was made to reduce the complexity of using .include whilst
juggling with tools/scaninc and tools/preproc:
- tools/scaninc doesn't apply the proper search rules for .include (it
  assumes #include behavior). In particular, it doesn't consider paths
  starting from $PWD, and doesn't scan the included files as a result.
- .include had to be processed before #include by preproc in many cases,
  as code was being included that had to be preprocessed by CPP (think
  of #define). This contradicts standard GCC behavior.

To make include paths consistent across the asm/ data/ and src/
directories, the following files were moved:
- constants/ → include/asm/constants/
- asm/macros/ → include/asm/macros/
- asm/macros.inc → include/asm/macros.inc
- include/macros/m4a.inc → include/asm/macros/m4a.inc

As part of the necessary changes for this to work, the scaninc method in
the makefile was improved to generate .d files that don't choke when
files are missing.

13 files changed, 156 insertions, 156 deletions

diff --git a/data/cutscenes.s b/data/cutscenes.s
index fecbf45..cad1fe1 100644
--- a/data/cutscenes.s
+++ b/data/cutscenes.s
@@ -1,8 +1,8 @@
     .section .rodata
 
-    .include "asm/macros.inc"
-    .include "constants/script_func_constants.inc"
-    .include "include/constants/bg_music.h"
+    #include "asm/macros.inc"
+    #include "asm/constants/script_func_constants.inc"
+    #include "constants/bg_music.h"
 
     @ Debug Room
     .global Cutscene_DebugRoom_Main
diff --git a/data/cutscenes_1.s b/data/cutscenes_1.s
index e3f197c..096fae4 100644
--- a/data/cutscenes_1.s
+++ b/data/cutscenes_1.s
@@ -1,8 +1,8 @@
     .section .rodata
 
-    .include "asm/macros.inc"
-    .include "constants/script_func_constants.inc"
-    .include "include/constants/bg_music.h"
+    #include "asm/macros.inc"
+    #include "asm/constants/script_func_constants.inc"
+    #include "constants/bg_music.h"
 
     .global Unk_822C248
     Unk_822C248:
@@ -9156,25 +9156,25 @@
     .string "pksdir0\0"
     .align 2,0
 
-    .include "data/scripts/personality_test.inc"
+    #include "scripts/personality_test.inc"
     .string "pksdir0\0"
     .align 2,0
 
 
-    .include "data/scripts/title.inc"
+    #include "scripts/title.inc"
     .string "pksdir0\0"
     .align 2,0
 
-    .include "data/scripts/intro.inc"
+    #include "scripts/intro.inc"
     .string "pksdir0\0"
     .align 2,0
 
-    .include "data/scripts/company_screens.inc"
+    #include "scripts/company_screens.inc"
     .string "pksdir0\0"
     .align 2,0
 
-    .include "data/scripts/health_safety.inc"
+    #include "scripts/health_safety.inc"
     .string "pksdir0\0"
     .align 2,0
 
-    .include "data/scripts/world_map.inc"
+    #include "scripts/world_map.inc"
diff --git a/data/data.s b/data/data.s
index c51e2d1..e00d0ce 100644
--- a/data/data.s
+++ b/data/data.s
@@ -99,7 +99,7 @@ gLoadScreenBackgroundPaletteFileNames: @ 80B6A28
         .4byte titlen1p_text
         .4byte titlen2p_text
 
-	.include "data/text/save.inc"
+	#include "text/save.inc"
 
 	.global gUnknown_80B6D90
 gUnknown_80B6D90: @ 80B6D90
diff --git a/data/data_80D47B8.s b/data/data_80D47B8.s
index 25fb2b1..1b63067 100644
--- a/data/data_80D47B8.s
+++ b/data/data_80D47B8.s
@@ -4617,11 +4617,11 @@ gUnknown_80DCA2C: @ 80DCA2C
         .align 2,0
         .4byte gUnknown_80DCA2C
 
-	.include "data/text/luminous_cave.inc"
+	#include "text/luminous_cave.inc"
 
-        .include "data/friend_area.inc"
+        #include "friend_area.inc"
 
-	.include "data/text/party_menu.inc"
+	#include "text/party_menu.inc"
 
 	.global gUnknown_80DD6EC
 gUnknown_80DD6EC: @ 80DD6EC
diff --git a/data/data_80DED44.s b/data/data_80DED44.s
index 4989dea..758d88b 100644
--- a/data/data_80DED44.s
+++ b/data/data_80DED44.s
@@ -257,7 +257,7 @@ gUnknown_80DFE1C: @ 80DFE1C
         .byte 0x03, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
 
-	.include "data/text/wonder_mail_3.inc"
+	#include "text/wonder_mail_3.inc"
 
 	.global gUnknown_80E016C
 gUnknown_80E016C: @ 80E016C
@@ -268,7 +268,7 @@ gUnknown_80E016C: @ 80E016C
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
 
-	.include "data/text/wonder_mail_complete.inc"
+	#include "text/wonder_mail_complete.inc"
 
 	.global gUnknown_80E0248
 gUnknown_80E0248: @ 80E0248
diff --git a/data/data_80E2068.s b/data/data_80E2068.s
index d00a658..e7e5921 100644
--- a/data/data_80E2068.s
+++ b/data/data_80E2068.s
@@ -1219,7 +1219,7 @@ gUnknown_80E4A40: @ 80E4A40
         .byte 0x18, 0xff
         .byte 0x19, 0xff
 
-        .include "data/text/credits.inc"
+        #include "text/credits.inc"
 
 	.global gUnknown_80E5990
 gUnknown_80E5990: @ 80E5990
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 8a64e9e..339464f 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -1,5 +1,5 @@
-.include "include/constants/status.h"
-.include "include/constants/targeting.h"
+#include "constants/status.h"
+#include "constants/targeting.h"
         .section .rodata
 
 	.global gUnknown_80F42D0
@@ -7430,7 +7430,7 @@ gChargeMovesToStatuses: @ 81069F4
 
 	.global gMultiTurnChargingStatuses
 gMultiTurnChargingStatuses: @ 8106A1C
-		.include "include/constants/status.h"
+		#include "constants/status.h"
 		.4byte CHARGING_STATUS_SOLARBEAM
 		.4byte CHARGING_STATUS_SKY_ATTACK
 		.4byte CHARGING_STATUS_RAZOR_WIND
diff --git a/data/dungeon/floor_id.inc b/data/dungeon/floor_id.inc
index accd20e..8214573 100644
--- a/data/dungeon/floor_id.inc
+++ b/data/dungeon/floor_id.inc
@@ -1,67 +1,67 @@
-.include "data/dungeon/TinyWoods/floor_id.inc"
-.include "data/dungeon/ThunderwaveCave/floor_id.inc"
-.include "data/dungeon/MtSteel/floor_id.inc"
-.include "data/dungeon/SinisterWoods/floor_id.inc"
-.include "data/dungeon/SilentChasm/floor_id.inc"
-.include "data/dungeon/MtThunder/floor_id.inc"
-.include "data/dungeon/MtThunderPeak/floor_id.inc"
-.include "data/dungeon/GreatCanyon/floor_id.inc"
-.include "data/dungeon/LapisCave/floor_id.inc"
-.include "data/dungeon/MtBlaze/floor_id.inc"
-.include "data/dungeon/MtBlazePeak/floor_id.inc"
-.include "data/dungeon/FrostyForest/floor_id.inc"
-.include "data/dungeon/FrostyGrotto/floor_id.inc"
-.include "data/dungeon/MtFreeze/floor_id.inc"
-.include "data/dungeon/MtFreezePeak/floor_id.inc"
-.include "data/dungeon/MagmaCavern/floor_id.inc"
-.include "data/dungeon/MagmaCavernPit/floor_id.inc"
-.include "data/dungeon/SkyTower/floor_id.inc"
-.include "data/dungeon/SkyTowerSummit/floor_id.inc"
-.include "data/dungeon/StormySea/floor_id.inc"
-.include "data/dungeon/SilverTrench/floor_id.inc"
-.include "data/dungeon/MeteorCave/floor_id.inc"
-.include "data/dungeon/MtFreezePeakAlt/floor_id.inc"
-.include "data/dungeon/WesternCave/floor_id.inc"
-.include "data/dungeon/Boss3/floor_id.inc" 
-.include "data/dungeon/Boss4/floor_id.inc" 
-.include "data/dungeon/WishCave/floor_id.inc" 
-.include "data/dungeon/BuriedRelic/floor_id.inc" 
-.include "data/dungeon/PitfallValley/floor_id.inc" 
-.include "data/dungeon/NorthernRange/floor_id.inc" 
-.include "data/dungeon/Boss9/floor_id.inc" 
-.include "data/dungeon/DesertRegion/floor_id.inc" 
-.include "data/dungeon/SouthernCavern/floor_id.inc" 
-.include "data/dungeon/WyvernHill/floor_id.inc" 
-.include "data/dungeon/FieryField/floor_id.inc" 
-.include "data/dungeon/NorthwindField/floor_id.inc" 
-.include "data/dungeon/SolarCave/floor_id.inc" 
-.include "data/dungeon/LightningField/floor_id.inc"
-.include "data/dungeon/DarknightRelic/floor_id.inc"
-.include "data/dungeon/WondrousSea/floor_id.inc"
-.include "data/dungeon/MurkyCave/floor_id.inc"
-.include "data/dungeon/GrandSea/floor_id.inc"
-.include "data/dungeon/UproarForest/floor_id.inc"
-.include "data/dungeon/OddityCave/floor_id.inc"
-.include "data/dungeon/RemainsIsland/floor_id.inc"
-.include "data/dungeon/MarvelousSea/floor_id.inc"
-.include "data/dungeon/FantasyStrait/floor_id.inc"
-.include "data/dungeon/RockPath/floor_id.inc"
-.include "data/dungeon/SnowPath/floor_id.inc"
-.include "data/dungeon/Autopilot/floor_id.inc"
-.include "data/dungeon/D50/floor_id.inc"
-.include "data/dungeon/D51/floor_id.inc"
-.include "data/dungeon/DojoRegistration/floor_id.inc"
-.include "data/dungeon/HowlingForest/floor_id.inc"
-.include "data/dungeon/D54/floor_id.inc"
-.include "data/dungeon/FantasyStraitAlt/floor_id.inc"
-.include "data/dungeon/WaterfallPond/floor_id.inc"
-.include "data/dungeon/UnownRelic/floor_id.inc"
-.include "data/dungeon/JoyousTower/floor_id.inc"
-.include "data/dungeon/FaroffSea/floor_id.inc"
-.include "data/dungeon/MtFaraway/floor_id.inc"
-.include "data/dungeon/D61/floor_id.inc"
-.include "data/dungeon/PurityForest/floor_id.inc"
-.include "data/dungeon/D63/floor_id.inc"
+#include "TinyWoods/floor_id.inc"
+#include "ThunderwaveCave/floor_id.inc"
+#include "MtSteel/floor_id.inc"
+#include "SinisterWoods/floor_id.inc"
+#include "SilentChasm/floor_id.inc"
+#include "MtThunder/floor_id.inc"
+#include "MtThunderPeak/floor_id.inc"
+#include "GreatCanyon/floor_id.inc"
+#include "LapisCave/floor_id.inc"
+#include "MtBlaze/floor_id.inc"
+#include "MtBlazePeak/floor_id.inc"
+#include "FrostyForest/floor_id.inc"
+#include "FrostyGrotto/floor_id.inc"
+#include "MtFreeze/floor_id.inc"
+#include "MtFreezePeak/floor_id.inc"
+#include "MagmaCavern/floor_id.inc"
+#include "MagmaCavernPit/floor_id.inc"
+#include "SkyTower/floor_id.inc"
+#include "SkyTowerSummit/floor_id.inc"
+#include "StormySea/floor_id.inc"
+#include "SilverTrench/floor_id.inc"
+#include "MeteorCave/floor_id.inc"
+#include "MtFreezePeakAlt/floor_id.inc"
+#include "WesternCave/floor_id.inc"
+#include "Boss3/floor_id.inc" 
+#include "Boss4/floor_id.inc" 
+#include "WishCave/floor_id.inc" 
+#include "BuriedRelic/floor_id.inc" 
+#include "PitfallValley/floor_id.inc" 
+#include "NorthernRange/floor_id.inc" 
+#include "Boss9/floor_id.inc" 
+#include "DesertRegion/floor_id.inc" 
+#include "SouthernCavern/floor_id.inc" 
+#include "WyvernHill/floor_id.inc" 
+#include "FieryField/floor_id.inc" 
+#include "NorthwindField/floor_id.inc" 
+#include "SolarCave/floor_id.inc" 
+#include "LightningField/floor_id.inc"
+#include "DarknightRelic/floor_id.inc"
+#include "WondrousSea/floor_id.inc"
+#include "MurkyCave/floor_id.inc"
+#include "GrandSea/floor_id.inc"
+#include "UproarForest/floor_id.inc"
+#include "OddityCave/floor_id.inc"
+#include "RemainsIsland/floor_id.inc"
+#include "MarvelousSea/floor_id.inc"
+#include "FantasyStrait/floor_id.inc"
+#include "RockPath/floor_id.inc"
+#include "SnowPath/floor_id.inc"
+#include "Autopilot/floor_id.inc"
+#include "D50/floor_id.inc"
+#include "D51/floor_id.inc"
+#include "DojoRegistration/floor_id.inc"
+#include "HowlingForest/floor_id.inc"
+#include "D54/floor_id.inc"
+#include "FantasyStraitAlt/floor_id.inc"
+#include "WaterfallPond/floor_id.inc"
+#include "UnownRelic/floor_id.inc"
+#include "JoyousTower/floor_id.inc"
+#include "FaroffSea/floor_id.inc"
+#include "MtFaraway/floor_id.inc"
+#include "D61/floor_id.inc"
+#include "PurityForest/floor_id.inc"
+#include "D63/floor_id.inc"
 
 @ Start of Dungeon Floor ID Table
 .global DungeonPointerTable
diff --git a/data/dungeon/main_data.inc b/data/dungeon/main_data.inc
index de8e282..6ea5946 100644
--- a/data/dungeon/main_data.inc
+++ b/data/dungeon/main_data.inc
@@ -2,29 +2,29 @@
 
 .global DungeonMainData
 DungeonMainData:
-.include "data/dungeon/TinyWoods/main_data.inc"
-.include "data/dungeon/ThunderwaveCave/main_data.inc"
-.include "data/dungeon/MtSteel/main_data.inc"
-.include "data/dungeon/SinisterWoods/main_data.inc"
-.include "data/dungeon/SilentChasm/main_data.inc"
-.include "data/dungeon/MtThunder/main_data.inc"
-.include "data/dungeon/MtThunderPeak/main_data.inc"
-.include "data/dungeon/GreatCanyon/main_data.inc"
-.include "data/dungeon/LapisCave/main_data.inc"
-.include "data/dungeon/MtBlaze/main_data.inc"
-.include "data/dungeon/MtBlazePeak/main_data.inc"
-.include "data/dungeon/FrostyForest/main_data.inc"
-.include "data/dungeon/FrostyGrotto/main_data.inc"
-.include "data/dungeon/MtFreeze/main_data.inc"
-.include "data/dungeon/MtFreezePeak/main_data.inc"
-.include "data/dungeon/MagmaCavern/main_data.inc"
-.include "data/dungeon/MagmaCavernPit/main_data.inc"
-.include "data/dungeon/SkyTower/main_data.inc"
-.include "data/dungeon/SkyTowerSummit/main_data.inc"
-.include "data/dungeon/StormySea/main_data.inc"
-.include "data/dungeon/SilverTrench/main_data.inc"
-.include "data/dungeon/MeteorCave/main_data.inc"
-.include "data/dungeon/MtFreezePeakAlt/main_data.inc"
+#include "TinyWoods/main_data.inc"
+#include "ThunderwaveCave/main_data.inc"
+#include "MtSteel/main_data.inc"
+#include "SinisterWoods/main_data.inc"
+#include "SilentChasm/main_data.inc"
+#include "MtThunder/main_data.inc"
+#include "MtThunderPeak/main_data.inc"
+#include "GreatCanyon/main_data.inc"
+#include "LapisCave/main_data.inc"
+#include "MtBlaze/main_data.inc"
+#include "MtBlazePeak/main_data.inc"
+#include "FrostyForest/main_data.inc"
+#include "FrostyGrotto/main_data.inc"
+#include "MtFreeze/main_data.inc"
+#include "MtFreezePeak/main_data.inc"
+#include "MagmaCavern/main_data.inc"
+#include "MagmaCavernPit/main_data.inc"
+#include "SkyTower/main_data.inc"
+#include "SkyTowerSummit/main_data.inc"
+#include "StormySea/main_data.inc"
+#include "SilverTrench/main_data.inc"
+#include "MeteorCave/main_data.inc"
+#include "MtFreezePeakAlt/main_data.inc"
 
 
 
diff --git a/data/dungeon/pokemon_found.inc b/data/dungeon/pokemon_found.inc
index 67ca464..c32676b 100644
--- a/data/dungeon/pokemon_found.inc
+++ b/data/dungeon/pokemon_found.inc
@@ -1,26 +1,26 @@
 @ Start of Pokemon Found (0x84b6064)
 
-.include "include/constants/species.h"
+#include "constants/species.h"
 
-.include "data/dungeon/TinyWoods/pokemon_found.inc"
-.include "data/dungeon/ThunderwaveCave/pokemon_found.inc"
-.include "data/dungeon/MtSteel/pokemon_found.inc"
-.include "data/dungeon/SinisterWoods/pokemon_found.inc"
-.include "data/dungeon/SilentChasm/pokemon_found.inc"
-.include "data/dungeon/MtThunder/pokemon_found.inc"
-.include "data/dungeon/MtThunderPeak/pokemon_found.inc"
-.include "data/dungeon/GreatCanyon/pokemon_found.inc"
-.include "data/dungeon/LapisCave/pokemon_found.inc"
-.include "data/dungeon/MtBlaze/pokemon_found.inc"
-.include "data/dungeon/MtBlazePeak/pokemon_found.inc"
-.include "data/dungeon/FrostyForest/pokemon_found.inc"
-.include "data/dungeon/FrostyGrotto/pokemon_found.inc"
-.include "data/dungeon/MtFreeze/pokemon_found.inc"
-.include "data/dungeon/MtFreezePeak/pokemon_found.inc"
-.include "data/dungeon/MagmaCavern/pokemon_found.inc"
-.include "data/dungeon/MagmaCavernPit/pokemon_found.inc"
-.include "data/dungeon/SkyTower/pokemon_found.inc"
-.include "data/dungeon/SkyTowerSummit/pokemon_found.inc"
+#include "TinyWoods/pokemon_found.inc"
+#include "ThunderwaveCave/pokemon_found.inc"
+#include "MtSteel/pokemon_found.inc"
+#include "SinisterWoods/pokemon_found.inc"
+#include "SilentChasm/pokemon_found.inc"
+#include "MtThunder/pokemon_found.inc"
+#include "MtThunderPeak/pokemon_found.inc"
+#include "GreatCanyon/pokemon_found.inc"
+#include "LapisCave/pokemon_found.inc"
+#include "MtBlaze/pokemon_found.inc"
+#include "MtBlazePeak/pokemon_found.inc"
+#include "FrostyForest/pokemon_found.inc"
+#include "FrostyGrotto/pokemon_found.inc"
+#include "MtFreeze/pokemon_found.inc"
+#include "MtFreezePeak/pokemon_found.inc"
+#include "MagmaCavern/pokemon_found.inc"
+#include "MagmaCavernPit/pokemon_found.inc"
+#include "SkyTower/pokemon_found.inc"
+#include "SkyTowerSummit/pokemon_found.inc"
 
 
 .byte 0x48, 0x32, 0x1a, 0x07, 0x1a, 0x07, 0x00, 0x00
diff --git a/data/dungeon_sbin.s b/data/dungeon_sbin.s
index d24b3b7..95f455e 100644
--- a/data/dungeon_sbin.s
+++ b/data/dungeon_sbin.s
@@ -30725,16 +30725,16 @@ b00pal:
 .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80
 
 
-.include "data/dungeon/banfont.inc"
-.include "data/dungeon/banrpal.inc"
-.include "data/dungeon/colvec.inc"
-.include "data/dungeon/etcfont.inc"
-.include "data/dungeon/etcfonta.inc"
-.include "data/dungeon/fixedmap.inc"
-.include "data/dungeon/hp5font.inc"
-.include "data/dungeon/itempat.inc"
-.include "data/dungeon/jyochu.inc"
-.include "data/dungeon/levfont.inc"
+#include "dungeon/banfont.inc"
+#include "dungeon/banrpal.inc"
+#include "dungeon/colvec.inc"
+#include "dungeon/etcfont.inc"
+#include "dungeon/etcfonta.inc"
+#include "dungeon/fixedmap.inc"
+#include "dungeon/hp5font.inc"
+#include "dungeon/itempat.inc"
+#include "dungeon/jyochu.inc"
+#include "dungeon/levfont.inc"
 
 @ Dungoeon Floor SIRO HEADER
 .global Mapparam_SIRO
@@ -30744,11 +30744,11 @@ Mapparam_SIRO:
 .byte 0x00, 0x00, 0x00, 0x00
 .byte 0x00, 0x00, 0x00, 0x00
 
-.include "data/dungeon/floor_id.inc"
-.include "data/dungeon/main_data.inc"
-.include "data/dungeon/pokemon_found.inc"
-.include "data/dungeon/traps_found.inc"
-.include "data/dungeon/items_found.inc"
+#include "dungeon/floor_id.inc"
+#include "dungeon/main_data.inc"
+#include "dungeon/pokemon_found.inc"
+#include "dungeon/traps_found.inc"
+#include "dungeon/items_found.inc"
 
 .global DungeonMasterTable
 DungeonMasterTable:
@@ -36413,5 +36413,5 @@ PartnerConversion9SIRO:
 .byte 0x30, 0x5f, 0x30, 0x32, 0x00, 0x00, 0x00, 0x00, 0x24, 0x6d, 0x30, 0x3a, 0x20, 0x5f, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f
 .byte 0x6e, 0x5f, 0x30, 0x39, 0x30, 0x5f, 0x30, 0x31, 0x00, 0x00, 0x00, 0x00
 
-.include "data/dungeon/trappat.inc"
-.include "data/dungeon/zmappat.inc"
+#include "dungeon/trappat.inc"
+#include "dungeon/zmappat.inc"
diff --git a/data/sound_data.s b/data/sound_data.s
index d21dfbb..32367fd 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,8 +1,8 @@
 	.section .rodata
 
-	.include "include/macros/m4a.inc"
+	#include "asm/macros/m4a.inc"
 
-	.include "sound/music_player_table.inc"
-	.include "sound/song_table.inc"
+	#include "../sound/music_player_table.inc"
+	#include "../sound/song_table.inc"
 
 	.incbin "baserom.gba", 0x1E8841C, 0x177BE4
diff --git a/data/system_sbin.s b/data/system_sbin.s
index 6742b67..7ea8cd5 100644
--- a/data/system_sbin.s
+++ b/data/system_sbin.s
@@ -1583,14 +1583,14 @@ DataRootTable:
 .byte 0x28, 0xcc, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 @ Address 0x306580
-.include "data/item/item_descriptions.s"
+#include "item/item_descriptions.s"
 .align 2,0
 
 @ Address 0x30cc28
-.include "data/item/item_data.inc"
+#include "item/item_data.inc"
 
 @ Address 0x30ea28
-.include "data/item/item_names.s"
+#include "item/item_names.s"
 .string "SIRO"
 
 .byte 0xb0, 0x91, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -10923,10 +10923,10 @@ DataRootTable:
 .byte 0x00, 0x00, 0x00, 0x00
 
 @ Address 0x357b98
-.include "data/pokemon/species_data.inc"
+#include "pokemon/species_data.inc"
 
 @ Address 0x35f2d8
-.include "data/pokemon/species_names.s"
+#include "pokemon/species_names.s"
 
 .string "SIRO"
 .byte 0x38, 0x33, 0x37, 0x08, 0x00, 0x00, 0x00, 0x00
@@ -11809,10 +11809,10 @@ DataRootTable:
 .byte 0x0f, 0x83, 0x10, 0x83, 0x11, 0x83, 0x12, 0x83, 0x13, 0x83, 0x14, 0x83, 0x15, 0x83, 0x16, 0x83, 0x17, 0x83, 0x18, 0x83, 0x19, 0x83, 0x1a, 0x83, 0x1b, 0x83, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00
 
 @ Address 0x3679a0
-.include "data/move/move_data.inc"
+#include "move/move_data.inc"
 
 @ Address 0x36b3b4
-.include "data/move/move_names.s"
+#include "move/move_names.s"
 
 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 .byte 0x06, 0x0c, 0x36, 0x08, 0x26, 0x0c, 0x36, 0x08, 0x4a, 0x0c, 0x36, 0x08, 0x70, 0x0c, 0x36, 0x08, 0x94, 0x0c, 0x36, 0x08, 0xc0, 0x0c, 0x36, 0x08, 0xe9, 0x0c, 0x36, 0x08, 0x06, 0x0d, 0x36, 0x08