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.

3 files changed, 107 insertions, 107 deletions

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