diff options
Diffstat (limited to 'scripts')
229 files changed, 456 insertions, 456 deletions
diff --git a/scripts/Baadon.asm b/scripts/Baadon.asm index 8736f03..3d659ab 100644 --- a/scripts/Baadon.asm +++ b/scripts/Baadon.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Baadon.asm", ROMX -BaadonScriptLoader:: +Baadon_ScriptLoader:: ret db "@" diff --git a/scripts/BaadonHouse1.asm b/scripts/BaadonHouse1.asm index bf37347..2f754e8 100644 --- a/scripts/BaadonHouse1.asm +++ b/scripts/BaadonHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonHouse1.asm", ROMX -BaadonHouse1ScriptLoader:: +BaadonHouse1_ScriptLoader:: ret -BaadonHouse1TextPointers:: +BaadonHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonHouse2.asm b/scripts/BaadonHouse2.asm index 5107f8e..709e938 100644 --- a/scripts/BaadonHouse2.asm +++ b/scripts/BaadonHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonHouse2.asm", ROMX -BaadonHouse2ScriptLoader:: +BaadonHouse2_ScriptLoader:: ret -BaadonHouse2TextPointers:: +BaadonHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonLeague1F.asm b/scripts/BaadonLeague1F.asm index 085ae7d..5e32cec 100644 --- a/scripts/BaadonLeague1F.asm +++ b/scripts/BaadonLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonLeague1F.asm", ROMX -BaadonLeague1FScriptLoader:: +BaadonLeague1F_ScriptLoader:: ret -BaadonLeague1FTextPointers:: +BaadonLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonLeague2F.asm b/scripts/BaadonLeague2F.asm index d706109..0bae897 100644 --- a/scripts/BaadonLeague2F.asm +++ b/scripts/BaadonLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonLeague2F.asm", ROMX -BaadonLeague2FScriptLoader:: +BaadonLeague2F_ScriptLoader:: ret -BaadonLeague2FTextPointers:: +BaadonLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonMart.asm b/scripts/BaadonMart.asm index 521b91b..40ac4c1 100644 --- a/scripts/BaadonMart.asm +++ b/scripts/BaadonMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonMart.asm", ROMX -BaadonMartScriptLoader:: +BaadonMart_ScriptLoader:: ret -BaadonMartTextPointers:: +BaadonMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonPokecenter1F.asm b/scripts/BaadonPokecenter1F.asm index c78966f..1c29390 100644 --- a/scripts/BaadonPokecenter1F.asm +++ b/scripts/BaadonPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonPokecenter1F.asm", ROMX -BaadonPokecenter1FScriptLoader:: +BaadonPokecenter1F_ScriptLoader:: ret -BaadonPokecenter1FTextPointers:: +BaadonPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonPokecenter2F.asm b/scripts/BaadonPokecenter2F.asm index 3b4d467..cd420b0 100644 --- a/scripts/BaadonPokecenter2F.asm +++ b/scripts/BaadonPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonPokecenter2F.asm", ROMX -BaadonPokecenter2FScriptLoader:: +BaadonPokecenter2F_ScriptLoader:: ret -BaadonPokecenter2FTextPointers:: +BaadonPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonRoute1.asm b/scripts/BaadonRoute1.asm index 3a94f6c..1e296c3 100644 --- a/scripts/BaadonRoute1.asm +++ b/scripts/BaadonRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonRoute1.asm", ROMX -BaadonRoute1ScriptLoader:: +BaadonRoute1_ScriptLoader:: ret db "@" diff --git a/scripts/BaadonRoute2.asm b/scripts/BaadonRoute2.asm index 05f44a9..ddd74e4 100644 --- a/scripts/BaadonRoute2.asm +++ b/scripts/BaadonRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonRoute2.asm", ROMX -BaadonRoute2ScriptLoader:: +BaadonRoute2_ScriptLoader:: ret db "@" diff --git a/scripts/BaadonRoute3.asm b/scripts/BaadonRoute3.asm index 4f7bcbc..6a3a004 100644 --- a/scripts/BaadonRoute3.asm +++ b/scripts/BaadonRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonRoute3.asm", ROMX -BaadonRoute3ScriptLoader:: +BaadonRoute3_ScriptLoader:: ret db "@" diff --git a/scripts/BaadonRouteGateNewtype.asm b/scripts/BaadonRouteGateNewtype.asm index d3e95af..318601a 100644 --- a/scripts/BaadonRouteGateNewtype.asm +++ b/scripts/BaadonRouteGateNewtype.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonRouteGateNewtype.asm", ROMX -BaadonRouteGateNewtypeScriptLoader:: +BaadonRouteGateNewtype_ScriptLoader:: ret -BaadonRouteGateNewtypeTextPointers:: +BaadonRouteGateNewtype_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonRouteGateWest.asm b/scripts/BaadonRouteGateWest.asm index 3577294..8ab5232 100644 --- a/scripts/BaadonRouteGateWest.asm +++ b/scripts/BaadonRouteGateWest.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonRouteGateWest.asm", ROMX -BaadonRouteGateWestScriptLoader:: +BaadonRouteGateWest_ScriptLoader:: ret -BaadonRouteGateWestTextPointers:: +BaadonRouteGateWest_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BaadonWallpaperHouse.asm b/scripts/BaadonWallpaperHouse.asm index 1f035f6..9fbfa9a 100644 --- a/scripts/BaadonWallpaperHouse.asm +++ b/scripts/BaadonWallpaperHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BaadonWallpaperHouse.asm", ROMX -BaadonWallpaperHouseScriptLoader:: +BaadonWallpaperHouse_ScriptLoader:: ret -BaadonWallpaperHouseTextPointers:: +BaadonWallpaperHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullForest.asm b/scripts/BullForest.asm index a3f4852..f7d6977 100644 --- a/scripts/BullForest.asm +++ b/scripts/BullForest.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BullForest.asm", ROMX -BullForestScriptLoader:: +BullForest_ScriptLoader:: ret db "@" diff --git a/scripts/BullForestRoute1.asm b/scripts/BullForestRoute1.asm index b4ed18d..2984072 100644 --- a/scripts/BullForestRoute1.asm +++ b/scripts/BullForestRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BullForestRoute1.asm", ROMX -BullForestRoute1ScriptLoader:: +BullForestRoute1_ScriptLoader:: ret db "@" diff --git a/scripts/BullForestRoute1House.asm b/scripts/BullForestRoute1House.asm index 3e16c4a..91067e9 100644 --- a/scripts/BullForestRoute1House.asm +++ b/scripts/BullForestRoute1House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullForestRoute1House.asm", ROMX -BullForestRoute1HouseScriptLoader:: +BullForestRoute1House_ScriptLoader:: ret -BullForestRoute1HouseTextPointers:: +BullForestRoute1House_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullForestRoute2.asm b/scripts/BullForestRoute2.asm index 815c061..90dd7d2 100644 --- a/scripts/BullForestRoute2.asm +++ b/scripts/BullForestRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BullForestRoute2.asm", ROMX -BullForestRoute2ScriptLoader:: +BullForestRoute2_ScriptLoader:: ret db "@" diff --git a/scripts/BullForestRoute3.asm b/scripts/BullForestRoute3.asm index 1724253..34719f1 100644 --- a/scripts/BullForestRoute3.asm +++ b/scripts/BullForestRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/BullForestRoute3.asm", ROMX -BullForestRoute3ScriptLoader:: +BullForestRoute3_ScriptLoader:: ret db "@" diff --git a/scripts/BullForestRouteGateStand.asm b/scripts/BullForestRouteGateStand.asm index 84b580b..9f14c34 100644 --- a/scripts/BullForestRouteGateStand.asm +++ b/scripts/BullForestRouteGateStand.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullForestRouteGateStand.asm", ROMX -BullForestRouteGateStandScriptLoader:: +BullForestRouteGateStand_ScriptLoader:: ret -BullForestRouteGateStandTextPointers:: +BullForestRouteGateStand_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse1.asm b/scripts/BullHouse1.asm index 281c978..df627cc 100644 --- a/scripts/BullHouse1.asm +++ b/scripts/BullHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullHouse1.asm", ROMX -BullHouse1ScriptLoader:: +BullHouse1_ScriptLoader:: ret -BullHouse1TextPointers:: +BullHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse2.asm b/scripts/BullHouse2.asm index 1e76ee4..8951b48 100644 --- a/scripts/BullHouse2.asm +++ b/scripts/BullHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullHouse2.asm", ROMX -BullHouse2ScriptLoader:: +BullHouse2_ScriptLoader:: ret -BullHouse2TextPointers:: +BullHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse3.asm b/scripts/BullHouse3.asm index 1cb40fc..221755e 100644 --- a/scripts/BullHouse3.asm +++ b/scripts/BullHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullHouse3.asm", ROMX -BullHouse3ScriptLoader:: +BullHouse3_ScriptLoader:: ret -BullHouse3TextPointers:: +BullHouse3_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullHouse4.asm b/scripts/BullHouse4.asm index 19d3824..0adf071 100644 --- a/scripts/BullHouse4.asm +++ b/scripts/BullHouse4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullHouse4.asm", ROMX -BullHouse4ScriptLoader:: +BullHouse4_ScriptLoader:: ret -BullHouse4TextPointers:: +BullHouse4_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullLeague1F.asm b/scripts/BullLeague1F.asm index 5d44b79..d9aac08 100644 --- a/scripts/BullLeague1F.asm +++ b/scripts/BullLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullLeague1F.asm", ROMX -BullLeague1FScriptLoader:: +BullLeague1F_ScriptLoader:: ret -BullLeague1FTextPointers:: +BullLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullLeague2F.asm b/scripts/BullLeague2F.asm index 24dc07e..2616c26 100644 --- a/scripts/BullLeague2F.asm +++ b/scripts/BullLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullLeague2F.asm", ROMX -BullLeague2FScriptLoader:: +BullLeague2F_ScriptLoader:: ret -BullLeague2FTextPointers:: +BullLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullMart.asm b/scripts/BullMart.asm index 3c5179b..bef01b2 100644 --- a/scripts/BullMart.asm +++ b/scripts/BullMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullMart.asm", ROMX -BullMartScriptLoader:: +BullMart_ScriptLoader:: ret -BullMartTextPointers:: +BullMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullPokecenter1F.asm b/scripts/BullPokecenter1F.asm index 552d719..ac479ac 100644 --- a/scripts/BullPokecenter1F.asm +++ b/scripts/BullPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullPokecenter1F.asm", ROMX -BullPokecenter1FScriptLoader:: +BullPokecenter1F_ScriptLoader:: ret -BullPokecenter1FTextPointers:: +BullPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/BullPokecenter2F.asm b/scripts/BullPokecenter2F.asm index dd46157..58d0cf0 100644 --- a/scripts/BullPokecenter2F.asm +++ b/scripts/BullPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/BullPokecenter2F.asm", ROMX -BullPokecenter2FScriptLoader:: +BullPokecenter2F_ScriptLoader:: ret -BullPokecenter2FTextPointers:: +BullPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/CaveMinecarts1.asm b/scripts/CaveMinecarts1.asm index 2c08c44..38bceb4 100644 --- a/scripts/CaveMinecarts1.asm +++ b/scripts/CaveMinecarts1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts1.asm", ROMX -CaveMinecarts1ScriptLoader:: +CaveMinecarts1_ScriptLoader:: ret -CaveMinecarts1TextPointers:: +CaveMinecarts1_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts2.asm b/scripts/CaveMinecarts2.asm index a05289c..dde0184 100644 --- a/scripts/CaveMinecarts2.asm +++ b/scripts/CaveMinecarts2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts2.asm", ROMX -CaveMinecarts2ScriptLoader:: +CaveMinecarts2_ScriptLoader:: ret -CaveMinecarts2TextPointers:: +CaveMinecarts2_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts3.asm b/scripts/CaveMinecarts3.asm index b3524cb..34a9275 100644 --- a/scripts/CaveMinecarts3.asm +++ b/scripts/CaveMinecarts3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts3.asm", ROMX -CaveMinecarts3ScriptLoader:: +CaveMinecarts3_ScriptLoader:: ret -CaveMinecarts3TextPointers:: +CaveMinecarts3_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts4.asm b/scripts/CaveMinecarts4.asm index 9e40937..69ea826 100644 --- a/scripts/CaveMinecarts4.asm +++ b/scripts/CaveMinecarts4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts4.asm", ROMX -CaveMinecarts4ScriptLoader:: +CaveMinecarts4_ScriptLoader:: ret -CaveMinecarts4TextPointers:: +CaveMinecarts4_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts5.asm b/scripts/CaveMinecarts5.asm index 1d3e6ce..2385564 100644 --- a/scripts/CaveMinecarts5.asm +++ b/scripts/CaveMinecarts5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts5.asm", ROMX -CaveMinecarts5ScriptLoader:: +CaveMinecarts5_ScriptLoader:: ret -CaveMinecarts5TextPointers:: +CaveMinecarts5_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts6.asm b/scripts/CaveMinecarts6.asm index 5912778..3375150 100644 --- a/scripts/CaveMinecarts6.asm +++ b/scripts/CaveMinecarts6.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts6.asm", ROMX -CaveMinecarts6ScriptLoader:: +CaveMinecarts6_ScriptLoader:: ret -CaveMinecarts6TextPointers:: +CaveMinecarts6_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/CaveMinecarts7.asm b/scripts/CaveMinecarts7.asm index 53a7d20..a871188 100644 --- a/scripts/CaveMinecarts7.asm +++ b/scripts/CaveMinecarts7.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/CaveMinecarts7.asm", ROMX -CaveMinecarts7ScriptLoader:: +CaveMinecarts7_ScriptLoader:: ret -CaveMinecarts7TextPointers:: +CaveMinecarts7_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/Fonto.asm b/scripts/Fonto.asm index 6629aa3..cdb3b51 100644 --- a/scripts/Fonto.asm +++ b/scripts/Fonto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Fonto.asm", ROMX -FontoScriptLoader:: +Fonto_ScriptLoader:: ret db "@" diff --git a/scripts/FontoHouse.asm b/scripts/FontoHouse.asm index 6b134a3..d7e933d 100644 --- a/scripts/FontoHouse.asm +++ b/scripts/FontoHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoHouse.asm", ROMX -FontoHouseScriptLoader:: +FontoHouse_ScriptLoader:: ret -FontoHouseTextPointers:: +FontoHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoLab.asm b/scripts/FontoLab.asm index 34e2d82..761d99e 100644 --- a/scripts/FontoLab.asm +++ b/scripts/FontoLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoLab.asm", ROMX -FontoLabScriptLoader:: +FontoLab_ScriptLoader:: ret -FontoLabTextPointers:: +FontoLab_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoMart.asm b/scripts/FontoMart.asm index 9851561..3e1b702 100644 --- a/scripts/FontoMart.asm +++ b/scripts/FontoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoMart.asm", ROMX -FontoMartScriptLoader:: +FontoMart_ScriptLoader:: ret -FontoMartTextPointers:: +FontoMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoPokecenter1F.asm b/scripts/FontoPokecenter1F.asm index 74a646c..bf6035f 100644 --- a/scripts/FontoPokecenter1F.asm +++ b/scripts/FontoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoPokecenter1F.asm", ROMX -FontoPokecenter1FScriptLoader:: +FontoPokecenter1F_ScriptLoader:: ret -FontoPokecenter1FTextPointers:: +FontoPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoPokecenter2F.asm b/scripts/FontoPokecenter2F.asm index 353eb39..cc0f64e 100644 --- a/scripts/FontoPokecenter2F.asm +++ b/scripts/FontoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoPokecenter2F.asm", ROMX -FontoPokecenter2FScriptLoader:: +FontoPokecenter2F_ScriptLoader:: ret -FontoPokecenter2FTextPointers:: +FontoPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoRocketHouse.asm b/scripts/FontoRocketHouse.asm index 88f02b5..ea20802 100644 --- a/scripts/FontoRocketHouse.asm +++ b/scripts/FontoRocketHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRocketHouse.asm", ROMX -FontoRocketHouseScriptLoader:: +FontoRocketHouse_ScriptLoader:: ret -FontoRocketHouseTextPointers:: +FontoRocketHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoRoute1.asm b/scripts/FontoRoute1.asm index 5ef94c9..cce38f6 100644 --- a/scripts/FontoRoute1.asm +++ b/scripts/FontoRoute1.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute1.asm", ROMX -FontoRoute1ScriptLoader:: +FontoRoute1_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRoute2.asm b/scripts/FontoRoute2.asm index 7e5f4ac..ceeaf82 100644 --- a/scripts/FontoRoute2.asm +++ b/scripts/FontoRoute2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute2.asm", ROMX -FontoRoute2ScriptLoader:: +FontoRoute2_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRoute3.asm b/scripts/FontoRoute3.asm index 7990a9e..b22aea1 100644 --- a/scripts/FontoRoute3.asm +++ b/scripts/FontoRoute3.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute3.asm", ROMX -FontoRoute3ScriptLoader:: +FontoRoute3_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRoute4.asm b/scripts/FontoRoute4.asm index b6ba95d..2a6ed32 100644 --- a/scripts/FontoRoute4.asm +++ b/scripts/FontoRoute4.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute4.asm", ROMX -FontoRoute4ScriptLoader:: +FontoRoute4_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRoute5.asm b/scripts/FontoRoute5.asm index 3396745..ebe3686 100644 --- a/scripts/FontoRoute5.asm +++ b/scripts/FontoRoute5.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute5.asm", ROMX -FontoRoute5ScriptLoader:: +FontoRoute5_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRoute6.asm b/scripts/FontoRoute6.asm index ac7a28c..8e817e0 100644 --- a/scripts/FontoRoute6.asm +++ b/scripts/FontoRoute6.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRoute6.asm", ROMX -FontoRoute6ScriptLoader:: +FontoRoute6_ScriptLoader:: ret db "@" diff --git a/scripts/FontoRouteGate1.asm b/scripts/FontoRouteGate1.asm index 322e14f..c7acf6a 100644 --- a/scripts/FontoRouteGate1.asm +++ b/scripts/FontoRouteGate1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRouteGate1.asm", ROMX -FontoRouteGate1ScriptLoader:: +FontoRouteGate1_ScriptLoader:: ret -FontoRouteGate1TextPointers:: +FontoRouteGate1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoRouteGate2.asm b/scripts/FontoRouteGate2.asm index 7b1841f..84f7a83 100644 --- a/scripts/FontoRouteGate2.asm +++ b/scripts/FontoRouteGate2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRouteGate2.asm", ROMX -FontoRouteGate2ScriptLoader:: +FontoRouteGate2_ScriptLoader:: ret -FontoRouteGate2TextPointers:: +FontoRouteGate2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/FontoRouteGate3.asm b/scripts/FontoRouteGate3.asm index 7091839..f05a809 100644 --- a/scripts/FontoRouteGate3.asm +++ b/scripts/FontoRouteGate3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/FontoRouteGate3.asm", ROMX -FontoRouteGate3ScriptLoader:: +FontoRouteGate3_ScriptLoader:: ret -FontoRouteGate3TextPointers:: +FontoRouteGate3_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Haiteku.asm b/scripts/Haiteku.asm index fefe049..65480ac 100644 --- a/scripts/Haiteku.asm +++ b/scripts/Haiteku.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Haiteku.asm", ROMX -HaitekuScriptLoader:: +Haiteku_ScriptLoader:: ret db "@" diff --git a/scripts/HaitekuAquarium1F.asm b/scripts/HaitekuAquarium1F.asm index 636aa61..256ee88 100644 --- a/scripts/HaitekuAquarium1F.asm +++ b/scripts/HaitekuAquarium1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuAquarium1F.asm", ROMX -HaitekuAquarium1FScriptLoader:: +HaitekuAquarium1F_ScriptLoader:: ret -HaitekuAquarium1FTextPointers:: +HaitekuAquarium1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuAquarium2F.asm b/scripts/HaitekuAquarium2F.asm index da6d18b..cba5c08 100644 --- a/scripts/HaitekuAquarium2F.asm +++ b/scripts/HaitekuAquarium2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuAquarium2F.asm", ROMX -HaitekuAquarium2FScriptLoader:: +HaitekuAquarium2F_ScriptLoader:: ret -HaitekuAquarium2FTextPointers:: +HaitekuAquarium2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuHouse1.asm b/scripts/HaitekuHouse1.asm index 4dd851c..6c9c611 100644 --- a/scripts/HaitekuHouse1.asm +++ b/scripts/HaitekuHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuHouse1.asm", ROMX -HaitekuHouse1ScriptLoader:: +HaitekuHouse1_ScriptLoader:: ret -HaitekuHouse1TextPointers:: +HaitekuHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuHouse2.asm b/scripts/HaitekuHouse2.asm index 24dc596..474a06b 100644 --- a/scripts/HaitekuHouse2.asm +++ b/scripts/HaitekuHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuHouse2.asm", ROMX -HaitekuHouse2ScriptLoader:: +HaitekuHouse2_ScriptLoader:: ret -HaitekuHouse2TextPointers:: +HaitekuHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuImposterOakHouse.asm b/scripts/HaitekuImposterOakHouse.asm index ac12ad1..15698e9 100644 --- a/scripts/HaitekuImposterOakHouse.asm +++ b/scripts/HaitekuImposterOakHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuImposterOakHouse.asm", ROMX -HaitekuImposterOakHouseScriptLoader:: +HaitekuImposterOakHouse_ScriptLoader:: ret -HaitekuImposterOakHouseTextPointers:: +HaitekuImposterOakHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuLeague1F.asm b/scripts/HaitekuLeague1F.asm index 513260c..43b584b 100644 --- a/scripts/HaitekuLeague1F.asm +++ b/scripts/HaitekuLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuLeague1F.asm", ROMX -HaitekuLeague1FScriptLoader:: +HaitekuLeague1F_ScriptLoader:: ret -HaitekuLeague1FTextPointers:: +HaitekuLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuLeague2F.asm b/scripts/HaitekuLeague2F.asm index 812566d..75d079e 100644 --- a/scripts/HaitekuLeague2F.asm +++ b/scripts/HaitekuLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuLeague2F.asm", ROMX -HaitekuLeague2FScriptLoader:: +HaitekuLeague2F_ScriptLoader:: ret -HaitekuLeague2FTextPointers:: +HaitekuLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuMart.asm b/scripts/HaitekuMart.asm index b325e32..56ecfe9 100644 --- a/scripts/HaitekuMart.asm +++ b/scripts/HaitekuMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuMart.asm", ROMX -HaitekuMartScriptLoader:: +HaitekuMart_ScriptLoader:: ret -HaitekuMartTextPointers:: +HaitekuMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuPokecenter1F.asm b/scripts/HaitekuPokecenter1F.asm index 2f54747..8755441 100644 --- a/scripts/HaitekuPokecenter1F.asm +++ b/scripts/HaitekuPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuPokecenter1F.asm", ROMX -HaitekuPokecenter1FScriptLoader:: +HaitekuPokecenter1F_ScriptLoader:: ret -HaitekuPokecenter1FTextPointers:: +HaitekuPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuPokecenter2F.asm b/scripts/HaitekuPokecenter2F.asm index 23140cb..ed82559 100644 --- a/scripts/HaitekuPokecenter2F.asm +++ b/scripts/HaitekuPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuPokecenter2F.asm", ROMX -HaitekuPokecenter2FScriptLoader:: +HaitekuPokecenter2F_ScriptLoader:: ret -HaitekuPokecenter2FTextPointers:: +HaitekuPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuWestRoute.asm b/scripts/HaitekuWestRoute.asm index feb3a4d..a24631b 100644 --- a/scripts/HaitekuWestRoute.asm +++ b/scripts/HaitekuWestRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuWestRoute.asm", ROMX -HaitekuWestRouteScriptLoader:: +HaitekuWestRoute_ScriptLoader:: ret db "@" diff --git a/scripts/HaitekuWestRouteGate.asm b/scripts/HaitekuWestRouteGate.asm index 2e27c03..e99f757 100644 --- a/scripts/HaitekuWestRouteGate.asm +++ b/scripts/HaitekuWestRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuWestRouteGate.asm", ROMX -HaitekuWestRouteGateScriptLoader:: +HaitekuWestRouteGate_ScriptLoader:: ret -HaitekuWestRouteGateTextPointers:: +HaitekuWestRouteGate_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/HaitekuWestRouteOcean.asm b/scripts/HaitekuWestRouteOcean.asm index 694c865..d3155bb 100644 --- a/scripts/HaitekuWestRouteOcean.asm +++ b/scripts/HaitekuWestRouteOcean.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/HaitekuWestRouteOcean.asm", ROMX -HaitekuWestRouteOceanScriptLoader:: +HaitekuWestRouteOcean_ScriptLoader:: ret db "@" diff --git a/scripts/Kanto.asm b/scripts/Kanto.asm index 1472564..b2617a4 100644 --- a/scripts/Kanto.asm +++ b/scripts/Kanto.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Kanto.asm", ROMX -KantoScriptLoader:: +Kanto_ScriptLoader:: ret db "@" diff --git a/scripts/KantoCeladonElevator.asm b/scripts/KantoCeladonElevator.asm index 2dde637..c05a44d 100644 --- a/scripts/KantoCeladonElevator.asm +++ b/scripts/KantoCeladonElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonElevator.asm", ROMX -KantoCeladonElevatorScriptLoader:: +KantoCeladonElevator_ScriptLoader:: ret -KantoCeladonElevatorTextPointers:: +KantoCeladonElevator_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeladonMart1F.asm b/scripts/KantoCeladonMart1F.asm index b45220f..0c1beb6 100644 --- a/scripts/KantoCeladonMart1F.asm +++ b/scripts/KantoCeladonMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonMart1F.asm", ROMX -KantoCeladonMart1FScriptLoader:: +KantoCeladonMart1F_ScriptLoader:: ret -KantoCeladonMart1FTextPointers:: +KantoCeladonMart1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeladonMart2F.asm b/scripts/KantoCeladonMart2F.asm index 92d5b36..ad0f5eb 100644 --- a/scripts/KantoCeladonMart2F.asm +++ b/scripts/KantoCeladonMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonMart2F.asm", ROMX -KantoCeladonMart2FScriptLoader:: +KantoCeladonMart2F_ScriptLoader:: ret -KantoCeladonMart2FTextPointers:: +KantoCeladonMart2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeladonMart3F.asm b/scripts/KantoCeladonMart3F.asm index c2fa6d3..bb62d83 100644 --- a/scripts/KantoCeladonMart3F.asm +++ b/scripts/KantoCeladonMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonMart3F.asm", ROMX -KantoCeladonMart3FScriptLoader:: +KantoCeladonMart3F_ScriptLoader:: ret -KantoCeladonMart3FTextPointers:: +KantoCeladonMart3F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeladonMart4F.asm b/scripts/KantoCeladonMart4F.asm index 8c86b1e..ccd037e 100644 --- a/scripts/KantoCeladonMart4F.asm +++ b/scripts/KantoCeladonMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonMart4F.asm", ROMX -KantoCeladonMart4FScriptLoader:: +KantoCeladonMart4F_ScriptLoader:: ret -KantoCeladonMart4FTextPointers:: +KantoCeladonMart4F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeladonMart5F.asm b/scripts/KantoCeladonMart5F.asm index ad7f09d..b0310f7 100644 --- a/scripts/KantoCeladonMart5F.asm +++ b/scripts/KantoCeladonMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeladonMart5F.asm", ROMX -KantoCeladonMart5FScriptLoader:: +KantoCeladonMart5F_ScriptLoader:: ret -KantoCeladonMart5FTextPointers:: +KantoCeladonMart5F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoCeruleanHouse.asm b/scripts/KantoCeruleanHouse.asm index 57dd75d..1129f6f 100644 --- a/scripts/KantoCeruleanHouse.asm +++ b/scripts/KantoCeruleanHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoCeruleanHouse.asm", ROMX -KantoCeruleanHouseScriptLoader:: +KantoCeruleanHouse_ScriptLoader:: ret -KantoCeruleanHouseTextPointers:: +KantoCeruleanHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoDiner.asm b/scripts/KantoDiner.asm index 483c69c..392d459 100644 --- a/scripts/KantoDiner.asm +++ b/scripts/KantoDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoDiner.asm", ROMX -KantoDinerScriptLoader:: +KantoDiner_ScriptLoader:: ret -KantoDinerTextPointers:: +KantoDiner_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoEastRoute.asm b/scripts/KantoEastRoute.asm index 3e62792..00cf9d0 100644 --- a/scripts/KantoEastRoute.asm +++ b/scripts/KantoEastRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/KantoEastRoute.asm", ROMX -KantoEastRouteScriptLoader:: +KantoEastRoute_ScriptLoader:: ret db "@" diff --git a/scripts/KantoEldersHouse.asm b/scripts/KantoEldersHouse.asm index 312d5b0..d6872dd 100644 --- a/scripts/KantoEldersHouse.asm +++ b/scripts/KantoEldersHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoEldersHouse.asm", ROMX -KantoEldersHouseScriptLoader:: +KantoEldersHouse_ScriptLoader:: ret -KantoEldersHouseTextPointers:: +KantoEldersHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoFishingGuru.asm b/scripts/KantoFishingGuru.asm index 29bab4d..6774e2e 100644 --- a/scripts/KantoFishingGuru.asm +++ b/scripts/KantoFishingGuru.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoFishingGuru.asm", ROMX -KantoFishingGuruScriptLoader:: +KantoFishingGuru_ScriptLoader:: ret -KantoFishingGuruTextPointers:: +KantoFishingGuru_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGameCorner.asm b/scripts/KantoGameCorner.asm index 272a24d..e9b6a4b 100644 --- a/scripts/KantoGameCorner.asm +++ b/scripts/KantoGameCorner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGameCorner.asm", ROMX -KantoGameCornerScriptLoader:: +KantoGameCorner_ScriptLoader:: ret -KantoGameCornerTextPointers:: +KantoGameCorner_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGameCornerPrizes.asm b/scripts/KantoGameCornerPrizes.asm index e823ba6..d025cfe 100644 --- a/scripts/KantoGameCornerPrizes.asm +++ b/scripts/KantoGameCornerPrizes.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGameCornerPrizes.asm", ROMX -KantoGameCornerPrizesScriptLoader:: +KantoGameCornerPrizes_ScriptLoader:: ret -KantoGameCornerPrizesTextPointers:: +KantoGameCornerPrizes_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ1.asm b/scripts/KantoGamefreakHQ1.asm index e6af919..5f9dd43 100644 --- a/scripts/KantoGamefreakHQ1.asm +++ b/scripts/KantoGamefreakHQ1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGamefreakHQ1.asm", ROMX -KantoGamefreakHQ1ScriptLoader:: +KantoGamefreakHQ1_ScriptLoader:: ret -KantoGamefreakHQ1TextPointers:: +KantoGamefreakHQ1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ2.asm b/scripts/KantoGamefreakHQ2.asm index b120c1e..464a746 100644 --- a/scripts/KantoGamefreakHQ2.asm +++ b/scripts/KantoGamefreakHQ2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGamefreakHQ2.asm", ROMX -KantoGamefreakHQ2ScriptLoader:: +KantoGamefreakHQ2_ScriptLoader:: ret -KantoGamefreakHQ2TextPointers:: +KantoGamefreakHQ2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ3.asm b/scripts/KantoGamefreakHQ3.asm index bf6650f..b92add9 100644 --- a/scripts/KantoGamefreakHQ3.asm +++ b/scripts/KantoGamefreakHQ3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGamefreakHQ3.asm", ROMX -KantoGamefreakHQ3ScriptLoader:: +KantoGamefreakHQ3_ScriptLoader:: ret -KantoGamefreakHQ3TextPointers:: +KantoGamefreakHQ3_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ4.asm b/scripts/KantoGamefreakHQ4.asm index 3e24765..fd0de29 100644 --- a/scripts/KantoGamefreakHQ4.asm +++ b/scripts/KantoGamefreakHQ4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGamefreakHQ4.asm", ROMX -KantoGamefreakHQ4ScriptLoader:: +KantoGamefreakHQ4_ScriptLoader:: ret -KantoGamefreakHQ4TextPointers:: +KantoGamefreakHQ4_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGamefreakHQ5.asm b/scripts/KantoGamefreakHQ5.asm index 591f5dd..92a82d1 100644 --- a/scripts/KantoGamefreakHQ5.asm +++ b/scripts/KantoGamefreakHQ5.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGamefreakHQ5.asm", ROMX -KantoGamefreakHQ5ScriptLoader:: +KantoGamefreakHQ5_ScriptLoader:: ret -KantoGamefreakHQ5TextPointers:: +KantoGamefreakHQ5_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGreensHouse1F.asm b/scripts/KantoGreensHouse1F.asm index ef2fc1c..0e7b5be 100644 --- a/scripts/KantoGreensHouse1F.asm +++ b/scripts/KantoGreensHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGreensHouse1F.asm", ROMX -KantoGreensHouse1FScriptLoader:: +KantoGreensHouse1F_ScriptLoader:: ret -KantoGreensHouse1FTextPointers:: +KantoGreensHouse1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoGreensHouse2F.asm b/scripts/KantoGreensHouse2F.asm index 2ed0dae..408263b 100644 --- a/scripts/KantoGreensHouse2F.asm +++ b/scripts/KantoGreensHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoGreensHouse2F.asm", ROMX -KantoGreensHouse2FScriptLoader:: +KantoGreensHouse2F_ScriptLoader:: ret -KantoGreensHouse2FTextPointers:: +KantoGreensHouse2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoHospital.asm b/scripts/KantoHospital.asm index 4844424..4894b11 100644 --- a/scripts/KantoHospital.asm +++ b/scripts/KantoHospital.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoHospital.asm", ROMX -KantoHospitalScriptLoader:: +KantoHospital_ScriptLoader:: ret -KantoHospitalTextPointers:: +KantoHospital_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoLavenderHouse.asm b/scripts/KantoLavenderHouse.asm index 19122bd..840626a 100644 --- a/scripts/KantoLavenderHouse.asm +++ b/scripts/KantoLavenderHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoLavenderHouse.asm", ROMX -KantoLavenderHouseScriptLoader:: +KantoLavenderHouse_ScriptLoader:: ret -KantoLavenderHouseTextPointers:: +KantoLavenderHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoLeague1F.asm b/scripts/KantoLeague1F.asm index b0e1efa..6198d60 100644 --- a/scripts/KantoLeague1F.asm +++ b/scripts/KantoLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoLeague1F.asm", ROMX -KantoLeague1FScriptLoader:: +KantoLeague1F_ScriptLoader:: ret -KantoLeague1FTextPointers:: +KantoLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoLeague21F.asm b/scripts/KantoLeague21F.asm index 83a6fbd..f2d7323 100644 --- a/scripts/KantoLeague21F.asm +++ b/scripts/KantoLeague21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoLeague21F.asm", ROMX -KantoLeague21FScriptLoader:: +KantoLeague21F_ScriptLoader:: ret -KantoLeague21FTextPointers:: +KantoLeague21F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoLeague22F.asm b/scripts/KantoLeague22F.asm index eb456b4..e2f401b 100644 --- a/scripts/KantoLeague22F.asm +++ b/scripts/KantoLeague22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoLeague22F.asm", ROMX -KantoLeague22FScriptLoader:: +KantoLeague22F_ScriptLoader:: ret -KantoLeague22FTextPointers:: +KantoLeague22F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoLeague2F.asm b/scripts/KantoLeague2F.asm index 90a093f..b9cc3f9 100644 --- a/scripts/KantoLeague2F.asm +++ b/scripts/KantoLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoLeague2F.asm", ROMX -KantoLeague2FScriptLoader:: +KantoLeague2F_ScriptLoader:: ret -KantoLeague2FTextPointers:: +KantoLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoMart.asm b/scripts/KantoMart.asm index 8d6acf7..04cf070 100644 --- a/scripts/KantoMart.asm +++ b/scripts/KantoMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoMart.asm", ROMX -KantoMartScriptLoader:: +KantoMart_ScriptLoader:: ret -KantoMartTextPointers:: +KantoMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoOaksLab.asm b/scripts/KantoOaksLab.asm index 6d59f7e..34d372a 100644 --- a/scripts/KantoOaksLab.asm +++ b/scripts/KantoOaksLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoOaksLab.asm", ROMX -KantoOaksLabScriptLoader:: +KantoOaksLab_ScriptLoader:: ret -KantoOaksLabTextPointers:: +KantoOaksLab_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoPokecenter1F.asm b/scripts/KantoPokecenter1F.asm index 5a807de..d36f513 100644 --- a/scripts/KantoPokecenter1F.asm +++ b/scripts/KantoPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoPokecenter1F.asm", ROMX -KantoPokecenter1FScriptLoader:: +KantoPokecenter1F_ScriptLoader:: ret -KantoPokecenter1FTextPointers:: +KantoPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoPokecenter21F.asm b/scripts/KantoPokecenter21F.asm index 599a607..34137e7 100644 --- a/scripts/KantoPokecenter21F.asm +++ b/scripts/KantoPokecenter21F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoPokecenter21F.asm", ROMX -KantoPokecenter21FScriptLoader:: +KantoPokecenter21F_ScriptLoader:: ret -KantoPokecenter21FTextPointers:: +KantoPokecenter21F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoPokecenter22F.asm b/scripts/KantoPokecenter22F.asm index 52a0cd1..645ed06 100644 --- a/scripts/KantoPokecenter22F.asm +++ b/scripts/KantoPokecenter22F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoPokecenter22F.asm", ROMX -KantoPokecenter22FScriptLoader:: +KantoPokecenter22F_ScriptLoader:: ret -KantoPokecenter22FTextPointers:: +KantoPokecenter22F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoPokecenter2F.asm b/scripts/KantoPokecenter2F.asm index 7d7c11e..d817bd6 100644 --- a/scripts/KantoPokecenter2F.asm +++ b/scripts/KantoPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoPokecenter2F.asm", ROMX -KantoPokecenter2FScriptLoader:: +KantoPokecenter2F_ScriptLoader:: ret -KantoPokecenter2FTextPointers:: +KantoPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoRedsHouse.asm b/scripts/KantoRedsHouse.asm index b4f27f5..3fcffcc 100644 --- a/scripts/KantoRedsHouse.asm +++ b/scripts/KantoRedsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoRedsHouse.asm", ROMX -KantoRedsHouseScriptLoader:: +KantoRedsHouse_ScriptLoader:: ret -KantoRedsHouseTextPointers:: +KantoRedsHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoSchool.asm b/scripts/KantoSchool.asm index 7cd4bbd..a2b2f87 100644 --- a/scripts/KantoSchool.asm +++ b/scripts/KantoSchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoSchool.asm", ROMX -KantoSchoolScriptLoader:: +KantoSchool_ScriptLoader:: ret -KantoSchoolTextPointers:: +KantoSchool_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoSilphCo.asm b/scripts/KantoSilphCo.asm index e340c10..2ed6edf 100644 --- a/scripts/KantoSilphCo.asm +++ b/scripts/KantoSilphCo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoSilphCo.asm", ROMX -KantoSilphCoScriptLoader:: +KantoSilphCo_ScriptLoader:: ret -KantoSilphCoTextPointers:: +KantoSilphCo_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoUnusedArea.asm b/scripts/KantoUnusedArea.asm index 5185dd6..3f5c7b0 100644 --- a/scripts/KantoUnusedArea.asm +++ b/scripts/KantoUnusedArea.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoUnusedArea.asm", ROMX -KantoUnusedAreaScriptLoader:: +KantoUnusedArea_ScriptLoader:: ret -KantoUnusedAreaTextPointers:: +KantoUnusedArea_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/KantoViridianHouse.asm b/scripts/KantoViridianHouse.asm index 7e80fcb..9906ece 100644 --- a/scripts/KantoViridianHouse.asm +++ b/scripts/KantoViridianHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/KantoViridianHouse.asm", ROMX -KantoViridianHouseScriptLoader:: +KantoViridianHouse_ScriptLoader:: ret -KantoViridianHouseTextPointers:: +KantoViridianHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/MtFuji.asm b/scripts/MtFuji.asm index 7cc00ff..77f9d44 100644 --- a/scripts/MtFuji.asm +++ b/scripts/MtFuji.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/MtFuji.asm", ROMX -MtFujiScriptLoader:: +MtFuji_ScriptLoader:: ret db "@" diff --git a/scripts/MtFujiRoute.asm b/scripts/MtFujiRoute.asm index 07afa2c..6afeb1f 100644 --- a/scripts/MtFujiRoute.asm +++ b/scripts/MtFujiRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/MtFujiRoute.asm", ROMX -MtFujiRouteScriptLoader:: +MtFujiRoute_ScriptLoader:: ret db "@" diff --git a/scripts/Newtype.asm b/scripts/Newtype.asm index e15b6bf..70dd82b 100644 --- a/scripts/Newtype.asm +++ b/scripts/Newtype.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Newtype.asm", ROMX -NewtypeScriptLoader:: +Newtype_ScriptLoader:: ret db "@" diff --git a/scripts/NewtypeDiner.asm b/scripts/NewtypeDiner.asm index f466f5a..04dc3b2 100644 --- a/scripts/NewtypeDiner.asm +++ b/scripts/NewtypeDiner.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeDiner.asm", ROMX -NewtypeDinerScriptLoader:: +NewtypeDiner_ScriptLoader:: ret -NewtypeDinerTextPointers:: +NewtypeDiner_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeDojo.asm b/scripts/NewtypeDojo.asm index 458963f..3aa89d6 100644 --- a/scripts/NewtypeDojo.asm +++ b/scripts/NewtypeDojo.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeDojo.asm", ROMX -NewtypeDojoScriptLoader:: +NewtypeDojo_ScriptLoader:: ret -NewtypeDojoTextPointers:: +NewtypeDojo_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeHouse1.asm b/scripts/NewtypeHouse1.asm index 1540250..8fafa4f 100644 --- a/scripts/NewtypeHouse1.asm +++ b/scripts/NewtypeHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeHouse1.asm", ROMX -NewtypeHouse1ScriptLoader:: +NewtypeHouse1_ScriptLoader:: ret -NewtypeHouse1TextPointers:: +NewtypeHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeHouse2.asm b/scripts/NewtypeHouse2.asm index 7f15567..0ed61fe 100644 --- a/scripts/NewtypeHouse2.asm +++ b/scripts/NewtypeHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeHouse2.asm", ROMX -NewtypeHouse2ScriptLoader:: +NewtypeHouse2_ScriptLoader:: ret -NewtypeHouse2TextPointers:: +NewtypeHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeHouse3.asm b/scripts/NewtypeHouse3.asm index 87fe10c..41db181 100644 --- a/scripts/NewtypeHouse3.asm +++ b/scripts/NewtypeHouse3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeHouse3.asm", ROMX -NewtypeHouse3ScriptLoader:: +NewtypeHouse3_ScriptLoader:: ret -NewtypeHouse3TextPointers:: +NewtypeHouse3_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeLeague1F.asm b/scripts/NewtypeLeague1F.asm index b10af5f..0b02250 100644 --- a/scripts/NewtypeLeague1F.asm +++ b/scripts/NewtypeLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeLeague1F.asm", ROMX -NewtypeLeague1FScriptLoader:: +NewtypeLeague1F_ScriptLoader:: ret -NewtypeLeague1FTextPointers:: +NewtypeLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeLeague2F.asm b/scripts/NewtypeLeague2F.asm index f7de676..f90a6cb 100644 --- a/scripts/NewtypeLeague2F.asm +++ b/scripts/NewtypeLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeLeague2F.asm", ROMX -NewtypeLeague2FScriptLoader:: +NewtypeLeague2F_ScriptLoader:: ret -NewtypeLeague2FTextPointers:: +NewtypeLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeMart.asm b/scripts/NewtypeMart.asm index 9d60dad..f8b8afc 100644 --- a/scripts/NewtypeMart.asm +++ b/scripts/NewtypeMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeMart.asm", ROMX -NewtypeMartScriptLoader:: +NewtypeMart_ScriptLoader:: ret -NewtypeMartTextPointers:: +NewtypeMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypePokecenter1F.asm b/scripts/NewtypePokecenter1F.asm index 84eae86..3d2c725 100644 --- a/scripts/NewtypePokecenter1F.asm +++ b/scripts/NewtypePokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypePokecenter1F.asm", ROMX -NewtypePokecenter1FScriptLoader:: +NewtypePokecenter1F_ScriptLoader:: ret -NewtypePokecenter1FTextPointers:: +NewtypePokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypePokecenter2F.asm b/scripts/NewtypePokecenter2F.asm index 31792a3..ebe8ab9 100644 --- a/scripts/NewtypePokecenter2F.asm +++ b/scripts/NewtypePokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypePokecenter2F.asm", ROMX -NewtypePokecenter2FScriptLoader:: +NewtypePokecenter2F_ScriptLoader:: ret -NewtypePokecenter2FTextPointers:: +NewtypePokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeRoute.asm b/scripts/NewtypeRoute.asm index ee3ca46..fbc5fb4 100644 --- a/scripts/NewtypeRoute.asm +++ b/scripts/NewtypeRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeRoute.asm", ROMX -NewtypeRouteScriptLoader:: +NewtypeRoute_ScriptLoader:: ret db "@" diff --git a/scripts/NewtypeRouteGate.asm b/scripts/NewtypeRouteGate.asm index 85cb8b3..ee0da05 100644 --- a/scripts/NewtypeRouteGate.asm +++ b/scripts/NewtypeRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeRouteGate.asm", ROMX -NewtypeRouteGateScriptLoader:: +NewtypeRouteGate_ScriptLoader:: ret -NewtypeRouteGateTextPointers:: +NewtypeRouteGate_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NewtypeSailorHouse.asm b/scripts/NewtypeSailorHouse.asm index ff6d568..1cb0d15 100644 --- a/scripts/NewtypeSailorHouse.asm +++ b/scripts/NewtypeSailorHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NewtypeSailorHouse.asm", ROMX -NewtypeSailorHouseScriptLoader:: +NewtypeSailorHouse_ScriptLoader:: ret -NewtypeSailorHouseTextPointers:: +NewtypeSailorHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/North.asm b/scripts/North.asm index ab88882..b4c485f 100644 --- a/scripts/North.asm +++ b/scripts/North.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/North.asm", ROMX -NorthScriptLoader:: +North_ScriptLoader:: ret db "@" diff --git a/scripts/NorthHouse1.asm b/scripts/NorthHouse1.asm index 7acf01d..d41c2c3 100644 --- a/scripts/NorthHouse1.asm +++ b/scripts/NorthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NorthHouse1.asm", ROMX -NorthHouse1ScriptLoader:: +NorthHouse1_ScriptLoader:: ret -NorthHouse1TextPointers:: +NorthHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NorthHouse2.asm b/scripts/NorthHouse2.asm index 014382e..d44d857 100644 --- a/scripts/NorthHouse2.asm +++ b/scripts/NorthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NorthHouse2.asm", ROMX -NorthHouse2ScriptLoader:: +NorthHouse2_ScriptLoader:: ret -NorthHouse2TextPointers:: +NorthHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NorthMart.asm b/scripts/NorthMart.asm index 6c02d36..b822a42 100644 --- a/scripts/NorthMart.asm +++ b/scripts/NorthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NorthMart.asm", ROMX -NorthMartScriptLoader:: +NorthMart_ScriptLoader:: ret -NorthMartTextPointers:: +NorthMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NorthPokecenter1F.asm b/scripts/NorthPokecenter1F.asm index d2118af..3f89e90 100644 --- a/scripts/NorthPokecenter1F.asm +++ b/scripts/NorthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NorthPokecenter1F.asm", ROMX -NorthPokecenter1FScriptLoader:: +NorthPokecenter1F_ScriptLoader:: ret -NorthPokecenter1FTextPointers:: +NorthPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/NorthPokecenter2F.asm b/scripts/NorthPokecenter2F.asm index 167eada..5a96396 100644 --- a/scripts/NorthPokecenter2F.asm +++ b/scripts/NorthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/NorthPokecenter2F.asm", ROMX -NorthPokecenter2FScriptLoader:: +NorthPokecenter2F_ScriptLoader:: ret -NorthPokecenter2FTextPointers:: +NorthPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Office1.asm b/scripts/Office1.asm index 4f1abec..dc5f819 100644 --- a/scripts/Office1.asm +++ b/scripts/Office1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Office1.asm", ROMX -Office1ScriptLoader:: +Office1_ScriptLoader:: ret -Office1TextPointers:: +Office1_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/Office2.asm b/scripts/Office2.asm index 3caa9b5..ee2e603 100644 --- a/scripts/Office2.asm +++ b/scripts/Office2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Office2.asm", ROMX -Office2ScriptLoader:: +Office2_ScriptLoader:: ret -Office2TextPointers:: +Office2_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/Office3.asm b/scripts/Office3.asm index 372df6f..c530eea 100644 --- a/scripts/Office3.asm +++ b/scripts/Office3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Office3.asm", ROMX -Office3ScriptLoader:: +Office3_ScriptLoader:: ret -Office3TextPointers:: +Office3_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/OldCity.asm b/scripts/OldCity.asm index 849d397..689c055 100644 --- a/scripts/OldCity.asm +++ b/scripts/OldCity.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/OldCity.asm", ROMX -OldCityScriptLoader:: +OldCity_ScriptLoader:: ret db "@" diff --git a/scripts/OldCityBillsHouse.asm b/scripts/OldCityBillsHouse.asm index 3783a8a..fb1ca39 100644 --- a/scripts/OldCityBillsHouse.asm +++ b/scripts/OldCityBillsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityBillsHouse.asm", ROMX -OldCityBillsHouseScriptLoader:: +OldCityBillsHouse_ScriptLoader:: ret -OldCityBillsHouseTextPointers:: +OldCityBillsHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityGym.asm b/scripts/OldCityGym.asm index df5b95a..e3f8e83 100644 --- a/scripts/OldCityGym.asm +++ b/scripts/OldCityGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityGym.asm", ROMX -OldCityGymScriptLoader:: +OldCityGym_ScriptLoader:: ret -OldCityGymTextPointers:: +OldCityGym_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityHouse.asm b/scripts/OldCityHouse.asm index d429b35..bff3d85 100644 --- a/scripts/OldCityHouse.asm +++ b/scripts/OldCityHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityHouse.asm", ROMX -OldCityHouseScriptLoader:: +OldCityHouse_ScriptLoader:: ret -OldCityHouseTextPointers:: +OldCityHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityKurtsHouse.asm b/scripts/OldCityKurtsHouse.asm index 94d4902..3b211d3 100644 --- a/scripts/OldCityKurtsHouse.asm +++ b/scripts/OldCityKurtsHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityKurtsHouse.asm", ROMX -OldCityKurtsHouseScriptLoader:: +OldCityKurtsHouse_ScriptLoader:: ret -OldCityKurtsHouseTextPointers:: +OldCityKurtsHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityMart.asm b/scripts/OldCityMart.asm index 83a6098..d45692d 100644 --- a/scripts/OldCityMart.asm +++ b/scripts/OldCityMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityMart.asm", ROMX -OldCityMartScriptLoader:: +OldCityMart_ScriptLoader:: ret -OldCityMartTextPointers:: +OldCityMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityMuseum.asm b/scripts/OldCityMuseum.asm index 93f69a4..283c8e4 100644 --- a/scripts/OldCityMuseum.asm +++ b/scripts/OldCityMuseum.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityMuseum.asm", ROMX -OldCityMuseumScriptLoader:: +OldCityMuseum_ScriptLoader:: ret -OldCityMuseumTextPointers:: +OldCityMuseum_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityPokecenter1F.asm b/scripts/OldCityPokecenter1F.asm index aaaf6de..c41f40e 100644 --- a/scripts/OldCityPokecenter1F.asm +++ b/scripts/OldCityPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityPokecenter1F.asm", ROMX -OldCityPokecenter1FScriptLoader:: +OldCityPokecenter1F_ScriptLoader:: ret -OldCityPokecenter1FTextPointers:: +OldCityPokecenter1F_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/OldCityPokecenter2F.asm b/scripts/OldCityPokecenter2F.asm index a23df87..3d0fef7 100644 --- a/scripts/OldCityPokecenter2F.asm +++ b/scripts/OldCityPokecenter2F.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityPokecenter2F.asm", ROMX -OldCityPokecenter2FScriptLoader: +OldCityPokecenter2F_ScriptLoader: call Unreferenced_Function7e6 ld hl, OldCityPokecenter2FScriptPointers call RunMapScript @@ -25,7 +25,7 @@ OldCityPokecenter2FNPCIds: OldCityPokecenter2FSignPointers: dw MapDefaultText -OldCityPokecenter2FTextPointers: +OldCityPokecenter2F_TextPointers: dw OldCityPokecenter2FText1 dw OldCityPokecenter2FText2 dw OldCityPokecenter2FText3 diff --git a/scripts/OldCityPokecenterBattle.asm b/scripts/OldCityPokecenterBattle.asm index 0b8bdc7..75321fb 100644 --- a/scripts/OldCityPokecenterBattle.asm +++ b/scripts/OldCityPokecenterBattle.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityPokecenterBattle.asm", ROMX -OldCityPokecenterBattleScriptLoader: +OldCityPokecenterBattle_ScriptLoader: ld hl, OldCityPokecenterBattleScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -24,7 +24,7 @@ OldCityPokecenterBattleNPCIds: OldCityPokecenterBattleSignPointers: dw MapDefaultText -OldCityPokecenterBattleTextPointers: +OldCityPokecenterBattle_TextPointers: dw OldCityPokecenterBattleText1 OldCityPokecenterBattleText1: diff --git a/scripts/OldCityPokecenterTimeMachine.asm b/scripts/OldCityPokecenterTimeMachine.asm index 49f2637..fccc9b8 100644 --- a/scripts/OldCityPokecenterTimeMachine.asm +++ b/scripts/OldCityPokecenterTimeMachine.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityPokecenterTimeMachine.asm", ROMX -OldCityPokecenterTimeMachineScriptLoader: +OldCityPokecenterTimeMachine_ScriptLoader: call Unreferenced_Function7e6 ld hl, OldCityPokecenterTimeMachineScriptPointers call RunMapScript @@ -25,7 +25,7 @@ OldCityPokecenterTimeMachineNPCIds: OldCityPokecenterTimeMachineSignPointers: dw MapDefaultText -OldCityPokecenterTimeMachineTextPointers: +OldCityPokecenterTimeMachine_TextPointers: dw OldCityPokecenterTimeMachineText1 OldCityPokecenterTimeMachineText1: diff --git a/scripts/OldCityPokecenterTrade.asm b/scripts/OldCityPokecenterTrade.asm index 0f66874..ea3f842 100644 --- a/scripts/OldCityPokecenterTrade.asm +++ b/scripts/OldCityPokecenterTrade.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityPokecenterTrade.asm", ROMX -OldCityPokecenterTradeScriptLoader: +OldCityPokecenterTrade_ScriptLoader: ld hl, OldCityPokecenterTradeScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -24,7 +24,7 @@ OldCityPokecenterTradeNPCIds: OldCityPokecenterTradeSignPointers: dw MapDefaultText -OldCityPokecenterTradeTextPointers: +OldCityPokecenterTrade_TextPointers: dw OldCityPokecenterTradeText1 OldCityPokecenterTradeText1: diff --git a/scripts/OldCitySchool.asm b/scripts/OldCitySchool.asm index 6cbb453..23b7bfc 100644 --- a/scripts/OldCitySchool.asm +++ b/scripts/OldCitySchool.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCitySchool.asm", ROMX -OldCitySchoolScriptLoader:: +OldCitySchool_ScriptLoader:: ret -OldCitySchoolTextPointers:: +OldCitySchool_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityTower1F.asm b/scripts/OldCityTower1F.asm index cbdece7..f8499b1 100644 --- a/scripts/OldCityTower1F.asm +++ b/scripts/OldCityTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityTower1F.asm", ROMX -OldCityTower1FScriptLoader:: +OldCityTower1F_ScriptLoader:: ret -OldCityTower1FTextPointers:: +OldCityTower1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityTower2F.asm b/scripts/OldCityTower2F.asm index b872e1f..558c182 100644 --- a/scripts/OldCityTower2F.asm +++ b/scripts/OldCityTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityTower2F.asm", ROMX -OldCityTower2FScriptLoader:: +OldCityTower2F_ScriptLoader:: ret -OldCityTower2FTextPointers:: +OldCityTower2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityTower3F.asm b/scripts/OldCityTower3F.asm index 2cc70cf..c931342 100644 --- a/scripts/OldCityTower3F.asm +++ b/scripts/OldCityTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityTower3F.asm", ROMX -OldCityTower3FScriptLoader:: +OldCityTower3F_ScriptLoader:: ret -OldCityTower3FTextPointers:: +OldCityTower3F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityTower4F.asm b/scripts/OldCityTower4F.asm index 8ecb116..135080d 100644 --- a/scripts/OldCityTower4F.asm +++ b/scripts/OldCityTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityTower4F.asm", ROMX -OldCityTower4FScriptLoader:: +OldCityTower4F_ScriptLoader:: ret -OldCityTower4FTextPointers:: +OldCityTower4F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/OldCityTower5F.asm b/scripts/OldCityTower5F.asm index d6effe8..411e5a1 100644 --- a/scripts/OldCityTower5F.asm +++ b/scripts/OldCityTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/OldCityTower5F.asm", ROMX -OldCityTower5FScriptLoader:: +OldCityTower5F_ScriptLoader:: ret -OldCityTower5FTextPointers:: +OldCityTower5F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/PlayerHouse1F.asm b/scripts/PlayerHouse1F.asm index b7134b3..3af2a66 100644 --- a/scripts/PlayerHouse1F.asm +++ b/scripts/PlayerHouse1F.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/PlayerHouse1F.asm", ROMX -PlayerHouse1FScriptLoader:: +PlayerHouse1F_ScriptLoader:: ld hl, PlayerHouse1FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -39,7 +39,7 @@ PlayerHouse1FSignPointers: dw Function38a2 dw Function38bd dw Function3899 -PlayerHouse1FTextPointers:: +PlayerHouse1F_TextPointers:: dw PlayerHouse1FNPCText1 PlayerHouse1FNPCText1: diff --git a/scripts/PlayerHouse2F.asm b/scripts/PlayerHouse2F.asm index 68eb0cb..ca23a69 100644 --- a/scripts/PlayerHouse2F.asm +++ b/scripts/PlayerHouse2F.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/PlayerHouse2F.asm", ROMX -PlayerHouse2FScriptLoader:: +PlayerHouse2F_ScriptLoader:: ld hl, PlayerHouse2FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -14,7 +14,7 @@ PlayerHouse2FScriptPointers: dw PlayerHouse2FScript2 dw PlayerHouse2FNPCIDs2 -PlayerHouse2FTextPointers:: +PlayerHouse2F_TextPointers:: dw PlayerHouse2FText1 dw PlayerHouse2FDollText diff --git a/scripts/PowerPlant1.asm b/scripts/PowerPlant1.asm index 9486a00..e441439 100644 --- a/scripts/PowerPlant1.asm +++ b/scripts/PowerPlant1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/PowerPlant1.asm", ROMX -PowerPlant1ScriptLoader:: +PowerPlant1_ScriptLoader:: ret -PowerPlant1TextPointers:: +PowerPlant1_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/PowerPlant2.asm b/scripts/PowerPlant2.asm index 66a08e6..55633e1 100644 --- a/scripts/PowerPlant2.asm +++ b/scripts/PowerPlant2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/PowerPlant2.asm", ROMX -PowerPlant2ScriptLoader:: +PowerPlant2_ScriptLoader:: ret -PowerPlant2TextPointers:: +PowerPlant2_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/PowerPlant3.asm b/scripts/PowerPlant3.asm index cb0819c..513647c 100644 --- a/scripts/PowerPlant3.asm +++ b/scripts/PowerPlant3.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/PowerPlant3.asm", ROMX -PowerPlant3ScriptLoader:: +PowerPlant3_ScriptLoader:: ret -PowerPlant3TextPointers:: +PowerPlant3_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/PowerPlant4.asm b/scripts/PowerPlant4.asm index 486a867..aa9610b 100644 --- a/scripts/PowerPlant4.asm +++ b/scripts/PowerPlant4.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/PowerPlant4.asm", ROMX -PowerPlant4ScriptLoader:: +PowerPlant4_ScriptLoader:: ret -PowerPlant4TextPointers:: +PowerPlant4_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/Prince.asm b/scripts/Prince.asm index 6a92620..218fdae 100644 --- a/scripts/Prince.asm +++ b/scripts/Prince.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Prince.asm", ROMX -PrinceScriptLoader:: +Prince_ScriptLoader:: ret db "@" diff --git a/scripts/PrinceRoute.asm b/scripts/PrinceRoute.asm index aacb28d..1bb544d 100644 --- a/scripts/PrinceRoute.asm +++ b/scripts/PrinceRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/PrinceRoute.asm", ROMX -PrinceRouteScriptLoader:: +PrinceRoute_ScriptLoader:: ret db "@" diff --git a/scripts/Route15.asm b/scripts/Route15.asm index 1eb40b1..a908079 100644 --- a/scripts/Route15.asm +++ b/scripts/Route15.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Route15.asm", ROMX -Route15ScriptLoader:: +Route15_ScriptLoader:: ret db "@" diff --git a/scripts/Route15Pokecenter1F.asm b/scripts/Route15Pokecenter1F.asm index 34edf53..8a20b82 100644 --- a/scripts/Route15Pokecenter1F.asm +++ b/scripts/Route15Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route15Pokecenter1F.asm", ROMX -Route15Pokecenter1FScriptLoader:: +Route15Pokecenter1F_ScriptLoader:: ret -Route15Pokecenter1FTextPointers:: +Route15Pokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route15Pokecenter2F.asm b/scripts/Route15Pokecenter2F.asm index 71f71b9..21d9729 100644 --- a/scripts/Route15Pokecenter2F.asm +++ b/scripts/Route15Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route15Pokecenter2F.asm", ROMX -Route15Pokecenter2FScriptLoader:: +Route15Pokecenter2F_ScriptLoader:: ret -Route15Pokecenter2FTextPointers:: +Route15Pokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route18.asm b/scripts/Route18.asm index 0c21fba..7026db6 100644 --- a/scripts/Route18.asm +++ b/scripts/Route18.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Route18.asm", ROMX -Route18ScriptLoader:: +Route18_ScriptLoader:: ret db "@" diff --git a/scripts/Route18Pokecenter1F.asm b/scripts/Route18Pokecenter1F.asm index dc7d18f..22b82ee 100644 --- a/scripts/Route18Pokecenter1F.asm +++ b/scripts/Route18Pokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route18Pokecenter1F.asm", ROMX -Route18Pokecenter1FScriptLoader:: +Route18Pokecenter1F_ScriptLoader:: ret -Route18Pokecenter1FTextPointers:: +Route18Pokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route18Pokecenter2F.asm b/scripts/Route18Pokecenter2F.asm index e7b136c..b2ca485 100644 --- a/scripts/Route18Pokecenter2F.asm +++ b/scripts/Route18Pokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route18Pokecenter2F.asm", ROMX -Route18Pokecenter2FScriptLoader:: +Route18Pokecenter2F_ScriptLoader:: ret -Route18Pokecenter2FTextPointers:: +Route18Pokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route1Gate1F.asm b/scripts/Route1Gate1F.asm index 767df68..39928d0 100644 --- a/scripts/Route1Gate1F.asm +++ b/scripts/Route1Gate1F.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/Route1Gate1F.asm", ROMX -Route1Gate1FScriptLoader:: +Route1Gate1F_ScriptLoader:: ld hl, Route1Gate1FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -19,7 +19,7 @@ Route1Gate1FNPCIDs: Route1Gate1FSignPointers: dw MapDefaultText ;no signs -Route1Gate1FTextPointers:: +Route1Gate1F_TextPointers:: dw Route1Gate1FText1 dw Route1Gate1FText2 diff --git a/scripts/Route1Gate2F.asm b/scripts/Route1Gate2F.asm index 987dae2..2f299ef 100644 --- a/scripts/Route1Gate2F.asm +++ b/scripts/Route1Gate2F.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/Route1Gate2F.asm", ROMX -Route1Gate2FScriptLoader:: +Route1Gate2F_ScriptLoader:: ld hl, Route1Gate2FScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -20,7 +20,7 @@ Route1Gate2FNPCIDs: Route1Gate2FSignPointers: dw Route1Gate2FTextSign1 dw Route1Gate2FTextSign2 -Route1Gate2FTextPointers:: +Route1Gate2F_TextPointers:: dw Route1Gate2FTextNPC1 dw Route1Gate2FTextNPC2 diff --git a/scripts/Route1P1.asm b/scripts/Route1P1.asm index 411a076..83bea98 100644 --- a/scripts/Route1P1.asm +++ b/scripts/Route1P1.asm @@ -13,7 +13,7 @@ Textdbb82: ret endr -Route1P1ScriptLoader:: +Route1P1_ScriptLoader:: ld hl, Route1P1ScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -32,7 +32,7 @@ Route1P1SignPointers: dw Route1P1TextSign1 dw Route1P1TextSign2 -Route1P1TextPointers:: +Route1P1_TextPointers:: dw Route1P1TextNPC1 dw Route1P1TextNPC2 diff --git a/scripts/Route1P2.asm b/scripts/Route1P2.asm index 40c5d6f..16cfc6b 100644 --- a/scripts/Route1P2.asm +++ b/scripts/Route1P2.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/Route1P2.asm", ROMX -Route1P2ScriptLoader:: +Route1P2_ScriptLoader:: ld hl, Route1P2ScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -20,7 +20,7 @@ Route1P2NPCIDs: Route1P2SignPointers: dw Route1P2TextSign1 -Route1P2TextPointers:: +Route1P2_TextPointers:: dw Route1P2Text1 dw Route1P2Text2 diff --git a/scripts/Route2.asm b/scripts/Route2.asm index f79a26a..6c58fc0 100644 --- a/scripts/Route2.asm +++ b/scripts/Route2.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Route2.asm", ROMX -Route2ScriptLoader:: +Route2_ScriptLoader:: ret db "@" diff --git a/scripts/Route2Gate1F.asm b/scripts/Route2Gate1F.asm index c0b3787..88ecbc9 100644 --- a/scripts/Route2Gate1F.asm +++ b/scripts/Route2Gate1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route2Gate1F.asm", ROMX -Route2Gate1FScriptLoader:: +Route2Gate1F_ScriptLoader:: ret -Route2Gate1FTextPointers:: +Route2Gate1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route2Gate2F.asm b/scripts/Route2Gate2F.asm index cac8a5e..53b02e9 100644 --- a/scripts/Route2Gate2F.asm +++ b/scripts/Route2Gate2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route2Gate2F.asm", ROMX -Route2Gate2FScriptLoader:: +Route2Gate2F_ScriptLoader:: ret -Route2Gate2FTextPointers:: +Route2Gate2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Route2House.asm b/scripts/Route2House.asm index 25f3897..aa8c9c9 100644 --- a/scripts/Route2House.asm +++ b/scripts/Route2House.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/Route2House.asm", ROMX -Route2HouseScriptLoader:: +Route2House_ScriptLoader:: ret -Route2HouseTextPointers:: +Route2House_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/RouteSilentEast.asm b/scripts/RouteSilentEast.asm index 4e41f0c..66c8c13 100644 --- a/scripts/RouteSilentEast.asm +++ b/scripts/RouteSilentEast.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/RouteSilentEast.asm", ROMX -RouteSilentEastScriptLoader:: +RouteSilentEast_ScriptLoader:: ret db "@" diff --git a/scripts/RouteSilentEastGate.asm b/scripts/RouteSilentEastGate.asm index 827376c..267fdf9 100644 --- a/scripts/RouteSilentEastGate.asm +++ b/scripts/RouteSilentEastGate.asm @@ -2,8 +2,8 @@ INCLUDE "constants.asm" SECTION "scripts/RouteSilentEastGate.asm", ROMX -RouteSilentEastGateScriptLoader:: +RouteSilentEastGate_ScriptLoader:: ret -RouteSilentEastGateTextPointers:: +RouteSilentEastGate_TextPointers:: db "@" diff --git a/scripts/RuinsOfAlphEntrance.asm b/scripts/RuinsOfAlphEntrance.asm index 6f92220..be72bcf 100644 --- a/scripts/RuinsOfAlphEntrance.asm +++ b/scripts/RuinsOfAlphEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/RuinsOfAlphEntrance.asm", ROMX -RuinsOfAlphEntranceScriptLoader:: +RuinsOfAlphEntrance_ScriptLoader:: ret -RuinsOfAlphEntranceTextPointers:: +RuinsOfAlphEntrance_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/RuinsOfAlphMain.asm b/scripts/RuinsOfAlphMain.asm index 208fc09..5cd8a21 100644 --- a/scripts/RuinsOfAlphMain.asm +++ b/scripts/RuinsOfAlphMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/RuinsOfAlphMain.asm", ROMX -RuinsOfAlphMainScriptLoader:: +RuinsOfAlphMain_ScriptLoader:: ret -RuinsOfAlphMainTextPointers:: +RuinsOfAlphMain_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/ShizukanaOka.asm b/scripts/ShizukanaOka.asm index 3387fee..5126a73 100644 --- a/scripts/ShizukanaOka.asm +++ b/scripts/ShizukanaOka.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/ShizukanaOka.asm", ROMX -ShizukanaOkaScriptLoader:: +ShizukanaOka_ScriptLoader:: ld hl, ShizukanaOkaScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -25,7 +25,7 @@ ShizukanaOkaSignPointers: dw ShizukanaOkaSignpost1 dw ShizukanaOkaSignpost2 -ShizukanaOkaTextPointers: +ShizukanaOka_TextPointers: dw ShizukanaOkaText1 dw ShizukanaOkaTrainer2 dw ShizukanaOkaTrainer3 diff --git a/scripts/SilentHill.asm b/scripts/SilentHill.asm index aa53190..68c8ce5 100644 --- a/scripts/SilentHill.asm +++ b/scripts/SilentHill.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/SilentHill.asm", ROMX -SilentHillScriptLoader:: +SilentHill_ScriptLoader:: ld hl, SilentHillScriptPointers1 call RunMapScript call WriteBackMapScriptNumber @@ -318,7 +318,7 @@ SilentHillTextString5: text "ここは <RIVAL> のいえ" done -SilentHillTextPointers:: +SilentHill_TextPointers:: dw SilentHillTextRival1 ; west dw SilentHillTextNorthExit ; north dw SilentHillTextBackpack ; npc1 diff --git a/scripts/SilentHillHouse.asm b/scripts/SilentHillHouse.asm index 664283c..8467468 100644 --- a/scripts/SilentHillHouse.asm +++ b/scripts/SilentHillHouse.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/SilentHillHouse.asm", ROMX -SilentHillHouseScriptLoader:: +SilentHillHouse_ScriptLoader:: ld hl, SilentHillHouseScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -101,7 +101,7 @@ SilentHillHouseTextString3: line "みちゃ いけないよな<⋯⋯>" done -SilentHillHouseTextPointers:: +SilentHillHouse_TextPointers:: dw SilentHillHouseNPCText3 dw SilentHillHouseNPCText4 diff --git a/scripts/SilentHillLabBack.asm b/scripts/SilentHillLabBack.asm index 622af89..78f5477 100644 --- a/scripts/SilentHillLabBack.asm +++ b/scripts/SilentHillLabBack.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/SilentHillLabBack.asm", ROMX -SilentHillLabBackScriptLoader:: +SilentHillLabBack_ScriptLoader:: ld hl, SilentHillLabBackScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -33,7 +33,7 @@ SilentHillLabBackNPCIDs3: SilentHillLabBackNPCIDs4: db 00, 01, 03, $FF -SilentHillLabBackTextPointers:: +SilentHillLabBack_TextPointers:: dw SilentHillLabBackText1 dw SilentHillLabBackFunc3 dw SilentHillLabBackFunc4 diff --git a/scripts/SilentHillLabFront.asm b/scripts/SilentHillLabFront.asm index a380f4a..6daf32f 100644 --- a/scripts/SilentHillLabFront.asm +++ b/scripts/SilentHillLabFront.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/SilentHillLabFront.asm", ROMX -SilentHillLabFrontScriptLoader:: +SilentHillLabFront_ScriptLoader:: ld hl, SilentHillLabFrontScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -130,7 +130,7 @@ SilentHillLabFrontNPCIDs9: db $08 db $FF -SilentHillLabFrontTextPointers:: +SilentHillLabFront_TextPointers:: dw SilentHillLabFrontText4 dw SilentHillLabFrontText7 dw SilentHillLabFrontText10 diff --git a/scripts/SilentHillPokecenter.asm b/scripts/SilentHillPokecenter.asm index c8e7697..c13e2b6 100644 --- a/scripts/SilentHillPokecenter.asm +++ b/scripts/SilentHillPokecenter.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/SilentHillPokecenter.asm", ROMX -SilentHillPokecenterScriptLoader:: +SilentHillPokecenter_ScriptLoader:: ld hl, SilentHillPokecenterScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -40,7 +40,7 @@ SilentHillPokecenterTextString1: text "げんざい ちょうせいちゅうです" done -SilentHillPokecenterTextPointers:: +SilentHillPokecenter_TextPointers:: dw SilentHillPokecenterNPCText1 dw SilentHillPokecenterNPCText2 dw SilentHillPokecenterNPCText3 diff --git a/scripts/SlowpokeWellEntrance.asm b/scripts/SlowpokeWellEntrance.asm index 5a46aee..1652dd4 100644 --- a/scripts/SlowpokeWellEntrance.asm +++ b/scripts/SlowpokeWellEntrance.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SlowpokeWellEntrance.asm", ROMX -SlowpokeWellEntranceScriptLoader:: +SlowpokeWellEntrance_ScriptLoader:: ret -SlowpokeWellEntranceTextPointers:: +SlowpokeWellEntrance_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/SlowpokeWellMain.asm b/scripts/SlowpokeWellMain.asm index 52a3150..90d6da1 100644 --- a/scripts/SlowpokeWellMain.asm +++ b/scripts/SlowpokeWellMain.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SlowpokeWellMain.asm", ROMX -SlowpokeWellMainScriptLoader:: +SlowpokeWellMain_ScriptLoader:: ret -SlowpokeWellMainTextPointers:: +SlowpokeWellMain_TextPointers:: dw GameplayText dw GameplayText dw GameplayText diff --git a/scripts/South.asm b/scripts/South.asm index 335b22f..70d9ba8 100644 --- a/scripts/South.asm +++ b/scripts/South.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/South.asm", ROMX -SouthScriptLoader:: +South_ScriptLoader:: ret db "@" diff --git a/scripts/SouthHouse1.asm b/scripts/SouthHouse1.asm index 62d5eb5..abd9a27 100644 --- a/scripts/SouthHouse1.asm +++ b/scripts/SouthHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SouthHouse1.asm", ROMX -SouthHouse1ScriptLoader:: +SouthHouse1_ScriptLoader:: ret -SouthHouse1TextPointers:: +SouthHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SouthHouse2.asm b/scripts/SouthHouse2.asm index 892d53b..dd38782 100644 --- a/scripts/SouthHouse2.asm +++ b/scripts/SouthHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SouthHouse2.asm", ROMX -SouthHouse2ScriptLoader:: +SouthHouse2_ScriptLoader:: ret -SouthHouse2TextPointers:: +SouthHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SouthMart.asm b/scripts/SouthMart.asm index 7fd6d6e..dddab37 100644 --- a/scripts/SouthMart.asm +++ b/scripts/SouthMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SouthMart.asm", ROMX -SouthMartScriptLoader:: +SouthMart_ScriptLoader:: ret -SouthMartTextPointers:: +SouthMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SouthPokecenter1F.asm b/scripts/SouthPokecenter1F.asm index 7eda8f4..0583b60 100644 --- a/scripts/SouthPokecenter1F.asm +++ b/scripts/SouthPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SouthPokecenter1F.asm", ROMX -SouthPokecenter1FScriptLoader:: +SouthPokecenter1F_ScriptLoader:: ret -SouthPokecenter1FTextPointers:: +SouthPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SouthPokecenter2F.asm b/scripts/SouthPokecenter2F.asm index 662aad9..048d130 100644 --- a/scripts/SouthPokecenter2F.asm +++ b/scripts/SouthPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SouthPokecenter2F.asm", ROMX -SouthPokecenter2FScriptLoader:: +SouthPokecenter2F_ScriptLoader:: ret -SouthPokecenter2FTextPointers:: +SouthPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Stand.asm b/scripts/Stand.asm index fa18d9a..8efde05 100644 --- a/scripts/Stand.asm +++ b/scripts/Stand.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Stand.asm", ROMX -StandScriptLoader:: +Stand_ScriptLoader:: ret db "@" diff --git a/scripts/StandHouse.asm b/scripts/StandHouse.asm index d8b22a6..14044a1 100644 --- a/scripts/StandHouse.asm +++ b/scripts/StandHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandHouse.asm", ROMX -StandHouseScriptLoader:: +StandHouse_ScriptLoader:: ret -StandHouseTextPointers:: +StandHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandLab.asm b/scripts/StandLab.asm index 7d6c1fd..adae3e5 100644 --- a/scripts/StandLab.asm +++ b/scripts/StandLab.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandLab.asm", ROMX -StandLabScriptLoader:: +StandLab_ScriptLoader:: ret -StandLabTextPointers:: +StandLab_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandLeague1F.asm b/scripts/StandLeague1F.asm index 2ab5b10..4ee11d1 100644 --- a/scripts/StandLeague1F.asm +++ b/scripts/StandLeague1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandLeague1F.asm", ROMX -StandLeague1FScriptLoader:: +StandLeague1F_ScriptLoader:: ret -StandLeague1FTextPointers:: +StandLeague1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandLeague2F.asm b/scripts/StandLeague2F.asm index 330cb88..d4d8349 100644 --- a/scripts/StandLeague2F.asm +++ b/scripts/StandLeague2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandLeague2F.asm", ROMX -StandLeague2FScriptLoader:: +StandLeague2F_ScriptLoader:: ret -StandLeague2FTextPointers:: +StandLeague2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandMart.asm b/scripts/StandMart.asm index 2e38c8e..f42c51c 100644 --- a/scripts/StandMart.asm +++ b/scripts/StandMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandMart.asm", ROMX -StandMartScriptLoader:: +StandMart_ScriptLoader:: ret -StandMartTextPointers:: +StandMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandOffice.asm b/scripts/StandOffice.asm index 49992d5..bf7f55b 100644 --- a/scripts/StandOffice.asm +++ b/scripts/StandOffice.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandOffice.asm", ROMX -StandOfficeScriptLoader:: +StandOffice_ScriptLoader:: ret -StandOfficeTextPointers:: +StandOffice_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandPokecenter1F.asm b/scripts/StandPokecenter1F.asm index 9286342..86e5a8a 100644 --- a/scripts/StandPokecenter1F.asm +++ b/scripts/StandPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandPokecenter1F.asm", ROMX -StandPokecenter1FScriptLoader:: +StandPokecenter1F_ScriptLoader:: ret -StandPokecenter1FTextPointers:: +StandPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandPokecenter2F.asm b/scripts/StandPokecenter2F.asm index a465526..0acfb4c 100644 --- a/scripts/StandPokecenter2F.asm +++ b/scripts/StandPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandPokecenter2F.asm", ROMX -StandPokecenter2FScriptLoader:: +StandPokecenter2F_ScriptLoader:: ret -StandPokecenter2FTextPointers:: +StandPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandRocketHouse1F.asm b/scripts/StandRocketHouse1F.asm index 1082531..8434d0a 100644 --- a/scripts/StandRocketHouse1F.asm +++ b/scripts/StandRocketHouse1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandRocketHouse1F.asm", ROMX -StandRocketHouse1FScriptLoader:: +StandRocketHouse1F_ScriptLoader:: ret -StandRocketHouse1FTextPointers:: +StandRocketHouse1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandRocketHouse2F.asm b/scripts/StandRocketHouse2F.asm index 5ef5b09..6a6df07 100644 --- a/scripts/StandRocketHouse2F.asm +++ b/scripts/StandRocketHouse2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandRocketHouse2F.asm", ROMX -StandRocketHouse2FScriptLoader:: +StandRocketHouse2F_ScriptLoader:: ret -StandRocketHouse2FTextPointers:: +StandRocketHouse2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/StandRoute.asm b/scripts/StandRoute.asm index 8513894..15def63 100644 --- a/scripts/StandRoute.asm +++ b/scripts/StandRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/StandRoute.asm", ROMX -StandRouteScriptLoader:: +StandRoute_ScriptLoader:: ret db "@" diff --git a/scripts/StandRouteGateKanto.asm b/scripts/StandRouteGateKanto.asm index 46a839c..5fc7d4f 100644 --- a/scripts/StandRouteGateKanto.asm +++ b/scripts/StandRouteGateKanto.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/StandRouteGateKanto.asm", ROMX -StandRouteGateKantoScriptLoader:: +StandRouteGateKanto_ScriptLoader:: ret -StandRouteGateKantoTextPointers:: +StandRouteGateKanto_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/Sugar.asm b/scripts/Sugar.asm index 3dd07e9..6ba2313 100644 --- a/scripts/Sugar.asm +++ b/scripts/Sugar.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/Sugar.asm", ROMX -SugarScriptLoader:: +Sugar_ScriptLoader:: ret db "@" diff --git a/scripts/SugarHouse.asm b/scripts/SugarHouse.asm index 1688252..2f7834f 100644 --- a/scripts/SugarHouse.asm +++ b/scripts/SugarHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarHouse.asm", ROMX -SugarHouseScriptLoader:: +SugarHouse_ScriptLoader:: ret -SugarHouseTextPointers:: +SugarHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SugarHouse2.asm b/scripts/SugarHouse2.asm index 90e59af..b46f16e 100644 --- a/scripts/SugarHouse2.asm +++ b/scripts/SugarHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarHouse2.asm", ROMX -SugarHouse2ScriptLoader:: +SugarHouse2_ScriptLoader:: ret -SugarHouse2TextPointers:: +SugarHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SugarMart.asm b/scripts/SugarMart.asm index 29baf4f..12bb007 100644 --- a/scripts/SugarMart.asm +++ b/scripts/SugarMart.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarMart.asm", ROMX -SugarMartScriptLoader:: +SugarMart_ScriptLoader:: ret -SugarMartTextPointers:: +SugarMart_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SugarPokecenter1F.asm b/scripts/SugarPokecenter1F.asm index f04e4ad..1903bb0 100644 --- a/scripts/SugarPokecenter1F.asm +++ b/scripts/SugarPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarPokecenter1F.asm", ROMX -SugarPokecenter1FScriptLoader:: +SugarPokecenter1F_ScriptLoader:: ret -SugarPokecenter1FTextPointers:: +SugarPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SugarPokecenter2F.asm b/scripts/SugarPokecenter2F.asm index 5ec3ff6..1fdfdea 100644 --- a/scripts/SugarPokecenter2F.asm +++ b/scripts/SugarPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarPokecenter2F.asm", ROMX -SugarPokecenter2FScriptLoader:: +SugarPokecenter2F_ScriptLoader:: ret -SugarPokecenter2FTextPointers:: +SugarPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/SugarRoute.asm b/scripts/SugarRoute.asm index c417796..a9e71dc 100644 --- a/scripts/SugarRoute.asm +++ b/scripts/SugarRoute.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/SugarRoute.asm", ROMX -SugarRouteScriptLoader:: +SugarRoute_ScriptLoader:: ret db "@" diff --git a/scripts/SugarRouteGate.asm b/scripts/SugarRouteGate.asm index f81aa0a..748a454 100644 --- a/scripts/SugarRouteGate.asm +++ b/scripts/SugarRouteGate.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/SugarRouteGate.asm", ROMX -SugarRouteGateScriptLoader:: +SugarRouteGate_ScriptLoader:: ret -SugarRouteGateTextPointers:: +SugarRouteGate_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/UnusedMap13.asm b/scripts/UnusedMap13.asm index b96574e..72cada0 100644 --- a/scripts/UnusedMap13.asm +++ b/scripts/UnusedMap13.asm @@ -2,7 +2,7 @@ include "constants.asm" SECTION "scripts/UnusedMap13.asm", ROMX -UnusedMap13ScriptLoader:: +UnusedMap13_ScriptLoader:: ld hl, UnusedMap13ScriptPointers call RunMapScript call WriteBackMapScriptNumber @@ -18,7 +18,7 @@ UnusedMap13NPCIDs: UnusedMap13SignPointers: dw MapDefaultText -UnusedMap13TextPointers:: +UnusedMap13_TextPointers:: dw MapDefaultText UnusedMap13Script: diff --git a/scripts/West.asm b/scripts/West.asm index 44e9ef6..14700ea 100644 --- a/scripts/West.asm +++ b/scripts/West.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" SECTION "scripts/West.asm", ROMX -WestScriptLoader:: +West_ScriptLoader:: ret db "@" diff --git a/scripts/WestGym.asm b/scripts/WestGym.asm index e13c33d..b933537 100644 --- a/scripts/WestGym.asm +++ b/scripts/WestGym.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestGym.asm", ROMX -WestGymScriptLoader:: +WestGym_ScriptLoader:: ret -WestGymTextPointers:: +WestGym_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestHouse1.asm b/scripts/WestHouse1.asm index 962bf9c..42f3a4f 100644 --- a/scripts/WestHouse1.asm +++ b/scripts/WestHouse1.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestHouse1.asm", ROMX -WestHouse1ScriptLoader:: +WestHouse1_ScriptLoader:: ret -WestHouse1TextPointers:: +WestHouse1_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestHouse2.asm b/scripts/WestHouse2.asm index 80e9632..7ab6515 100644 --- a/scripts/WestHouse2.asm +++ b/scripts/WestHouse2.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestHouse2.asm", ROMX -WestHouse2ScriptLoader:: +WestHouse2_ScriptLoader:: ret -WestHouse2TextPointers:: +WestHouse2_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart1F.asm b/scripts/WestMart1F.asm index e7da65a..c3e2f38 100644 --- a/scripts/WestMart1F.asm +++ b/scripts/WestMart1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart1F.asm", ROMX -WestMart1FScriptLoader:: +WestMart1F_ScriptLoader:: ret -WestMart1FTextPointers:: +WestMart1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart2F.asm b/scripts/WestMart2F.asm index 59b7859..4359666 100644 --- a/scripts/WestMart2F.asm +++ b/scripts/WestMart2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart2F.asm", ROMX -WestMart2FScriptLoader:: +WestMart2F_ScriptLoader:: ret -WestMart2FTextPointers:: +WestMart2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart3F.asm b/scripts/WestMart3F.asm index a06dccb..e4f12a8 100644 --- a/scripts/WestMart3F.asm +++ b/scripts/WestMart3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart3F.asm", ROMX -WestMart3FScriptLoader:: +WestMart3F_ScriptLoader:: ret -WestMart3FTextPointers:: +WestMart3F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart4F.asm b/scripts/WestMart4F.asm index ccde786..a894e7f 100644 --- a/scripts/WestMart4F.asm +++ b/scripts/WestMart4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart4F.asm", ROMX -WestMart4FScriptLoader:: +WestMart4F_ScriptLoader:: ret -WestMart4FTextPointers:: +WestMart4F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart5F.asm b/scripts/WestMart5F.asm index 63cd740..9cd6750 100644 --- a/scripts/WestMart5F.asm +++ b/scripts/WestMart5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart5F.asm", ROMX -WestMart5FScriptLoader:: +WestMart5F_ScriptLoader:: ret -WestMart5FTextPointers:: +WestMart5F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMart6F.asm b/scripts/WestMart6F.asm index e2d0e55..95d0962 100644 --- a/scripts/WestMart6F.asm +++ b/scripts/WestMart6F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMart6F.asm", ROMX -WestMart6FScriptLoader:: +WestMart6F_ScriptLoader:: ret -WestMart6FTextPointers:: +WestMart6F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestMartElevator.asm b/scripts/WestMartElevator.asm index cf16f0a..903bea5 100644 --- a/scripts/WestMartElevator.asm +++ b/scripts/WestMartElevator.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestMartElevator.asm", ROMX -WestMartElevatorScriptLoader:: +WestMartElevator_ScriptLoader:: ret -WestMartElevatorTextPointers:: +WestMartElevator_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestPokecenter1F.asm b/scripts/WestPokecenter1F.asm index 6485294..ad7229e 100644 --- a/scripts/WestPokecenter1F.asm +++ b/scripts/WestPokecenter1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestPokecenter1F.asm", ROMX -WestPokecenter1FScriptLoader:: +WestPokecenter1F_ScriptLoader:: ret -WestPokecenter1FTextPointers:: +WestPokecenter1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestPokecenter2F.asm b/scripts/WestPokecenter2F.asm index 70e7e77..f18dd1c 100644 --- a/scripts/WestPokecenter2F.asm +++ b/scripts/WestPokecenter2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestPokecenter2F.asm", ROMX -WestPokecenter2FScriptLoader:: +WestPokecenter2F_ScriptLoader:: ret -WestPokecenter2FTextPointers:: +WestPokecenter2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRadioTower1F.asm b/scripts/WestRadioTower1F.asm index f00f505..9c04dd1 100644 --- a/scripts/WestRadioTower1F.asm +++ b/scripts/WestRadioTower1F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRadioTower1F.asm", ROMX -WestRadioTower1FScriptLoader:: +WestRadioTower1F_ScriptLoader:: ret -WestRadioTower1FTextPointers:: +WestRadioTower1F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRadioTower2F.asm b/scripts/WestRadioTower2F.asm index 3bc4c53..1e2fe2f 100644 --- a/scripts/WestRadioTower2F.asm +++ b/scripts/WestRadioTower2F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRadioTower2F.asm", ROMX -WestRadioTower2FScriptLoader:: +WestRadioTower2F_ScriptLoader:: ret -WestRadioTower2FTextPointers:: +WestRadioTower2F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRadioTower3F.asm b/scripts/WestRadioTower3F.asm index 002d109..b44bd5c 100644 --- a/scripts/WestRadioTower3F.asm +++ b/scripts/WestRadioTower3F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRadioTower3F.asm", ROMX -WestRadioTower3FScriptLoader:: +WestRadioTower3F_ScriptLoader:: ret -WestRadioTower3FTextPointers:: +WestRadioTower3F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRadioTower4F.asm b/scripts/WestRadioTower4F.asm index 66d4aed..c318aaa 100644 --- a/scripts/WestRadioTower4F.asm +++ b/scripts/WestRadioTower4F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRadioTower4F.asm", ROMX -WestRadioTower4FScriptLoader:: +WestRadioTower4F_ScriptLoader:: ret -WestRadioTower4FTextPointers:: +WestRadioTower4F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRadioTower5F.asm b/scripts/WestRadioTower5F.asm index f45fb6e..c7c6226 100644 --- a/scripts/WestRadioTower5F.asm +++ b/scripts/WestRadioTower5F.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRadioTower5F.asm", ROMX -WestRadioTower5FScriptLoader:: +WestRadioTower5F_ScriptLoader:: ret -WestRadioTower5FTextPointers:: +WestRadioTower5F_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/WestRocketRaidedHouse.asm b/scripts/WestRocketRaidedHouse.asm index 4fa6632..5e1e57d 100644 --- a/scripts/WestRocketRaidedHouse.asm +++ b/scripts/WestRocketRaidedHouse.asm @@ -2,10 +2,10 @@ INCLUDE "constants.asm" SECTION "scripts/WestRocketRaidedHouse.asm", ROMX -WestRocketRaidedHouseScriptLoader:: +WestRocketRaidedHouse_ScriptLoader:: ret -WestRocketRaidedHouseTextPointers:: +WestRocketRaidedHouse_TextPointers:: dw MapDefaultText dw MapDefaultText dw MapDefaultText diff --git a/scripts/dummy_text_pointers.asm b/scripts/dummy_text_pointers.asm index 95f2c79..9955f70 100644 --- a/scripts/dummy_text_pointers.asm +++ b/scripts/dummy_text_pointers.asm @@ -1,44 +1,44 @@ INCLUDE "constants.asm" SECTION "scripts/dummy_text_pointers.asm", ROMX -OldCityTextPointers:: -WestTextPointers:: -HaitekuTextPointers:: -FontoTextPointers:: -BaadonTextPointers:: -NewtypeTextPointers:: -SugarTextPointers:: -BullForestTextPointers:: -StandTextPointers:: -KantoTextPointers:: -PrinceTextPointers:: -MtFujiTextPointers:: -SouthTextPointers:: -NorthTextPointers:: -Route2TextPointers:: -HaitekuWestRouteTextPointers:: -HaitekuWestRouteOceanTextPointers:: -FontoRoute1TextPointers:: -FontoRoute6TextPointers:: -FontoRoute2TextPointers:: -FontoRoute4TextPointers:: -FontoRoute3TextPointers:: -BaadonRoute1TextPointers:: -BaadonRoute2TextPointers:: -BaadonRoute3TextPointers:: -Route15TextPointers:: -NewtypeRouteTextPointers:: -Route18TextPointers:: -BullForestRoute1TextPointers:: -SugarRouteTextPointers:: -BullForestRoute2TextPointers:: -StandRouteTextPointers:: -KantoEastRouteTextPointers:: -RouteSilentEastTextPointers:: -PrinceRouteTextPointers:: -MtFujiRouteTextPointers:: -FontoRoute5TextPointers:: -BullForestRoute3TextPointers:: +OldCity_TextPointers:: +West_TextPointers:: +Haiteku_TextPointers:: +Fonto_TextPointers:: +Baadon_TextPointers:: +Newtype_TextPointers:: +Sugar_TextPointers:: +BullForest_TextPointers:: +Stand_TextPointers:: +Kanto_TextPointers:: +Prince_TextPointers:: +MtFuji_TextPointers:: +South_TextPointers:: +North_TextPointers:: +Route2_TextPointers:: +HaitekuWestRoute_TextPointers:: +HaitekuWestRouteOcean_TextPointers:: +FontoRoute1_TextPointers:: +FontoRoute6_TextPointers:: +FontoRoute2_TextPointers:: +FontoRoute4_TextPointers:: +FontoRoute3_TextPointers:: +BaadonRoute1_TextPointers:: +BaadonRoute2_TextPointers:: +BaadonRoute3_TextPointers:: +Route15_TextPointers:: +NewtypeRoute_TextPointers:: +Route18_TextPointers:: +BullForestRoute1_TextPointers:: +SugarRoute_TextPointers:: +BullForestRoute2_TextPointers:: +StandRoute_TextPointers:: +KantoEastRoute_TextPointers:: +RouteSilentEast_TextPointers:: +PrinceRoute_TextPointers:: +MtFujiRoute_TextPointers:: +FontoRoute5_TextPointers:: +BullForestRoute3_TextPointers:: dw GameplayText dw GameplayText dw GameplayText |