diff --git a/audio/cries.asm b/audio/cries.asm index 69a43571d92..fc55d4b8f26 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -1,4 +1,4 @@ -SECTION "Cry_Marill - Cry_Aipom_Ch8", ROMX +SECTION "audio/cries.asm@Johto", ROMX Cry_Marill: musicheader 3, 5, Cry_Marill_Ch5 @@ -830,7 +830,7 @@ Cry_Aipom_Ch8: endchannel -SECTION "Cry_Nidoran_M - Cry_Rattata_Ch8", ROMX +SECTION "audio/cries.asm@Kanto", ROMX Cry_Nidoran_M: musicheader 3, 5, Cry_Nidoran_M_Ch5 diff --git a/audio/engine.asm b/audio/engine.asm index f4e1ce25b50..46b3f92a953 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -7,7 +7,7 @@ ; PlayStereoSFX -SECTION "_MapSetup_Sound_Off - SFX", ROMX +SECTION "audio/engine.asm", ROMX _MapSetup_Sound_Off:: ; restart sound operation diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 256ea195e99..78447aa510f 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -1,4 +1,4 @@ -SECTION "Music_AfterTheRivalFight", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER] +SECTION "audio/music/aftertherivalfight.asm", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER] Music_AfterTheRivalFight: musicheader 4, 1, Music_AfterTheRivalFight_Ch1 diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 20a71dc8f7d..2e96af5efb9 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -1,4 +1,4 @@ -SECTION "Music_AzaleaTown", ROMX +SECTION "audio/music/azaleatown.asm", ROMX Music_AzaleaTown: musicheader 4, 1, Music_AzaleaTown_Ch1 diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm index e94f4e96f0e..41f43cc875c 100644 --- a/audio/music/battletowerlobby.asm +++ b/audio/music/battletowerlobby.asm @@ -1,4 +1,4 @@ -SECTION "Music_BattleTowerLobby", ROMX +SECTION "audio/music/battletowerlobby.asm", ROMX Music_BattleTowerLobby: musicheader 4, 1, Music_BattleTowerLobby_Ch1 diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index b70bc878cfb..03cacadd503 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -1,4 +1,4 @@ -SECTION "Music_BattleTowerTheme", ROMX +SECTION "audio/music/battletowertheme.asm", ROMX Music_BattleTowerTheme: musicheader 4, 1, Music_BattleTowerTheme_Ch1 diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 793b56abf39..1006bd64e13 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -1,4 +1,4 @@ -SECTION "Music_Bicycle", ROMX +SECTION "audio/music/bicycle.asm", ROMX Music_Bicycle: musicheader 4, 1, Music_Bicycle_Ch1 diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm index 8e4ff46a852..37d4440bcab 100644 --- a/audio/music/buenaspassword.asm +++ b/audio/music/buenaspassword.asm @@ -1,4 +1,4 @@ -SECTION "Music_BuenasPassword", ROMX +SECTION "audio/music/buenaspassword.asm", ROMX Music_BuenasPassword: musicheader 4, 1, Music_BuenasPassword_Ch1 diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index 5e57985d2de..b4d1509d432 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -1,4 +1,4 @@ -SECTION "Music_BugCatchingContest", ROMX +SECTION "audio/music/bugcatchingcontest.asm", ROMX Music_BugCatchingContest: musicheader 4, 1, Music_BugCatchingContest_Ch1 diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index d48c79afec3..1d31de8ea9e 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -1,4 +1,4 @@ -SECTION "Music_BurnedTower", ROMX +SECTION "audio/music/burnedtower.asm", ROMX Music_BurnedTower: musicheader 4, 1, Music_BurnedTower_Ch1 diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index 956182a4ca8..1668800a073 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -1,4 +1,4 @@ -SECTION "Music_CeladonCity", ROMX +SECTION "audio/music/celadoncity.asm", ROMX Music_CeladonCity: musicheader 3, 1, Music_CeladonCity_Ch1 diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index ebac0ef9551..9af3c42f20c 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_ChampionBattle", ROMX +SECTION "audio/music/championbattle.asm", ROMX Music_ChampionBattle: musicheader 3, 1, Music_ChampionBattle_Ch1 diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index 8b0974f7ce3..0917a0efa17 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -1,4 +1,4 @@ -SECTION "Music_CherrygroveCity", ROMX +SECTION "audio/music/cherrygrovecity.asm", ROMX Music_CherrygroveCity: musicheader 4, 1, Music_CherrygroveCity_Ch1 diff --git a/audio/music/clair.asm b/audio/music/clair.asm index 5894e8b7b86..011a95c091b 100644 --- a/audio/music/clair.asm +++ b/audio/music/clair.asm @@ -1,4 +1,4 @@ -SECTION "Music_Clair", ROMX +SECTION "audio/music/clair.asm", ROMX Music_Clair: musicheader 4, 1, Music_Clair_Ch1 diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index ab9a321370a..a696cbae48f 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -1,4 +1,4 @@ -SECTION "Music_ContestResults", ROMX +SECTION "audio/music/contestresults.asm", ROMX Music_ContestResults: musicheader 4, 1, Music_ContestResults_Ch1 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index b6aca27534c..9b7e0705116 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,4 +1,4 @@ -SECTION "Music_Credits", ROMX +SECTION "audio/music/credits.asm", ROMX Music_Credits: musicheader 4, 1, Music_Credits_Ch1 diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm index 0b04d9eaadf..d8fa657a77b 100644 --- a/audio/music/crystalopening.asm +++ b/audio/music/crystalopening.asm @@ -1,4 +1,4 @@ -SECTION "Music_CrystalOpening", ROMX +SECTION "audio/music/crystalopening.asm", ROMX Music_CrystalOpening: musicheader 4, 1, Music_CrystalOpening_Ch1 diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 80b98563c0e..9877112b31b 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -1,4 +1,4 @@ -SECTION "Music_DancingHall", ROMX +SECTION "audio/music/dancinghall.asm", ROMX Music_DancingHall: musicheader 3, 1, Music_DancingHall_Ch1 diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index e74735361a3..4661666b9d3 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -1,4 +1,4 @@ -SECTION "Music_DarkCave", ROMX +SECTION "audio/music/darkcave.asm", ROMX Music_DarkCave: musicheader 4, 1, Music_DarkCave_Ch1 diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 165134c2008..b01b4778671 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -1,4 +1,4 @@ -SECTION "Music_DragonsDen", ROMX +SECTION "audio/music/dragonsden.asm", ROMX Music_DragonsDen: musicheader 4, 1, Music_DragonsDen_Ch1 diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index c591c893a5b..ec0c048d39b 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -1,4 +1,4 @@ -SECTION "Music_EcruteakCity", ROMX +SECTION "audio/music/ecruteakcity.asm", ROMX Music_EcruteakCity: musicheader 3, 1, Music_EcruteakCity_Ch1 diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 122e14c8cdf..019d44d1e25 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -1,4 +1,4 @@ -SECTION "Music_ElmsLab", ROMX +SECTION "audio/music/elmslab.asm", ROMX Music_ElmsLab: musicheader 4, 1, Music_ElmsLab_Ch1 diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index a42ebd264d5..db191e3342e 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -1,4 +1,4 @@ -SECTION "Music_Evolution", ROMX +SECTION "audio/music/evolution.asm", ROMX Music_Evolution: musicheader 4, 1, Music_Evolution_Ch1 diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 49da82d1d1a..8dd4d6a632b 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,4 +1,4 @@ -SECTION "Music_GameCorner", ROMX +SECTION "audio/music/gamecorner.asm", ROMX Music_GameCorner: musicheader 4, 1, Music_GameCorner_Ch1 diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index f3976545028..b15166f6526 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -1,4 +1,4 @@ -SECTION "Music_GoldenrodCity", ROMX +SECTION "audio/music/goldenrodcity.asm", ROMX Music_GoldenrodCity: musicheader 4, 1, Music_GoldenrodCity_Ch1 diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index cf58d99fba7..b7a47358ff6 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -1,4 +1,4 @@ -SECTION "Music_GoldSilverOpening", ROMX +SECTION "audio/music/goldsilveropening.asm", ROMX Music_GoldSilverOpening: musicheader 3, 1, Music_GoldSilverOpening_Ch1 diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index b3c343a5332..9079b40368e 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -1,4 +1,4 @@ -SECTION "Music_GoldSilverOpening2", ROMX +SECTION "audio/music/goldsilveropening2.asm", ROMX Music_GoldSilverOpening2: musicheader 4, 1, Music_GoldSilverOpening2_Ch1 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 93a1789d074..e19469ccf74 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,4 +1,4 @@ -SECTION "Music_Gym", ROMX +SECTION "audio/music/gym.asm", ROMX Music_Gym: musicheader 4, 1, Music_Gym_Ch1 diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index e91776b4a10..3965442b126 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -1,4 +1,4 @@ -SECTION "Music_GymLeaderVictory", ROMX +SECTION "audio/music/gymleadervictory.asm", ROMX Music_GymLeaderVictory: musicheader 4, 1, Music_GymLeaderVictory_Ch1 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 7af317b16f4..49768eaefbe 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,4 +1,4 @@ -SECTION "Music_HallOfFame", ROMX +SECTION "audio/music/halloffame.asm", ROMX Music_HallOfFame: musicheader 4, 1, Music_HallOfFame_Ch1 diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm index 7bf8d4dcab3..4f38d1693a2 100644 --- a/audio/music/healpokemon.asm +++ b/audio/music/healpokemon.asm @@ -1,4 +1,4 @@ -SECTION "Music_HealPokemon", ROMX +SECTION "audio/music/healpokemon.asm", ROMX Music_HealPokemon: musicheader 3, 1, Music_HealPokemon_Ch1 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 55a7af3b302..27c36c13a91 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,4 +1,4 @@ -SECTION "Music_IndigoPlateau", ROMX +SECTION "audio/music/indigoplateau.asm", ROMX Music_IndigoPlateau: musicheader 4, 1, Music_IndigoPlateau_Ch1 diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index 8b77cdd2cbb..d41531073d4 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_JohtoGymBattle", ROMX +SECTION "audio/music/johtogymbattle.asm", ROMX Music_JohtoGymBattle: musicheader 3, 1, Music_JohtoGymBattle_Ch1 diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index 4d0f017bdb5..9484a6527f8 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_JohtoTrainerBattle", ROMX +SECTION "audio/music/johtotrainerbattle.asm", ROMX Music_JohtoTrainerBattle: musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index 8cd5c87a6b8..06e9733b788 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_JohtoWildBattle", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE] +SECTION "audio/music/johtowildbattle.asm", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE] Music_JohtoWildBattle: musicheader 3, 1, Music_JohtoWildBattle_Ch1 diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index 8b9a80dab83..d8c6bfc3e25 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -1,4 +1,4 @@ -SECTION "Music_JohtoWildBattleNight", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE] +SECTION "audio/music/johtowildbattlenight.asm", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE] Music_JohtoWildBattleNight: musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 08e0f7d6bc4..502a1c7c8a4 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_KantoGymBattle", ROMX +SECTION "audio/music/kantogymbattle.asm", ROMX Music_KantoGymBattle: musicheader 3, 1, Music_KantoGymBattle_Ch1 diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 5e35cf9a2b0..a642ccd4f5b 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_KantoTrainerBattle", ROMX +SECTION "audio/music/kantotrainerbattle.asm", ROMX Music_KantoTrainerBattle: musicheader 3, 1, Music_KantoTrainerBattle_Ch1 diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index 2eb8e0177e8..7051a9dd88c 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_KantoWildBattle", ROMX +SECTION "audio/music/kantowildbattle.asm", ROMX Music_KantoWildBattle: musicheader 3, 1, Music_KantoWildBattle_Ch1 diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index a8d1adefbe9..945a2a972fd 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -1,4 +1,4 @@ -SECTION "Music_LakeOfRage", ROMX +SECTION "audio/music/lakeofrage.asm", ROMX Music_LakeOfRage: musicheader 4, 1, Music_LakeOfRage_Ch1 diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index 14c5517936e..12f909bb206 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -1,4 +1,4 @@ -SECTION "Music_LakeOfRageRocketRadio", ROMX +SECTION "audio/music/lakeofragerocketradio.asm", ROMX Music_LakeOfRageRocketRadio: musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 0a567c8888f..a4abe60ad9f 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -1,4 +1,4 @@ -SECTION "Music_LavenderTown", ROMX +SECTION "audio/music/lavendertown.asm", ROMX Music_LavenderTown: musicheader 3, 1, Music_LavenderTown_Ch1 diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 6d5fffc10a4..f6e0d834152 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -1,4 +1,4 @@ -SECTION "Music_Lighthouse", ROMX +SECTION "audio/music/lighthouse.asm", ROMX Music_Lighthouse: musicheader 4, 1, Music_Lighthouse_Ch1 diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index 99f821aa8bc..d872fdc263b 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookBeauty", ROMX +SECTION "audio/music/lookbeauty.asm", ROMX Music_LookBeauty: musicheader 4, 1, Music_LookBeauty_Ch1 diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index 04fd243f2ec..a27a5af1121 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookHiker", ROMX +SECTION "audio/music/lookhiker.asm", ROMX Music_LookHiker: musicheader 4, 1, Music_LookHiker_Ch1 diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 54a1a0f5958..e96a817d23f 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookKimonoGirl", ROMX +SECTION "audio/music/lookkimonogirl.asm", ROMX Music_LookKimonoGirl: musicheader 3, 1, Music_LookKimonoGirl_Ch1 diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 36ab9b1d55a..a7bf07d0af7 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookLass", ROMX +SECTION "audio/music/looklass.asm", ROMX Music_LookLass: musicheader 4, 1, Music_LookLass_Ch1 diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm index 7078b32fa3c..b75bd2f2d1d 100644 --- a/audio/music/lookmysticalman.asm +++ b/audio/music/lookmysticalman.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookMysticalMan", ROMX +SECTION "audio/music/lookmysticalman.asm", ROMX Music_LookMysticalMan: musicheader 4, 1, Music_LookMysticalMan_Ch1 diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 6cfc2725d8a..0aa71b30ccc 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookOfficer", ROMX +SECTION "audio/music/lookofficer.asm", ROMX Music_LookOfficer: musicheader 3, 1, Music_LookOfficer_Ch1 diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index 20b43cb0c62..3eb2a8c7f96 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookPokemaniac", ROMX +SECTION "audio/music/lookpokemaniac.asm", ROMX Music_LookPokemaniac: musicheader 3, 1, Music_LookPokemaniac_Ch1 diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index 61c6dd9586e..110aaa68263 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookRival", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER] +SECTION "audio/music/lookrival.asm", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER] Music_LookRival: musicheader 4, 1, Music_LookRival_Ch1 diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index 8f3924e4819..1cd3f7d4495 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookRocket", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER] +SECTION "audio/music/lookrocket.asm", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER] Music_LookRocket: musicheader 4, 1, Music_LookRocket_Ch1 diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index 4da770eed29..03b38bf98ad 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookSage", ROMX +SECTION "audio/music/looksage.asm", ROMX Music_LookSage: musicheader 2, 1, Music_LookSage_Ch1 diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index 5cb07d924f0..f153f46886c 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -1,4 +1,4 @@ -SECTION "Music_LookYoungster", ROMX +SECTION "audio/music/lookyoungster.asm", ROMX Music_LookYoungster: musicheader 3, 1, Music_LookYoungster_Ch1 diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index 3d00d2c575c..d6d2453515c 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -1,4 +1,4 @@ -SECTION "Music_MagnetTrain", ROMX +SECTION "audio/music/magnettrain.asm", ROMX Music_MagnetTrain: musicheader 4, 1, Music_MagnetTrain_Ch1 diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index e698b9eb713..44fbfc47447 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -1,4 +1,4 @@ -SECTION "Music_MainMenu", ROMX +SECTION "audio/music/mainmenu.asm", ROMX Music_MainMenu: musicheader 4, 1, Music_MainMenu_Ch1 diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm index ed37aec271b..a52f9862ec9 100644 --- a/audio/music/mobileadapter.asm +++ b/audio/music/mobileadapter.asm @@ -1,4 +1,4 @@ -SECTION "Music_MobileAdapter", ROMX +SECTION "audio/music/mobileadapter.asm", ROMX Music_MobileAdapter: musicheader 4, 1, Music_MobileAdapter_Ch1 diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm index 37270008c35..0e3af1af744 100644 --- a/audio/music/mobileadaptermenu.asm +++ b/audio/music/mobileadaptermenu.asm @@ -1,4 +1,4 @@ -SECTION "Music_MobileAdapterMenu", ROMX +SECTION "audio/music/mobileadaptermenu.asm", ROMX Music_MobileAdapterMenu: musicheader 3, 1, Music_MobileAdapterMenu_Ch1 diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm index f688f696d48..b9719ae95bb 100644 --- a/audio/music/mobilecenter.asm +++ b/audio/music/mobilecenter.asm @@ -1,4 +1,4 @@ -SECTION "Music_MobileCenter", ROMX +SECTION "audio/music/mobilecenter.asm", ROMX Music_MobileCenter: musicheader 4, 1, Music_MobileCenter_Ch1 diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 426566070a6..5791f2b2962 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -1,4 +1,4 @@ -SECTION "Music_Mom", ROMX +SECTION "audio/music/mom.asm", ROMX Music_Mom: musicheader 3, 2, Music_Mom_Ch2 diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index d190ae71742..37b359dd066 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -1,4 +1,4 @@ -SECTION "Music_MtMoon", ROMX +SECTION "audio/music/mtmoon.asm", ROMX Music_MtMoon: musicheader 4, 1, Music_MtMoon_Ch1 diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index f0b6abd0b19..1c02da05d37 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -1,4 +1,4 @@ -SECTION "Music_MtMoonSquare", ROMX +SECTION "audio/music/mtmoonsquare.asm", ROMX Music_MtMoonSquare: musicheader 2, 1, Music_MtMoonSquare_Ch1 diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index df063e83801..03e3ba289f9 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -1,4 +1,4 @@ -SECTION "Music_NationalPark", ROMX +SECTION "audio/music/nationalpark.asm", ROMX Music_NationalPark: musicheader 4, 1, Music_NationalPark_Ch1 diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index 3e8f47d3b89..e7bbf044509 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -1,4 +1,4 @@ -SECTION "Music_NewBarkTown", ROMX +SECTION "audio/music/newbarktown.asm", ROMX Music_NewBarkTown: musicheader 3, 1, Music_NewBarkTown_Ch1 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 1c9dbd7569e..4012d75ecc4 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,4 +1,4 @@ -SECTION "Music_PalletTown", ROMX +SECTION "audio/music/pallettown.asm", ROMX Music_PalletTown: musicheader 3, 1, Music_PalletTown_Ch1 diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index 8df1e8f6260..c670781d135 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -1,4 +1,4 @@ -SECTION "Music_PokeFluteChannel", ROMX +SECTION "audio/music/pokeflutechannel.asm", ROMX Music_PokeFluteChannel: musicheader 3, 1, Music_PokeFluteChannel_Ch1 diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 3a5d3740510..e7fcb40c479 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -1,4 +1,4 @@ -SECTION "Music_PokemonCenter", ROMX +SECTION "audio/music/pokemoncenter.asm", ROMX Music_PokemonCenter: musicheader 4, 1, Music_PokemonCenter_Ch1 diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index df6a60f20b7..1f310e618d7 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -1,4 +1,4 @@ -SECTION "Music_PokemonChannel", ROMX +SECTION "audio/music/pokemonchannel.asm", ROMX Music_PokemonChannel: musicheader 4, 1, Music_PokemonChannel_Ch1 diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index cd46d32d7f2..02937b36218 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -1,4 +1,4 @@ -SECTION "Music_PokemonLullaby", ROMX +SECTION "audio/music/pokemonlullaby.asm", ROMX Music_PokemonLullaby: musicheader 3, 1, Music_PokemonLullaby_Ch1 diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index dde0bac46d4..3b046d52c58 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -1,4 +1,4 @@ -SECTION "Music_PokemonMarch", ROMX +SECTION "audio/music/pokemonmarch.asm", ROMX Music_PokemonMarch: musicheader 4, 1, Music_PokemonMarch_Ch1 diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index fed97ace903..7d510d7f6f6 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -1,4 +1,4 @@ -SECTION "Music_PostCredits", ROMX +SECTION "audio/music/postcredits.asm", ROMX Music_PostCredits: musicheader 2, 1, Music_PostCredits_Ch1 diff --git a/audio/music/printer.asm b/audio/music/printer.asm index e1d3748571e..447c7fde2f5 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -1,4 +1,4 @@ -SECTION "Music_Printer", ROMX +SECTION "audio/music/printer.asm", ROMX Music_Printer: musicheader 1, 3, Music_Printer_Ch3 diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index f8d70bfd6e0..9ed5ef0704d 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -1,4 +1,4 @@ -SECTION "Music_ProfOak", ROMX +SECTION "audio/music/profoak.asm", ROMX Music_ProfOak: musicheader 3, 1, Music_ProfOak_Ch1 diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 8cf5e645d40..7f74895fe48 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -1,4 +1,4 @@ -SECTION "Music_ProfOaksPokemonTalk", ROMX +SECTION "audio/music/profoakspokemontalk.asm", ROMX Music_ProfOaksPokemonTalk: musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index dc3dc648fbe..4a071daee05 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_RivalBattle", ROMX +SECTION "audio/music/rivalbattle.asm", ROMX Music_RivalBattle: musicheader 3, 1, Music_RivalBattle_Ch1 diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index 955bdb0a496..21edba25bd5 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_RocketBattle", ROMX +SECTION "audio/music/rocketbattle.asm", ROMX Music_RocketBattle: musicheader 3, 1, Music_RocketBattle_Ch1 diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index 3596a0bdf0a..2399435e0ad 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -1,4 +1,4 @@ -SECTION "Music_RocketHideout", ROMX +SECTION "audio/music/rockethideout.asm", ROMX Music_RocketHideout: musicheader 4, 1, Music_RocketHideout_Ch1 diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 032f4520094..11b36582d0f 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -1,4 +1,4 @@ -SECTION "Music_RocketTheme", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER] +SECTION "audio/music/rockettheme.asm", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER] Music_RocketTheme: musicheader 4, 1, Music_RocketTheme_Ch1 diff --git a/audio/music/route1.asm b/audio/music/route1.asm index f2ff984fde0..2d529915169 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route1", ROMX +SECTION "audio/music/route1.asm", ROMX Music_Route1: musicheader 3, 1, Music_Route1_Ch1 diff --git a/audio/music/route12.asm b/audio/music/route12.asm index 01a5ce1f032..00a33e27320 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route12", ROMX +SECTION "audio/music/route12.asm", ROMX Music_Route12: musicheader 4, 1, Music_Route12_Ch1 diff --git a/audio/music/route2.asm b/audio/music/route2.asm index 1a65ac098fd..e5f39754454 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route2", ROMX +SECTION "audio/music/route2.asm", ROMX Music_Route2: musicheader 4, 1, Music_Route2_Ch1 diff --git a/audio/music/route26.asm b/audio/music/route26.asm index b0a71c2188a..ed1b7bf8bfb 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route26", ROMX +SECTION "audio/music/route26.asm", ROMX Music_Route26: musicheader 4, 1, Music_Route26_Ch1 diff --git a/audio/music/route29.asm b/audio/music/route29.asm index 3d3f2790a28..56da38b89b8 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route29", ROMX +SECTION "audio/music/route29.asm", ROMX Music_Route29: musicheader 4, 1, Music_Route29_Ch1 diff --git a/audio/music/route3.asm b/audio/music/route3.asm index d9948d33997..b6ad4c96d88 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route3", ROMX +SECTION "audio/music/route3.asm", ROMX Music_Route3: musicheader 4, 1, Music_Route3_Ch1 diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 921a517d823..fb0db2c3553 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route30", ROMX +SECTION "audio/music/route30.asm", ROMX Music_Route30: musicheader 4, 1, Music_Route30_Ch1 diff --git a/audio/music/route36.asm b/audio/music/route36.asm index c54fa9869a7..06380026e7f 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route36", ROMX +SECTION "audio/music/route36.asm", ROMX Music_Route36: musicheader 4, 1, Music_Route36_Ch1 diff --git a/audio/music/route37.asm b/audio/music/route37.asm index 77616757920..7ea64651b21 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -1,4 +1,4 @@ -SECTION "Music_Route37", ROMX +SECTION "audio/music/route37.asm", ROMX Music_Route37: musicheader 4, 1, Music_Route37_Ch1 diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index 487c52793ae..21284a31e7b 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -1,4 +1,4 @@ -SECTION "Music_RuinsOfAlphInterior", ROMX +SECTION "audio/music/ruinsofalphinterior.asm", ROMX Music_RuinsOfAlphInterior: musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index 999a2c71025..eb2f253ec8f 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -1,4 +1,4 @@ -SECTION "Music_RuinsOfAlphRadio", ROMX +SECTION "audio/music/ruinsofalphradio.asm", ROMX Music_RuinsOfAlphRadio: musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index d266156f3db..d23329e3574 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -1,4 +1,4 @@ -SECTION "Music_ShowMeAround", ROMX +SECTION "audio/music/showmearound.asm", ROMX Music_ShowMeAround: musicheader 4, 1, Music_ShowMeAround_Ch1 diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index 2e5736b5bf2..f99b7647e88 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -1,4 +1,4 @@ -SECTION "Music_SproutTower", ROMX +SECTION "audio/music/sprouttower.asm", ROMX Music_SproutTower: musicheader 4, 1, Music_SproutTower_Ch1 diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 4df79888504..4b9779f25bd 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -1,4 +1,4 @@ -SECTION "Music_SSAqua", ROMX +SECTION "audio/music/ssaqua.asm", ROMX Music_SSAqua: musicheader 4, 1, Music_SSAqua_Ch1 diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index f383686083a..58ea0e3cfec 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -1,4 +1,4 @@ -SECTION "Music_SuccessfulCapture", ROMX, BANK[BANK_MUSIC_WILD_VICTORY] +SECTION "audio/music/successfulcapture.asm", ROMX, BANK[BANK_MUSIC_WILD_VICTORY] Music_SuccessfulCapture: musicheader 3, 1, Music_SuccessfulCapture_Ch1 diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm index 48b7b2f310c..802df065adb 100644 --- a/audio/music/suicunebattle.asm +++ b/audio/music/suicunebattle.asm @@ -1,4 +1,4 @@ -SECTION "Music_SuicuneBattle", ROMX +SECTION "audio/music/suicunebattle.asm", ROMX Music_SuicuneBattle: musicheader 3, 1, Music_SuicuneBattle_Ch1 diff --git a/audio/music/surf.asm b/audio/music/surf.asm index a80193afad8..b064fb3978b 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -1,4 +1,4 @@ -SECTION "Music_Surf", ROMX +SECTION "audio/music/surf.asm", ROMX Music_Surf: musicheader 3, 1, Music_Surf_Ch1 diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index 950efd6d10b..3be342bb7d7 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -1,4 +1,4 @@ -SECTION "Music_TinTower", ROMX +SECTION "audio/music/tintower.asm", ROMX Music_TinTower: musicheader 4, 1, Music_TinTower_Ch1 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 0d05b0271b4..aada38e4a27 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,4 +1,4 @@ -SECTION "Music_TitleScreen", ROMX +SECTION "audio/music/titlescreen.asm", ROMX Music_TitleScreen: musicheader 4, 1, Music_TitleScreen_Ch1 diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 4dc95f0a754..e04b77806ee 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -1,4 +1,4 @@ -SECTION "Music_TrainerVictory", ROMX +SECTION "audio/music/trainervictory.asm", ROMX Music_TrainerVictory: musicheader 3, 1, Music_TrainerVictory_Ch1 diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index 4965e329a1e..33a346809b3 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -1,4 +1,4 @@ -SECTION "Music_UnionCave", ROMX +SECTION "audio/music/unioncave.asm", ROMX Music_UnionCave: musicheader 4, 1, Music_UnionCave_Ch1 diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index 9d4c2d10816..ca13a29d618 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -1,4 +1,4 @@ -SECTION "Music_VermilionCity", ROMX +SECTION "audio/music/vermilioncity.asm", ROMX Music_VermilionCity: musicheader 3, 1, Music_VermilionCity_Ch1 diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index 54466cfccb1..24eaf63636a 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -1,4 +1,4 @@ -SECTION "Music_VictoryRoad", ROMX +SECTION "audio/music/victoryroad.asm", ROMX Music_VictoryRoad: musicheader 4, 1, Music_VictoryRoad_Ch1 diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index 7480a905d87..48131ee37c7 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -1,4 +1,4 @@ -SECTION "Music_VioletCity", ROMX +SECTION "audio/music/violetcity.asm", ROMX Music_VioletCity: musicheader 4, 1, Music_VioletCity_Ch1 diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index 3036582a8e4..9a016c3b38c 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -1,4 +1,4 @@ -SECTION "Music_ViridianCity", ROMX +SECTION "audio/music/viridiancity.asm", ROMX Music_ViridianCity: musicheader 4, 1, Music_ViridianCity_Ch1 diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index 79b313d1e25..b5a79ae8d2f 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -1,4 +1,4 @@ -SECTION "Music_WildPokemonVictory", ROMX, BANK[BANK_MUSIC_WILD_VICTORY] +SECTION "audio/music/wildpokemonvictory.asm", ROMX, BANK[BANK_MUSIC_WILD_VICTORY] Music_WildPokemonVictory: musicheader 3, 1, Music_WildPokemonVictory_Ch1 diff --git a/audio/sfx.asm b/audio/sfx.asm index 5bab0bb6d47..87fd5f04a20 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1,4 +1,4 @@ -SECTION "Sfx_PokeballsPlacedOnTable - Sfx_Elevator_Ch8", ROMX +SECTION "audio/sfx.asm", ROMX Sfx_PokeballsPlacedOnTable: musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 @@ -5007,7 +5007,7 @@ Sfx_Elevator_Ch8: endchannel -SECTION "Sfx_StopSlot - Sfx_StopSlot_Ch5", ROMX +SECTION "audio/sfx.asm@Sfx_StopSlot", ROMX Sfx_StopSlot: musicheader 1, 5, Sfx_StopSlot_Ch5 @@ -5019,7 +5019,7 @@ Sfx_StopSlot_Ch5: endchannel -SECTION "Sfx_GlassTing - Sfx_GlassTing_Ch5", ROMX +SECTION "audio/sfx.asm@Sfx_GlassTing", ROMX Sfx_GlassTing: musicheader 1, 5, Sfx_GlassTing_Ch5 @@ -5030,7 +5030,7 @@ Sfx_GlassTing_Ch5: endchannel -SECTION "Sfx_GlassTing2 - Sfx_GlassTing2_Ch6", ROMX +SECTION "audio/sfx.asm@Sfx_GlassTing2", ROMX Sfx_GlassTing2: musicheader 2, 5, Sfx_GlassTing2_Ch5 diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm index e34cc087829..77877a203ed 100644 --- a/audio/sfx_crystal.asm +++ b/audio/sfx_crystal.asm @@ -1,4 +1,4 @@ -SECTION "Sfx_IntroUnown1 - Sfx_IntroUnown1_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroUnown1", ROMX Sfx_IntroUnown1: musicheader 1, 5, Sfx_IntroUnown1_Ch5 @@ -11,7 +11,7 @@ Sfx_IntroUnown1_Ch5: endchannel -SECTION "Sfx_IntroUnown2 - Sfx_IntroUnown2_Ch6", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroUnown2", ROMX Sfx_IntroUnown2: musicheader 1, 6, Sfx_IntroUnown2_Ch6 @@ -24,7 +24,7 @@ Sfx_IntroUnown2_Ch6: endchannel -SECTION "Sfx_IntroUnown3 - Sfx_IntroUnown3_Ch7", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroUnown3", ROMX Sfx_IntroUnown3: musicheader 1, 7, Sfx_IntroUnown3_Ch7 @@ -40,7 +40,7 @@ Sfx_IntroUnown3_Ch7: endchannel -SECTION "Sfx_DittoPopUp - Sfx_DittoPopUp_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_DittoPopUp", ROMX Sfx_DittoPopUp: musicheader 1, 5, Sfx_DittoPopUp_Ch5 @@ -56,7 +56,7 @@ Sfx_DittoPopUp_Ch5: endchannel -SECTION "Sfx_DittoTransform - Sfx_DittoTransform_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_DittoTransform", ROMX Sfx_DittoTransform: musicheader 1, 5, Sfx_DittoTransform_Ch5 @@ -71,7 +71,7 @@ Sfx_DittoTransform_Ch5: endchannel -SECTION "Sfx_IntroSuicune1 - Sfx_IntroSuicune1_Ch8", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroSuicune1", ROMX Sfx_IntroSuicune1: musicheader 1, 8, Sfx_IntroSuicune1_Ch8 @@ -82,7 +82,7 @@ Sfx_IntroSuicune1_Ch8: endchannel -SECTION "Sfx_IntroPichu - Sfx_IntroPichu_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroPichu", ROMX Sfx_IntroPichu: musicheader 1, 5, Sfx_IntroPichu_Ch5 @@ -97,7 +97,7 @@ Sfx_IntroPichu_Ch5: endchannel -SECTION "Sfx_IntroSuicune2 - Sfx_IntroSuicune2_Ch8", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroSuicune2", ROMX Sfx_IntroSuicune2: musicheader 1, 8, Sfx_IntroSuicune2_Ch8 @@ -122,7 +122,7 @@ Sfx_IntroSuicune2_Ch8: endchannel -SECTION "Sfx_IntroSuicune3 - Sfx_IntroSuicune3_Ch8", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroSuicune3", ROMX Sfx_IntroSuicune3: musicheader 1, 8, Sfx_IntroSuicune3_Ch8 @@ -136,7 +136,7 @@ Sfx_IntroSuicune3_Ch8: endchannel -SECTION "Sfx_DittoBounce - Sfx_DittoBounce_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_DittoBounce", ROMX Sfx_DittoBounce: musicheader 1, 5, Sfx_DittoBounce_Ch5 @@ -151,7 +151,7 @@ Sfx_DittoBounce_Ch5: endchannel -SECTION "Sfx_IntroSuicune4 - Sfx_IntroSuicune4_Ch8", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_IntroSuicune4", ROMX Sfx_IntroSuicune4: musicheader 1, 8, Sfx_IntroSuicune4_Ch8 @@ -171,7 +171,7 @@ Sfx_IntroSuicune4_Ch8: endchannel -SECTION "Sfx_GameFreakPresents - Sfx_GameFreakPresents_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_GameFreakPresents", ROMX Sfx_GameFreakPresents: musicheader 1, 5, Sfx_GameFreakPresents_Ch5 @@ -199,7 +199,7 @@ Sfx_GameFreakPresents_Ch5: endchannel -SECTION "Sfx_Tingle - Sfx_Tingle_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_Tingle", ROMX Sfx_Tingle: musicheader 1, 5, Sfx_Tingle_Ch5 @@ -224,7 +224,7 @@ Sfx_Tingle_Ch5: endchannel -SECTION "Sfx_TwoPcBeeps - Sfx_TwoPcBeeps_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_TwoPcBeeps", ROMX Sfx_TwoPcBeeps: musicheader 1, 5, Sfx_TwoPcBeeps_Ch5 @@ -238,7 +238,7 @@ Sfx_TwoPcBeeps_Ch5: endchannel -SECTION "Sfx_4NoteDitty - Sfx_4NoteDitty_Ch7", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_4NoteDitty", ROMX Sfx_4NoteDitty: musicheader 3, 5, Sfx_4NoteDitty_Ch5 @@ -285,7 +285,7 @@ Sfx_4NoteDitty_Ch7: endchannel -SECTION "Sfx_Twinkle - Sfx_Twinkle_Ch5", ROMX +SECTION "audio/sfx_crystal.asm@Sfx_Twinkle", ROMX Sfx_Twinkle: musicheader 1, 5, Sfx_Twinkle_Ch5 diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index c7ad28056c9..005f1d77bab 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -1,6 +1,6 @@ ; battle commands are defined in engine/battle/effect_commands.asm -SECTION "BattleCommandPointers", ROMX +SECTION "data/battle/effect_command_pointers.asm", ROMX dw 0 ; padding diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm index a3018bf751d..e094b04369f 100644 --- a/data/battle_tower/trainer_text.asm +++ b/data/battle_tower/trainer_text.asm @@ -1,4 +1,4 @@ -SECTION "Battle Tower Trainer Text", ROMX +SECTION "data/battle_tower/trainer_text.asm", ROMX BattleTowerText_0x1ec000: text "Hello, glad to" diff --git a/data/battle_tower/unknown.asm b/data/battle_tower/unknown.asm index dc94716d1c3..b49b82b761c 100644 --- a/data/battle_tower/unknown.asm +++ b/data/battle_tower/unknown.asm @@ -1,4 +1,4 @@ -SECTION "Battle Tower Trainer Data", ROMX +SECTION "data/battle_tower/unknown.asm", ROMX BattleTowerTrainerData:: ; What exactly it is, I don't know ; Size is 70 (Nr of Trainers in BattleTower) * 0x24 (Nr of Bytes that are copied) diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 9ee60d89f9e..2d7efc8f3f9 100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm @@ -2,7 +2,7 @@ NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" -SECTION "TileCollisionTable", ROMX +SECTION "data/collision_permissions.asm", ROMX TileCollisionTable:: ; entries correspond to COLL_* constants diff --git a/data/items/attributes.asm b/data/items/attributes.asm index 534e7b4503b..28a6ba4938e 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -6,7 +6,7 @@ item_attribute: MACRO ENDM -SECTION "ItemAttributes", ROMX +SECTION "data/items/attributes.asm", ROMX ItemAttributes: ; entries correspond to item ids diff --git a/data/items/marts.asm b/data/items/marts.asm index d04ea5e2048..1a3f5bcf86d 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,4 +1,4 @@ -SECTION "Marts - DefaultMart", ROMX +SECTION "data/items/marts.asm", ROMX Marts: ; entries correspond to MART_* constants diff --git a/data/items/names.asm b/data/items/names.asm index bfb8d70620c..d86c627a41b 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,4 +1,4 @@ -SECTION "ItemNames", ROMX +SECTION "data/items/names.asm", ROMX ItemNames:: db "MASTER BALL@" diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index d62dcb3dde8..af2b2c5435b 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -96,7 +96,7 @@ endc ENDM -SECTION "NewBarkTown_MapAttributes - Route31VioletGate_MapAttributes", ROMX +SECTION "data/maps/attributes.asm", ROMX map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST connection west, Route29, ROUTE_29, 0 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 3e83e1a5100..53cdfc6888c 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -15,7 +15,7 @@ map: MACRO ENDM -SECTION "MapGroupPointers - MapGroup_Cherrygrove", ROMX +SECTION "data/maps/maps.asm", ROMX MapGroupPointers:: ; pointers to the first map of each map group diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index c4f9869911c..f1aa420b359 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -5,7 +5,7 @@ scene_var: MACRO ENDM -SECTION "MapScenes", ROMX +SECTION "data/maps/scenes.asm", ROMX MapScenes:: scene_var POKECENTER_2F, wPokecenter2FSceneID diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 1e0660b3dcc..7081dd83d00 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -1,4 +1,4 @@ -SECTION "BattleAnimations - BattleAnim_ShowMon_1", ROMX +SECTION "data/moves/animations.asm", ROMX BattleAnimations:: ; entries correspond to constants/move_constants.asm diff --git a/data/moves/effects.asm b/data/moves/effects.asm index 5331ffa6d86..eec5c273514 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -1,4 +1,4 @@ -SECTION "MoveEffectsPointers - DefenseCurl", ROMX +SECTION "data/moves/effects.asm", ROMX INCLUDE "data/moves/effects_pointers.asm" diff --git a/data/moves/moves.asm b/data/moves/moves.asm index d386049a65c..f70b383d994 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -11,7 +11,7 @@ move: MACRO ENDM -SECTION "Moves", ROMX +SECTION "data/moves/moves.asm", ROMX Moves: ; entries correspond to constants/move_constants.asm diff --git a/data/moves/names.asm b/data/moves/names.asm index 7a28416569c..96e0014dc0e 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -1,4 +1,4 @@ -SECTION "MoveNames", ROMX +SECTION "data/moves/names.asm", ROMX MoveNames:: db "POUND@" diff --git a/data/phone/text/alan_callee.asm b/data/phone/text/alan_callee.asm index 6bca798d2d8..9e0f14e1c88 100644 --- a/data/phone/text/alan_callee.asm +++ b/data/phone/text/alan_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b659d - UnknownText_0x1b6652", ROMX +SECTION "data/phone/text/alan_callee.asm", ROMX UnknownText_0x1b659d: text "Yup, it's @" diff --git a/data/phone/text/alan_caller.asm b/data/phone/text/alan_caller.asm index 61392c84705..584986f51e5 100644 --- a/data/phone/text/alan_caller.asm +++ b/data/phone/text/alan_caller.asm @@ -1,4 +1,4 @@ -SECTION "AlanGettingStrongerText - UnknownText_0x64f1a", ROMX +SECTION "data/phone/text/alan_caller.asm", ROMX AlanGettingStrongerText: text "My @" diff --git a/data/phone/text/alan_overworld.asm b/data/phone/text/alan_overworld.asm index f933fb1e4c7..eadf0445bc8 100644 --- a/data/phone/text/alan_overworld.asm +++ b/data/phone/text/alan_overworld.asm @@ -1,4 +1,4 @@ -SECTION "AlanAskNumber1Text - AlanPackFullText", ROMX +SECTION "data/phone/text/alan_overworld.asm", ROMX AlanAskNumber1Text: text "Reading textbooks" diff --git a/data/phone/text/anthony_callee.asm b/data/phone/text/anthony_callee.asm index a5cf1619483..b00b03f34fd 100644 --- a/data/phone/text/anthony_callee.asm +++ b/data/phone/text/anthony_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5f7a - UnknownText_0x1b606f", ROMX +SECTION "data/phone/text/anthony_callee.asm", ROMX UnknownText_0x1b5f7a: text "Yeah, @" diff --git a/data/phone/text/anthony_caller.asm b/data/phone/text/anthony_caller.asm index c664b7728b7..ae8f39df441 100644 --- a/data/phone/text/anthony_caller.asm +++ b/data/phone/text/anthony_caller.asm @@ -1,4 +1,4 @@ -SECTION "AnthonyAteBerriesText - UnknownText_0x176dd1", ROMX +SECTION "data/phone/text/anthony_caller.asm", ROMX AnthonyAteBerriesText: text "The other day, I" diff --git a/data/phone/text/anthony_overworld.asm b/data/phone/text/anthony_overworld.asm index 38ba606f4a3..3b2b1c33e0a 100644 --- a/data/phone/text/anthony_overworld.asm +++ b/data/phone/text/anthony_overworld.asm @@ -1,4 +1,4 @@ -SECTION "AnthonyAskNumber1Text - AnthonyRematchText", ROMX +SECTION "data/phone/text/anthony_overworld.asm", ROMX AnthonyAskNumber1Text: text "By the way, I'm a" diff --git a/data/phone/text/arnie_callee.asm b/data/phone/text/arnie_callee.asm index a872a484cc4..52c1b35823a 100644 --- a/data/phone/text/arnie_callee.asm +++ b/data/phone/text/arnie_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b6454 - UnknownText_0x1b656c", ROMX +SECTION "data/phone/text/arnie_callee.asm", ROMX UnknownText_0x1b6454: text "Yeah, hello." diff --git a/data/phone/text/arnie_caller.asm b/data/phone/text/arnie_caller.asm index 12e5d9030fc..fa7d3cacd83 100644 --- a/data/phone/text/arnie_caller.asm +++ b/data/phone/text/arnie_caller.asm @@ -1,4 +1,4 @@ -SECTION "ArnieLovesTheCuteText - UnknownText_0x64c5a", ROMX +SECTION "data/phone/text/arnie_caller.asm", ROMX ArnieLovesTheCuteText: text "I'm always with my" diff --git a/data/phone/text/arnie_overworld.asm b/data/phone/text/arnie_overworld.asm index 33b138491ea..2f4a0a86fef 100644 --- a/data/phone/text/arnie_overworld.asm +++ b/data/phone/text/arnie_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ArnieAskNumber1Text - ArnieRematchText", ROMX +SECTION "data/phone/text/arnie_overworld.asm", ROMX ArnieAskNumber1Text: text "Do you get the" diff --git a/data/phone/text/beth_callee.asm b/data/phone/text/beth_callee.asm index 208e8e99939..57256d07f5f 100644 --- a/data/phone/text/beth_callee.asm +++ b/data/phone/text/beth_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b53f7 - UnknownText_0x1b5510", ROMX +SECTION "data/phone/text/beth_callee.asm", ROMX UnknownText_0x1b53f7: text "Hello, this is" diff --git a/data/phone/text/beth_caller.asm b/data/phone/text/beth_caller.asm index d9fc29c9880..fae34daca28 100644 --- a/data/phone/text/beth_caller.asm +++ b/data/phone/text/beth_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x174c7f - BethForgetDealText", ROMX +SECTION "data/phone/text/beth_caller.asm", ROMX UnknownText_0x174c7f: text "Do you remember my" diff --git a/data/phone/text/beth_overworld.asm b/data/phone/text/beth_overworld.asm index 8adc226e141..5bfea833439 100644 --- a/data/phone/text/beth_overworld.asm +++ b/data/phone/text/beth_overworld.asm @@ -1,4 +1,4 @@ -SECTION "BethAskNumber1Text - BethRematchText", ROMX +SECTION "data/phone/text/beth_overworld.asm", ROMX BethAskNumber1Text: text "It's been a while" diff --git a/data/phone/text/beverly_callee.asm b/data/phone/text/beverly_callee.asm index b67eedcc499..88539c32ed8 100644 --- a/data/phone/text/beverly_callee.asm +++ b/data/phone/text/beverly_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b4f21 - UnknownText_0x1b502b", ROMX +SECTION "data/phone/text/beverly_callee.asm", ROMX UnknownText_0x1b4f21: text "Hello, this is" diff --git a/data/phone/text/beverly_caller.asm b/data/phone/text/beverly_caller.asm index b746538ad8c..b5bc14e8228 100644 --- a/data/phone/text/beverly_caller.asm +++ b/data/phone/text/beverly_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x174688 - UnknownText_0x174895", ROMX +SECTION "data/phone/text/beverly_caller.asm", ROMX UnknownText_0x174688: text "I fancied up my" diff --git a/data/phone/text/beverly_overworld.asm b/data/phone/text/beverly_overworld.asm index a91fe0ec317..956fb5019bd 100644 --- a/data/phone/text/beverly_overworld.asm +++ b/data/phone/text/beverly_overworld.asm @@ -1,4 +1,4 @@ -SECTION "BeverlyAskNumber1Text - BeverlyPackFullText", ROMX +SECTION "data/phone/text/beverly_overworld.asm", ROMX BeverlyAskNumber1Text: text "Your MARILL is so" diff --git a/data/phone/text/bike_shop.asm b/data/phone/text/bike_shop.asm index ebe630d5ba6..be9d01cd914 100644 --- a/data/phone/text/bike_shop.asm +++ b/data/phone/text/bike_shop.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x174000", ROMX +SECTION "data/phone/text/bike_shop.asm", ROMX UnknownText_0x174000: text "Hi, !" diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm index 5c9f71eeb06..66d818af5c3 100644 --- a/data/phone/text/bill.asm +++ b/data/phone/text/bill.asm @@ -1,4 +1,4 @@ -SECTION "BillPhoneMornGreetingText - BillPhoneNewlyFullText", ROMX +SECTION "data/phone/text/bill.asm", ROMX BillPhoneMornGreetingText: text "Good morning!" diff --git a/data/phone/text/brent_callee.asm b/data/phone/text/brent_callee.asm index a77698983e8..4e9b4d26e63 100644 --- a/data/phone/text/brent_callee.asm +++ b/data/phone/text/brent_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b6c96 - UnknownText_0x1b6db9", ROMX +SECTION "data/phone/text/brent_callee.asm", ROMX UnknownText_0x1b6c96: text "Yes? @" diff --git a/data/phone/text/brent_caller.asm b/data/phone/text/brent_caller.asm index e1d622d7b0b..c954842dd16 100644 --- a/data/phone/text/brent_caller.asm +++ b/data/phone/text/brent_caller.asm @@ -1,4 +1,4 @@ -SECTION "BrentRareTradeText - UnknownText_0x66579", ROMX +SECTION "data/phone/text/brent_caller.asm", ROMX BrentRareTradeText: text "Oh yeah, I got an" diff --git a/data/phone/text/brent_overworld.asm b/data/phone/text/brent_overworld.asm index 5c40e8be5bf..d74548c8496 100644 --- a/data/phone/text/brent_overworld.asm +++ b/data/phone/text/brent_overworld.asm @@ -1,4 +1,4 @@ -SECTION "BrentAskNumber1Text - BrentRematchText", ROMX +SECTION "data/phone/text/brent_overworld.asm", ROMX BrentAskNumber1Text: text "By the way, you're" diff --git a/data/phone/text/chad_callee.asm b/data/phone/text/chad_callee.asm index 0c6acb14c26..d34bc285579 100644 --- a/data/phone/text/chad_callee.asm +++ b/data/phone/text/chad_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b67e2 - UnknownText_0x1b68e8", ROMX +SECTION "data/phone/text/chad_callee.asm", ROMX UnknownText_0x1b67e2: text "Hello, this is" diff --git a/data/phone/text/chad_caller.asm b/data/phone/text/chad_caller.asm index aa47ff78f9e..91eb1ca0dc8 100644 --- a/data/phone/text/chad_caller.asm +++ b/data/phone/text/chad_caller.asm @@ -1,4 +1,4 @@ -SECTION "ChadObservingWildText - UnknownText_0x65a63", ROMX +SECTION "data/phone/text/chad_caller.asm", ROMX ChadObservingWildText: text "I recently began" diff --git a/data/phone/text/chad_overworld.asm b/data/phone/text/chad_overworld.asm index 74fddb28fa3..54724855c52 100644 --- a/data/phone/text/chad_overworld.asm +++ b/data/phone/text/chad_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ChadAskNumber1Text - ChadRematchText", ROMX +SECTION "data/phone/text/chad_overworld.asm", ROMX ChadAskNumber1Text: text "Huh? Is that thing" diff --git a/data/phone/text/dana_callee.asm b/data/phone/text/dana_callee.asm index 4a95b8444b5..a2ede7a8996 100644 --- a/data/phone/text/dana_callee.asm +++ b/data/phone/text/dana_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b66c8 - UnknownText_0x1b6795", ROMX +SECTION "data/phone/text/dana_callee.asm", ROMX UnknownText_0x1b66c8: text "Hi, @" diff --git a/data/phone/text/dana_caller.asm b/data/phone/text/dana_caller.asm index 1ac3e7b7c9e..ebe030b7318 100644 --- a/data/phone/text/dana_caller.asm +++ b/data/phone/text/dana_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x64f74 - UnknownText_0x6520f", ROMX +SECTION "data/phone/text/dana_caller.asm", ROMX UnknownText_0x64f74: text "My @" diff --git a/data/phone/text/dana_overworld.asm b/data/phone/text/dana_overworld.asm index c993abb16e6..98c97057b4f 100644 --- a/data/phone/text/dana_overworld.asm +++ b/data/phone/text/dana_overworld.asm @@ -1,4 +1,4 @@ -SECTION "DanaAskNumber1Text - DanaPackFullText", ROMX +SECTION "data/phone/text/dana_overworld.asm", ROMX DanaAskNumber1Text: text "You're really good" diff --git a/data/phone/text/derek_callee.asm b/data/phone/text/derek_callee.asm index d3d10bf5667..1245c1d0ecc 100644 --- a/data/phone/text/derek_callee.asm +++ b/data/phone/text/derek_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b69a8 - UnknownText_0x1b6ac2", ROMX +SECTION "data/phone/text/derek_callee.asm", ROMX UnknownText_0x1b69a8: text "Hi, ?" diff --git a/data/phone/text/derek_caller.asm b/data/phone/text/derek_caller.asm index da63665aa03..43f9196d0d8 100644 --- a/data/phone/text/derek_caller.asm +++ b/data/phone/text/derek_caller.asm @@ -1,4 +1,4 @@ -SECTION "DerekCheekPincherText - UnknownText_0x65da6", ROMX +SECTION "data/phone/text/derek_caller.asm", ROMX DerekCheekPincherText: text "Listen to this." diff --git a/data/phone/text/derek_overworld.asm b/data/phone/text/derek_overworld.asm index 61400b10001..e402194ffe0 100644 --- a/data/phone/text/derek_overworld.asm +++ b/data/phone/text/derek_overworld.asm @@ -1,4 +1,4 @@ -SECTION "DerekAskNumber1Text - DerekPackFullText", ROMX +SECTION "data/phone/text/derek_overworld.asm", ROMX DerekAskNumber1Text: text "Oh, wow! PIKACHU!" diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index 03062ab867e..da96b6bf171 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -1,4 +1,4 @@ -SECTION "ElmPhoneStartText - ElmPhoneUnusedText", ROMX +SECTION "data/phone/text/elm.asm", ROMX ElmPhoneStartText: text "Hello, ?" diff --git a/data/phone/text/erin_callee.asm b/data/phone/text/erin_callee.asm index d50e4a22dee..ac6404c6220 100644 --- a/data/phone/text/erin_callee.asm +++ b/data/phone/text/erin_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b751a - UnknownText_0x1b75e5", ROMX +SECTION "data/phone/text/erin_callee.asm", ROMX UnknownText_0x1b751a: text "Yes, this is" diff --git a/data/phone/text/erin_caller.asm b/data/phone/text/erin_caller.asm index f5c4424d64e..d0d55a27589 100644 --- a/data/phone/text/erin_caller.asm +++ b/data/phone/text/erin_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x6717a - ErinComeBattleText", ROMX +SECTION "data/phone/text/erin_caller.asm", ROMX UnknownText_0x6717a: text_ram wStringBuffer3 diff --git a/data/phone/text/erin_overworld.asm b/data/phone/text/erin_overworld.asm index 2ce16b18e78..913c0d09c68 100644 --- a/data/phone/text/erin_overworld.asm +++ b/data/phone/text/erin_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ErinAskNumber1Text - ErinRematchGiftText", ROMX +SECTION "data/phone/text/erin_overworld.asm", ROMX ErinAskNumber1Text: text "It really made me" diff --git a/data/phone/text/gaven_callee.asm b/data/phone/text/gaven_callee.asm index 1ddba9858a1..7be9814fb55 100644 --- a/data/phone/text/gaven_callee.asm +++ b/data/phone/text/gaven_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5270 - UnknownText_0x1b5393", ROMX +SECTION "data/phone/text/gaven_callee.asm", ROMX UnknownText_0x1b5270: text "Hello, this is" diff --git a/data/phone/text/gaven_caller.asm b/data/phone/text/gaven_caller.asm index a73e769045e..c0fb8b4340c 100644 --- a/data/phone/text/gaven_caller.asm +++ b/data/phone/text/gaven_caller.asm @@ -1,4 +1,4 @@ -SECTION "GavenGreaterText - UnknownText_0x174c49", ROMX +SECTION "data/phone/text/gaven_caller.asm", ROMX GavenGreaterText: text "My @" diff --git a/data/phone/text/gaven_overworld.asm b/data/phone/text/gaven_overworld.asm index 406f286b005..1e0c19ca053 100644 --- a/data/phone/text/gaven_overworld.asm +++ b/data/phone/text/gaven_overworld.asm @@ -1,4 +1,4 @@ -SECTION "GavenAskNumber1Text - GavenRematchText", ROMX +SECTION "data/phone/text/gaven_overworld.asm", ROMX GavenAskNumber1Text: text "Wow, you're tough." diff --git a/data/phone/text/gina_callee.asm b/data/phone/text/gina_callee.asm index d0f07d467fc..765893f5f3e 100644 --- a/data/phone/text/gina_callee.asm +++ b/data/phone/text/gina_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b626a - UnknownText_0x1b6352", ROMX +SECTION "data/phone/text/gina_callee.asm", ROMX UnknownText_0x1b626a: text "Hello? This is" diff --git a/data/phone/text/gina_caller.asm b/data/phone/text/gina_caller.asm index 6aedb81d132..f5e80c5a931 100644 --- a/data/phone/text/gina_caller.asm +++ b/data/phone/text/gina_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1771fd - UnknownText_0x17750e", ROMX +SECTION "data/phone/text/gina_caller.asm", ROMX UnknownText_0x1771fd: text "My @" diff --git a/data/phone/text/gina_overworld.asm b/data/phone/text/gina_overworld.asm index b5d86224d3d..c96639257af 100644 --- a/data/phone/text/gina_overworld.asm +++ b/data/phone/text/gina_overworld.asm @@ -1,4 +1,4 @@ -SECTION "GinaAskNumber1Text - GinaPackFullText", ROMX +SECTION "data/phone/text/gina_overworld.asm", ROMX GinaAskNumber1Text: text "Whenever I see a" diff --git a/data/phone/text/huey_callee.asm b/data/phone/text/huey_callee.asm index 5ba7927cd80..4531c88d761 100644 --- a/data/phone/text/huey_callee.asm +++ b/data/phone/text/huey_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5073 - UnknownText_0x1b5154", ROMX +SECTION "data/phone/text/huey_callee.asm", ROMX UnknownText_0x1b5073: text "Yeah, this is" diff --git a/data/phone/text/huey_caller.asm b/data/phone/text/huey_caller.asm index 1c64068a178..85e3622ef49 100644 --- a/data/phone/text/huey_caller.asm +++ b/data/phone/text/huey_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1748ea - UnknownText_0x1749c7", ROMX +SECTION "data/phone/text/huey_caller.asm", ROMX UnknownText_0x1748ea: text "Hey, I challenge" diff --git a/data/phone/text/huey_overworld.asm b/data/phone/text/huey_overworld.asm index 22042e487bd..68864007a4f 100644 --- a/data/phone/text/huey_overworld.asm +++ b/data/phone/text/huey_overworld.asm @@ -1,4 +1,4 @@ -SECTION "HueyAskNumber1Text - HueyRematchGiftText", ROMX +SECTION "data/phone/text/huey_overworld.asm", ROMX HueyAskNumber1Text: text "Cool! That's the" diff --git a/data/phone/text/irwin_callee.asm b/data/phone/text/irwin_callee.asm index 99e202cb962..ef6871dbffd 100644 --- a/data/phone/text/irwin_callee.asm +++ b/data/phone/text/irwin_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b638c - UnknownText_0x1b642c", ROMX +SECTION "data/phone/text/irwin_callee.asm", ROMX UnknownText_0x1b638c: text "Hello? @" diff --git a/data/phone/text/irwin_caller.asm b/data/phone/text/irwin_caller.asm index dc650329a47..ff32254f1dd 100644 --- a/data/phone/text/irwin_caller.asm +++ b/data/phone/text/irwin_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x64000 - UnknownText_0x648dc", ROMX +SECTION "data/phone/text/irwin_caller.asm", ROMX UnknownText_0x64000: text "I hate having to" diff --git a/data/phone/text/irwin_overworld.asm b/data/phone/text/irwin_overworld.asm index fba984696d0..1531e912af8 100644 --- a/data/phone/text/irwin_overworld.asm +++ b/data/phone/text/irwin_overworld.asm @@ -1,4 +1,4 @@ -SECTION "IrwinAskNumber1Text - IrwinPhoneFullText", ROMX +SECTION "data/phone/text/irwin_overworld.asm", ROMX IrwinAskNumber1Text: text "You're the best" diff --git a/data/phone/text/jack_callee.asm b/data/phone/text/jack_callee.asm index fdd3ee7d05d..da2cda157c7 100644 --- a/data/phone/text/jack_callee.asm +++ b/data/phone/text/jack_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b4dc5 - UnknownText_0x1b4ecd", ROMX +SECTION "data/phone/text/jack_callee.asm", ROMX UnknownText_0x1b4dc5: text "Hello. This is" diff --git a/data/phone/text/jack_caller.asm b/data/phone/text/jack_caller.asm index 7f756599411..a454832fd46 100644 --- a/data/phone/text/jack_caller.asm +++ b/data/phone/text/jack_caller.asm @@ -1,4 +1,4 @@ -SECTION "JackIntelligenceText - UnknownText_0x174638", ROMX +SECTION "data/phone/text/jack_caller.asm", ROMX JackIntelligenceText: text "My @" diff --git a/data/phone/text/jack_overworld.asm b/data/phone/text/jack_overworld.asm index b10a64bc954..fd5254714a0 100644 --- a/data/phone/text/jack_overworld.asm +++ b/data/phone/text/jack_overworld.asm @@ -1,4 +1,4 @@ -SECTION "JackAskNumber1Text - JackRematchText", ROMX +SECTION "data/phone/text/jack_overworld.asm", ROMX JackAskNumber1Text: text "Your knowledge is" diff --git a/data/phone/text/joey_callee.asm b/data/phone/text/joey_callee.asm index d76d98f56fe..bbf4a89f5f7 100644 --- a/data/phone/text/joey_callee.asm +++ b/data/phone/text/joey_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b589a - UnknownText_0x1b59b2", ROMX +SECTION "data/phone/text/joey_callee.asm", ROMX UnknownText_0x1b589a: text "Hi, @" diff --git a/data/phone/text/joey_caller.asm b/data/phone/text/joey_caller.asm index c72628983eb..3b3677bd5ec 100644 --- a/data/phone/text/joey_caller.asm +++ b/data/phone/text/joey_caller.asm @@ -1,4 +1,4 @@ -SECTION "JoeySharperText - UnknownText_0x175786", ROMX +SECTION "data/phone/text/joey_caller.asm", ROMX JoeySharperText: text "My @" diff --git a/data/phone/text/joey_overworld.asm b/data/phone/text/joey_overworld.asm index 48354f19bbb..30975fdaf15 100644 --- a/data/phone/text/joey_overworld.asm +++ b/data/phone/text/joey_overworld.asm @@ -1,4 +1,4 @@ -SECTION "JoeyAskNumber1Text - JoeyRematchGiftText", ROMX +SECTION "data/phone/text/joey_overworld.asm", ROMX JoeyAskNumber1Text: text "Listen, can I get" diff --git a/data/phone/text/jose_callee.asm b/data/phone/text/jose_callee.asm index 7b144c9806b..076a12d17ee 100644 --- a/data/phone/text/jose_callee.asm +++ b/data/phone/text/jose_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b55ae - UnknownText_0x1b5694", ROMX +SECTION "data/phone/text/jose_callee.asm", ROMX UnknownText_0x1b55ae: text "Hello, this is" diff --git a/data/phone/text/jose_caller.asm b/data/phone/text/jose_caller.asm index 08c5327e36e..bf6b4164bd0 100644 --- a/data/phone/text/jose_caller.asm +++ b/data/phone/text/jose_caller.asm @@ -1,4 +1,4 @@ -SECTION "JoseAromaText - UnknownText_0x17529c", ROMX +SECTION "data/phone/text/jose_caller.asm", ROMX JoseAromaText: text "Hey listen, my" diff --git a/data/phone/text/jose_overworld.asm b/data/phone/text/jose_overworld.asm index 17c818d6de9..e0614c66dd3 100644 --- a/data/phone/text/jose_overworld.asm +++ b/data/phone/text/jose_overworld.asm @@ -1,4 +1,4 @@ -SECTION "JoseAskNumber1Text - JosePackFullText", ROMX +SECTION "data/phone/text/jose_overworld.asm", ROMX JoseAskNumber1Text: text "If my @" diff --git a/data/phone/text/kenji_callee.asm b/data/phone/text/kenji_callee.asm index 7933b4d52ac..65eec8f0deb 100644 --- a/data/phone/text/kenji_callee.asm +++ b/data/phone/text/kenji_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b730b - UnknownText_0x1b73af", ROMX +SECTION "data/phone/text/kenji_callee.asm", ROMX UnknownText_0x1b730b: text_ram wStringBuffer3 diff --git a/data/phone/text/kenji_caller.asm b/data/phone/text/kenji_caller.asm index ef0fc89aa76..fa4a378d9d2 100644 --- a/data/phone/text/kenji_caller.asm +++ b/data/phone/text/kenji_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x66dab - UnknownText_0x66f52", ROMX +SECTION "data/phone/text/kenji_caller.asm", ROMX UnknownText_0x66dab: text "Anyway, we'll chat" diff --git a/data/phone/text/kenji_overworld.asm b/data/phone/text/kenji_overworld.asm index fc367bda79d..4bb78e25b6a 100644 --- a/data/phone/text/kenji_overworld.asm +++ b/data/phone/text/kenji_overworld.asm @@ -1,4 +1,4 @@ -SECTION "KenjiAskNumber1Text - KenjiPackFullText", ROMX +SECTION "data/phone/text/kenji_overworld.asm", ROMX KenjiAskNumber1Text: text "Our battle was" diff --git a/data/phone/text/liz_callee.asm b/data/phone/text/liz_callee.asm index 82b0c57e776..bbe21d55c07 100644 --- a/data/phone/text/liz_callee.asm +++ b/data/phone/text/liz_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5d9f - UnknownText_0x1b5ebe", ROMX +SECTION "data/phone/text/liz_callee.asm", ROMX UnknownText_0x1b5d9f: text "Hello, @" diff --git a/data/phone/text/liz_caller.asm b/data/phone/text/liz_caller.asm index 9c48cafbde5..865363894b2 100644 --- a/data/phone/text/liz_caller.asm +++ b/data/phone/text/liz_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x175fda - UnknownText_0x1769da", ROMX +SECTION "data/phone/text/liz_caller.asm", ROMX UnknownText_0x175fda: text "Oh, you have to" diff --git a/data/phone/text/liz_overworld.asm b/data/phone/text/liz_overworld.asm index 56ab4ae9e83..85480f505c7 100644 --- a/data/phone/text/liz_overworld.asm +++ b/data/phone/text/liz_overworld.asm @@ -1,4 +1,4 @@ -SECTION "LizAskNumber1Text - LizRematchText", ROMX +SECTION "data/phone/text/liz_overworld.asm", ROMX LizAskNumber1Text: text "Oh? You're on a" diff --git a/data/phone/text/mom.asm b/data/phone/text/mom.asm index c5972cbe0ff..5b45a226c53 100644 --- a/data/phone/text/mom.asm +++ b/data/phone/text/mom.asm @@ -1,4 +1,4 @@ -SECTION "MomPhoneGreetingText - MomPhoneLectureText", ROMX +SECTION "data/phone/text/mom.asm", ROMX MomPhoneGreetingText: text "Hello?" diff --git a/data/phone/text/parry_callee.asm b/data/phone/text/parry_callee.asm index ea8c3214a1c..9b89a77accd 100644 --- a/data/phone/text/parry_callee.asm +++ b/data/phone/text/parry_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b73c7 - UnknownText_0x1b74c8", ROMX +SECTION "data/phone/text/parry_callee.asm", ROMX UnknownText_0x1b73c7: text "Yup, yup!" diff --git a/data/phone/text/parry_caller.asm b/data/phone/text/parry_caller.asm index d7b5d5b35ca..30e01642a09 100644 --- a/data/phone/text/parry_caller.asm +++ b/data/phone/text/parry_caller.asm @@ -1,4 +1,4 @@ -SECTION "ParryNoMatchText - ParryHaventYouGottenToText", ROMX +SECTION "data/phone/text/parry_caller.asm", ROMX ParryNoMatchText: text "Nothing can match" diff --git a/data/phone/text/parry_overworld.asm b/data/phone/text/parry_overworld.asm index 9ad0a32151c..28d10f2cab0 100644 --- a/data/phone/text/parry_overworld.asm +++ b/data/phone/text/parry_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ParryAskNumber1Text - ParryRematchGiftText", ROMX +SECTION "data/phone/text/parry_overworld.asm", ROMX ParryAskNumber1Text: text "Sheesh, the way" diff --git a/data/phone/text/ralph_callee.asm b/data/phone/text/ralph_callee.asm index 1dbfa10f10e..fd13dad6147 100644 --- a/data/phone/text/ralph_callee.asm +++ b/data/phone/text/ralph_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5c10 - UnknownText_0x1b5d51", ROMX +SECTION "data/phone/text/ralph_callee.asm", ROMX UnknownText_0x1b5c10: text "Yes? Ah, ." diff --git a/data/phone/text/ralph_caller.asm b/data/phone/text/ralph_caller.asm index 574415f70b9..d10a862affe 100644 --- a/data/phone/text/ralph_caller.asm +++ b/data/phone/text/ralph_caller.asm @@ -1,4 +1,4 @@ -SECTION "RalphNeglectingKidsText - UnknownText_0x175f70", ROMX +SECTION "data/phone/text/ralph_caller.asm", ROMX RalphNeglectingKidsText: text "I've been spending" diff --git a/data/phone/text/ralph_overworld.asm b/data/phone/text/ralph_overworld.asm index 6edc4c13de6..77a80669e8b 100644 --- a/data/phone/text/ralph_overworld.asm +++ b/data/phone/text/ralph_overworld.asm @@ -1,4 +1,4 @@ -SECTION "RalphAskNumber1Text - RalphRematchText", ROMX +SECTION "data/phone/text/ralph_overworld.asm", ROMX RalphAskNumber1Text: text "Don't young people" diff --git a/data/phone/text/reena_callee.asm b/data/phone/text/reena_callee.asm index 1f88ac6c854..55ae43e76b3 100644 --- a/data/phone/text/reena_callee.asm +++ b/data/phone/text/reena_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5702 - UnknownText_0x1b5819", ROMX +SECTION "data/phone/text/reena_callee.asm", ROMX UnknownText_0x1b5702: text "Hello, this is" diff --git a/data/phone/text/reena_caller.asm b/data/phone/text/reena_caller.asm index d9f6c12262c..c96a40468e0 100644 --- a/data/phone/text/reena_caller.asm +++ b/data/phone/text/reena_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1752f5 - UnknownText_0x1754e5", ROMX +SECTION "data/phone/text/reena_caller.asm", ROMX UnknownText_0x1752f5: text "Listen, dear…" diff --git a/data/phone/text/reena_overworld.asm b/data/phone/text/reena_overworld.asm index 90b8b4b974a..71fe65eacaf 100644 --- a/data/phone/text/reena_overworld.asm +++ b/data/phone/text/reena_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ReenaAskNumber1Text - ReenaRematchText", ROMX +SECTION "data/phone/text/reena_overworld.asm", ROMX ReenaAskNumber1Text: text "Not bad…" diff --git a/data/phone/text/tiffany_callee.asm b/data/phone/text/tiffany_callee.asm index d9e3447c29a..aff324541f3 100644 --- a/data/phone/text/tiffany_callee.asm +++ b/data/phone/text/tiffany_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b6e7c - UnknownText_0x1b6f60", ROMX +SECTION "data/phone/text/tiffany_callee.asm", ROMX UnknownText_0x1b6e7c: text "Yes? This is" diff --git a/data/phone/text/tiffany_caller.asm b/data/phone/text/tiffany_caller.asm index a7ac3a33a9f..cb7e249d2af 100644 --- a/data/phone/text/tiffany_caller.asm +++ b/data/phone/text/tiffany_caller.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x665ad - UnknownText_0x6691d", ROMX +SECTION "data/phone/text/tiffany_caller.asm", ROMX UnknownText_0x665ad: text "My @" diff --git a/data/phone/text/tiffany_overworld.asm b/data/phone/text/tiffany_overworld.asm index 4cd393d646c..bf1a26dce15 100644 --- a/data/phone/text/tiffany_overworld.asm +++ b/data/phone/text/tiffany_overworld.asm @@ -1,4 +1,4 @@ -SECTION "TiffanyAskNumber1Text - TiffanyPackFullText", ROMX +SECTION "data/phone/text/tiffany_overworld.asm", ROMX TiffanyAskNumber1Text: text "Hi! You like" diff --git a/data/phone/text/todd_callee.asm b/data/phone/text/todd_callee.asm index 6b19138b7b5..29b581a6c92 100644 --- a/data/phone/text/todd_callee.asm +++ b/data/phone/text/todd_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b60f5 - UnknownText_0x1b61f2", ROMX +SECTION "data/phone/text/todd_callee.asm", ROMX UnknownText_0x1b60f5: text "Yes? This is" diff --git a/data/phone/text/todd_caller.asm b/data/phone/text/todd_caller.asm index a78ed68c8b0..d9b8e8988e8 100644 --- a/data/phone/text/todd_caller.asm +++ b/data/phone/text/todd_caller.asm @@ -1,4 +1,4 @@ -SECTION "ToddLooksCuteLikeMeText - UnknownText_0x17717c", ROMX +SECTION "data/phone/text/todd_caller.asm", ROMX ToddLooksCuteLikeMeText: text "My @" diff --git a/data/phone/text/todd_overworld.asm b/data/phone/text/todd_overworld.asm index b42b04a9c16..c055e673c7f 100644 --- a/data/phone/text/todd_overworld.asm +++ b/data/phone/text/todd_overworld.asm @@ -1,4 +1,4 @@ -SECTION "ToddAskNumber1Text - UnusedText_0xa43ca", ROMX +SECTION "data/phone/text/todd_overworld.asm", ROMX ToddAskNumber1Text: text "From here, I can" diff --git a/data/phone/text/tully_callee.asm b/data/phone/text/tully_callee.asm index 8b9531c67aa..07a2e941f36 100644 --- a/data/phone/text/tully_callee.asm +++ b/data/phone/text/tully_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b6b39 - UnknownText_0x1b6c56", ROMX +SECTION "data/phone/text/tully_callee.asm", ROMX UnknownText_0x1b6b39: text "Hello, this is" diff --git a/data/phone/text/tully_caller.asm b/data/phone/text/tully_caller.asm index c1c63b9cadb..89281d6f059 100644 --- a/data/phone/text/tully_caller.asm +++ b/data/phone/text/tully_caller.asm @@ -1,4 +1,4 @@ -SECTION "TullyGrownText - UnknownText_0x66087", ROMX +SECTION "data/phone/text/tully_caller.asm", ROMX TullyGrownText: text "My @" diff --git a/data/phone/text/tully_overworld.asm b/data/phone/text/tully_overworld.asm index 2305c1036de..a0e00659270 100644 --- a/data/phone/text/tully_overworld.asm +++ b/data/phone/text/tully_overworld.asm @@ -1,4 +1,4 @@ -SECTION "TullyAskNumber1Text - TullyPackFullText", ROMX +SECTION "data/phone/text/tully_overworld.asm", ROMX TullyAskNumber1Text: text "Hey, you're trying" diff --git a/data/phone/text/unknown_callee.asm b/data/phone/text/unknown_callee.asm index 5abca70b1a9..a5e2a0db366 100644 --- a/data/phone/text/unknown_callee.asm +++ b/data/phone/text/unknown_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b518b - UnknownText_0x1b522b", ROMX +SECTION "data/phone/text/unknown_callee.asm", ROMX UnknownText_0x1b518b: text "How are your" diff --git a/data/phone/text/unused.asm b/data/phone/text/unused.asm index 1b1efc232b8..cb599cf7542 100644 --- a/data/phone/text/unused.asm +++ b/data/phone/text/unused.asm @@ -1,4 +1,4 @@ -SECTION "UnusedPhoneText", ROMX +SECTION "data/phone/text/unused.asm", ROMX UnusedPhoneText: text "Good morning." diff --git a/data/phone/text/vance_callee.asm b/data/phone/text/vance_callee.asm index 430daef65b2..c322f22eaea 100644 --- a/data/phone/text/vance_callee.asm +++ b/data/phone/text/vance_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b7019 - UnknownText_0x1b7161", ROMX +SECTION "data/phone/text/vance_callee.asm", ROMX UnknownText_0x1b7019: text "Yes, hello?" diff --git a/data/phone/text/vance_caller.asm b/data/phone/text/vance_caller.asm index 3f225e6d582..a79c4888589 100644 --- a/data/phone/text/vance_caller.asm +++ b/data/phone/text/vance_caller.asm @@ -1,4 +1,4 @@ -SECTION "VanceLiftoffText - VanceHurryHurryText", ROMX +SECTION "data/phone/text/vance_caller.asm", ROMX VanceLiftoffText: text "My @" diff --git a/data/phone/text/vance_overworld.asm b/data/phone/text/vance_overworld.asm index ba5b93d80a9..9e00e79f5af 100644 --- a/data/phone/text/vance_overworld.asm +++ b/data/phone/text/vance_overworld.asm @@ -1,4 +1,4 @@ -SECTION "VanceAskNumber1Text - VanceRematchGiftText", ROMX +SECTION "data/phone/text/vance_overworld.asm", ROMX VanceAskNumber1Text: text "You know, you are" diff --git a/data/phone/text/wade_callee.asm b/data/phone/text/wade_callee.asm index 5622575b27c..671cd945f19 100644 --- a/data/phone/text/wade_callee.asm +++ b/data/phone/text/wade_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b5a3b - UnknownText_0x1b5b68", ROMX +SECTION "data/phone/text/wade_callee.asm", ROMX UnknownText_0x1b5a3b: text "Hello? This is" diff --git a/data/phone/text/wade_caller.asm b/data/phone/text/wade_caller.asm index ce22d8e3309..a9f018c2af9 100644 --- a/data/phone/text/wade_caller.asm +++ b/data/phone/text/wade_caller.asm @@ -1,4 +1,4 @@ -SECTION "WadeAreYouGrowingText - UnknownText_0x175b6d", ROMX +SECTION "data/phone/text/wade_caller.asm", ROMX WadeAreYouGrowingText: text "Are your #MON" diff --git a/data/phone/text/wade_overworld.asm b/data/phone/text/wade_overworld.asm index 2a7a4f3b339..6ef303ecd61 100644 --- a/data/phone/text/wade_overworld.asm +++ b/data/phone/text/wade_overworld.asm @@ -1,4 +1,4 @@ -SECTION "WadeAskNumber1Text - WadePackFullText", ROMX +SECTION "data/phone/text/wade_overworld.asm", ROMX WadeAskNumber1Text: text "You're awesome!" diff --git a/data/phone/text/wilton_callee.asm b/data/phone/text/wilton_callee.asm index 1da5cd402cc..7c0c2cebac4 100644 --- a/data/phone/text/wilton_callee.asm +++ b/data/phone/text/wilton_callee.asm @@ -1,4 +1,4 @@ -SECTION "UnknownText_0x1b71d5 - UnknownText_0x1b72d0", ROMX +SECTION "data/phone/text/wilton_callee.asm", ROMX UnknownText_0x1b71d5: text "Hello, you have" diff --git a/data/phone/text/wilton_caller.asm b/data/phone/text/wilton_caller.asm index aff5dd90a45..28b66ea0e0f 100644 --- a/data/phone/text/wilton_caller.asm +++ b/data/phone/text/wilton_caller.asm @@ -1,4 +1,4 @@ -SECTION "WiltonGrownText - WiltonWantThisText", ROMX +SECTION "data/phone/text/wilton_caller.asm", ROMX WiltonGrownText: text "My @" diff --git a/data/phone/text/wilton_overworld.asm b/data/phone/text/wilton_overworld.asm index 60133922f3a..3377b337073 100644 --- a/data/phone/text/wilton_overworld.asm +++ b/data/phone/text/wilton_overworld.asm @@ -1,4 +1,4 @@ -SECTION "WiltonAskNumber1Text - WiltonPackFullText", ROMX +SECTION "data/phone/text/wilton_overworld.asm", ROMX WiltonAskNumber1Text: text "Eh, our battle was" diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index e0f4e1f7f74..2b522765e1f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -32,7 +32,7 @@ endr ENDM -SECTION "BaseData", ROMX +SECTION "data/pokemon/base_stats.asm", ROMX BaseData:: INCLUDE "data/pokemon/base_stats/bulbasaur.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index b3802e42d3e..e1f8f209dad 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -4,7 +4,7 @@ mon_cry: MACRO ENDM -SECTION "PokemonCries", ROMX +SECTION "data/pokemon/cries.asm", ROMX PokemonCries:: ; entries correspond to constants/pokemon_constants.asm diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index a66f1673700..660f62d1a88 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "Pokedex Entries 001-064", ROMX +SECTION "data/pokemon/dex_entries.asm@Pokedex Entries 001-064", ROMX BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" @@ -69,7 +69,7 @@ AbraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/abra.asm" KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" -SECTION "Pokedex Entries 065-128", ROMX +SECTION "data/pokemon/dex_entries.asm@Pokedex Entries 065-128", ROMX AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" @@ -137,7 +137,7 @@ PinsirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pinsir.asm" TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" -SECTION "Pokedex Entries 129-192", ROMX +SECTION "data/pokemon/dex_entries.asm@Pokedex Entries 129-192", ROMX MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" @@ -205,7 +205,7 @@ SunkernPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunkern.asm" SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" -SECTION "Pokedex Entries 193-251", ROMX +SECTION "data/pokemon/dex_entries.asm@Pokedex Entries 193-251", ROMX YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm index 5586cd19f1c..c853809b11c 100644 --- a/data/pokemon/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "EggMovePointers - NoEggMoves", ROMX +SECTION "data/pokemon/egg_moves.asm", ROMX ; All instances of Charm, Steel Wing, Sweet Scent, and Lovely Kiss were ; removed from egg move lists in Crystal. diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index 2ec40c6d9c8..b095c3a4f96 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -1,4 +1,4 @@ -SECTION "EvolvePokemon - CelebiEvosAttacks", ROMX +SECTION "data/pokemon/evos_attacks.asm", ROMX INCLUDE "engine/pokemon/evolve.asm" diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 972607c703d..367dda18937 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -1,7 +1,7 @@ ; The original base Special stat for each Pokémon from Red/Blue -SECTION "KantoMonSpecials", ROMX +SECTION "data/pokemon/gen1_base_special.asm", ROMX KantoMonSpecials: db 65 ; BULBASAUR diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 9ff748d4d81..9968fdb8289 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -1,4 +1,4 @@ -SECTION "PokemonNames", ROMX +SECTION "data/pokemon/names.asm", ROMX PokemonNames:: db "BULBASAUR@" diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index bf29a37f9ab..fc6d9be1bd6 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -2,7 +2,7 @@ ; FLOAT: Has to be at the same address as UnownPicPointers -SECTION "PokemonPicPointers", ROMX[$4000] +SECTION "data/pokemon/pic_pointers.asm", ROMX[$4000] PokemonPicPointers:: ; entries correspond to Pokémon species, two apiece diff --git a/data/pokemon/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm index 909b68b0527..28fe0296890 100644 --- a/data/pokemon/unown_pic_pointers.asm +++ b/data/pokemon/unown_pic_pointers.asm @@ -1,5 +1,5 @@ ; FLOAT: Has to be at the same address as PokemonPicPointers -SECTION "UnownPicPointers", ROMX[$4000] +SECTION "data/pokemon/unown_pic_pointers.asm", ROMX[$4000] UnownPicPointers:: ; entries correspond to Unown letters, two apiece diff --git a/data/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm index e03d2ec1335..58cf7a9e0e5 100644 --- a/data/pokemon/unused_pic_banks.asm +++ b/data/pokemon/unused_pic_banks.asm @@ -2,7 +2,7 @@ ; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm. -SECTION "Unreferenced_MonPicBanks", ROMX +SECTION "data/pokemon/unused_pic_banks.asm", ROMX Unreferenced_MonPicBanks: ; last mon in bank, bank # diff --git a/data/text/battle.asm b/data/text/battle.asm index 495b557f3ac..b0fc5a42624 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1,4 +1,4 @@ -SECTION "BattleText_PlayerPickedUpPayDayMoney - BattleText_0x8188e", ROMX +SECTION "data/text/battle.asm", ROMX BattleText:: ; used only for BANK(BattleText) diff --git a/data/text/common_1.asm b/data/text/common_1.asm index 85af78eaefa..2c4b043e220 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -1,4 +1,4 @@ -SECTION "Text 1", ROMX +SECTION "data/text/common_1.asm", ROMX _FruitBearingTreeText:: text "It's a fruit-" diff --git a/data/text/common_2.asm b/data/text/common_2.asm index 3844d604496..5460ccd08f9 100644 --- a/data/text/common_2.asm +++ b/data/text/common_2.asm @@ -1,4 +1,4 @@ -SECTION "Text 2", ROMX +SECTION "data/text/common_2.asm", ROMX UnknownText_0x1c0000:: text "Oh, no picture?" diff --git a/data/text/common_3.asm b/data/text/common_3.asm index 7b5cc68082f..d1192046f7c 100644 --- a/data/text/common_3.asm +++ b/data/text/common_3.asm @@ -1,4 +1,4 @@ -SECTION "Text 3", ROMX +SECTION "data/text/common_3.asm", ROMX _OakText6:: text "Now, what did you" diff --git a/data/text/std_text.asm b/data/text/std_text.asm index 78ddb908380..e0708184a24 100644 --- a/data/text/std_text.asm +++ b/data/text/std_text.asm @@ -1,4 +1,4 @@ -SECTION "NurseMornText - RegisteredNumber2Text", ROMX +SECTION "data/text/std_text.asm", ROMX NurseMornText: text "Good morning!" diff --git a/data/text_buffers.asm b/data/text_buffers.asm index ac60dc2da75..02e75b484f8 100644 --- a/data/text_buffers.asm +++ b/data/text_buffers.asm @@ -1,4 +1,4 @@ -SECTION "StringBufferPointers", ROMX +SECTION "data/text_buffers.asm", ROMX StringBufferPointers:: ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) diff --git a/data/tilesets.asm b/data/tilesets.asm index 45dff88b944..27e4f6545c8 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -6,7 +6,7 @@ tileset: MACRO ENDM -SECTION "Tilesets", ROMX +SECTION "data/tilesets.asm", ROMX ; Associated data: ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index d227d0d4335..826ea2dbcd9 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,4 +1,4 @@ -SECTION "TrainerClassNames", ROMX +SECTION "data/trainers/class_names.asm", ROMX TrainerClassNames:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index d1e804f7055..358fda1dbad 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -1,7 +1,7 @@ ; Pics are defined in gfx/pics.asm -SECTION "TrainerPicPointers", ROMX +SECTION "data/trainers/pic_pointers.asm", ROMX TrainerPicPointers:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 7863cf0c304..32aeb2a2691 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -1,4 +1,4 @@ -SECTION "AI_SwitchOrTryItem - TextJump_EnemyUsedOn", ROMX, BANK[BANK_TRAINER_ATTRIBUTES] +SECTION "engine/battle/ai/items.asm", ROMX, BANK[BANK_TRAINER_ATTRIBUTES] AI_SwitchOrTryItem: and a diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index 64b721ac325..495ffb8bd3f 100644 --- a/engine/battle/ai/move.asm +++ b/engine/battle/ai/move.asm @@ -1,4 +1,4 @@ -SECTION "AIChooseMove - AIScoringPointers", ROMX +SECTION "engine/battle/ai/move.asm", ROMX AIChooseMove: ; Score each move in wEnemyMonMoves starting from wBuffer1. Lower is better. diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm index 38c5505f8ff..2e72bd34421 100644 --- a/engine/battle/ai/redundant.asm +++ b/engine/battle/ai/redundant.asm @@ -1,4 +1,4 @@ -SECTION "AI_Redundant", ROMX +SECTION "engine/battle/ai/redundant.asm", ROMX AI_Redundant: ; Check if move effect c will fail because it's already been used. diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index b5bd3f930fa..2701fe6dfea 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -1,4 +1,4 @@ -SECTION "AIScoring - AI_50_50", ROMX +SECTION "engine/battle/ai/scoring.asm", ROMX AIScoring: ; used only for BANK(AIScoring) diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 92482ff8265..11b8be610bc 100644 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm @@ -1,4 +1,4 @@ -SECTION "_AnimateHPBar - ShortHPBar_CalcPixelFrame", ROMX, BANK[BANK_ANIMATE_HP_BAR] +SECTION "engine/battle/anim_hp_bar.asm", ROMX, BANK[BANK_ANIMATE_HP_BAR] _AnimateHPBar: call .IsMaximumMoreThan48Pixels diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index ad86ab0b534..57812ba6a0b 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -9,7 +9,7 @@ BATTLETRANSITION_END EQU $80 BATTLETRANSITION_SQUARE EQU "8" ; $fe -SECTION "DoBattleTransition - StartTrainerBattle_ZoomToBlack", ROMX, BANK[BANK_BATTLE_TRANSITION] +SECTION "engine/battle/battle_transition.asm", ROMX, BANK[BANK_BATTLE_TRANSITION] DoBattleTransition: call .InitGFX @@ -829,7 +829,7 @@ ENDM ret -SECTION "Unreferenced_Function8c7c9", ROMX +SECTION "engine/battle/battle_transition.asm@Unreferenced_Function8c7c9", ROMX Unreferenced_Function8c7c9: ld a, $1 diff --git a/engine/battle/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm index 78fb6cb89e4..f005a068ca4 100644 --- a/engine/battle/battlestart_copytilemapatonce.asm +++ b/engine/battle/battlestart_copytilemapatonce.asm @@ -1,4 +1,4 @@ -SECTION "BattleStart_CopyTilemapAtOnce", ROMX, BANK[BANK_BATTLE_TRANSITION] +SECTION "engine/battle/battlestart_copytilemapatonce.asm", ROMX, BANK[BANK_BATTLE_TRANSITION] BattleStart_CopyTilemapAtOnce: call CGBOnly_CopyTilemapAtOnce diff --git a/engine/battle/check_battle_scene.asm b/engine/battle/check_battle_scene.asm index eece3943ff7..65eb4aee680 100644 --- a/engine/battle/check_battle_scene.asm +++ b/engine/battle/check_battle_scene.asm @@ -1,4 +1,4 @@ -SECTION "CheckBattleScene", ROMX +SECTION "engine/battle/check_battle_scene.asm", ROMX CheckBattleScene: ; Return carry if battle scene is turned off. diff --git a/engine/battle/consume_held_item.asm b/engine/battle/consume_held_item.asm index ae8a4990e34..52471c1a752 100644 --- a/engine/battle/consume_held_item.asm +++ b/engine/battle/consume_held_item.asm @@ -1,4 +1,4 @@ -SECTION "ConsumeHeldItem - ConsumableEffects", ROMX +SECTION "engine/battle/consume_held_item.asm", ROMX ConsumeHeldItem: push hl diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d6e3bd80ea6..38a27d8114f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1,6 +1,6 @@ ; Core components of the battle engine. -SECTION "DoBattle - BattleStartMessage", ROMX +SECTION "engine/battle/core.asm", ROMX DoBattle: xor a diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index cb5f442b26f..577bba1f9d7 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1,4 +1,4 @@ -SECTION "DoPlayerTurn - _CheckBattleScene", ROMX +SECTION "engine/battle/effect_commands.asm", ROMX DoPlayerTurn: call SetPlayerTurn diff --git a/engine/battle/hidden_power.asm b/engine/battle/hidden_power.asm index e1b1f4bd028..c819e0bbdb8 100644 --- a/engine/battle/hidden_power.asm +++ b/engine/battle/hidden_power.asm @@ -1,4 +1,4 @@ -SECTION "HiddenPowerDamage", ROMX +SECTION "engine/battle/hidden_power.asm", ROMX HiddenPowerDamage: ; Override Hidden Power's type and power based on the user's DVs. diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm index 7f0add64cf3..dafaa2e2c33 100644 --- a/engine/battle/link_result.asm +++ b/engine/battle/link_result.asm @@ -1,4 +1,4 @@ -SECTION "DetermineLinkBattleResult", ROMX +SECTION "engine/battle/link_result.asm", ROMX DetermineLinkBattleResult: farcall UpdateEnemyMonInParty diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm index 50550f438f4..bcad6f02568 100644 --- a/engine/battle/menu.asm +++ b/engine/battle/menu.asm @@ -1,4 +1,4 @@ -SECTION "LoadBattleMenu - Function24fb2", ROMX +SECTION "engine/battle/menu.asm", ROMX LoadBattleMenu: ld hl, BattleMenuHeader diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index f53592249d6..2a9b760164e 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -1,4 +1,4 @@ -SECTION "_DisappearUser - GetPlayerBackpicCoords", ROMX +SECTION "engine/battle/misc.asm@AppearDisappearUser", ROMX _DisappearUser: xor a @@ -52,7 +52,7 @@ GetPlayerBackpicCoords: ret -SECTION "DoWeatherModifiers - WeatherMoveModifiers", ROMX +SECTION "engine/battle/misc.asm@DoWeatherModifiers", ROMX DoWeatherModifiers: ld de, WeatherTypeModifiers @@ -150,7 +150,7 @@ DoWeatherModifiers: INCLUDE "data/battle/weather_modifiers.asm" -SECTION "DoBadgeTypeBoosts - BadgeTypeBoosts", ROMX +SECTION "engine/battle/misc.asm@DoBadgeTypeBoosts", ROMX DoBadgeTypeBoosts: ld a, [wLinkMode] diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm index 3ea7ebff22c..98b9a4c2cd1 100644 --- a/engine/battle/read_trainer_attributes.asm +++ b/engine/battle/read_trainer_attributes.asm @@ -1,4 +1,4 @@ -SECTION "GetTrainerClassName - TrainerClassAttributes", ROMX, BANK[BANK_TRAINER_ATTRIBUTES] +SECTION "engine/battle/read_trainer_attributes.asm", ROMX, BANK[BANK_TRAINER_ATTRIBUTES] GetTrainerClassName: ld hl, wRivalName diff --git a/engine/battle/read_trainer_dvs.asm b/engine/battle/read_trainer_dvs.asm index a7c4f8d6eca..a5becf779f4 100644 --- a/engine/battle/read_trainer_dvs.asm +++ b/engine/battle/read_trainer_dvs.asm @@ -1,4 +1,4 @@ -SECTION "GetTrainerDVs - TrainerClassDVs", ROMX +SECTION "engine/battle/read_trainer_dvs.asm", ROMX GetTrainerDVs: ; Return the DVs of wOtherTrainerClass in bc diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index c9677b8abea..b01d929ae84 100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -1,4 +1,4 @@ -SECTION "ReadTrainerParty - MysticalmanGroup", ROMX +SECTION "engine/battle/read_trainer_party.asm", ROMX ReadTrainerParty: ld a, [wInBattleTowerBattle] diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index 166ed093837..740e7c78e24 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -1,4 +1,4 @@ -SECTION "_ReturnToBattle_UseBall", ROMX +SECTION "engine/battle/returntobattle_useball.asm", ROMX _ReturnToBattle_UseBall: call ClearBGPalettes diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index 8003eed5919..0f2fc378128 100644 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -1,4 +1,4 @@ -SECTION "BattleIntroSlidingPics", ROMX +SECTION "engine/battle/sliding_intro.asm", ROMX BattleIntroSlidingPics: ldh a, [rSVBK] diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index b8526ff7384..4ebb0da8510 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -1,4 +1,4 @@ -SECTION "ShowLinkBattleParticipants", ROMX +SECTION "engine/battle/start_battle.asm@ShowLinkBattleParticipants", ROMX ShowLinkBattleParticipants: ; If we're not in a communications room, @@ -15,7 +15,7 @@ ShowLinkBattleParticipants: ret -SECTION "FindFirstAliveMonAndStartBattle", ROMX +SECTION "engine/battle/start_battle.asm@FindFirstAliveMonAndStartBattle", ROMX FindFirstAliveMonAndStartBattle: xor a @@ -52,7 +52,7 @@ FindFirstAliveMonAndStartBattle: ret -SECTION "PlayBattleMusic", ROMX +SECTION "engine/battle/start_battle.asm@PlayBattleMusic", ROMX PlayBattleMusic: push hl @@ -157,7 +157,7 @@ PlayBattleMusic: ret -SECTION "ClearBattleRAM", ROMX +SECTION "engine/battle/start_battle.asm@ClearBattleRAM", ROMX ClearBattleRAM: xor a diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 9a3819c9bcf..b2cb8e823cc 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -1,4 +1,4 @@ -SECTION "BattleStart_TrainerHuds - LoadBallIconGFX", ROMX +SECTION "engine/battle/trainer_huds.asm", ROMX BattleStart_TrainerHuds: ld a, $e4 @@ -234,7 +234,7 @@ LoadBallIconGFX: INCBIN "gfx/battle/balls.2bpp" -SECTION "_ShowLinkBattleParticipants", ROMX +SECTION "engine/battle/trainer_huds.asm@_ShowLinkBattleParticipants", ROMX _ShowLinkBattleParticipants: call ClearBGPalettes diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm index 1f27e0d5f0f..ccb4e95ba6e 100644 --- a/engine/battle/unreferenced_getgen1trainerclassname.asm +++ b/engine/battle/unreferenced_getgen1trainerclassname.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_GetGen1TrainerClassName - Gen1TrainerClassNames", ROMX +SECTION "engine/battle/unreferenced_getgen1trainerclassname.asm", ROMX Unreferenced_GetGen1TrainerClassName: ld hl, Gen1TrainerClassNames diff --git a/engine/battle/update_battle_huds.asm b/engine/battle/update_battle_huds.asm index 30ba9072666..f1f8e1c7f85 100644 --- a/engine/battle/update_battle_huds.asm +++ b/engine/battle/update_battle_huds.asm @@ -1,4 +1,4 @@ -SECTION "_UpdateBattleHUDs", ROMX +SECTION "engine/battle/update_battle_huds.asm", ROMX _UpdateBattleHUDs: farcall DrawPlayerHUD diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 85fe2d9e81e..1d702686522 100644 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -1,4 +1,4 @@ -SECTION "DisplayUsedMoveText - UpdateUsedMoves", ROMX +SECTION "engine/battle/used_move_text.asm", ROMX DisplayUsedMoveText: ; battle command 03 diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 4b812ed7304..49c47daf270 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -8,7 +8,7 @@ ; BG effects for use in battle animations. -SECTION "ExecuteBGEffects - BattleBGEffects_Cosine", ROMX +SECTION "engine/battle_anims/bg_effects.asm", ROMX ExecuteBGEffects: ld hl, wActiveBGEffects diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm index 038806e9826..7e7fb237716 100644 --- a/engine/battle_anims/core.asm +++ b/engine/battle_anims/core.asm @@ -1,4 +1,4 @@ -SECTION "PlayBattleAnim - AnimObjGFX", ROMX +SECTION "engine/battle_anims/core.asm", ROMX PlayBattleAnim: ldh a, [rSVBK] diff --git a/engine/battle_anims/pokeball_wobble.asm b/engine/battle_anims/pokeball_wobble.asm index 3caa3b478c4..b95a6fee62b 100644 --- a/engine/battle_anims/pokeball_wobble.asm +++ b/engine/battle_anims/pokeball_wobble.asm @@ -1,4 +1,4 @@ -SECTION "GetPokeBallWobble - WobbleProbabilities", ROMX +SECTION "engine/battle_anims/pokeball_wobble.asm", ROMX GetPokeBallWobble: ; Returns whether a Poke Ball will wobble in the catch animation. diff --git a/engine/crystal.asm b/engine/crystal.asm index bdeef370949..3377d566efa 100644 --- a/engine/crystal.asm +++ b/engine/crystal.asm @@ -1,4 +1,4 @@ -SECTION "InitCrystalData - Function4a6d8", ROMX +SECTION "engine/crystal.asm", ROMX INCLUDE "engine/menus/init_gender.asm" INCLUDE "engine/items/pack_kris.asm" diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm index 330077a070c..bf7c03a639f 100644 --- a/engine/events/basement_key.asm +++ b/engine/events/basement_key.asm @@ -1,4 +1,4 @@ -SECTION "_BasementKey", ROMX +SECTION "engine/events/basement_key.asm", ROMX _BasementKey: ; Are we even in the right map to use this? diff --git a/engine/events/battle_tower/get_trainer_class.asm b/engine/events/battle_tower/get_trainer_class.asm index c132c2012c9..270cd33e3c5 100644 --- a/engine/events/battle_tower/get_trainer_class.asm +++ b/engine/events/battle_tower/get_trainer_class.asm @@ -1,4 +1,4 @@ -SECTION "GetMobileOTTrainerClass - FemaleTrainers", ROMX +SECTION "engine/events/battle_tower/get_trainer_class.asm", ROMX GetMobileOTTrainerClass: ; mobile function ld h, b diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 26f3d6e113b..4c0466eafe3 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -1,4 +1,4 @@ -SECTION "Function_LoadOpponentTrainerAndPokemons - BattleTowerMons10", ROMX +SECTION "engine/events/battle_tower/load_trainer.asm", ROMX Function_LoadOpponentTrainerAndPokemons: ldh a, [rSVBK] diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 0e1f7012786..67b728dba07 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -1,4 +1,4 @@ -SECTION "CheckForMobileBattleRules - Function_HasPartyAnEgg", ROMX +SECTION "engine/events/battle_tower/rules.asm", ROMX CheckForMobileBattleRules: ld de, .PointerTables diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm index 87092d5b8be..fa8097c52d9 100644 --- a/engine/events/battle_tower/trainer_text.asm +++ b/engine/events/battle_tower/trainer_text.asm @@ -1,4 +1,4 @@ -SECTION "BattleTowerText - BTWinF15", ROMX +SECTION "engine/events/battle_tower/trainer_text.asm", ROMX BattleTowerText:: ; Print text c for trainer [wBT_OTTrainerClass] diff --git a/engine/events/buena.asm b/engine/events/buena.asm index d7081296c7a..8be3c1b778a 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -1,4 +1,4 @@ -SECTION "BuenasPassword", ROMX +SECTION "engine/events/buena.asm@BuenasPassword", ROMX BuenasPassword: xor a @@ -66,7 +66,7 @@ endr ret -SECTION "BuenaPrize - BuenaPrizeItems", ROMX +SECTION "engine/events/buena.asm@BuenaPrize", ROMX BuenaPrize: xor a diff --git a/engine/events/buena_menu.asm b/engine/events/buena_menu.asm index 5b819b14230..fc5f39744d8 100644 --- a/engine/events/buena_menu.asm +++ b/engine/events/buena_menu.asm @@ -1,4 +1,4 @@ -SECTION "AskRememberPassword - Buena_ExitMenu", ROMX +SECTION "engine/events/buena_menu.asm", ROMX AskRememberPassword: call .DoMenu diff --git a/engine/events/bug_contest/abort.asm b/engine/events/bug_contest/abort.asm index bbdf75711f8..ce2a3afab25 100644 --- a/engine/events/bug_contest/abort.asm +++ b/engine/events/bug_contest/abort.asm @@ -1,4 +1,4 @@ -SECTION "Script_AbortBugContest", ROMX +SECTION "engine/events/bug_contest/abort.asm", ROMX Script_AbortBugContest: checkflag ENGINE_BUG_CONTEST_TIMER diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm index 647ccd7d5e2..984f10a1363 100644 --- a/engine/events/bug_contest/caught_mon.asm +++ b/engine/events/bug_contest/caught_mon.asm @@ -1,4 +1,4 @@ -SECTION "BugContest_SetCaughtContestMon", ROMX, BANK[BANK_MOVE_MON] +SECTION "engine/events/bug_contest/caught_mon.asm", ROMX, BANK[BANK_MOVE_MON] BugContest_SetCaughtContestMon: ld a, [wContestMon] diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm index 7ae22da9d22..ed921e48d95 100644 --- a/engine/events/bug_contest/contest.asm +++ b/engine/events/bug_contest/contest.asm @@ -1,4 +1,4 @@ -SECTION "GiveParkBalls", ROMX +SECTION "engine/events/bug_contest/contest.asm@GiveParkBalls", ROMX GiveParkBalls: xor a @@ -9,7 +9,7 @@ GiveParkBalls: ret -SECTION "BugCatchingContestBattleScript - BugCatchingContestText_ContestIsOver", ROMX +SECTION "engine/events/bug_contest/contest.asm@BugCatchingContestBattleScript", ROMX BugCatchingContestBattleScript:: loadvar VAR_BATTLETYPE, BATTLETYPE_CONTEST diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm index 3c2f05c65f4..ca6041d1989 100644 --- a/engine/events/bug_contest/contest_2.asm +++ b/engine/events/bug_contest/contest_2.asm @@ -1,4 +1,4 @@ -SECTION "SelectRandomBugContestContestants - BugCatchingContestantEventFlagTable", ROMX, BANK[BANK_BUG_CONTEST_JUDGING] +SECTION "engine/events/bug_contest/contest_2.asm@SelectRandomBugContestContestants", ROMX, BANK[BANK_BUG_CONTEST_JUDGING] SelectRandomBugContestContestants: ; Select five random people to participate in the current contest. @@ -75,7 +75,7 @@ CheckBugContestContestantFlag: INCLUDE "data/events/bug_contest_flags.asm" -SECTION "ContestDropOffMons", ROMX +SECTION "engine/events/bug_contest/contest_2.asm@ContestDropOffMons", ROMX ContestDropOffMons: ld hl, wPartyMon1HP @@ -102,7 +102,7 @@ ContestDropOffMons: ret -SECTION "ContestReturnMons", ROMX +SECTION "engine/events/bug_contest/contest_2.asm@ContestReturnMons", ROMX ContestReturnMons: ; Restore the species of the second mon. diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index a152ef11c1c..03546a28ed5 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -1,4 +1,4 @@ -SECTION "DisplayCaughtContestMonStats - SwitchMonText", ROMX +SECTION "engine/events/bug_contest/display_stats.asm@DisplayCaughtContestMonStats", ROMX DisplayCaughtContestMonStats: call ClearBGPalettes @@ -94,7 +94,7 @@ SwitchMonText: text_end -SECTION "DisplayAlreadyCaughtText", ROMX +SECTION "engine/events/bug_contest/display_stats.asm@DisplayAlreadyCaughtText", ROMX DisplayAlreadyCaughtText: call GetPokemonName @@ -107,7 +107,7 @@ DisplayAlreadyCaughtText: text_end -SECTION "DummyPredef2F - DummyPredef39", ROMX +SECTION "engine/events/bug_contest/display_stats.asm@DummyPredef", ROMX DummyPredef2F: DummyPredef38: diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 7d628ddaf41..f227879faae 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -1,4 +1,4 @@ -SECTION "_BugContestJudging - ContestScore", ROMX, BANK[BANK_BUG_CONTEST_JUDGING] +SECTION "engine/events/bug_contest/judging.asm", ROMX, BANK[BANK_BUG_CONTEST_JUDGING] _BugContestJudging: call ContestScore diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index b9196052cde..b9e4d09f7fa 100644 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm @@ -1,4 +1,4 @@ -SECTION "_CardKey", ROMX +SECTION "engine/events/card_key.asm", ROMX _CardKey: ; Are we even in the right map to use this? diff --git a/engine/events/catch_tutorial.asm b/engine/events/catch_tutorial.asm index 496439c9340..fae984caaf1 100644 --- a/engine/events/catch_tutorial.asm +++ b/engine/events/catch_tutorial.asm @@ -1,4 +1,4 @@ -SECTION "CatchTutorial", ROMX +SECTION "engine/events/catch_tutorial.asm", ROMX CatchTutorial:: ld a, [wBattleType] diff --git a/engine/events/catch_tutorial_input.asm b/engine/events/catch_tutorial_input.asm index f1df6a2eeec..5cefc36ffd7 100644 --- a/engine/events/catch_tutorial_input.asm +++ b/engine/events/catch_tutorial_input.asm @@ -1,4 +1,4 @@ -SECTION "_DudeAutoInput_A - DudeAutoInput_DownA", ROMX +SECTION "engine/events/catch_tutorial_input.asm", ROMX _DudeAutoInput_A:: ld hl, DudeAutoInput_A diff --git a/engine/events/checkforhiddenitems.asm b/engine/events/checkforhiddenitems.asm index c93a7b749a2..7bbb516160e 100644 --- a/engine/events/checkforhiddenitems.asm +++ b/engine/events/checkforhiddenitems.asm @@ -1,4 +1,4 @@ -SECTION "CheckForHiddenItems", ROMX +SECTION "engine/events/checkforhiddenitems.asm", ROMX CheckForHiddenItems: ; Checks to see if there are hidden items on the screen that have not yet been found. If it finds one, returns carry. diff --git a/engine/events/checksave.asm b/engine/events/checksave.asm index 2d2217a33fd..bd09a0a3a5e 100644 --- a/engine/events/checksave.asm +++ b/engine/events/checksave.asm @@ -1,4 +1,4 @@ -SECTION "CheckSave", ROMX +SECTION "engine/events/checksave.asm", ROMX CheckSave:: ld a, BANK(sCheckValue1) ; aka BANK(sCheckValue2) diff --git a/engine/events/checktime.asm b/engine/events/checktime.asm index 7d94830a25e..22dbf961ddc 100644 --- a/engine/events/checktime.asm +++ b/engine/events/checktime.asm @@ -1,4 +1,4 @@ -SECTION "CheckTime", ROMX +SECTION "engine/events/checktime.asm", ROMX CheckTime:: ld a, [wTimeOfDay] diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index a2247f7bc40..318867875c2 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -22,7 +22,7 @@ const DAYCARETEXT_COME_AGAIN -SECTION "DayCareMan - DayCare_InitBreeding", ROMX +SECTION "engine/events/daycare.asm", ROMX DayCareMan: ld hl, wDayCareMan diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 25a763f7ef3..3550491f9e3 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -1,4 +1,4 @@ -SECTION "_Diploma - DiplomaPage2Tilemap", ROMX +SECTION "engine/events/diploma.asm", ROMX _Diploma: call PlaceDiplomaOnScreen diff --git a/engine/events/dratini.asm b/engine/events/dratini.asm index 88f084246a9..fa4b2971419 100644 --- a/engine/events/dratini.asm +++ b/engine/events/dratini.asm @@ -1,4 +1,4 @@ -SECTION "GiveDratini", ROMX +SECTION "engine/events/dratini.asm", ROMX GiveDratini: ; if wScriptVar is 0 or 1, change the moveset of the last Dratini in the party. diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm index 552d3497a32..6d635f5585c 100644 --- a/engine/events/elevator.asm +++ b/engine/events/elevator.asm @@ -1,4 +1,4 @@ -SECTION "Elevator - ElevatorFloorNames", ROMX +SECTION "engine/events/elevator.asm", ROMX Elevator:: call .LoadPointer diff --git a/engine/events/engine_flags.asm b/engine/events/engine_flags.asm index 88e4d78439a..e95575e61a2 100644 --- a/engine/events/engine_flags.asm +++ b/engine/events/engine_flags.asm @@ -1,4 +1,4 @@ -SECTION "EngineFlagAction - EngineFlags", ROMX +SECTION "engine/events/engine_flags.asm", ROMX EngineFlagAction:: ; Do action b on engine flag de diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index ddbe59b1560..cfe6570e072 100644 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -3,7 +3,7 @@ FIELDMOVE_TREE EQU $84 FIELDMOVE_FLY EQU $84 -SECTION "PlayWhirlpoolSound", ROMX +SECTION "engine/events/field_moves.asm@PlayWhirlpoolSound", ROMX PlayWhirlpoolSound: call WaitSFX @@ -13,7 +13,7 @@ PlayWhirlpoolSound: ret -SECTION "BlindingFlash", ROMX +SECTION "engine/events/field_moves.asm@BlindingFlash", ROMX BlindingFlash: farcall FadeOutPalettes @@ -28,7 +28,7 @@ BlindingFlash: ret -SECTION "ShakeHeadbuttTree - Cut_Headbutt_GetPixelFacing", ROMX +SECTION "engine/events/field_moves.asm@Trees", ROMX ShakeHeadbuttTree: farcall ClearSpriteAnims @@ -315,7 +315,7 @@ Cut_Headbutt_GetPixelFacing: dbpixel 12, 11 -SECTION "FlyFromAnim - FlyFunction_FrameTimer", ROMX +SECTION "engine/events/field_moves.asm@Fly", ROMX FlyFromAnim: call DelayFrame diff --git a/engine/events/fish.asm b/engine/events/fish.asm index 56d94ff45bf..0ab669c2a83 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -1,4 +1,4 @@ -SECTION "Fish - TimeFishGroups", ROMX +SECTION "engine/events/fish.asm", ROMX Fish: ; Using a fishing rod. diff --git a/engine/events/fishing_gfx.asm b/engine/events/fishing_gfx.asm index 94c83f8b9a4..e47961791c1 100644 --- a/engine/events/fishing_gfx.asm +++ b/engine/events/fishing_gfx.asm @@ -1,4 +1,4 @@ -SECTION "LoadFishingGFX - KrisFishingGFX", ROMX +SECTION "engine/events/fishing_gfx.asm", ROMX LoadFishingGFX: ldh a, [rVBK] diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm index 6a8c32ee1f3..0d14ac47ea7 100644 --- a/engine/events/forced_movement.asm +++ b/engine/events/forced_movement.asm @@ -1,4 +1,4 @@ -SECTION "Script_ForcedMovement", ROMX +SECTION "engine/events/forced_movement.asm", ROMX Script_ForcedMovement:: readvar VAR_FACING diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 6bad434f514..951fb778efd 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -1,4 +1,4 @@ -SECTION "FruitTreeScript - NothingHereText", ROMX +SECTION "engine/events/fruit_trees.asm", ROMX FruitTreeScript:: callasm GetCurTreeFruit diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm index be5f19c436a..a5e82945d93 100644 --- a/engine/events/haircut.asm +++ b/engine/events/haircut.asm @@ -1,4 +1,4 @@ -SECTION "BillsGrandfather - CopyPokemonName_Buffer1_Buffer3", ROMX, BANK[BANK_HAPPINESS] +SECTION "engine/events/haircut.asm", ROMX, BANK[BANK_HAPPINESS] BillsGrandfather: farcall SelectMonFromParty @@ -81,7 +81,7 @@ CopyPokemonName_Buffer1_Buffer3: jp CopyBytes -SECTION "DummyPredef1", ROMX +SECTION "engine/events/haircut.asm@DummyPredef1", ROMX DummyPredef1: ret diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 1fc6f9c8707..375d0578e84 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -1,7 +1,7 @@ HALLOFFAME_COLON EQU $63 -SECTION "HallOfFame - HOF_AnimatePlayerPic", ROMX +SECTION "engine/events/halloffame.asm", ROMX HallOfFame:: call HallOfFame_FadeOutMusic diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm index 62c410f89ce..7195fe02a28 100644 --- a/engine/events/happiness_egg.asm +++ b/engine/events/happiness_egg.asm @@ -1,4 +1,4 @@ -SECTION "GetFirstPokemonHappiness - HappinessChanges", ROMX, BANK[BANK_HAPPINESS] +SECTION "engine/events/happiness_egg.asm@ChangeHappiness", ROMX, BANK[BANK_HAPPINESS] GetFirstPokemonHappiness: ld hl, wPartyMon1Happiness @@ -107,7 +107,7 @@ ChangeHappiness: INCLUDE "data/events/happiness_changes.asm" -SECTION "StepHappiness", ROMX +SECTION "engine/events/happiness_egg.asm@StepHappiness", ROMX StepHappiness:: ; Raise the party's happiness by 1 point every other step cycle. @@ -145,7 +145,7 @@ StepHappiness:: ret -SECTION "DayCareStep", ROMX +SECTION "engine/events/happiness_egg.asm@DayCareStep", ROMX DayCareStep:: ; Raise the experience of Day-Care Pokémon every step cycle. diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 33dfa0d4c86..d9d1565c78a 100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -8,7 +8,7 @@ const HEALMACHINESTATE_FINISH -SECTION "HealMachineAnim", ROMX +SECTION "engine/events/heal_machine_anim.asm", ROMX HealMachineAnim: ; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon. diff --git a/engine/events/hidden_item.asm b/engine/events/hidden_item.asm index 5a126a0e0d8..f370bfceb93 100644 --- a/engine/events/hidden_item.asm +++ b/engine/events/hidden_item.asm @@ -1,4 +1,4 @@ -SECTION "HiddenItemScript - SetMemEvent", ROMX +SECTION "engine/events/hidden_item.asm", ROMX HiddenItemScript:: opentext diff --git a/engine/events/item_ball.asm b/engine/events/item_ball.asm index 63bfddf6e30..2ef817017a4 100644 --- a/engine/events/item_ball.asm +++ b/engine/events/item_ball.asm @@ -1,4 +1,4 @@ -SECTION "FindItemInBallScript", ROMX +SECTION "engine/events/item_ball.asm", ROMX FindItemInBallScript:: callasm .TryReceiveItem diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm index 9da08ad8268..4b31a394d8a 100644 --- a/engine/events/itemfinder.asm +++ b/engine/events/itemfinder.asm @@ -1,4 +1,4 @@ -SECTION "ItemFinder", ROMX +SECTION "engine/events/itemfinder.asm", ROMX ItemFinder: farcall CheckForHiddenItems diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index 91f3626b96e..29ae2c214ea 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -1,4 +1,4 @@ -SECTION "Kurt_PrintTextWhichApricorn - Kurt_GetRidOfItem", ROMX +SECTION "engine/events/kurt.asm", ROMX Kurt_PrintTextWhichApricorn: ld hl, .Text diff --git a/engine/events/kurt_selectquantity_interpretjoypad.asm b/engine/events/kurt_selectquantity_interpretjoypad.asm index dc93db1c1bb..6adb363a6ab 100644 --- a/engine/events/kurt_selectquantity_interpretjoypad.asm +++ b/engine/events/kurt_selectquantity_interpretjoypad.asm @@ -1,4 +1,4 @@ -SECTION "Kurt_SelectQuantity_InterpretJoypad", ROMX, BANK[BANK_BUY_SELL_TOSS] +SECTION "engine/events/kurt_selectquantity_interpretjoypad.asm", ROMX, BANK[BANK_BUY_SELL_TOSS] Kurt_SelectQuantity_InterpretJoypad: call BuySellToss_InterpretJoypad diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 41776ac16b6..802b6bff5d7 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -1,4 +1,4 @@ -SECTION "CheckForLuckyNumberWinners", ROMX +SECTION "engine/events/lucky_number.asm@CheckForLuckyNumberWinners", ROMX CheckForLuckyNumberWinners: xor a @@ -219,7 +219,7 @@ CheckForLuckyNumberWinners: text_end -SECTION "PrintTodaysLuckyNumber", ROMX +SECTION "engine/events/lucky_number.asm@PrintTodaysLuckyNumber", ROMX PrintTodaysLuckyNumber: ld hl, wStringBuffer3 diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 82412da658a..2dd618b40bf 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -1,4 +1,4 @@ -SECTION "CheckMagikarpLength - MagikarpHouseSign", ROMX +SECTION "engine/events/magikarp.asm", ROMX CheckMagikarpLength: ; Returns 3 if you select a Magikarp that beats the previous record. diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm index 4bc99049f13..058c1cf2edb 100644 --- a/engine/events/magnet_train.asm +++ b/engine/events/magnet_train.asm @@ -1,4 +1,4 @@ -SECTION "MagnetTrain - MagnetTrainTilemap4", ROMX +SECTION "engine/events/magnet_train.asm", ROMX MagnetTrain: ld a, [wScriptVar] diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 9f94c4f7cec..92f69050210 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -1,7 +1,7 @@ MAP_NAME_SIGN_START EQU $60 -SECTION "ReturnFromMapSetupScript - PlaceMapNameFrame", ROMX +SECTION "engine/events/map_name_sign.asm", ROMX ReturnFromMapSetupScript:: xor a diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 5fc5db3e13a..dc64548fbc2 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -1,4 +1,4 @@ -SECTION "BankOfMom - MenuData_0x166bd", ROMX +SECTION "engine/events/mom.asm", ROMX BankOfMom: ldh a, [hInMenu] diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 94d18aa0906..5a0c86f6734 100644 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -6,7 +6,7 @@ NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)" const MOM_DOLL -SECTION "MomTriesToBuySomething - _MomText_ItsInRoom", ROMX +SECTION "engine/events/mom_phone.asm", ROMX MomTriesToBuySomething:: ld a, [wMapReentryScriptQueueFlag] @@ -242,7 +242,7 @@ _MomText_ItsInRoom: db 0 ; unused -SECTION "DummyPredef3A", ROMX +SECTION "engine/events/mom_phone.asm@DummyPredef3A", ROMX DummyPredef3A: ret diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index e4841ffe57c..5eb03361ac7 100644 --- a/engine/events/move_deleter.asm +++ b/engine/events/move_deleter.asm @@ -1,4 +1,4 @@ -SECTION "MoveDeletion", ROMX +SECTION "engine/events/move_deleter.asm", ROMX MoveDeletion: ld hl, .IntroText diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 28aa04fd925..4c805c6092f 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -1,4 +1,4 @@ -SECTION "_NameRater - NameRaterDoneText", ROMX +SECTION "engine/events/name_rater.asm", ROMX _NameRater: ; Introduce himself diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 1c238bd9138..f25c641b054 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -1,4 +1,4 @@ -SECTION "NPCTrade - TradeAfterText3", ROMX +SECTION "engine/events/npc_trade.asm", ROMX NPCTrade:: ld a, e diff --git a/engine/events/odd_egg.asm b/engine/events/odd_egg.asm index 7a3400f2d31..7e78378b4aa 100644 --- a/engine/events/odd_egg.asm +++ b/engine/events/odd_egg.asm @@ -1,4 +1,4 @@ -SECTION "_GiveOddEgg - OddEgg1End", ROMX +SECTION "engine/events/odd_egg.asm", ROMX _GiveOddEgg: ; Figure out which egg to give. diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 8961e002055..4cea2e61410 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -1,4 +1,4 @@ -SECTION "FieldMoveJumptableReset - UnknownText_0xd1d0", ROMX +SECTION "engine/events/overworld.asm", ROMX FieldMoveJumptableReset: xor a diff --git a/engine/events/play_slow_cry.asm b/engine/events/play_slow_cry.asm index 21b8f412fa7..0eb8ed6084f 100644 --- a/engine/events/play_slow_cry.asm +++ b/engine/events/play_slow_cry.asm @@ -1,4 +1,4 @@ -SECTION "PlaySlowCry", ROMX +SECTION "engine/events/play_slow_cry.asm", ROMX PlaySlowCry: ld a, [wScriptVar] diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index d461b1407b1..855a417523d 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -1,4 +1,4 @@ -SECTION "DoPoisonStep", ROMX +SECTION "engine/events/poisonstep.asm", ROMX DoPoisonStep:: ld a, [wPartyCount] diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 269cc7a51ce..0c0609293b3 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -1,4 +1,4 @@ -SECTION "LoadPoisonBGPals", ROMX +SECTION "engine/events/poisonstep_pals.asm", ROMX LoadPoisonBGPals: call .LoadPals diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index c6f7d488803..eaf41d94b66 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -16,7 +16,7 @@ const SEERACTION_LEVEL_ONLY -SECTION "PokeSeer - SeerAdvice5", ROMX +SECTION "engine/events/poke_seer.asm", ROMX PokeSeer: ld a, SEER_INTRO @@ -400,7 +400,7 @@ SeerAdvice5: text_end -SECTION "GetCaughtGender", ROMX +SECTION "engine/events/poke_seer.asm@GetCaughtGender", ROMX GetCaughtGender: ld hl, MON_CAUGHTGENDER diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 062234daa82..99b2fd4dfbd 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -1,4 +1,4 @@ -SECTION "PokemonCenterPC - PokecenterPCText_LinkClosed", ROMX +SECTION "engine/events/pokecenter_pc.asm", ROMX PokemonCenterPC: call PC_CheckPartyForPokemon diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index 9c4cf8ecdc6..68bae22e342 100644 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -1,4 +1,4 @@ -SECTION "Pokepic - PokepicMenuHeader", ROMX +SECTION "engine/events/pokepic.asm", ROMX Pokepic:: ld hl, PokepicMenuHeader diff --git a/engine/events/pokerus/apply_pokerus_tick.asm b/engine/events/pokerus/apply_pokerus_tick.asm index 6b53f07c24e..519acbbb655 100644 --- a/engine/events/pokerus/apply_pokerus_tick.asm +++ b/engine/events/pokerus/apply_pokerus_tick.asm @@ -1,4 +1,4 @@ -SECTION "ApplyPokerusTick", ROMX +SECTION "engine/events/pokerus/apply_pokerus_tick.asm", ROMX ApplyPokerusTick: ; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured. diff --git a/engine/events/pokerus/check_pokerus.asm b/engine/events/pokerus/check_pokerus.asm index 46cd5ce65ba..f5727d856bf 100644 --- a/engine/events/pokerus/check_pokerus.asm +++ b/engine/events/pokerus/check_pokerus.asm @@ -1,4 +1,4 @@ -SECTION "_CheckPokerus", ROMX +SECTION "engine/events/pokerus/check_pokerus.asm", ROMX _CheckPokerus: ; Return carry if a monster in your party has Pokerus diff --git a/engine/events/pokerus/pokerus.asm b/engine/events/pokerus/pokerus.asm index 6eb892de9b1..c406dd96a78 100644 --- a/engine/events/pokerus/pokerus.asm +++ b/engine/events/pokerus/pokerus.asm @@ -1,4 +1,4 @@ -SECTION "GivePokerusAndConvertBerries - ConvertBerriesToBerryJuice", ROMX +SECTION "engine/events/pokerus/pokerus.asm", ROMX GivePokerusAndConvertBerries: call ConvertBerriesToBerryJuice diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm index f47eb9f771a..0ec53c8a62b 100644 --- a/engine/events/print_photo.asm +++ b/engine/events/print_photo.asm @@ -1,4 +1,4 @@ -SECTION "PhotoStudio", ROMX +SECTION "engine/events/print_photo.asm", ROMX PhotoStudio: ld hl, .Text_AskWhichMon diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 46bab50004d..88941f82ee9 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -2,7 +2,7 @@ UNOWNSTAMP_BOLD_A EQU "♂" ; $ef UNOWNSTAMP_BOLD_B EQU "♀" ; $f5 -SECTION "_UnownPrinter - UnownDexBTile", ROMX +SECTION "engine/events/print_unown.asm", ROMX _UnownPrinter: ld a, [wUnownDex] @@ -222,7 +222,7 @@ UnownDexBTile: INCBIN "gfx/printer/bold_b.1bpp" -SECTION "PlaceUnownPrinterFrontpic", ROMX +SECTION "engine/events/print_unown.asm@PlaceUnownPrinterFrontpic", ROMX PlaceUnownPrinterFrontpic: hlcoord 0, 0 diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 510b4f86a2a..45b63804f71 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -1,4 +1,4 @@ -SECTION "RotateUnownFrontpic - UnownPrinter_GBPrinterRectangle", ROMX +SECTION "engine/events/print_unown_2.asm", ROMX RotateUnownFrontpic: ; something to do with Unown printer diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index d2c7ae10518..879ca1219a6 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -1,4 +1,4 @@ -SECTION "ProfOaksPC - OakPCText4", ROMX +SECTION "engine/events/prof_oaks_pc.asm", ROMX ProfOaksPC: ld hl, OakPCText1 diff --git a/engine/events/repel.asm b/engine/events/repel.asm index 77c6d2239d0..cb9418e1ded 100644 --- a/engine/events/repel.asm +++ b/engine/events/repel.asm @@ -1,4 +1,4 @@ -SECTION "RepelWoreOffScript", ROMX +SECTION "engine/events/repel.asm", ROMX RepelWoreOffScript:: opentext diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm index 5d176554cb2..3beb45bd5f2 100644 --- a/engine/events/sacred_ash.asm +++ b/engine/events/sacred_ash.asm @@ -1,4 +1,4 @@ -SECTION "_SacredAsh - UnknownText_0x50845", ROMX +SECTION "engine/events/sacred_ash.asm", ROMX _SacredAsh: ld a, $0 diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index ea459610978..a090feddaaa 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -1,7 +1,7 @@ MANIA_OT_ID EQU 00518 -SECTION "GiveShuckle - ReturnShuckle", ROMX +SECTION "engine/events/shuckle.asm", ROMX GiveShuckle: ; Adding to the party. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index 14010482613..6e49d8cab7b 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -1,4 +1,4 @@ -SECTION "Special - SpecialsPointers", ROMX +SECTION "engine/events/specials.asm", ROMX Special:: ; Run script special de. @@ -18,13 +18,13 @@ Special:: INCLUDE "data/special_pointers.asm" -SECTION "DummySpecial_c224", ROMX +SECTION "engine/events/specials.asm@DummySpecial_c224", ROMX DummySpecial_c224: ret -SECTION "SetPlayerPalette", ROMX +SECTION "engine/events/specials.asm@SetPlayerPalette", ROMX SetPlayerPalette: ld a, [wScriptVar] @@ -33,7 +33,7 @@ SetPlayerPalette: ret -SECTION "GameCornerPrizeMonCheckDex", ROMX +SECTION "engine/events/specials.asm@GameCornerPrizeMonCheckDex", ROMX GameCornerPrizeMonCheckDex: ld a, [wScriptVar] @@ -51,7 +51,7 @@ GameCornerPrizeMonCheckDex: ret -SECTION "UnusedSetSeenMon", ROMX +SECTION "engine/events/specials.asm@UnusedSetSeenMon", ROMX UnusedSetSeenMon: ld a, [wScriptVar] @@ -60,7 +60,7 @@ UnusedSetSeenMon: ret -SECTION "FindPartyMonAboveLevel - FoundNone", ROMX +SECTION "engine/events/specials.asm@FindPartyMon", ROMX FindPartyMonAboveLevel: ld a, [wScriptVar] @@ -101,7 +101,7 @@ FoundNone: ret -SECTION "NameRival", ROMX +SECTION "engine/events/specials.asm@NameRival", ROMX NameRival: ld b, NAME_RIVAL @@ -117,14 +117,14 @@ NameRival: db "SILVER@" -SECTION "NameRater", ROMX +SECTION "engine/events/specials.asm@NameRater", ROMX NameRater: farcall _NameRater ret -SECTION "OverworldTownMap", ROMX +SECTION "engine/events/specials.asm@OverworldTownMap", ROMX OverworldTownMap: call FadeToMenu @@ -133,7 +133,7 @@ OverworldTownMap: ret -SECTION "UnownPrinter", ROMX +SECTION "engine/events/specials.asm@UnownPrinter", ROMX UnownPrinter: call FadeToMenu @@ -142,7 +142,7 @@ UnownPrinter: ret -SECTION "DisplayLinkRecord", ROMX +SECTION "engine/events/specials.asm@DisplayLinkRecord", ROMX DisplayLinkRecord: call FadeToMenu @@ -151,7 +151,7 @@ DisplayLinkRecord: ret -SECTION "PlayersHousePC", ROMX +SECTION "engine/events/specials.asm@PlayersHousePC", ROMX PlayersHousePC: xor a @@ -162,7 +162,7 @@ PlayersHousePC: ret -SECTION "CheckMysteryGift", ROMX +SECTION "engine/events/specials.asm@CheckMysteryGift", ROMX CheckMysteryGift: ld a, BANK(sMysteryGiftItem) @@ -178,7 +178,7 @@ CheckMysteryGift: ret -SECTION "GetMysteryGiftItem", ROMX +SECTION "engine/events/specials.asm@GetMysteryGiftItem", ROMX GetMysteryGiftItem: ld a, BANK(sMysteryGiftItem) @@ -214,7 +214,7 @@ GetMysteryGiftItem: text_end -SECTION "BugContestJudging", ROMX +SECTION "engine/events/specials.asm@BugContestJudging", ROMX BugContestJudging: farcall _BugContestJudging @@ -223,7 +223,7 @@ BugContestJudging: ret -SECTION "MapRadio", ROMX +SECTION "engine/events/specials.asm@MapRadio", ROMX MapRadio: ld a, [wScriptVar] @@ -232,7 +232,7 @@ MapRadio: ret -SECTION "UnownPuzzle", ROMX +SECTION "engine/events/specials.asm@UnownPuzzle", ROMX UnownPuzzle: call FadeToMenu @@ -243,7 +243,7 @@ UnownPuzzle: ret -SECTION "SlotMachine - CheckCoinsAndCoinCase", ROMX +SECTION "engine/events/specials.asm@StartGameCornerGame", ROMX SlotMachine: call CheckCoinsAndCoinCase @@ -319,7 +319,7 @@ CheckCoinsAndCoinCase: text_end -SECTION "ClearBGPalettesBufferScreen", ROMX +SECTION "engine/events/specials.asm@ClearBGPalettesBufferScreen", ROMX ClearBGPalettesBufferScreen: call ClearBGPalettes @@ -327,7 +327,7 @@ ClearBGPalettesBufferScreen: ret -SECTION "ScriptReturnCarry - CheckLuckyNumberShowFlag", ROMX +SECTION "engine/events/specials.asm@Misc", ROMX ScriptReturnCarry: jr c, .carry @@ -385,7 +385,7 @@ CheckLuckyNumberShowFlag: jp ScriptReturnCarry -SECTION "SnorlaxAwake", ROMX +SECTION "engine/events/specials.asm@SnorlaxAwake", ROMX SnorlaxAwake: ; Check if the Poké Flute channel is playing, and if the player is standing @@ -438,14 +438,14 @@ SnorlaxAwake: db -1 -SECTION "PlayCurMonCry", ROMX +SECTION "engine/events/specials.asm@PlayCurMonCry", ROMX PlayCurMonCry: ld a, [wCurPartySpecies] jp PlayMonCry -SECTION "GameboyCheck", ROMX +SECTION "engine/events/specials.asm@GameboyCheck", ROMX GameboyCheck: ldh a, [hCGB] @@ -469,7 +469,7 @@ GameboyCheck: ret -SECTION "FadeOutMusic", ROMX +SECTION "engine/events/specials.asm@FadeOutMusic", ROMX FadeOutMusic: ld a, LOW(MUSIC_NONE) @@ -481,7 +481,7 @@ FadeOutMusic: ret -SECTION "Diploma", ROMX +SECTION "engine/events/specials.asm@Diploma", ROMX Diploma: call FadeToMenu @@ -490,7 +490,7 @@ Diploma: ret -SECTION "PrintDiploma", ROMX +SECTION "engine/events/specials.asm@PrintDiploma", ROMX PrintDiploma: call FadeToMenu @@ -499,7 +499,7 @@ PrintDiploma: ret -SECTION "TrainerHouse", ROMX +SECTION "engine/events/specials.asm@TrainerHouse", ROMX TrainerHouse: ld a, BANK(sMysteryGiftTrainerHouseFlag) diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm index 6f7f6ffbe0a..790daffa380 100644 --- a/engine/events/squirtbottle.asm +++ b/engine/events/squirtbottle.asm @@ -1,4 +1,4 @@ -SECTION "_Squirtbottle", ROMX +SECTION "engine/events/squirtbottle.asm", ROMX _Squirtbottle: ld hl, .SquirtbottleScript diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm index 31e9f1f03ed..4fa8da45bc5 100644 --- a/engine/events/std_collision.asm +++ b/engine/events/std_collision.asm @@ -1,4 +1,4 @@ -SECTION "CheckFacingTileForStdScript - Script_JumpStdFromRAM", ROMX +SECTION "engine/events/std_collision.asm", ROMX CheckFacingTileForStdScript:: ; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index 1fc86c43059..fa2cad25221 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -1,4 +1,4 @@ -SECTION "StdScripts", ROMX +SECTION "engine/events/std_scripts.asm", ROMX StdScripts:: ; entries correspond to constants/std_constants.asm @@ -56,7 +56,7 @@ StdScripts:: dba HappinessCheckScript -SECTION "PokecenterNurseScript", ROMX +SECTION "engine/events/std_scripts.asm@PokecenterNurseScript", ROMX PokecenterNurseScript: ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set @@ -168,43 +168,43 @@ PokecenterNurseScript: end -SECTION "DifficultBookshelfScript", ROMX +SECTION "engine/events/std_scripts.asm@DifficultBookshelfScript", ROMX DifficultBookshelfScript: farjumptext DifficultBookshelfText -SECTION "PictureBookshelfScript", ROMX +SECTION "engine/events/std_scripts.asm@PictureBookshelfScript", ROMX PictureBookshelfScript: farjumptext PictureBookshelfText -SECTION "MagazineBookshelfScript", ROMX +SECTION "engine/events/std_scripts.asm@MagazineBookshelfScript", ROMX MagazineBookshelfScript: farjumptext MagazineBookshelfText -SECTION "TeamRocketOathScript", ROMX +SECTION "engine/events/std_scripts.asm@TeamRocketOathScript", ROMX TeamRocketOathScript: farjumptext TeamRocketOathText -SECTION "IncenseBurnerScript", ROMX +SECTION "engine/events/std_scripts.asm@IncenseBurnerScript", ROMX IncenseBurnerScript: farjumptext IncenseBurnerText -SECTION "MerchandiseShelfScript", ROMX +SECTION "engine/events/std_scripts.asm@MerchandiseShelfScript", ROMX MerchandiseShelfScript: farjumptext MerchandiseShelfText -SECTION "TownMapScript", ROMX +SECTION "engine/events/std_scripts.asm@TownMapScript", ROMX TownMapScript: opentext @@ -215,13 +215,13 @@ TownMapScript: end -SECTION "WindowScript", ROMX +SECTION "engine/events/std_scripts.asm@WindowScript", ROMX WindowScript: farjumptext WindowText -SECTION "TVScript", ROMX +SECTION "engine/events/std_scripts.asm@TVScript", ROMX TVScript: opentext @@ -231,13 +231,13 @@ TVScript: end -SECTION "HomepageScript", ROMX +SECTION "engine/events/std_scripts.asm@HomepageScript", ROMX HomepageScript: farjumptext HomepageText -SECTION "Radio1Script", ROMX +SECTION "engine/events/std_scripts.asm@Radio1Script", ROMX Radio1Script: opentext @@ -247,7 +247,7 @@ Radio1Script: end -SECTION "Radio2Script", ROMX +SECTION "engine/events/std_scripts.asm@Radio2Script", ROMX Radio2Script: ; Lucky Channel @@ -258,13 +258,13 @@ Radio2Script: end -SECTION "TrashCanScript", ROMX +SECTION "engine/events/std_scripts.asm@TrashCanScript", ROMX TrashCanScript: farjumptext TrashCanText -SECTION "PCScript", ROMX +SECTION "engine/events/std_scripts.asm@PCScript", ROMX PCScript: opentext @@ -273,7 +273,7 @@ PCScript: end -SECTION "ElevatorButtonScript", ROMX +SECTION "engine/events/std_scripts.asm@ElevatorButtonScript", ROMX ElevatorButtonScript: playsound SFX_READ_TEXT_2 @@ -282,31 +282,31 @@ ElevatorButtonScript: end -SECTION "StrengthBoulderScript", ROMX +SECTION "engine/events/std_scripts.asm@StrengthBoulderScript", ROMX StrengthBoulderScript: farsjump AskStrengthScript -SECTION "SmashRockScript", ROMX +SECTION "engine/events/std_scripts.asm@SmashRockScript", ROMX SmashRockScript: farsjump AskRockSmashScript -SECTION "PokecenterSignScript", ROMX +SECTION "engine/events/std_scripts.asm@PokecenterSignScript", ROMX PokecenterSignScript: farjumptext PokecenterSignText -SECTION "MartSignScript", ROMX +SECTION "engine/events/std_scripts.asm@MartSignScript", ROMX MartSignScript: farjumptext MartSignText -SECTION "DayToTextScript", ROMX +SECTION "engine/events/std_scripts.asm@DayToTextScript", ROMX DayToTextScript: readvar VAR_WEEKDAY @@ -352,14 +352,14 @@ DayToTextScript: db "SATURDAY@" -SECTION "GoldenrodRocketsScript", ROMX +SECTION "engine/events/std_scripts.asm@GoldenrodRocketsScript", ROMX GoldenrodRocketsScript: clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER end -SECTION "RadioTowerRocketsScript", ROMX +SECTION "engine/events/std_scripts.asm@RadioTowerRocketsScript", ROMX RadioTowerRocketsScript: setflag ENGINE_ROCKETS_IN_RADIO_TOWER @@ -373,7 +373,7 @@ RadioTowerRocketsScript: end -SECTION "BugContestResultsWarpScript - BugContestResults_CopyContestantsToResults", ROMX, BANK[BANK_BUG_CONTEST_RESULTS] +SECTION "engine/events/std_scripts.asm@BugContestResultsScript", ROMX, BANK[BANK_BUG_CONTEST_RESULTS] BugContestResultsWarpScript: special ClearBGPalettes @@ -548,7 +548,7 @@ BugContestResults_CopyContestantsToResults: end -SECTION "InitializeEventsScript", ROMX +SECTION "engine/events/std_scripts.asm@InitializeEventsScript", ROMX InitializeEventsScript: setevent EVENT_EARLS_ACADEMY_EARL @@ -690,7 +690,7 @@ InitializeEventsScript: return -SECTION "AskNumber1MScript", ROMX +SECTION "engine/events/std_scripts.asm@AskNumber1MScript", ROMX AskNumber1MScript: special RandomPhoneMon @@ -778,7 +778,7 @@ AskNumber1MScript: end -SECTION "AskNumber2MScript", ROMX +SECTION "engine/events/std_scripts.asm@AskNumber2MScript", ROMX AskNumber2MScript: special RandomPhoneMon @@ -866,7 +866,7 @@ AskNumber2MScript: end -SECTION "RegisteredNumberMScript", ROMX +SECTION "engine/events/std_scripts.asm@RegisteredNumberMScript", ROMX RegisteredNumberMScript: farwritetext RegisteredNumber1Text @@ -876,7 +876,7 @@ RegisteredNumberMScript: end -SECTION "NumberAcceptedMScript", ROMX +SECTION "engine/events/std_scripts.asm@NumberAcceptedMScript", ROMX NumberAcceptedMScript: readvar VAR_CALLERID @@ -1003,7 +1003,7 @@ NumberAcceptedMScript: end -SECTION "NumberDeclinedMScript", ROMX +SECTION "engine/events/std_scripts.asm@NumberDeclinedMScript", ROMX NumberDeclinedMScript: readvar VAR_CALLERID @@ -1130,7 +1130,7 @@ NumberDeclinedMScript: end -SECTION "PhoneFullMScript", ROMX +SECTION "engine/events/std_scripts.asm@PhoneFullMScript", ROMX PhoneFullMScript: readvar VAR_CALLERID @@ -1257,7 +1257,7 @@ PhoneFullMScript: end -SECTION "RematchMScript", ROMX +SECTION "engine/events/std_scripts.asm@RematchMScript", ROMX RematchMScript: readvar VAR_CALLERID @@ -1366,7 +1366,7 @@ RematchMScript: end -SECTION "GiftMScript", ROMX +SECTION "engine/events/std_scripts.asm@GiftMScript", ROMX GiftMScript: readvar VAR_CALLERID @@ -1408,7 +1408,7 @@ GiftMScript: end -SECTION "PackFullMScript", ROMX +SECTION "engine/events/std_scripts.asm@PackFullMScript", ROMX PackFullMScript: readvar VAR_CALLERID @@ -1481,7 +1481,7 @@ PackFullMScript: end -SECTION "RematchGiftMScript", ROMX +SECTION "engine/events/std_scripts.asm@RematchGiftMScript", ROMX RematchGiftMScript: opentext @@ -1509,7 +1509,7 @@ RematchGiftMScript: end -SECTION "AskNumber1FScript", ROMX +SECTION "engine/events/std_scripts.asm@AskNumber1FScript", ROMX AskNumber1FScript: readvar VAR_CALLERID @@ -1548,7 +1548,7 @@ AskNumber1FScript: end -SECTION "AskNumber2FScript", ROMX +SECTION "engine/events/std_scripts.asm@AskNumber2FScript", ROMX AskNumber2FScript: readvar VAR_CALLERID @@ -1587,7 +1587,7 @@ AskNumber2FScript: end -SECTION "RegisteredNumberFScript", ROMX +SECTION "engine/events/std_scripts.asm@RegisteredNumberFScript", ROMX RegisteredNumberFScript: farwritetext RegisteredNumber2Text @@ -1597,7 +1597,7 @@ RegisteredNumberFScript: end -SECTION "NumberAcceptedFScript", ROMX +SECTION "engine/events/std_scripts.asm@NumberAcceptedFScript", ROMX NumberAcceptedFScript: readvar VAR_CALLERID @@ -1652,7 +1652,7 @@ NumberAcceptedFScript: end -SECTION "NumberDeclinedFScript", ROMX +SECTION "engine/events/std_scripts.asm@NumberDeclinedFScript", ROMX NumberDeclinedFScript: readvar VAR_CALLERID @@ -1707,7 +1707,7 @@ NumberDeclinedFScript: end -SECTION "PhoneFullFScript", ROMX +SECTION "engine/events/std_scripts.asm@PhoneFullFScript", ROMX PhoneFullFScript: readvar VAR_CALLERID @@ -1762,7 +1762,7 @@ PhoneFullFScript: end -SECTION "RematchFScript", ROMX +SECTION "engine/events/std_scripts.asm@RematchFScript", ROMX RematchFScript: readvar VAR_CALLERID @@ -1811,7 +1811,7 @@ RematchFScript: end -SECTION "GiftFScript", ROMX +SECTION "engine/events/std_scripts.asm@GiftFScript", ROMX GiftFScript: readvar VAR_CALLERID @@ -1838,7 +1838,7 @@ GiftFScript: end -SECTION "PackFullFScript", ROMX +SECTION "engine/events/std_scripts.asm@PackFullFScript", ROMX PackFullFScript: readvar VAR_CALLERID @@ -1875,7 +1875,7 @@ PackFullFScript: end -SECTION "RematchGiftFScript", ROMX +SECTION "engine/events/std_scripts.asm@RematchGiftFScript", ROMX RematchGiftFScript: readvar VAR_CALLERID @@ -1888,7 +1888,7 @@ RematchGiftFScript: end -SECTION "GymStatue1Script", ROMX +SECTION "engine/events/std_scripts.asm@GymStatue1Script", ROMX GymStatue1Script: getcurlandmarkname STRING_BUFFER_3 @@ -1899,7 +1899,7 @@ GymStatue1Script: end -SECTION "GymStatue2Script", ROMX +SECTION "engine/events/std_scripts.asm@GymStatue2Script", ROMX GymStatue2Script: getcurlandmarkname STRING_BUFFER_3 @@ -1912,7 +1912,7 @@ GymStatue2Script: end -SECTION "ReceiveItemScript", ROMX +SECTION "engine/events/std_scripts.asm@ReceiveItemScript", ROMX ReceiveItemScript: waitsfx @@ -1922,7 +1922,7 @@ ReceiveItemScript: end -SECTION "ReceiveTogepiEggScript", ROMX +SECTION "engine/events/std_scripts.asm@ReceiveTogepiEggScript", ROMX ReceiveTogepiEggScript: waitsfx @@ -1932,7 +1932,7 @@ ReceiveTogepiEggScript: end -SECTION "GameCornerCoinVendorScript - CoinVendor_IntroScript", ROMX +SECTION "engine/events/std_scripts.asm@GameCornerCoinVendorScript", ROMX GameCornerCoinVendorScript: faceplayer @@ -2016,7 +2016,7 @@ CoinVendor_IntroScript: db "CANCEL@" -SECTION "HappinessCheckScript", ROMX +SECTION "engine/events/std_scripts.asm@HappinessCheckScript", ROMX HappinessCheckScript: faceplayer @@ -2042,7 +2042,7 @@ HappinessCheckScript: end -SECTION "Movement_ContestResults_WalkAfterWarp", ROMX, BANK[BANK_BUG_CONTEST_RESULTS] +SECTION "engine/events/std_scripts.asm@Movement_ContestResults_WalkAfterWarp", ROMX, BANK[BANK_BUG_CONTEST_RESULTS] Movement_ContestResults_WalkAfterWarp: step RIGHT diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm index 7cf530e03e5..feaa289969d 100644 --- a/engine/events/sweet_scent.asm +++ b/engine/events/sweet_scent.asm @@ -1,4 +1,4 @@ -SECTION "SweetScentFromMenu - UnknownText_0x5072b", ROMX +SECTION "engine/events/sweet_scent.asm", ROMX SweetScentFromMenu: ld hl, .SweetScent diff --git a/engine/events/trainer_scripts.asm b/engine/events/trainer_scripts.asm index 73a6de3a9c2..d0abc0d7e6a 100644 --- a/engine/events/trainer_scripts.asm +++ b/engine/events/trainer_scripts.asm @@ -1,4 +1,4 @@ -SECTION "TalkToTrainerScript - AlreadyBeatenTrainerScript", ROMX +SECTION "engine/events/trainer_scripts.asm", ROMX TalkToTrainerScript:: faceplayer diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm index 9b85bf42fe3..cb39270a729 100644 --- a/engine/events/treemons.asm +++ b/engine/events/treemons.asm @@ -1,4 +1,4 @@ -SECTION "TreeMonEncounter - GetTreeScore", ROMX +SECTION "engine/events/treemons.asm", ROMX TreeMonEncounter: farcall StubbedTrainerRankings_TreeEncounters diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index 6426ad80627..087fb0deb20 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -1,4 +1,4 @@ -SECTION "HoOhChamber", ROMX +SECTION "engine/events/unown_walls.asm@HoOhChamber", ROMX HoOhChamber: ld hl, wPartySpecies @@ -13,7 +13,7 @@ HoOhChamber: ret -SECTION "OmanyteChamber", ROMX +SECTION "engine/events/unown_walls.asm@OmanyteChamber", ROMX OmanyteChamber: call GetMapAttributesPointer ; pointless? @@ -57,7 +57,7 @@ OmanyteChamber: ret -SECTION "SpecialAerodactylChamber", ROMX +SECTION "engine/events/unown_walls.asm@SpecialAerodactylChamber", ROMX SpecialAerodactylChamber: push de @@ -87,7 +87,7 @@ SpecialAerodactylChamber: ret -SECTION "SpecialKabutoChamber", ROMX +SECTION "engine/events/unown_walls.asm@SpecialKabutoChamber", ROMX SpecialKabutoChamber: push hl @@ -111,7 +111,7 @@ SpecialKabutoChamber: ret -SECTION "DisplayUnownWords - _DisplayUnownWords_CopyWord", ROMX +SECTION "engine/events/unown_walls.asm@DisplayUnownWords", ROMX DisplayUnownWords: ld a, [wScriptVar] diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index d38a70055a1..7779f23b99c 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -1,4 +1,4 @@ -SECTION "Script_BattleWhiteout - GetWhiteoutSpawn", ROMX +SECTION "engine/events/whiteout.asm", ROMX Script_BattleWhiteout:: callasm BattleBGMap diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index f3dbf6032e4..7c70c0c0623 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -4,7 +4,7 @@ CARDFLIP_LIGHT_ON EQU "♀" ; $f5 CARDFLIP_DECK_SIZE EQU 4 * 6 -SECTION "Unknown_e00ed", ROMX, BANK[BANK_DUMMY_GAME] +SECTION "engine/games/card_flip.asm@Unknown_e00ed", ROMX, BANK[BANK_DUMMY_GAME] ; two labels below called from inside ./dummy_game.asm Unknown_e00ed: @@ -14,7 +14,7 @@ ret_e00ed: ret -SECTION "_CardFlip - CardFlipTilemap", ROMX +SECTION "engine/games/card_flip.asm", ROMX _CardFlip: ld hl, wOptions diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index f93a0f8c0b5..6c8cdb34bfc 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -1,4 +1,4 @@ -SECTION "_DummyGame - LZ_e2221", ROMX, BANK[BANK_DUMMY_GAME] +SECTION "engine/games/dummy_game.asm", ROMX, BANK[BANK_DUMMY_GAME] _DummyGame: call .LoadGFXAndPals diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 2defb2d81d4..3daaac7207e 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -75,7 +75,7 @@ SLOTS_END_LOOP_F EQU 7 const REEL_ACTION_DROP_REEL -SECTION "_SlotMachine - Slots3LZ", ROMX +SECTION "engine/games/slot_machine.asm", ROMX _SlotMachine: ld hl, wOptions diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index 914ffe10358..4a899e394d7 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -4,7 +4,7 @@ PUZZLE_VOID EQU $ef puzcoord EQUS "* 6 +" -SECTION "_UnownPuzzle - OmanytePuzzleLZ", ROMX +SECTION "engine/games/unown_puzzle.asm", ROMX _UnownPuzzle: ldh a, [hInMenu] diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 41dc24c1c73..f9325cb4798 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1,4 +1,4 @@ -SECTION "LoadSGBLayout - SlotMachinePals", ROMX +SECTION "engine/gfx/color.asm", ROMX INCLUDE "engine/gfx/sgb_layouts.asm" diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index d0324eb80c5..bf44889c92d 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -1,4 +1,4 @@ -SECTION "HDMATransferAttrMapAndTileMapToWRAMBank3 - HDMATransfer_OnlyTopFourRows", ROMX +SECTION "engine/gfx/dma_transfer.asm", ROMX HDMATransferAttrMapAndTileMapToWRAMBank3:: ld hl, .Function diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index 1cd442a9737..070f82ea71c 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -1,7 +1,7 @@ INCLUDE "gfx/font.asm" -SECTION "Unreferenced_fb434 - Unreferenced_Functionfb43f", ROMX +SECTION "engine/gfx/load_font.asm@Unreferenced", ROMX ; This and the following two functions are unreferenced. ; Debug, perhaps? @@ -22,7 +22,7 @@ Unreferenced_Functionfb43f: ; End unreferenced block -SECTION "_LoadStandardFont", ROMX +SECTION "engine/gfx/load_font.asm@_LoadStandardFont", ROMX _LoadStandardFont:: ld de, Font @@ -51,7 +51,7 @@ _LoadStandardFont:: ret -SECTION "_LoadFontsExtra1 - LoadStatsScreenPageTilesGFX", ROMX +SECTION "engine/gfx/load_font.asm", ROMX _LoadFontsExtra1:: ld de, FontsExtra_SolidBlackGFX diff --git a/engine/gfx/load_overworld_font.asm b/engine/gfx/load_overworld_font.asm index 39fe0a8019b..f7feeced4ab 100644 --- a/engine/gfx/load_overworld_font.asm +++ b/engine/gfx/load_overworld_font.asm @@ -1,4 +1,4 @@ -SECTION "LoadOverworldFont", ROMX +SECTION "engine/gfx/load_overworld_font.asm", ROMX LoadOverworldFont:: ld de, .OverworldFontGFX diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index 494c576c82c..3c4ddec92fe 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -1,4 +1,4 @@ -SECTION "GetUnownLetter", ROMX +SECTION "engine/gfx/load_pics.asm@GetUnownLetter", ROMX GetUnownLetter: ; Return Unown letter in wUnownLetter based on DVs at hl @@ -51,7 +51,7 @@ GetUnownLetter: ret -SECTION "GetMonFrontpic - LoadOrientedFrontpic", ROMX +SECTION "engine/gfx/load_pics.asm", ROMX GetMonFrontpic: ld a, [wCurPartySpecies] @@ -256,7 +256,7 @@ GLOBAL PICS_FIX push hl push bc - sub BANK("Pics 1") - PICS_FIX + sub BANK("gfx/pics.asm@Pics 1") - PICS_FIX ld c, a ld b, 0 ld hl, .PicsBanks @@ -267,30 +267,30 @@ GLOBAL PICS_FIX ret .PicsBanks: - db BANK("Pics 1") ; BANK("Pics 1") + 0 - db BANK("Pics 2") ; BANK("Pics 1") + 1 - db BANK("Pics 3") ; BANK("Pics 1") + 2 - db BANK("Pics 4") ; BANK("Pics 1") + 3 - db BANK("Pics 5") ; BANK("Pics 1") + 4 - db BANK("Pics 6") ; BANK("Pics 1") + 5 - db BANK("Pics 7") ; BANK("Pics 1") + 6 - db BANK("Pics 8") ; BANK("Pics 1") + 7 - db BANK("Pics 9") ; BANK("Pics 1") + 8 - db BANK("Pics 10") ; BANK("Pics 1") + 9 - db BANK("Pics 11") ; BANK("Pics 1") + 10 - db BANK("Pics 12") ; BANK("Pics 1") + 11 - db BANK("Pics 13") ; BANK("Pics 1") + 12 - db BANK("Pics 14") ; BANK("Pics 1") + 13 - db BANK("Pics 15") ; BANK("Pics 1") + 14 - db BANK("Pics 16") ; BANK("Pics 1") + 15 - db BANK("Pics 17") ; BANK("Pics 1") + 16 - db BANK("Pics 18") ; BANK("Pics 1") + 17 - db BANK("Pics 19") ; BANK("Pics 1") + 18 - db BANK("Pics 20") ; BANK("Pics 1") + 19 - db BANK("Pics 21") ; BANK("Pics 1") + 20 - db BANK("Pics 22") ; BANK("Pics 1") + 21 - db BANK("Pics 23") ; BANK("Pics 1") + 22 - db BANK("Pics 24") ; BANK("Pics 1") + 23 + db BANK("gfx/pics.asm@Pics 1") ; BANK("gfx/pics.asm@Pics 1") + 0 + db BANK("gfx/pics.asm@Pics 2") ; BANK("gfx/pics.asm@Pics 1") + 1 + db BANK("gfx/pics.asm@Pics 3") ; BANK("gfx/pics.asm@Pics 1") + 2 + db BANK("gfx/pics.asm@Pics 4") ; BANK("gfx/pics.asm@Pics 1") + 3 + db BANK("gfx/pics.asm@Pics 5") ; BANK("gfx/pics.asm@Pics 1") + 4 + db BANK("gfx/pics.asm@Pics 6") ; BANK("gfx/pics.asm@Pics 1") + 5 + db BANK("gfx/pics.asm@Pics 7") ; BANK("gfx/pics.asm@Pics 1") + 6 + db BANK("gfx/pics.asm@Pics 8") ; BANK("gfx/pics.asm@Pics 1") + 7 + db BANK("gfx/pics.asm@Pics 9") ; BANK("gfx/pics.asm@Pics 1") + 8 + db BANK("gfx/pics.asm@Pics 10") ; BANK("gfx/pics.asm@Pics 1") + 9 + db BANK("gfx/pics.asm@Pics 11") ; BANK("gfx/pics.asm@Pics 1") + 10 + db BANK("gfx/pics.asm@Pics 12") ; BANK("gfx/pics.asm@Pics 1") + 11 + db BANK("gfx/pics.asm@Pics 13") ; BANK("gfx/pics.asm@Pics 1") + 12 + db BANK("gfx/pics.asm@Pics 14") ; BANK("gfx/pics.asm@Pics 1") + 13 + db BANK("gfx/pics.asm@Pics 15") ; BANK("gfx/pics.asm@Pics 1") + 14 + db BANK("gfx/pics.asm@Pics 16") ; BANK("gfx/pics.asm@Pics 1") + 15 + db BANK("gfx/pics.asm@Pics 17") ; BANK("gfx/pics.asm@Pics 1") + 16 + db BANK("gfx/pics.asm@Pics 18") ; BANK("gfx/pics.asm@Pics 1") + 17 + db BANK("gfx/pics.asm@Pics 19") ; BANK("gfx/pics.asm@Pics 1") + 18 + db BANK("gfx/pics.asm@Pics 20") ; BANK("gfx/pics.asm@Pics 1") + 19 + db BANK("gfx/pics.asm@Pics 21") ; BANK("gfx/pics.asm@Pics 1") + 20 + db BANK("gfx/pics.asm@Pics 22") ; BANK("gfx/pics.asm@Pics 1") + 21 + db BANK("gfx/pics.asm@Pics 23") ; BANK("gfx/pics.asm@Pics 1") + 22 + db BANK("gfx/pics.asm@Pics 24") ; BANK("gfx/pics.asm@Pics 1") + 23 Function511ec: ld a, c diff --git a/engine/gfx/load_push_oam.asm b/engine/gfx/load_push_oam.asm index a263c2d753f..bb4d9380ffa 100644 --- a/engine/gfx/load_push_oam.asm +++ b/engine/gfx/load_push_oam.asm @@ -1,4 +1,4 @@ -SECTION "WriteOAMDMACodeToHRAM", ROMX, BANK[BANK_GAME_INIT] +SECTION "engine/gfx/load_push_oam.asm", ROMX, BANK[BANK_GAME_INIT] WriteOAMDMACodeToHRAM:: ld c, LOW(hTransferVirtualOAM) diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 167e594ebe6..4af54350d00 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -1,6 +1,6 @@ ; Pic animation arrangement. -SECTION "Unused_AnimateMon_Slow_Normal - HOF_AnimateFrontpic", ROMX +SECTION "engine/gfx/pic_animation.asm", ROMX Unused_AnimateMon_Slow_Normal: hlcoord 12, 0 diff --git a/engine/gfx/place_graphic.asm b/engine/gfx/place_graphic.asm index 702e167514e..0006eaf0897 100644 --- a/engine/gfx/place_graphic.asm +++ b/engine/gfx/place_graphic.asm @@ -1,4 +1,4 @@ -SECTION "PlaceGraphic", ROMX +SECTION "engine/gfx/place_graphic.asm", ROMX PlaceGraphic: ; Fill wBoxAlignment-aligned box width b height c diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm index 1351b689afc..1fde8092340 100644 --- a/engine/gfx/player_gfx.asm +++ b/engine/gfx/player_gfx.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_Function88248", ROMX +SECTION "engine/gfx/player_gfx.asm@Unreferenced_Function88248", ROMX Unreferenced_Function88248: ld c, CAL @@ -13,7 +13,7 @@ Unreferenced_Function88248: ret -SECTION "MovePlayerPicRight - MovePlayerPic", ROMX +SECTION "engine/gfx/player_gfx.asm@MovePlayerPic", ROMX MovePlayerPicRight: hlcoord 6, 4 @@ -61,7 +61,7 @@ MovePlayerPic: jr .loop -SECTION "ShowPlayerNamingChoices - Unreferenced_GetPlayerNameArray", ROMX +SECTION "engine/gfx/player_gfx.asm@ShowPlayerNamingChoices", ROMX ShowPlayerNamingChoices: ld hl, ChrisNameMenuHeader @@ -93,7 +93,7 @@ Unreferenced_GetPlayerNameArray: ret -SECTION "GetPlayerIcon", ROMX +SECTION "engine/gfx/player_gfx.asm@GetPlayerIcon", ROMX GetPlayerIcon: ; Get the player icon corresponding to gender @@ -114,7 +114,7 @@ GetPlayerIcon: ret -SECTION "GetCardPic - CardGFX", ROMX +SECTION "engine/gfx/player_gfx.asm@GetCardPic", ROMX GetCardPic: ld hl, ChrisCardPic @@ -144,7 +144,7 @@ CardGFX: INCBIN "gfx/trainer_card/trainer_card.2bpp" -SECTION "GetPlayerBackpic - GetKrisBackpic", ROMX +SECTION "engine/gfx/player_gfx.asm@GetPlayerPic", ROMX GetPlayerBackpic: ld a, [wPlayerGender] @@ -237,8 +237,5 @@ GetKrisBackpic: call Get2bpp ret - -SECTION "KrisBackpic", ROMX - KrisBackpic: INCBIN "gfx/player/kris_back.2bpp" diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index 2cfaff16d9a..d870ff9240a 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -1,4 +1,4 @@ -SECTION "ClearSpriteAnims", ROMX +SECTION "engine/gfx/sprites.asm@ClearSpriteAnims", ROMX ClearSpriteAnims: ld hl, wSpriteAnimDict @@ -13,7 +13,7 @@ ClearSpriteAnims: ret -SECTION "PlaySpriteAnimationsAndDelayFrame - BigmonIcon", ROMX +SECTION "engine/gfx/sprites.asm", ROMX PlaySpriteAnimationsAndDelayFrame: call PlaySpriteAnimations diff --git a/engine/gfx/trademon_frontpic.asm b/engine/gfx/trademon_frontpic.asm index 188b1ceb766..17f55498b21 100644 --- a/engine/gfx/trademon_frontpic.asm +++ b/engine/gfx/trademon_frontpic.asm @@ -1,4 +1,4 @@ -SECTION "GetTrademonFrontpic", ROMX +SECTION "engine/gfx/trademon_frontpic.asm@GetTrademonFrontpic", ROMX GetTrademonFrontpic: ld a, [wOTTrademonSpecies] @@ -16,7 +16,7 @@ GetTrademonFrontpic: ret -SECTION "AnimateTrademonFrontpic", ROMX +SECTION "engine/gfx/trademon_frontpic.asm@AnimateTrademonFrontpic", ROMX AnimateTrademonFrontpic: ld a, [wOTTrademonSpecies] diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm index 4ac85b1ed5b..076fe8ba843 100644 --- a/engine/items/buy_sell_toss.asm +++ b/engine/items/buy_sell_toss.asm @@ -1,4 +1,4 @@ -SECTION "SelectQuantityToToss - SellItem_MenuHeader", ROMX, BANK[BANK_BUY_SELL_TOSS] +SECTION "engine/items/buy_sell_toss.asm", ROMX, BANK[BANK_BUY_SELL_TOSS] SelectQuantityToToss: ld hl, TossItem_MenuHeader diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e8ffa89dd10..d38783798fc 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1,4 +1,4 @@ -SECTION "_DoItemEffect - GetMthMoveOfCurrentMon", ROMX +SECTION "engine/items/item_effects.asm", ROMX _DoItemEffect:: ld a, [wCurItem] @@ -763,10 +763,10 @@ GetPokedexEntryBank: ret .PokedexEntryBanks: - db BANK("Pokedex Entries 001-064") - db BANK("Pokedex Entries 065-128") - db BANK("Pokedex Entries 129-192") - db BANK("Pokedex Entries 193-251") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 001-064") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 065-128") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 129-192") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 193-251") HeavyBallMultiplier: ; subtract 20 from catch rate if weight < 102.4 kg diff --git a/engine/items/items.asm b/engine/items/items.asm index b4fa1e5fb7c..36e2aad971f 100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1,4 +1,4 @@ -SECTION "_ReceiveItem - GetItemPrice", ROMX +SECTION "engine/items/items.asm", ROMX _ReceiveItem:: call DoesHLEqualNumItems diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 93c80e4df15..1c47b5e34f7 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -7,7 +7,7 @@ const MARTTEXT_SOLD_OUT -SECTION "OpenMartDialog - CheckCoins", ROMX +SECTION "engine/items/mart.asm", ROMX OpenMartDialog:: call GetMart diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 1cae7048072..a8f70e4292e 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -13,7 +13,7 @@ const PACKSTATE_QUITRUNSCRIPT ; 10 -SECTION "Pack - PackGFX", ROMX, BANK[BANK_PACK] +SECTION "engine/items/pack.asm", ROMX, BANK[BANK_PACK] Pack: ld hl, wOptions diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm index 3cedca17d07..70cf1688238 100644 --- a/engine/items/print_item_description.asm +++ b/engine/items/print_item_description.asm @@ -1,4 +1,4 @@ -SECTION "PrintItemDescription - TeruSama33Desc", ROMX +SECTION "engine/items/print_item_description.asm", ROMX PrintItemDescription: ; Print the description for item [wCurSpecies] at de. diff --git a/engine/items/switch_items.asm b/engine/items/switch_items.asm index 801456ff64e..7830ec34a4f 100644 --- a/engine/items/switch_items.asm +++ b/engine/items/switch_items.asm @@ -1,4 +1,4 @@ -SECTION "SwitchItemsInBag - Function24aab", ROMX +SECTION "engine/items/switch_items.asm", ROMX SwitchItemsInBag: ld a, [wSwitchItem] diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 66be607a9ed..2cb98b89ff3 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,4 +1,4 @@ -SECTION "TMHMPocket - BeatUpDescription", ROMX +SECTION "engine/items/tmhm.asm", ROMX TMHMPocket: ld a, $1 diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index ac5639ad307..82dc96c557e 100644 --- a/engine/items/tmhm2.asm +++ b/engine/items/tmhm2.asm @@ -1,4 +1,4 @@ -SECTION "CanLearnTMHMMove - TMHMMoves", ROMX +SECTION "engine/items/tmhm2.asm", ROMX CanLearnTMHMMove: ld a, [wCurPartySpecies] diff --git a/engine/items/update_item_description.asm b/engine/items/update_item_description.asm index 79322db2d26..1181befd62f 100644 --- a/engine/items/update_item_description.asm +++ b/engine/items/update_item_description.asm @@ -1,4 +1,4 @@ -SECTION "UpdateItemDescription", ROMX +SECTION "engine/items/update_item_description.asm", ROMX UpdateItemDescription: ld a, [wMenuSelection] diff --git a/engine/link/init_list.asm b/engine/link/init_list.asm index e29b545c814..3bb42634c5d 100644 --- a/engine/link/init_list.asm +++ b/engine/link/init_list.asm @@ -1,4 +1,4 @@ -SECTION "InitList", ROMX +SECTION "engine/link/init_list.asm", ROMX InitList: ld a, [wInitListType] diff --git a/engine/link/link.asm b/engine/link/link.asm index 3b01fa49084..9bd89a75aef 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1,4 +1,4 @@ -SECTION "LinkCommunications - Link_EnsureSync", ROMX +SECTION "engine/link/link.asm", ROMX LinkCommunications: call ClearBGPalettes @@ -2499,7 +2499,7 @@ Link_EnsureSync: ret -SECTION "CableClubCheckWhichChris", ROMX +SECTION "engine/link/link.asm@CableClubCheckWhichChris", ROMX CableClubCheckWhichChris: ldh a, [hSerialConnectionStatus] @@ -2513,13 +2513,13 @@ CableClubCheckWhichChris: ret -SECTION "Unreferenced_Gen1LinkCommsBorderGFX", ROMX +SECTION "engine/link/link.asm@Unreferenced_Gen1LinkCommsBorderGFX", ROMX Unreferenced_Gen1LinkCommsBorderGFX: INCBIN "gfx/trade/unused_gen_1_border_tiles.2bpp" -SECTION "Unreferenced_Function29fe4", ROMX +SECTION "engine/link/link.asm@Unreferenced_Function29fe4", ROMX Unreferenced_Function29fe4: ld a, BANK(sPartyMail) diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm index 65c131b2dab..3cbb849d250 100644 --- a/engine/link/link_2.asm +++ b/engine/link/link_2.asm @@ -1,4 +1,4 @@ -SECTION "LinkMonStatsScreen", ROMX +SECTION "engine/link/link_2.asm@LinkMonStatsScreen", ROMX LinkMonStatsScreen: ld a, [wMenuCursorY] @@ -20,7 +20,7 @@ LinkMonStatsScreen: ret -SECTION "Link_WaitBGMap", ROMX +SECTION "engine/link/link_2.asm@Link_WaitBGMap", ROMX Link_WaitBGMap: call WaitBGMap @@ -28,7 +28,7 @@ Link_WaitBGMap: ret -SECTION "LinkTextbox2", ROMX +SECTION "engine/link/link_2.asm@LinkTextbox2", ROMX LinkTextbox2: ld h, d diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index 12df88d5e78..43766cf8d99 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -1,4 +1,4 @@ -SECTION "LinkCommsBorderGFX - LinkTextbox", ROMX +SECTION "engine/link/link_trade.asm@_LoadTradeScreenBorder", ROMX LinkCommsBorderGFX: INCBIN "gfx/trade/border_tiles.2bpp" @@ -156,7 +156,7 @@ LinkTextbox: ret -SECTION "Function16d6ce - Function16d6e1", ROMX +SECTION "engine/link/link_trade.asm@Function16d6ce", ROMX Function16d6ce: call LoadStandardMenuHeader @@ -183,7 +183,7 @@ Function16d6e1: db "WAITING..!@" -SECTION "LinkTradeMenu", ROMX +SECTION "engine/link/link_trade.asm@LinkTradeMenu", ROMX LinkTradeMenu: call .MenuAction diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index ab56aa31b1e..742e00611b6 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1,4 +1,4 @@ -SECTION "DoMysteryGift - MysteryGiftJP_GFX", ROMX +SECTION "engine/link/mystery_gift.asm", ROMX DoMysteryGift: call ClearTileMap diff --git a/engine/link/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm index f9b3817fd8a..77975b9271f 100644 --- a/engine/link/mystery_gift_2.asm +++ b/engine/link/mystery_gift_2.asm @@ -1,4 +1,4 @@ -SECTION "PrepMysteryGiftDataToSend", ROMX +SECTION "engine/link/mystery_gift_2.asm@PrepMysteryGiftDataToSend", ROMX PrepMysteryGiftDataToSend: ld de, wMysteryGiftStaging @@ -124,7 +124,7 @@ PrepMysteryGiftDataToSend: ret -SECTION "MysteryGiftGetItemHeldEffect - MysteryGiftDecos", ROMX +SECTION "engine/link/mystery_gift_2.asm@MysteryGiftGetItemHeldEffect", ROMX MysteryGiftGetItemHeldEffect: ld a, c diff --git a/engine/link/place_waiting_text.asm b/engine/link/place_waiting_text.asm index 69468a9bd2a..eaa82bd0f7c 100644 --- a/engine/link/place_waiting_text.asm +++ b/engine/link/place_waiting_text.asm @@ -1,4 +1,4 @@ -SECTION "PlaceWaitingText", ROMX +SECTION "engine/link/place_waiting_text.asm", ROMX PlaceWaitingText:: hlcoord 3, 10 diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm index d3919a969fd..5d1c9adb5e9 100644 --- a/engine/link/time_capsule.asm +++ b/engine/link/time_capsule.asm @@ -1,7 +1,7 @@ ; These functions seem to be related to backwards compatibility -SECTION "ValidateOTTrademon", ROMX +SECTION "engine/link/time_capsule.asm@ValidateOTTrademon", ROMX ValidateOTTrademon: ld a, [wd003] @@ -68,7 +68,7 @@ ValidateOTTrademon: ret -SECTION "Functionfb5dd", ROMX +SECTION "engine/link/time_capsule.asm@Functionfb5dd", ROMX Functionfb5dd: ld a, [wd002] @@ -107,7 +107,7 @@ Functionfb5dd: ret -SECTION "PlaceTradePartnerNamesAndParty", ROMX +SECTION "engine/link/time_capsule.asm@PlaceTradePartnerNamesAndParty", ROMX PlaceTradePartnerNamesAndParty: hlcoord 4, 0 diff --git a/engine/link/time_capsule_2.asm b/engine/link/time_capsule_2.asm index b3d83a0f976..ff9719393b0 100644 --- a/engine/link/time_capsule_2.asm +++ b/engine/link/time_capsule_2.asm @@ -1,4 +1,4 @@ -SECTION "ConvertMon_2to1 - Pokered_MonIndices", ROMX +SECTION "engine/link/time_capsule_2.asm", ROMX ConvertMon_2to1: ; Takes the Gen 2 Pokemon number stored in wTempSpecies, diff --git a/engine/math/divide.asm b/engine/math/divide.asm index 2170ce4d451..6a2b82e2af1 100644 --- a/engine/math/divide.asm +++ b/engine/math/divide.asm @@ -1,4 +1,4 @@ -SECTION "_Divide", ROMX +SECTION "engine/math/divide.asm", ROMX _Divide:: xor a diff --git a/engine/math/get_square_root.asm b/engine/math/get_square_root.asm index 5e845bb45ad..ab99516d670 100644 --- a/engine/math/get_square_root.asm +++ b/engine/math/get_square_root.asm @@ -1,4 +1,4 @@ -SECTION "GetSquareRoot", ROMX +SECTION "engine/math/get_square_root.asm", ROMX NUM_SQUARE_ROOTS EQU 255 diff --git a/engine/math/multiply.asm b/engine/math/multiply.asm index 499be2ad390..3561471bde0 100644 --- a/engine/math/multiply.asm +++ b/engine/math/multiply.asm @@ -1,4 +1,4 @@ -SECTION "_Multiply", ROMX +SECTION "engine/math/multiply.asm", ROMX _Multiply:: ; hMultiplier is one byte. diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index 24c0c9322fe..5927025244b 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -1,4 +1,4 @@ -SECTION "_PrintNum", ROMX +SECTION "engine/math/print_num.asm", ROMX _PrintNum:: ; Print c digits of the b-byte value from de to hl. diff --git a/engine/math/sine.asm b/engine/math/sine.asm index 821f0d9f5c8..888096bd192 100644 --- a/engine/math/sine.asm +++ b/engine/math/sine.asm @@ -1,4 +1,4 @@ -SECTION "_Sine", ROMX +SECTION "engine/math/sine.asm", ROMX _Sine:: ; a = d * sin(e * pi/32) diff --git a/engine/menus/blank_screen.asm b/engine/menus/blank_screen.asm index a8a80b06063..7d37de1d324 100644 --- a/engine/menus/blank_screen.asm +++ b/engine/menus/blank_screen.asm @@ -1,4 +1,4 @@ -SECTION "BlankScreen", ROMX +SECTION "engine/menus/blank_screen.asm", ROMX BlankScreen: call DisableSpriteUpdates diff --git a/engine/menus/debug.asm b/engine/menus/debug.asm index fc644ad6bf5..6a5a8eb496a 100644 --- a/engine/menus/debug.asm +++ b/engine/menus/debug.asm @@ -23,7 +23,7 @@ const DEBUGTEST_F ; $7f -SECTION "ColorTest - Function823c7", ROMX +SECTION "engine/menus/debug.asm", ROMX ColorTest: ; A debug menu to test monster and trainer palettes at runtime. diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm index 14f8a8a7075..22f9beea5c7 100644 --- a/engine/menus/delete_save.asm +++ b/engine/menus/delete_save.asm @@ -1,4 +1,4 @@ -SECTION "_DeleteSaveData", ROMX +SECTION "engine/menus/delete_save.asm", ROMX _DeleteSaveData: farcall BlankScreen diff --git a/engine/menus/empty_sram.asm b/engine/menus/empty_sram.asm index 868c4ff0599..13564ffad9c 100644 --- a/engine/menus/empty_sram.asm +++ b/engine/menus/empty_sram.asm @@ -1,4 +1,4 @@ -SECTION "EmptyAllSRAMBanks", ROMX +SECTION "engine/menus/empty_sram.asm", ROMX EmptyAllSRAMBanks: ld a, 0 diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 981fdf5aaad..faf8d41f2cd 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -1,4 +1,4 @@ -SECTION "_MainMenu - GameInit", ROMX, BANK[BANK_GAME_INIT] +SECTION "engine/menus/intro_menu.asm", ROMX, BANK[BANK_GAME_INIT] _MainMenu: ld de, MUSIC_NONE diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 1cac91e54ba..6c8b49560ed 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -1,4 +1,4 @@ -SECTION "_2DMenu_ - Place2DMenuCursor", ROMX +SECTION "engine/menus/menu.asm@_2DMenu_", ROMX _2DMenu_:: ld hl, CopyMenuData @@ -557,7 +557,7 @@ Place2DMenuCursor: ret -SECTION "_PushWindow", ROMX +SECTION "engine/menus/menu.asm@_PushWindow", ROMX _PushWindow:: ldh a, [rSVBK] @@ -659,7 +659,7 @@ _PushWindow:: ret -SECTION "_ExitMenu - Error_Cant_ExitMenu", ROMX +SECTION "engine/menus/menu.asm@_ExitMenu", ROMX _ExitMenu:: xor a @@ -744,7 +744,7 @@ Error_Cant_ExitMenu: text_end -SECTION "_InitVerticalMenuCursor", ROMX +SECTION "engine/menus/menu.asm@_InitVerticalMenuCursor", ROMX _InitVerticalMenuCursor:: ld a, [wMenuDataFlags] diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index ffa36378c17..ceabe3bb23a 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -1,4 +1,4 @@ -SECTION "PlaceMenuItemName", ROMX +SECTION "engine/menus/menu_2.asm@PlaceMenuItemName", ROMX PlaceMenuItemName: push de @@ -10,7 +10,7 @@ PlaceMenuItemName: ret -SECTION "PlaceMenuItemQuantity", ROMX +SECTION "engine/menus/menu_2.asm@PlaceMenuItemQuantity", ROMX PlaceMenuItemQuantity: push de @@ -33,7 +33,7 @@ PlaceMenuItemQuantity: ret -SECTION "PlaceMoneyTopRight - MenuHeader_0x24b1d", ROMX +SECTION "engine/menus/menu_2.asm@PlaceMoneyTextbox", ROMX PlaceMoneyTopRight: ld hl, MenuHeader_0x24b15 @@ -73,7 +73,7 @@ MenuHeader_0x24b1d: db 1 ; default option -SECTION "DisplayCoinCaseBalance - ShowMoney_TerminatorString", ROMX +SECTION "engine/menus/menu_2.asm@DisplayCoinCaseBalance", ROMX DisplayCoinCaseBalance: ; Place a text box of size 1x7 at 11, 0. @@ -122,7 +122,7 @@ ShowMoney_TerminatorString: db "@" -SECTION "Unreferenced_Function24b8f", ROMX +SECTION "engine/menus/menu_2.asm@Unreferenced_Function24b8f", ROMX Unreferenced_Function24b8f: ; related to safari? @@ -158,7 +158,7 @@ Unreferenced_Function24b8f: db "ボール　　　こ@" -SECTION "StartMenu_DrawBugContestStatusBox - StartMenu_PrintBugContestStatus", ROMX +SECTION "engine/menus/menu_2.asm@StartMenu_PrintBugContestStatus", ROMX StartMenu_DrawBugContestStatusBox: hlcoord 0, 0 @@ -223,7 +223,7 @@ StartMenu_PrintBugContestStatus: db "LEVEL@" -SECTION "FindApricornsInBag - ApricornBalls", ROMX +SECTION "engine/menus/menu_2.asm@FindApricornsInBag", ROMX FindApricornsInBag: ; Checks the bag for Apricorns. diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 34ca689a448..62eb53cd5b9 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -5,7 +5,7 @@ NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb NAMINGSCREEN_UNDERLINE EQU "" ; $f2 -SECTION "_NamingScreen - MailEntry_Lowercase", ROMX +SECTION "engine/menus/naming_screen.asm", ROMX _NamingScreen: call DisableSpriteUpdates diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index 73d107316ef..1807ebaac24 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -1,4 +1,4 @@ -SECTION "_OptionsMenu - Options_UpdateCursorPosition", ROMX +SECTION "engine/menus/options_menu.asm", ROMX _OptionsMenu: ld hl, hInMenu diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 591cedc3175..5647d47398b 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1,4 +1,4 @@ -SECTION "SaveMenu - Text_SaveOnMoveMonWOMail", ROMX +SECTION "engine/menus/save.asm", ROMX SaveMenu: call LoadStandardMenuHeader diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 865cc6dfb73..cd327b2de3c 100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm @@ -1,4 +1,4 @@ -SECTION "SaveMenu_CopyTilemapAtOnce", ROMX +SECTION "engine/menus/savemenu_copytilemapatonce.asm", ROMX SaveMenu_CopyTilemapAtOnce: ldh a, [hCGB] diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 8079a11c0f4..b6c5aa96322 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -1,4 +1,4 @@ -SECTION "_InitScrollingMenu - ScrollingMenu_GetListItemCoordAndFunctionArgs", ROMX +SECTION "engine/menus/scrolling_menu.asm", ROMX _InitScrollingMenu:: xor a diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 4e22b3be264..e3b88132857 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -10,7 +10,7 @@ const STARTMENUITEM_POKEGEAR ; 7 const STARTMENUITEM_QUIT ; 8 -SECTION "StartMenu - UseRegisteredItem", ROMX, BANK[BANK_PACK] +SECTION "engine/menus/start_menu.asm", ROMX, BANK[BANK_PACK] StartMenu:: call ClearWindowData diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 435ac7f5e02..a10f13a89b6 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -9,7 +9,7 @@ const TRAINERCARDSTATE_QUIT ; 6 -SECTION "TrainerCard - CardRightCornerGFX", ROMX +SECTION "engine/menus/trainer_card.asm", ROMX TrainerCard: ld a, [wVramState] diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 79dc4e7447c..f9ef0f10fd5 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "Credits - CreditsStrings", ROMX +SECTION "engine/movie/credits.asm", ROMX Credits:: bit 6, b ; Hall Of Fame diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm index 48b57df8dae..1919b82d7ad 100644 --- a/engine/movie/crystal_intro.asm +++ b/engine/movie/crystal_intro.asm @@ -1,4 +1,4 @@ -SECTION "Copyright_GFPresents - GameFreakLogo", ROMX +SECTION "engine/movie/crystal_intro.asm@Copyright_GFPresents", ROMX Copyright_GFPresents: ld de, MUSIC_NONE @@ -336,7 +336,7 @@ INCBIN "gfx/splash/logo1.1bpp" INCBIN "gfx/splash/logo2.1bpp" -SECTION "CrystalIntro - IntroGrass4GFX", ROMX +SECTION "engine/movie/crystal_intro.asm", ROMX CrystalIntro: ldh a, [rSVBK] diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm index aa99c6c4751..d7dd2974772 100644 --- a/engine/movie/evolution_animation.asm +++ b/engine/movie/evolution_animation.asm @@ -1,4 +1,4 @@ -SECTION "EvolutionAnimation", ROMX +SECTION "engine/movie/evolution_animation.asm", ROMX EvolutionAnimation: push hl diff --git a/engine/movie/gbc_only.asm b/engine/movie/gbc_only.asm index ae9642b6bd6..fce08e5e271 100644 --- a/engine/movie/gbc_only.asm +++ b/engine/movie/gbc_only.asm @@ -1,4 +1,4 @@ -SECTION "GBCOnlyScreen - GBCOnlyGFX", ROMX +SECTION "engine/movie/gbc_only.asm", ROMX GBCOnlyScreen: ldh a, [hCGB] diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 095606d7320..12ed894e265 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -1,4 +1,4 @@ -SECTION "InitDisplayForHallOfFame", ROMX +SECTION "engine/movie/init_hof_credits.asm@InitDisplayForHallOfFame", ROMX InitDisplayForHallOfFame: call ClearBGPalettes @@ -31,7 +31,7 @@ InitDisplayForHallOfFame: text_end -SECTION "InitDisplayForRedCredits", ROMX +SECTION "engine/movie/init_hof_credits.asm@InitDisplayForRedCredits", ROMX InitDisplayForRedCredits: call ClearBGPalettes @@ -66,7 +66,7 @@ InitDisplayForRedCredits: ret -SECTION "ResetDisplayBetweenHallOfFameMons", ROMX +SECTION "engine/movie/init_hof_credits.asm@ResetDisplayBetweenHallOfFameMons", ROMX ResetDisplayBetweenHallOfFameMons: ldh a, [rSVBK] diff --git a/engine/movie/title.asm b/engine/movie/title.asm index d593c5ae035..6327e005da1 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -1,4 +1,4 @@ -SECTION "Function10ed51 - TitleScreenPalettes", ROMX +SECTION "engine/movie/title.asm", ROMX Function10ed51: call _TitleScreen diff --git a/engine/movie/unused_title.asm b/engine/movie/unused_title.asm index b54a256b67f..bb712062cf9 100644 --- a/engine/movie/unused_title.asm +++ b/engine/movie/unused_title.asm @@ -1,4 +1,4 @@ -SECTION "UnusedTitleScreen - UnusedTitleFG_OAM", ROMX +SECTION "engine/movie/unused_title.asm", ROMX UnusedTitleScreen: call ClearBGPalettes diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index c6ffb903af1..646dea44ab2 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -1,4 +1,4 @@ -SECTION "InitDecorations", ROMX +SECTION "engine/overworld/decorations.asm@InitDecorations", ROMX InitDecorations: ld a, DECO_FEATHERY_BED @@ -8,7 +8,7 @@ InitDecorations: ret -SECTION "_PlayerDecorationMenu - DecorationDesc_GiantOrnament", ROMX +SECTION "engine/overworld/decorations.asm", ROMX _PlayerDecorationMenu: ld a, [wWhichIndexSet] @@ -1090,7 +1090,7 @@ DecorationDesc_GiantOrnament: text_end -SECTION "ToggleMaptileDecorations - PadCoords_de", ROMX +SECTION "engine/overworld/decorations.asm@ToggleMaptileDecorations", ROMX ToggleMaptileDecorations: ; tile coordinates work the same way as for changeblock diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index ceb131c1f13..e71ffab321e 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "OverworldLoop - ContestMons", ROMX +SECTION "engine/overworld/events.asm", ROMX OverworldLoop:: xor a ; MAPSTATUS_START @@ -1272,7 +1272,7 @@ TryWildEncounter_BugContest: INCLUDE "data/wild/bug_contest_mons.asm" -SECTION "DoBikeStep", ROMX +SECTION "engine/overworld/events.asm@DoBikeStep", ROMX DoBikeStep:: nop @@ -1341,7 +1341,7 @@ DoBikeStep:: ret -SECTION "ClearCmdQueue", ROMX +SECTION "engine/overworld/events.asm@ClearCmdQueue", ROMX ClearCmdQueue:: ld hl, wCmdQueue @@ -1356,7 +1356,7 @@ ClearCmdQueue:: ret -SECTION "HandleCmdQueue - CmdQueue_Type3", ROMX +SECTION "engine/overworld/events.asm@HandleCmdQueue", ROMX HandleCmdQueue:: ld hl, wCmdQueue @@ -1603,7 +1603,7 @@ CmdQueue_Type3: ret -SECTION "CmdQueue_StoneTable", ROMX +SECTION "engine/overworld/events.asm@CmdQueue_StoneTable", ROMX CmdQueue_StoneTable: ld de, wPlayerStruct diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index e31e51c962a..695b3d7b18d 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -1,4 +1,4 @@ -SECTION "ReanchorBGMap_NoOAMUpdate - HDMATransfer_FillBGMap0WithBlack", ROMX, BANK[BANK_MAP_OBJECTS] +SECTION "engine/overworld/init_map.asm", ROMX, BANK[BANK_MAP_OBJECTS] ReanchorBGMap_NoOAMUpdate:: call DelayFrame diff --git a/engine/overworld/landmarks.asm b/engine/overworld/landmarks.asm index 4ada631e4e5..206eaf82750 100644 --- a/engine/overworld/landmarks.asm +++ b/engine/overworld/landmarks.asm @@ -1,4 +1,4 @@ -SECTION "GetLandmarkCoords - SpecialMapName", ROMX +SECTION "engine/overworld/landmarks.asm", ROMX GetLandmarkCoords: ; Return coordinates (d, e) of landmark e. @@ -48,7 +48,7 @@ GetLandmarkName:: INCLUDE "data/maps/landmarks.asm" -SECTION "RegionCheck", ROMX +SECTION "engine/overworld/landmarks.asm@RegionCheck", ROMX RegionCheck: ; Checks if the player is in Kanto or Johto. diff --git a/engine/overworld/load_map_part.asm b/engine/overworld/load_map_part.asm index 0a423fba2c1..f4124f668e8 100644 --- a/engine/overworld/load_map_part.asm +++ b/engine/overworld/load_map_part.asm @@ -1,4 +1,4 @@ -SECTION "_LoadMapPart", ROMX +SECTION "engine/overworld/load_map_part.asm", ROMX _LoadMapPart:: ld hl, wSurroundingTiles diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 7bafed74e8a..998f5baa884 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -1,4 +1,4 @@ -SECTION "Facings - InitSprites", ROMX, BANK[BANK_MAP_OBJECTS] +SECTION "engine/overworld/map_objects.asm", ROMX, BANK[BANK_MAP_OBJECTS] INCLUDE "data/sprites/facings.asm" diff --git a/engine/overworld/map_objects_2.asm b/engine/overworld/map_objects_2.asm index 0396b95ce24..ad3735c459b 100644 --- a/engine/overworld/map_objects_2.asm +++ b/engine/overworld/map_objects_2.asm @@ -1,4 +1,4 @@ -SECTION "LoadObjectMasks - GetObjectTimeMask", ROMX +SECTION "engine/overworld/map_objects_2.asm", ROMX LoadObjectMasks: ld hl, wObjectMasks diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 598c9a3cb46..502bcaa50f1 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -1,4 +1,4 @@ -SECTION "RunMapSetupScript - MapSetupCommands", ROMX +SECTION "engine/overworld/map_setup.asm@RunMapSetupScript", ROMX RunMapSetupScript:: ldh a, [hMapEntryMethod] @@ -110,7 +110,7 @@ MapSetupCommands: dba ReturnFromMapSetupScript ; 2d -SECTION "DontScrollText", ROMX +SECTION "engine/overworld/map_setup.asm@DontScrollText", ROMX DontScrollText: xor a @@ -118,7 +118,7 @@ DontScrollText: ret -SECTION "ActivateMapAnims", ROMX +SECTION "engine/overworld/map_setup.asm@ActivateMapAnims", ROMX ActivateMapAnims: ld a, $1 @@ -126,7 +126,7 @@ ActivateMapAnims: ret -SECTION "SuspendMapAnims", ROMX +SECTION "engine/overworld/map_setup.asm@SuspendMapAnims", ROMX SuspendMapAnims: xor a @@ -134,7 +134,7 @@ SuspendMapAnims: ret -SECTION "LoadObjectsRunCallback_02", ROMX +SECTION "engine/overworld/map_setup.asm@LoadObjectsRunCallback_02", ROMX LoadObjectsRunCallback_02: ld a, MAPCALLBACK_OBJECTS @@ -147,7 +147,7 @@ LoadObjectsRunCallback_02: ret -SECTION "DelayClearingOldSprites", ROMX +SECTION "engine/overworld/map_setup.asm@DelayClearingOldSprites", ROMX DelayClearingOldSprites: ld hl, wPlayerSpriteSetupFlags @@ -155,7 +155,7 @@ DelayClearingOldSprites: ret -SECTION "DelayLoadingNewSprites", ROMX +SECTION "engine/overworld/map_setup.asm@DelayLoadingNewSprites", ROMX DelayLoadingNewSprites: ld hl, wPlayerSpriteSetupFlags @@ -163,7 +163,7 @@ DelayLoadingNewSprites: ret -SECTION "CheckReplaceKrisSprite", ROMX +SECTION "engine/overworld/map_setup.asm@CheckReplaceKrisSprite", ROMX CheckReplaceKrisSprite: nop @@ -239,7 +239,7 @@ CheckReplaceKrisSprite: ret -SECTION "FadeOldMapMusic", ROMX +SECTION "engine/overworld/map_setup.asm@FadeOldMapMusic", ROMX FadeOldMapMusic: ld a, 6 @@ -247,14 +247,14 @@ FadeOldMapMusic: ret -SECTION "RetainOldPalettes", ROMX +SECTION "engine/overworld/map_setup.asm@RetainOldPalettes", ROMX RetainOldPalettes: farcall _UpdateTimePals ret -SECTION "RotatePalettesRightMapAndMusic", ROMX +SECTION "engine/overworld/map_setup.asm@RotatePalettesRightMapAndMusic", ROMX RotatePalettesRightMapAndMusic: ld e, 0 @@ -267,7 +267,7 @@ RotatePalettesRightMapAndMusic: ret -SECTION "ForceMapMusic", ROMX +SECTION "engine/overworld/map_setup.asm@ForceMapMusic", ROMX ForceMapMusic: ld a, [wPlayerState] diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d351c9268d1..23d0a8c4de8 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -1,4 +1,4 @@ -SECTION "CanObjectMoveInDirection - Function7171", ROMX, BANK[BANK_MAP_OBJECTS] +SECTION "engine/overworld/npc_movement.asm", ROMX, BANK[BANK_MAP_OBJECTS] CanObjectMoveInDirection: ld hl, OBJECT_PALETTE diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index 0860a171f3e..f0d842677ea 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -1,4 +1,4 @@ -SECTION "GetEmote2bpp - OverworldSprites", ROMX +SECTION "engine/overworld/overworld.asm", ROMX GetEmote2bpp: ld a, $1 diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index 5d10099c24e..5a8415754e2 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -1,4 +1,4 @@ -SECTION "DoPlayerMovement - CheckStandingOnIce", ROMX +SECTION "engine/overworld/player_movement.asm", ROMX DoPlayerMovement:: @@ -809,7 +809,7 @@ CheckStandingOnIce:: ret -SECTION "StopPlayerForEvent", ROMX +SECTION "engine/overworld/player_movement.asm@StopPlayerForEvent", ROMX StopPlayerForEvent:: ld hl, wPlayerNextMovement diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 37b9ab7940a..543a5a815b5 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -1,4 +1,4 @@ -SECTION "SpawnPlayer - CopyTempObjectToObjectStruct", ROMX +SECTION "engine/overworld/player_object.asm@SpawnPlayer", ROMX SpawnPlayer: ld a, -1 @@ -498,7 +498,7 @@ CopyTempObjectToObjectStruct: ret -SECTION "TrainerWalkToPlayer", ROMX +SECTION "engine/overworld/player_object.asm@TrainerWalkToPlayer", ROMX TrainerWalkToPlayer: ldh a, [hLastTalked] @@ -565,7 +565,7 @@ TrainerWalkToPlayer: ret -SECTION "SurfStartStep", ROMX +SECTION "engine/overworld/player_object.asm@SurfStartStep", ROMX SurfStartStep: call InitMovementBuffer @@ -594,7 +594,7 @@ SurfStartStep: slow_step RIGHT -SECTION "FollowNotExact", ROMX +SECTION "engine/overworld/player_object.asm@FollowNotExact", ROMX FollowNotExact:: push bc @@ -684,7 +684,7 @@ FollowNotExact:: ret -SECTION "GetRelativeFacing", ROMX +SECTION "engine/overworld/player_object.asm@GetRelativeFacing", ROMX GetRelativeFacing:: ; Determines which way map object e would have to turn to face map object d. Returns carry if it's impossible for whatever reason. @@ -793,7 +793,7 @@ GetRelativeFacing:: ret -SECTION "QueueFollowerFirstStep", ROMX +SECTION "engine/overworld/player_object.asm@QueueFollowerFirstStep", ROMX QueueFollowerFirstStep: call .QueueFirstStep diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm index a66c2ed5672..fc48cfc6dca 100644 --- a/engine/overworld/player_step.asm +++ b/engine/overworld/player_step.asm @@ -1,4 +1,4 @@ -SECTION "_HandlePlayerStep - UpdateOverworldMap", ROMX +SECTION "engine/overworld/player_step.asm", ROMX _HandlePlayerStep:: ld a, [wPlayerStepFlags] diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm index 2ffbfb5ac52..219a0e59468 100644 --- a/engine/overworld/spawn_points.asm +++ b/engine/overworld/spawn_points.asm @@ -1,4 +1,4 @@ -SECTION "SpawnPoints - IsSpawnPoint", ROMX +SECTION "engine/overworld/spawn_points.asm", ROMX INCLUDE "data/maps/spawn_points.asm" diff --git a/engine/overworld/tile_events.asm b/engine/overworld/tile_events.asm index 73ef7944634..3647d663dcc 100644 --- a/engine/overworld/tile_events.asm +++ b/engine/overworld/tile_events.asm @@ -1,4 +1,4 @@ -SECTION "CheckWarpCollision", ROMX +SECTION "engine/overworld/tile_events.asm@CheckWarpCollision", ROMX CheckWarpCollision:: ; Is this tile a warp? @@ -18,7 +18,7 @@ CheckWarpCollision:: ret -SECTION "CheckDirectionalWarp", ROMX +SECTION "engine/overworld/tile_events.asm@CheckDirectionalWarp", ROMX CheckDirectionalWarp:: ; If this is a directional warp, clear carry (press the designated button to warp). @@ -40,7 +40,7 @@ CheckDirectionalWarp:: ret -SECTION "CheckWarpFacingDown", ROMX +SECTION "engine/overworld/tile_events.asm@CheckWarpFacingDown", ROMX CheckWarpFacingDown: ld de, 1 @@ -62,7 +62,7 @@ CheckWarpFacingDown: db -1 -SECTION "CheckGrassCollision", ROMX +SECTION "engine/overworld/tile_events.asm@CheckGrassCollision", ROMX CheckGrassCollision:: ld a, [wPlayerStandingTile] @@ -85,7 +85,7 @@ CheckGrassCollision:: db -1 -SECTION "CheckCutCollision", ROMX +SECTION "engine/overworld/tile_events.asm@CheckCutCollision", ROMX CheckCutCollision: ld a, c @@ -104,7 +104,7 @@ CheckCutCollision: db -1 -SECTION "GetWarpSFX", ROMX +SECTION "engine/overworld/tile_events.asm@GetWarpSFX", ROMX GetWarpSFX:: ld a, [wPlayerStandingTile] diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 57f8d4920bf..84db26ed629 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -1,4 +1,4 @@ -SECTION "_InitializeStartDay - CopyDayHourMinToHL", ROMX +SECTION "engine/overworld/time.asm", ROMX _InitializeStartDay: call InitializeStartDay diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index b950c2de6d0..5b180e57c81 100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm @@ -1,4 +1,4 @@ -SECTION "_GetVarAction", ROMX +SECTION "engine/overworld/variables.asm", ROMX _GetVarAction:: ld a, c diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 875aa361a80..41d2a95eb93 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -1,4 +1,4 @@ -SECTION "HandleNewMap - InitCommandQueue", ROMX +SECTION "engine/overworld/warp_connection.asm@HandleNewMap", ROMX HandleNewMap: call ClearUnusedMapBuffer @@ -17,7 +17,7 @@ InitCommandQueue: ret -SECTION "EnterMapConnection", ROMX +SECTION "engine/overworld/warp_connection.asm@EnterMapConnection", ROMX EnterMapConnection: ; Return carry if a connection has been entered. @@ -155,7 +155,7 @@ EnterMapConnection: ret -SECTION "LoadWarpData", ROMX +SECTION "engine/overworld/warp_connection.asm@LoadWarpData", ROMX LoadWarpData: call .SaveDigWarp @@ -233,7 +233,7 @@ LoadWarpData: ret -SECTION "LoadMapTimeOfDay", ROMX +SECTION "engine/overworld/warp_connection.asm@LoadMapTimeOfDay", ROMX LoadMapTimeOfDay: ld hl, wVramState @@ -307,7 +307,7 @@ LoadMapTimeOfDay: ret -SECTION "LoadGraphics", ROMX +SECTION "engine/overworld/warp_connection.asm@LoadGraphics", ROMX LoadGraphics: call LoadTileset @@ -322,14 +322,14 @@ LoadGraphics: ret -SECTION "LoadMapPalettes", ROMX +SECTION "engine/overworld/warp_connection.asm@LoadMapPalettes", ROMX LoadMapPalettes: ld b, SCGB_MAPPALS jp GetSGBLayout -SECTION "RefreshMapSprites", ROMX +SECTION "engine/overworld/warp_connection.asm@RefreshMapSprites", ROMX RefreshMapSprites: call ClearSprites @@ -350,7 +350,7 @@ RefreshMapSprites: ret -SECTION "CheckMovingOffEdgeOfMap", ROMX +SECTION "engine/overworld/warp_connection.asm@CheckMovingOffEdgeOfMap", ROMX CheckMovingOffEdgeOfMap:: ld a, [wPlayerStepDirection] @@ -410,7 +410,7 @@ CheckMovingOffEdgeOfMap:: ret -SECTION "GetCoordOfUpperLeftCorner", ROMX +SECTION "engine/overworld/warp_connection.asm@GetCoordOfUpperLeftCorner", ROMX GetCoordOfUpperLeftCorner:: ld hl, wOverworldMapBlocks diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index f8c9f308b0d..0bc78b32a3e 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -1,4 +1,4 @@ -SECTION "LoadWildMonData - SwarmWaterWildMons", ROMX +SECTION "engine/overworld/wildmons.asm", ROMX LoadWildMonData: call _GrassWildmonLookup diff --git a/engine/phone/caller_scripts.asm b/engine/phone/caller_scripts.asm index da53e07a54a..830d54c8233 100644 --- a/engine/phone/caller_scripts.asm +++ b/engine/phone/caller_scripts.asm @@ -1,4 +1,4 @@ -SECTION "Phone_GenericCall_Male - BikeShopPhoneCallerScript", ROMX +SECTION "engine/phone/caller_scripts.asm", ROMX INCLUDE "engine/phone/scripts/generic_caller.asm" INCLUDE "engine/phone/scripts/jack_gossip.asm" diff --git a/engine/phone/numbers.asm b/engine/phone/numbers.asm index 4f861e9fdf9..741d16c54e1 100644 --- a/engine/phone/numbers.asm +++ b/engine/phone/numbers.asm @@ -1,4 +1,4 @@ -SECTION "AddPhoneNumber - PermanentNumbers", ROMX +SECTION "engine/phone/numbers.asm", ROMX AddPhoneNumber:: call _CheckCellNum diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 661e6ac3ea1..622acdb9247 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -1,4 +1,4 @@ -SECTION "FarPlaceString - UnknownText_0x9066d", ROMX, BANK[BANK_PHONE_CALL] +SECTION "engine/phone/phone.asm", ROMX, BANK[BANK_PHONE_CALL] FarPlaceString: ldh a, [hROMBank] diff --git a/engine/phone/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm index 4d65ffcee28..08547671f45 100644 --- a/engine/phone/phonering_copytilemapatonce.asm +++ b/engine/phone/phonering_copytilemapatonce.asm @@ -1,4 +1,4 @@ -SECTION "PhoneRing_CopyTilemapAtOnce", ROMX +SECTION "engine/phone/phonering_copytilemapatonce.asm", ROMX PhoneRing_CopyTilemapAtOnce: ldh a, [hCGB] diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index cfdc55a6370..46cece8141a 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -1,4 +1,4 @@ -SECTION "AlanPhoneCalleeScript - AlanHasFireStone", ROMX +SECTION "engine/phone/scripts/alan.asm", ROMX AlanPhoneCalleeScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm index cc8c27c678a..7b550e44433 100644 --- a/engine/phone/scripts/anthony.asm +++ b/engine/phone/scripts/anthony.asm @@ -1,4 +1,4 @@ -SECTION "AnthonyPhoneCalleeScript - AnthonyTriesDunsparceSwarm", ROMX +SECTION "engine/phone/scripts/anthony.asm", ROMX AnthonyPhoneCalleeScript: gettrainername STRING_BUFFER_3, HIKER, ANTHONY2 diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index 902f52e8166..c3e2fa6cd2f 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -1,4 +1,4 @@ -SECTION "ArniePhoneCalleeScript - ArnieYanmaAlreadySwarming", ROMX +SECTION "engine/phone/scripts/arnie.asm", ROMX ArniePhoneCalleeScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1 diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm index 1708fccd4c7..1bc66fce39e 100644 --- a/engine/phone/scripts/beth.asm +++ b/engine/phone/scripts/beth.asm @@ -1,4 +1,4 @@ -SECTION "BethPhoneCalleeScript - BethWantsBattle", ROMX +SECTION "engine/phone/scripts/beth.asm", ROMX BethPhoneCalleeScript: gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1 diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm index 8461ab8e116..5a8b70fa31c 100644 --- a/engine/phone/scripts/beverly.asm +++ b/engine/phone/scripts/beverly.asm @@ -1,4 +1,4 @@ -SECTION "BeverlyPhoneCalleeScript - BeverlyPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/beverly.asm", ROMX BeverlyPhoneCalleeScript: gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1 diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm index f1492a64477..13e6b8d2778 100644 --- a/engine/phone/scripts/bill.asm +++ b/engine/phone/scripts/bill.asm @@ -1,4 +1,4 @@ -SECTION "BillPhoneCalleeScript - BillPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/bill.asm", ROMX BillPhoneCalleeScript: checktime DAY diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm index 1cf4bc5124d..1099af7cf1a 100644 --- a/engine/phone/scripts/brent.asm +++ b/engine/phone/scripts/brent.asm @@ -1,4 +1,4 @@ -SECTION "BrentPhoneCalleeScript - BrentBillTrivia", ROMX +SECTION "engine/phone/scripts/brent.asm", ROMX BrentPhoneCalleeScript: gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1 diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm index f0d89fb1833..3128ae0cd4b 100644 --- a/engine/phone/scripts/buena.asm +++ b/engine/phone/scripts/buena.asm @@ -1,4 +1,4 @@ -SECTION "BuenaPhoneCalleeScript - UnknownText_0xa1e2f", ROMX +SECTION "engine/phone/scripts/buena.asm", ROMX BuenaPhoneCalleeScript: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm index b4235983644..ab713157a4f 100644 --- a/engine/phone/scripts/chad.asm +++ b/engine/phone/scripts/chad.asm @@ -1,4 +1,4 @@ -SECTION "ChadPhoneCalleeScript - ChadOakGossip", ROMX +SECTION "engine/phone/scripts/chad.asm", ROMX ChadPhoneCalleeScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1 diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm index b791240dd6a..6e44dddd7ac 100644 --- a/engine/phone/scripts/dana.asm +++ b/engine/phone/scripts/dana.asm @@ -1,4 +1,4 @@ -SECTION "DanaPhoneCalleeScript - DanaHasThunderstone", ROMX +SECTION "engine/phone/scripts/dana.asm", ROMX DanaPhoneCalleeScript: gettrainername STRING_BUFFER_3, LASS, DANA1 diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm index e27c62fb7b6..c03f158573b 100644 --- a/engine/phone/scripts/derek.asm +++ b/engine/phone/scripts/derek.asm @@ -1,4 +1,4 @@ -SECTION "DerekPhoneCalleeScript - DerekPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/derek.asm", ROMX DerekPhoneCalleeScript: gettrainername STRING_BUFFER_3, POKEFANM, DEREK1 diff --git a/engine/phone/scripts/elm.asm b/engine/phone/scripts/elm.asm index 1b199da84d2..40c16e10903 100644 --- a/engine/phone/scripts/elm.asm +++ b/engine/phone/scripts/elm.asm @@ -1,4 +1,4 @@ -SECTION "ElmPhoneCalleeScript - ElmPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/elm.asm", ROMX ElmPhoneCalleeScript: readvar VAR_SPECIALPHONECALL diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 8117f3752d9..59b2319f483 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -1,4 +1,4 @@ -SECTION "ErinPhoneCalleeScript - ErinWantsBattle", ROMX +SECTION "engine/phone/scripts/erin.asm", ROMX ErinPhoneCalleeScript: gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index d5aae20287c..f35c1ca577c 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -1,4 +1,4 @@ -SECTION "GavenPhoneCalleeScript - GavenFoundRare", ROMX +SECTION "engine/phone/scripts/gaven.asm", ROMX GavenPhoneCalleeScript: gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm index 2d34c252ec3..99d7e7b1e2a 100644 --- a/engine/phone/scripts/generic_callee.asm +++ b/engine/phone/scripts/generic_callee.asm @@ -1,4 +1,4 @@ -SECTION "PhoneScript_Random2 - PhoneScript_MonFlavorText", ROMX +SECTION "engine/phone/scripts/generic_callee.asm", ROMX PhoneScript_Random2: random 2 @@ -1258,7 +1258,7 @@ PhoneScript_MonFlavorText: farsjump PhoneScript_HangupText_Male -SECTION "GrandmaString - BrotherString", ROMX, BANK[BANK_PHONE_TIFFANY] +SECTION "engine/phone/scripts/generic_callee.asm@TiffanysFamilyMembers", ROMX, BANK[BANK_PHONE_TIFFANY] GrandmaString: db "Grandma@" GrandpaString: db "Grandpa@" diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm index d782d20cee7..35c977386d6 100644 --- a/engine/phone/scripts/gina.asm +++ b/engine/phone/scripts/gina.asm @@ -1,4 +1,4 @@ -SECTION "GinaPhoneCalleeScript - GinaHasLeafStone", ROMX +SECTION "engine/phone/scripts/gina.asm", ROMX GinaPhoneCalleeScript: gettrainername STRING_BUFFER_3, PICNICKER, GINA1 diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm index a4b3219e15c..b10a4595b55 100644 --- a/engine/phone/scripts/huey.asm +++ b/engine/phone/scripts/huey.asm @@ -1,4 +1,4 @@ -SECTION "HueyPhoneCalleeScript - HueyWantsBattle", ROMX +SECTION "engine/phone/scripts/huey.asm", ROMX HueyPhoneCalleeScript: gettrainername STRING_BUFFER_3, SAILOR, HUEY1 diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm index 73b9393c774..79beb800952 100644 --- a/engine/phone/scripts/irwin.asm +++ b/engine/phone/scripts/irwin.asm @@ -1,4 +1,4 @@ -SECTION "IrwinPhoneCalleeScript - IrwinPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/irwin.asm", ROMX IrwinPhoneCalleeScript: gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1 diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index 5ba9b47299a..5b1adfbf58c 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -1,4 +1,4 @@ -SECTION "JackPhoneCalleeScript - JackBattleTrivia", ROMX +SECTION "engine/phone/scripts/jack.asm", ROMX JackPhoneCalleeScript: gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index a22a606a737..079c3e135aa 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -1,4 +1,4 @@ -SECTION "JoeyPhoneCalleeScript - JoeyWantsBattle", ROMX +SECTION "engine/phone/scripts/joey.asm", ROMX JoeyPhoneCalleeScript: gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1 diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index 8b608947708..9f57b7bbe9b 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -1,4 +1,4 @@ -SECTION "JosePhoneCalleeScript - JoseHasStarPiece", ROMX +SECTION "engine/phone/scripts/jose.asm", ROMX JosePhoneCalleeScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2 diff --git a/engine/phone/scripts/kenji.asm b/engine/phone/scripts/kenji.asm index 48055489a9d..8da4012decd 100644 --- a/engine/phone/scripts/kenji.asm +++ b/engine/phone/scripts/kenji.asm @@ -1,4 +1,4 @@ -SECTION "KenjiPhoneCalleeScript - KenjiPhoneCallerScript", ROMX +SECTION "engine/phone/scripts/kenji.asm", ROMX KenjiPhoneCalleeScript: gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3 diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm index 9c9ccae1205..d7eeccb7be2 100644 --- a/engine/phone/scripts/liz.asm +++ b/engine/phone/scripts/liz.asm @@ -1,4 +1,4 @@ -SECTION "LizPhoneCalleeScript - LizGossipScript", ROMX +SECTION "engine/phone/scripts/liz.asm", ROMX LizPhoneCalleeScript: gettrainername STRING_BUFFER_3, PICNICKER, LIZ1 diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm index f351854af37..05c353a251e 100644 --- a/engine/phone/scripts/mom.asm +++ b/engine/phone/scripts/mom.asm @@ -1,4 +1,4 @@ -SECTION "MomPhoneCalleeScript - MomPhoneLectureScript", ROMX +SECTION "engine/phone/scripts/mom.asm", ROMX MomPhoneCalleeScript: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm index e52627aff6a..68ea9ce81cd 100644 --- a/engine/phone/scripts/parry.asm +++ b/engine/phone/scripts/parry.asm @@ -1,4 +1,4 @@ -SECTION "ParryPhoneCalleeScript - ParryWantsBattle", ROMX +SECTION "engine/phone/scripts/parry.asm", ROMX ParryPhoneCalleeScript: gettrainername STRING_BUFFER_3, HIKER, PARRY1 diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm index 6073f8bb888..2f624bd7011 100644 --- a/engine/phone/scripts/ralph.asm +++ b/engine/phone/scripts/ralph.asm @@ -1,4 +1,4 @@ -SECTION "RalphPhoneCalleeScript - Ralph_SetUpSwarm", ROMX +SECTION "engine/phone/scripts/ralph.asm", ROMX RalphPhoneCalleeScript: gettrainername STRING_BUFFER_3, FISHER, RALPH1 diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index 4e219b16122..b3442a117f1 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -1,4 +1,4 @@ -SECTION "ReenaPhoneCalleeScript - ReenaWantsBattle", ROMX +SECTION "engine/phone/scripts/reena.asm", ROMX ReenaPhoneCalleeScript: gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm index 1660375e519..050955cc7f8 100644 --- a/engine/phone/scripts/tiffany.asm +++ b/engine/phone/scripts/tiffany.asm @@ -1,4 +1,4 @@ -SECTION "TiffanyPhoneCalleeScript - TiffanyHasPinkBow", ROMX, BANK[BANK_PHONE_TIFFANY] +SECTION "engine/phone/scripts/tiffany.asm", ROMX, BANK[BANK_PHONE_TIFFANY] TiffanyPhoneCalleeScript: gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3 diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm index e000080f885..f1c2348a7d9 100644 --- a/engine/phone/scripts/todd.asm +++ b/engine/phone/scripts/todd.asm @@ -1,4 +1,4 @@ -SECTION "ToddPhoneCalleeScript - ToddDeptStoreSale", ROMX +SECTION "engine/phone/scripts/todd.asm", ROMX ToddPhoneCalleeScript: gettrainername STRING_BUFFER_3, CAMPER, TODD1 diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index f93c51ed292..ea27dfb4206 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -1,4 +1,4 @@ -SECTION "TullyPhoneCalleeScript - TullyFoundWaterStone", ROMX +SECTION "engine/phone/scripts/tully.asm", ROMX TullyPhoneCalleeScript: gettrainername STRING_BUFFER_3, FISHER, TULLY1 diff --git a/engine/phone/scripts/unused.asm b/engine/phone/scripts/unused.asm index 575b3999a9a..4ac29ce99dc 100644 --- a/engine/phone/scripts/unused.asm +++ b/engine/phone/scripts/unused.asm @@ -1,4 +1,4 @@ -SECTION "UnusedPhoneScript", ROMX +SECTION "engine/phone/scripts/unused.asm", ROMX UnusedPhoneScript: farwritetext UnusedPhoneText diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm index 905870b30b6..e6611520865 100644 --- a/engine/phone/scripts/vance.asm +++ b/engine/phone/scripts/vance.asm @@ -1,4 +1,4 @@ -SECTION "VancePhoneCalleeScript - VanceWantsRematch", ROMX +SECTION "engine/phone/scripts/vance.asm", ROMX VancePhoneCalleeScript: gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1 diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm index 9d2e56446ec..c64c47a2c43 100644 --- a/engine/phone/scripts/wade.asm +++ b/engine/phone/scripts/wade.asm @@ -1,4 +1,4 @@ -SECTION "WadePhoneCalleeScript - WadeHasItem2", ROMX +SECTION "engine/phone/scripts/wade.asm", ROMX WadePhoneCalleeScript: gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1 diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index eaa361e41ba..68367cf9781 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -1,4 +1,4 @@ -SECTION "WiltonPhoneCalleeScript - WiltonHasItem", ROMX +SECTION "engine/phone/scripts/wilton.asm", ROMX WiltonPhoneCalleeScript: gettrainername STRING_BUFFER_3, FISHER, WILTON1 diff --git a/engine/pokedex/dex_entry.asm b/engine/pokedex/dex_entry.asm index c2c86798ba6..4e6850d1b17 100644 --- a/engine/pokedex/dex_entry.asm +++ b/engine/pokedex/dex_entry.asm @@ -1,4 +1,4 @@ -SECTION "DisplayDexEntry - PokedexDataPointerTable", ROMX +SECTION "engine/pokedex/dex_entry.asm", ROMX DisplayDexEntry: call GetPokemonName @@ -166,10 +166,10 @@ GetDexEntryPointer: ret .PokedexEntryBanks: - db BANK("Pokedex Entries 001-064") - db BANK("Pokedex Entries 065-128") - db BANK("Pokedex Entries 129-192") - db BANK("Pokedex Entries 193-251") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 001-064") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 065-128") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 129-192") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 193-251") GetDexEntryPagePointer: call GetDexEntryPointer diff --git a/engine/pokedex/new_pokedex_entry.asm b/engine/pokedex/new_pokedex_entry.asm index 40b59a59523..78b5c76b518 100644 --- a/engine/pokedex/new_pokedex_entry.asm +++ b/engine/pokedex/new_pokedex_entry.asm @@ -1,4 +1,4 @@ -SECTION "NewPokedexEntry", ROMX +SECTION "engine/pokedex/new_pokedex_entry.asm", ROMX NewPokedexEntry: ldh a, [hMapAnims] diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 331ed768cea..4949d0cd91a 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -19,7 +19,7 @@ POKEDEX_SCX EQU 5 GLOBAL POKEDEX_SCX -SECTION "Pokedex - Pokedex_ResetBGMapMode", ROMX +SECTION "engine/pokedex/pokedex.asm", ROMX Pokedex: ldh a, [hWX] diff --git a/engine/pokedex/pokedex_3.asm b/engine/pokedex/pokedex_3.asm index 9f9ecee74fc..78b0981e28a 100644 --- a/engine/pokedex/pokedex_3.asm +++ b/engine/pokedex/pokedex_3.asm @@ -1,4 +1,4 @@ -SECTION "LoadSGBPokedexGFX - SGBPokedexGFX_LZ", ROMX +SECTION "engine/pokedex/pokedex_3.asm@LoadSGBPokedexGFX", ROMX LoadSGBPokedexGFX: ld hl, SGBPokedexGFX_LZ @@ -17,7 +17,7 @@ SGBPokedexGFX_LZ: INCBIN "gfx/pokedex/sgb.2bpp.lz" -SECTION "LoadQuestionMarkPic", ROMX +SECTION "engine/pokedex/pokedex_3.asm@LoadQuestionMarkPic", ROMX LoadQuestionMarkPic: ld hl, .QuestionMarkLZ @@ -29,7 +29,7 @@ LoadQuestionMarkPic: INCBIN "gfx/pokedex/question_mark.2bpp.lz" -SECTION "DrawPokedexListWindow - Bank77_FillColumn", ROMX +SECTION "engine/pokedex/pokedex_3.asm@DrawPokedexWindow", ROMX DrawPokedexListWindow: ld a, $32 diff --git a/engine/pokedex/slowpoke_anim.asm b/engine/pokedex/slowpoke_anim.asm index 81f749b1ba2..08fd495cef4 100644 --- a/engine/pokedex/slowpoke_anim.asm +++ b/engine/pokedex/slowpoke_anim.asm @@ -1,4 +1,4 @@ -SECTION "AnimateDexSearchSlowpoke - DoDexSearchSlowpokeFrame", ROMX +SECTION "engine/pokedex/slowpoke_anim.asm", ROMX AnimateDexSearchSlowpoke: ld hl, .FrameIDs diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm index da8f4e83f68..3a42fbc64c0 100644 --- a/engine/pokedex/unown_dex.asm +++ b/engine/pokedex/unown_dex.asm @@ -1,4 +1,4 @@ -SECTION "UpdateUnownDex", ROMX +SECTION "engine/pokedex/unown_dex.asm@UpdateUnownDex", ROMX UpdateUnownDex: ld a, [wUnownLetter] @@ -21,7 +21,7 @@ UpdateUnownDex: ret -SECTION "PrintUnownWord - UnownWordZ", ROMX +SECTION "engine/pokedex/unown_dex.asm@PrintUnownWord", ROMX PrintUnownWord: hlcoord 4, 15 diff --git a/engine/pokegear/map.asm b/engine/pokegear/map.asm index 6925383823b..590424176e9 100644 --- a/engine/pokegear/map.asm +++ b/engine/pokegear/map.asm @@ -1,4 +1,4 @@ -SECTION "PokegearMap - Unreferenced_Function92311", ROMX +SECTION "engine/pokegear/map.asm", ROMX PokegearMap: ld a, e diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 5d9dc49baa4..bbe153bf3c7 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -23,7 +23,7 @@ NUM_POKEGEAR_CARDS EQU const_value const POKEGEARSTATE_RADIOJOYPAD ; c -SECTION "PokeGear - PlayRadio", ROMX, BANK[BANK_PHONE_CALL] +SECTION "engine/pokegear/pokegear.asm", ROMX, BANK[BANK_PHONE_CALL] PokeGear: ld hl, wOptions diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 715900857ab..a59ea5a1985 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -1,4 +1,4 @@ -SECTION "PlayRadioShow - NextRadioLine", ROMX +SECTION "engine/pokegear/radio.asm", ROMX PlayRadioShow: ; If we're already in the radio program proper, we don't need to be here. @@ -704,10 +704,10 @@ PokedexShow_GetDexEntryBank: ret .PokedexEntryBanks: - db BANK("Pokedex Entries 001-064") - db BANK("Pokedex Entries 065-128") - db BANK("Pokedex Entries 129-192") - db BANK("Pokedex Entries 193-251") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 001-064") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 065-128") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 129-192") + db BANK("data/pokemon/dex_entries.asm@Pokedex Entries 193-251") PokedexShow1: call StartRadioStation diff --git a/engine/pokegear/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm index c2584fed485..f1cf33dca76 100644 --- a/engine/pokegear/townmap_convertlinebreakcharacters.asm +++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm @@ -1,4 +1,4 @@ -SECTION "TownMap_ConvertLineBreakCharacters", ROMX +SECTION "engine/pokegear/townmap_convertlinebreakcharacters.asm", ROMX TownMap_ConvertLineBreakCharacters: ld hl, wStringBuffer1 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index ede7e1e7b3c..aeccbe3c0df 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1,4 +1,4 @@ -SECTION "_DepositPKMN - PCString_NoReleasingEGGS", ROMX +SECTION "engine/pokemon/bills_pc.asm", ROMX _DepositPKMN: ld hl, wOptions @@ -2230,7 +2230,7 @@ PCString_PartyFull: db "The party's full!@" PCString_NoReleasingEGGS: db "No releasing EGGS!@" -SECTION "_ChangeBox - BillsPC_PlaceChangeBoxString", ROMX +SECTION "engine/pokemon/bills_pc.asm@_ChangeBox", ROMX _ChangeBox: call LoadStandardMenuHeader diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index b4d2f6a0c17..b43c0adf74d 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -1,4 +1,4 @@ -SECTION "_BillsPC - ClearPCItemScreen", ROMX +SECTION "engine/pokemon/bills_pc_top.asm", ROMX _BillsPC: call .CheckCanUsePC @@ -257,7 +257,7 @@ ClearPCItemScreen: ret -SECTION "CopyBoxmonToTempMon", ROMX +SECTION "engine/pokemon/bills_pc_top.asm@CopyBoxmonToTempMon", ROMX CopyBoxmonToTempMon: ld a, [wCurPartyMon] @@ -273,7 +273,7 @@ CopyBoxmonToTempMon: ret -SECTION "Unreferenced_Functione5d9", ROMX +SECTION "engine/pokemon/bills_pc_top.asm@Unreferenced_Functione5d9", ROMX Unreferenced_Functione5d9: ld a, [wCurBox] diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index ac6e0dd24cd..c59b12e453a 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -1,4 +1,4 @@ -SECTION "CheckBreedmonCompatibility - DayCareMonCompatibilityText", ROMX +SECTION "engine/pokemon/breeding.asm", ROMX CheckBreedmonCompatibility: call .CheckBreedingGroupCompatibility @@ -956,7 +956,7 @@ DayCareMonCompatibilityText: text_end -SECTION "Unreferenced_GetEmptyString", ROMX +SECTION "engine/pokemon/breeding.asm@Unreferenced_GetEmptyString", ROMX Unreferenced_GetEmptyString: ld hl, .string diff --git a/engine/pokemon/breedmon_level_growth.asm b/engine/pokemon/breedmon_level_growth.asm index 6f84033d725..38d44d3d66f 100644 --- a/engine/pokemon/breedmon_level_growth.asm +++ b/engine/pokemon/breedmon_level_growth.asm @@ -1,4 +1,4 @@ -SECTION "GetBreedMon1LevelGrowth - GetBreedMon2LevelGrowth", ROMX, BANK[BANK_MOVE_MON] +SECTION "engine/pokemon/breedmon_level_growth.asm", ROMX, BANK[BANK_MOVE_MON] GetBreedMon1LevelGrowth: ld hl, wBreedMon1Stats diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index 044417fe547..13201aea3da 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -1,4 +1,4 @@ -SECTION "CheckPartyFullAfterContest - SetEggMonCaughtData", ROMX +SECTION "engine/pokemon/caught_data.asm", ROMX CheckPartyFullAfterContest: ld a, [wContestMon] diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index 2e0300264b4..d21f8d7a04c 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -1,4 +1,4 @@ -SECTION "CorrectNickErrors", ROMX +SECTION "engine/pokemon/correct_nick_errors.asm", ROMX CorrectNickErrors:: ; error-check monster nick before use diff --git a/engine/pokemon/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm index 2ccbbc89022..38044f4b72f 100644 --- a/engine/pokemon/correct_party_errors.asm +++ b/engine/pokemon/correct_party_errors.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_CorrectPartyErrors", ROMX +SECTION "engine/pokemon/correct_party_errors.asm", ROMX Unreferenced_CorrectPartyErrors: ld hl, wPartyCount diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm index f56afccffc1..98088b0c592 100644 --- a/engine/pokemon/european_mail.asm +++ b/engine/pokemon/european_mail.asm @@ -1,4 +1,4 @@ -SECTION "IsMailEuropean", ROMX +SECTION "engine/pokemon/european_mail.asm@IsMailEuropean", ROMX IsMailEuropean: ; return 1 if French @@ -29,7 +29,7 @@ IsMailEuropean: ret -SECTION "StandardEnglishFont - SpanishItalianFont", ROMX +SECTION "engine/pokemon/european_mail.asm@Fonts", ROMX ; The regular font. StandardEnglishFont: @@ -44,7 +44,7 @@ SpanishItalianFont: INCBIN "gfx/font/spanish_italian.1bpp" -SECTION "HandleFrenchGermanMail", ROMX +SECTION "engine/pokemon/european_mail.asm@FrenchGerman", ROMX HandleFrenchGermanMail: ; called if mail is french or german @@ -76,7 +76,7 @@ HandleFrenchGermanMail: ret -SECTION "DeutenEnglischenPost", ROMX +SECTION "engine/pokemon/european_mail.asm@English", ROMX LireLeCourrierAnglais: DeutenEnglischenPost: @@ -111,7 +111,7 @@ DeutenEnglischenPost: ret -SECTION "HandleSpanishItalianMail", ROMX +SECTION "engine/pokemon/european_mail.asm@SpanishItalian", ROMX HandleSpanishItalianMail: LeerCorreosIngleses: diff --git a/engine/pokemon/experience.asm b/engine/pokemon/experience.asm index 33f08d1ab77..5a33e5e95e3 100644 --- a/engine/pokemon/experience.asm +++ b/engine/pokemon/experience.asm @@ -1,4 +1,4 @@ -SECTION "CalcLevel - GrowthRates", ROMX +SECTION "engine/pokemon/experience.asm", ROMX CalcLevel: ld a, [wTempMonSpecies] diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm index dbb49b360a2..38d72fe65f2 100644 --- a/engine/pokemon/health.asm +++ b/engine/pokemon/health.asm @@ -1,4 +1,4 @@ -SECTION "HealParty - HealPartyMon", ROMX +SECTION "engine/pokemon/health.asm", ROMX HealParty: xor a @@ -55,7 +55,7 @@ HealPartyMon: ret -SECTION "ComputeHPBarPixels - AnimateHPBar", ROMX, BANK[BANK_ANIMATE_HP_BAR] +SECTION "engine/pokemon/health.asm@AnimateHPBar", ROMX, BANK[BANK_ANIMATE_HP_BAR] ComputeHPBarPixels: ; e = bc * (6 * 8) / de diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index e9390cbe2f9..4aae0814b33 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -1,4 +1,4 @@ -SECTION "KnowsMove", ROMX +SECTION "engine/pokemon/knows_move.asm", ROMX KnowsMove: ld a, MON_MOVES diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm index 61338f142e9..cf3ecab813a 100644 --- a/engine/pokemon/learn.asm +++ b/engine/pokemon/learn.asm @@ -1,4 +1,4 @@ -SECTION "LearnMove - Text_CantForgetHM", ROMX +SECTION "engine/pokemon/learn.asm", ROMX LearnMove: call LoadTileMapToTempTileMap diff --git a/engine/pokemon/level_up_happiness.asm b/engine/pokemon/level_up_happiness.asm index 9bc012ee50e..5c36cfa01a6 100644 --- a/engine/pokemon/level_up_happiness.asm +++ b/engine/pokemon/level_up_happiness.asm @@ -1,4 +1,4 @@ -SECTION "LevelUpHappinessMod", ROMX +SECTION "engine/pokemon/level_up_happiness.asm", ROMX LevelUpHappinessMod: ld a, [wCurPartyMon] diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index 6204d3605de..ba8d9cffc61 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -1,4 +1,4 @@ -SECTION "SendMailToPC - MailboxPC", ROMX +SECTION "engine/pokemon/mail.asm", ROMX SendMailToPC: ld a, MON_ITEM diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index 3bae1a5e547..f502edb57aa 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -1,4 +1,4 @@ -SECTION "ReadPartyMonMail - PortraitMailBorderGFX", ROMX +SECTION "engine/pokemon/mail_2.asm@ReadAnyMail", ROMX ReadPartyMonMail: ld a, [wCurPartyMon] @@ -914,7 +914,7 @@ LoadMailGFX_Color3: INCLUDE "gfx/mail.asm" -SECTION "ItemIsMail - MailItems", ROMX +SECTION "engine/pokemon/mail_2.asm@ItemIsMail", ROMX ItemIsMail: ld a, d diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 9a5d0e81075..f0d777e27e5 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -1,4 +1,4 @@ -SECTION "DrawPlayerHP - DrawHP", ROMX +SECTION "engine/pokemon/mon_stats.asm@DrawHP", ROMX DrawPlayerHP: ld a, $1 @@ -85,7 +85,7 @@ DrawHP: ret -SECTION "PrintTempMonStats", ROMX +SECTION "engine/pokemon/mon_stats.asm@PrintTempMonStats", ROMX PrintTempMonStats: ; Print wTempMon's stats at hl, with spacing bc. @@ -127,7 +127,7 @@ PrintTempMonStats: next "@" -SECTION "GetGender", ROMX, BANK[BANK_PARTY_MENU] +SECTION "engine/pokemon/mon_stats.asm@GetGender", ROMX, BANK[BANK_PARTY_MENU] GetGender: ; Return the gender of a given monster (wCurPartyMon/wCurOTMon/wCurWildMon). @@ -243,7 +243,7 @@ GetGender: ret -SECTION "ListMovePP", ROMX +SECTION "engine/pokemon/mon_stats.asm@ListMovePP", ROMX ListMovePP: ld a, [wNumMoves] @@ -335,7 +335,7 @@ ListMovePP: ret -SECTION "Unreferenced_Function50cd0", ROMX +SECTION "engine/pokemon/mon_stats.asm@Unreferenced_Function50cd0", ROMX Unreferenced_Function50cd0: .loop @@ -351,7 +351,7 @@ Unreferenced_Function50cd0: ; FLOAT: Must be in the same bank as CopyMonToTempMon and DrawEnemyHP. ; Since this function is unused, this disassembly doesn't make sure that is the case. -SECTION "Unused_PlaceEnemyHPLevel", ROMX +SECTION "engine/pokemon/mon_stats.asm@Unused_PlaceEnemyHPLevel", ROMX Unused_PlaceEnemyHPLevel: push hl @@ -382,7 +382,7 @@ Unused_PlaceEnemyHPLevel: ret -SECTION "PlaceStatusString - ParString", ROMX, BANK[BANK_PARTY_MENU] +SECTION "engine/pokemon/mon_stats.asm@PlaceStatusString", ROMX, BANK[BANK_PARTY_MENU] PlaceStatusString: push de @@ -452,7 +452,7 @@ FrzString: db "FRZ@" ParString: db "PAR@" -SECTION "ListMoves", ROMX +SECTION "engine/pokemon/mon_stats.asm@ListMoves", ROMX ListMoves: ; List moves at hl, spaced every [wBuffer1] tiles. diff --git a/engine/pokemon/mon_submenu.asm b/engine/pokemon/mon_submenu.asm index 4b381fface5..e8411e3758e 100644 --- a/engine/pokemon/mon_submenu.asm +++ b/engine/pokemon/mon_submenu.asm @@ -1,4 +1,4 @@ -SECTION "MonMenuOptionStrings - AddMonMenuItem", ROMX +SECTION "engine/pokemon/mon_submenu.asm", ROMX INCLUDE "data/mon_menu.asm" @@ -247,7 +247,7 @@ AddMonMenuItem: ret -SECTION "BattleMonMenu - MenuData_0x24edc", ROMX +SECTION "engine/pokemon/mon_submenu.asm@BattleMonMenu", ROMX BattleMonMenu: ld hl, MenuHeader_0x24ed4 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index da45a3e3fac..0172d9c6e9e 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1,7 +1,7 @@ RANDY_OT_ID EQU 01001 -SECTION "TryAddMonToParty - InitNickname", ROMX, BANK[BANK_MOVE_MON] +SECTION "engine/pokemon/move_mon.asm", ROMX, BANK[BANK_MOVE_MON] TryAddMonToParty: ; Check if to copy wild mon or generate a new one diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm index 2515f6003b1..e7c2385fc0f 100644 --- a/engine/pokemon/move_mon_wo_mail.asm +++ b/engine/pokemon/move_mon_wo_mail.asm @@ -1,4 +1,4 @@ -SECTION "InsertPokemonIntoBox - InsertDataIntoBoxOrParty", ROMX +SECTION "engine/pokemon/move_mon_wo_mail.asm", ROMX InsertPokemonIntoBox: ld a, BANK(sBoxCount) diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 23501f5c2b3..bff8f0b8f20 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -1,4 +1,4 @@ -SECTION "SelectMonFromParty - YouHaveNoPKMNString", ROMX, BANK[BANK_PARTY_MENU] +SECTION "engine/pokemon/party_menu.asm", ROMX, BANK[BANK_PARTY_MENU] SelectMonFromParty: call DisableSpriteUpdates @@ -783,7 +783,7 @@ YouHaveNoPKMNString: db "You have no !@" -SECTION "PrintPartyMenuActionText", ROMX +SECTION "engine/pokemon/party_menu.asm@PrintPartyMenuActionText", ROMX PrintPartyMenuActionText: ld a, [wCurPartyMon] diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index 861cde1d44c..b252c3b2c5b 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -1,4 +1,4 @@ -SECTION "BeastsCheck - UpdateOTPointer", ROMX +SECTION "engine/pokemon/search.asm", ROMX BeastsCheck: ; Check if the player owns all three legendary beasts. diff --git a/engine/pokemon/search2.asm b/engine/pokemon/search2.asm index 915652be0ed..1d45677c87c 100644 --- a/engine/pokemon/search2.asm +++ b/engine/pokemon/search2.asm @@ -1,4 +1,4 @@ -SECTION "_FindPartyMonAboveLevel - RetroactivelyIgnoreEggs", ROMX +SECTION "engine/pokemon/search2.asm", ROMX _FindPartyMonAboveLevel: ld hl, wPartyMon1Level diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 5772d263aae..3f37d40eb7e 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -5,7 +5,7 @@ NUM_STAT_PAGES EQU const_value + -1 -SECTION "BattleStatsScreenInit - CheckFaintedFrzSlp", ROMX +SECTION "engine/pokemon/stats_screen.asm", ROMX BattleStatsScreenInit: ld a, [wLinkMode] diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index 13db3804183..6383f57ddaa 100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm @@ -1,4 +1,4 @@ -SECTION "_SwitchPartyMons", ROMX +SECTION "engine/pokemon/switchpartymons.asm", ROMX _SwitchPartyMons: ld a, [wSwitchMon] diff --git a/engine/pokemon/tempmon.asm b/engine/pokemon/tempmon.asm index 6d416ad7493..03274da13f6 100644 --- a/engine/pokemon/tempmon.asm +++ b/engine/pokemon/tempmon.asm @@ -1,4 +1,4 @@ -SECTION "CopyMonToTempMon - GetMonSpecies", ROMX +SECTION "engine/pokemon/tempmon.asm", ROMX CopyMonToTempMon: ; gets the BaseData of a mon diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index 371b19842db..8753df0c99a 100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm @@ -1,4 +1,4 @@ -SECTION "PrintMonTypes - Dark", ROMX +SECTION "engine/pokemon/types.asm", ROMX PrintMonTypes: ; Print one or both types of [wCurSpecies] diff --git a/engine/predef.asm b/engine/predef.asm index b9d65985117..0d31f5d77d7 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,4 +1,4 @@ -SECTION "GetPredefPointer - PredefPointers", ROMX +SECTION "engine/predef.asm", ROMX GetPredefPointer:: ; Return the bank and address of wPredefID in a and wPredefAddress. diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 0041b76d8c0..d46da4d4fe0 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -1,7 +1,7 @@ PRINTPARTY_HP EQU "◀" ; $71 -SECTION "PrintPage1", ROMX +SECTION "engine/printer/print_party.asm@PrintPage1", ROMX PrintPage1: hlcoord 0, 0 @@ -55,7 +55,7 @@ PrintPage1: ret -SECTION "PrintPage2", ROMX +SECTION "engine/printer/print_party.asm@PrintPage2", ROMX PrintPage2: hlcoord 0, 0, wPrinterTileMapBuffer @@ -107,7 +107,7 @@ PrintPage2: ret -SECTION "GBPrinterString_Null - GBPrinterString_PrinterError4", ROMX +SECTION "engine/printer/print_party.asm@GBPrinterStrings", ROMX GBPrinterStrings: ; used only for BANK(GBPrinterStrings) GBPrinterString_Null: db "@" @@ -140,7 +140,7 @@ GBPrinterString_PrinterError4: db "@" -SECTION "PrintPartyMonPage1 - GBPrinterLvIcon", ROMX +SECTION "engine/printer/print_party.asm@PrintPartyMon", ROMX PrintPartyMonPage1: call ClearBGPalettes diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index ea036e85e81..25f5f65ed37 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -1,4 +1,4 @@ -SECTION "Printer_StartTransmission - String84a25", ROMX +SECTION "engine/printer/printer.asm", ROMX INCLUDE "engine/printer/printer_serial.asm" diff --git a/engine/rtc/print_hours_mins.asm b/engine/rtc/print_hours_mins.asm index 9d10031b332..8299dbfcdfc 100644 --- a/engine/rtc/print_hours_mins.asm +++ b/engine/rtc/print_hours_mins.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_Function1dd6a9", ROMX +SECTION "engine/rtc/print_hours_mins.asm@Unreferenced_Function1dd6a9", ROMX Unreferenced_Function1dd6a9: ld a, b @@ -16,7 +16,7 @@ Unreferenced_Function1dd6a9: ret -SECTION "PrintHoursMins - String_PM", ROMX +SECTION "engine/rtc/print_hours_mins.asm", ROMX PrintHoursMins: ; Hours in b, minutes in c diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 2bf44b34e75..54934072015 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -1,4 +1,4 @@ -SECTION "_ResetClock - ClockResetPassword", ROMX +SECTION "engine/rtc/reset_password.asm", ROMX _ResetClock: farcall BlankScreen diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index e6ef22cda55..cf003fac1ff 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -1,4 +1,4 @@ -SECTION "RestartClock_GetWraparoundTime - RestartClock", ROMX +SECTION "engine/rtc/restart_clock.asm", ROMX RestartClock_GetWraparoundTime: push hl @@ -233,16 +233,10 @@ RestartClock: ld [hl], e ret - -SECTION "UnreferencedString_HourJP", ROMX - UnreferencedString_HourJP: ; unused db "じ@" ; HR - -SECTION "UnreferencedString_MinuteJP", ROMX - UnreferencedString_MinuteJP: ; unused db "ふん@" ; MIN diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index 3d2d257e13a..f384eaba5e2 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_StopRTC", ROMX +SECTION "engine/rtc/rtc.asm@Unreferenced_StopRTC", ROMX Unreferenced_StopRTC: ld a, SRAM_ENABLE @@ -13,7 +13,7 @@ Unreferenced_StopRTC: ret -SECTION "StartRTC - Function1409b", ROMX +SECTION "engine/rtc/rtc.asm@StartRTC - Function1409b", ROMX StartRTC: ld a, SRAM_ENABLE @@ -122,7 +122,7 @@ Function1409b: ret -SECTION "Function140ae", ROMX +SECTION "engine/rtc/rtc.asm@Function140ae", ROMX Function140ae: call CheckRTCStatus @@ -161,7 +161,7 @@ Function140ae: ret -SECTION "_InitTime", ROMX +SECTION "engine/rtc/rtc.asm@_InitTime", ROMX _InitTime:: call GetClock diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 85463d02566..fcfd042872e 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -2,7 +2,7 @@ TIMESET_UP_ARROW EQU "♂" ; $ef TIMESET_DOWN_ARROW EQU "♀" ; $f5 -SECTION "InitClock - AdjustHourForAMorPM", ROMX +SECTION "engine/rtc/timeset.asm", ROMX InitClock: ; Ask the player to set the time. diff --git a/engine/smallflag.asm b/engine/smallflag.asm index 71400e3c081..5b5153e6be4 100644 --- a/engine/smallflag.asm +++ b/engine/smallflag.asm @@ -1,4 +1,4 @@ -SECTION "SmallFarFlagAction", ROMX +SECTION "engine/smallflag.asm", ROMX SmallFarFlagAction: ; Perform action b on bit c in flag array hl. diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm index 87e9fa588ea..2d1322a34ee 100644 --- a/engine/tilesets/map_palettes.asm +++ b/engine/tilesets/map_palettes.asm @@ -1,4 +1,4 @@ -SECTION "SwapTextboxPalettes - TilesetBattleTowerOutsidePalMap", ROMX +SECTION "engine/tilesets/map_palettes.asm", ROMX SwapTextboxPalettes:: hlcoord 0, 0 diff --git a/engine/tilesets/mapgroup_roofs.asm b/engine/tilesets/mapgroup_roofs.asm index 560eedadc60..dc46b718433 100644 --- a/engine/tilesets/mapgroup_roofs.asm +++ b/engine/tilesets/mapgroup_roofs.asm @@ -1,4 +1,4 @@ -SECTION "LoadMapGroupRoof - Roofs", ROMX +SECTION "engine/tilesets/mapgroup_roofs.asm", ROMX LoadMapGroupRoof:: ld a, [wMapGroup] diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 89b23ebf1ba..f52d0efcefc 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -1,4 +1,4 @@ -SECTION "_AnimateTileset - WhirlpoolTiles4", ROMX +SECTION "engine/tilesets/tileset_anims.asm", ROMX _AnimateTileset:: ; Iterate over a given pointer array of diff --git a/engine/tilesets/timeofday_pals.asm b/engine/tilesets/timeofday_pals.asm index 8bff9eb8879..134fe8dbeed 100644 --- a/engine/tilesets/timeofday_pals.asm +++ b/engine/tilesets/timeofday_pals.asm @@ -1,11 +1,11 @@ -SECTION "DummyPredef35 - DummyPredef36", ROMX +SECTION "engine/tilesets/timeofday_pals.asm@DummyPredef", ROMX DummyPredef35: DummyPredef36: ret -SECTION "UpdateTimeOfDayPal - GetTimePalFade", ROMX +SECTION "engine/tilesets/timeofday_pals.asm", ROMX UpdateTimeOfDayPal:: call UpdateTime diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm index 55e14ef2a32..bccf1b54aff 100644 --- a/gfx/battle_anims.asm +++ b/gfx/battle_anims.asm @@ -1,4 +1,4 @@ -SECTION "AnimObj00GFX - AnimObjAeroblastGFX", ROMX +SECTION "gfx/battle_anims.asm", ROMX AnimObj00GFX: AnimObjHitGFX: INCBIN "gfx/battle_anims/hit.2bpp.lz" diff --git a/gfx/emotes.asm b/gfx/emotes.asm index 8ef748d6799..c043b1bfea5 100644 --- a/gfx/emotes.asm +++ b/gfx/emotes.asm @@ -1,4 +1,4 @@ -SECTION "ShockEmote - GrassRustleGFX", ROMX +SECTION "gfx/emotes.asm", ROMX ShockEmote: INCBIN "gfx/emotes/shock.2bpp" QuestionEmote: INCBIN "gfx/emotes/question.2bpp" diff --git a/gfx/font.asm b/gfx/font.asm index 10f54f62b8d..47ba9d7436d 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -1,4 +1,4 @@ -SECTION "FontExtra - Footprints", ROMX +SECTION "gfx/font.asm", ROMX FontExtra: INCBIN "gfx/font/font_extra.2bpp" diff --git a/gfx/pics.asm b/gfx/pics.asm index d7e37cd21d0..d78fe488525 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -9,7 +9,7 @@ INCLUDE "data/trainers/pic_pointers.asm" ; FLOAT: All pics sections must be in consecutive banks for dba_pic to work -SECTION "Pics 1", ROMX, BANK[BANK_PICS + 0] +SECTION "gfx/pics.asm@Pics 1", ROMX, BANK[BANK_PICS + 0] HoOhFrontpic: INCBIN "gfx/pokemon/ho_oh/front.animated.2bpp.lz" MachampFrontpic: INCBIN "gfx/pokemon/machamp/front.animated.2bpp.lz" @@ -26,7 +26,7 @@ SuicuneFrontpic: INCBIN "gfx/pokemon/suicune/front.animated.2bpp.lz" TyphlosionFrontpic: INCBIN "gfx/pokemon/typhlosion/front.animated.2bpp.lz" -SECTION "Pics 2", ROMX, BANK[BANK_PICS + 1] +SECTION "gfx/pics.asm@Pics 2", ROMX, BANK[BANK_PICS + 1] BlastoiseFrontpic: INCBIN "gfx/pokemon/blastoise/front.animated.2bpp.lz" RapidashFrontpic: INCBIN "gfx/pokemon/rapidash/front.animated.2bpp.lz" @@ -46,7 +46,7 @@ CharizardFrontpic: INCBIN "gfx/pokemon/charizard/front.animated.2bpp.lz" QuilavaFrontpic: INCBIN "gfx/pokemon/quilava/front.animated.2bpp.lz" -SECTION "Pics 3", ROMX, BANK[BANK_PICS + 2] +SECTION "gfx/pics.asm@Pics 3", ROMX, BANK[BANK_PICS + 2] SteelixFrontpic: INCBIN "gfx/pokemon/steelix/front.animated.2bpp.lz" AlakazamFrontpic: INCBIN "gfx/pokemon/alakazam/front.animated.2bpp.lz" @@ -68,7 +68,7 @@ PrimeapeFrontpic: INCBIN "gfx/pokemon/primeape/front.animated.2bpp.lz" OmastarBackpic: INCBIN "gfx/pokemon/omastar/back.2bpp.lz" -SECTION "Pics 4", ROMX, BANK[BANK_PICS + 3] +SECTION "gfx/pics.asm@Pics 4", ROMX, BANK[BANK_PICS + 3] DodrioFrontpic: INCBIN "gfx/pokemon/dodrio/front.animated.2bpp.lz" SlowkingFrontpic: INCBIN "gfx/pokemon/slowking/front.animated.2bpp.lz" @@ -92,7 +92,7 @@ PinsirFrontpic: INCBIN "gfx/pokemon/pinsir/front.animated.2bpp.lz" UnownEFrontpic: INCBIN "gfx/pokemon/unown_e/front.animated.2bpp.lz" -SECTION "Pics 5", ROMX, BANK[BANK_PICS + 4] +SECTION "gfx/pics.asm@Pics 5", ROMX, BANK[BANK_PICS + 4] GolbatFrontpic: INCBIN "gfx/pokemon/golbat/front.animated.2bpp.lz" KinglerFrontpic: INCBIN "gfx/pokemon/kingler/front.animated.2bpp.lz" @@ -117,7 +117,7 @@ MrMimeFrontpic: INCBIN "gfx/pokemon/mr__mime/front.animated.2bpp.lz" HeracrossFrontpic: INCBIN "gfx/pokemon/heracross/front.animated.2bpp.lz" -SECTION "Pics 6", ROMX, BANK[BANK_PICS + 5] +SECTION "gfx/pics.asm@Pics 6", ROMX, BANK[BANK_PICS + 5] AriadosFrontpic: INCBIN "gfx/pokemon/ariados/front.animated.2bpp.lz" NoctowlFrontpic: INCBIN "gfx/pokemon/noctowl/front.animated.2bpp.lz" @@ -144,7 +144,7 @@ GligarFrontpic: INCBIN "gfx/pokemon/gligar/front.animated.2bpp.lz" DunsparceFrontpic: INCBIN "gfx/pokemon/dunsparce/front.animated.2bpp.lz" -SECTION "Pics 7", ROMX, BANK[BANK_PICS + 6] +SECTION "gfx/pics.asm@Pics 7", ROMX, BANK[BANK_PICS + 6] VaporeonFrontpic: INCBIN "gfx/pokemon/vaporeon/front.animated.2bpp.lz" GirafarigFrontpic: INCBIN "gfx/pokemon/girafarig/front.animated.2bpp.lz" @@ -173,7 +173,7 @@ TogeticFrontpic: INCBIN "gfx/pokemon/togetic/front.animated.2bpp.lz" KangaskhanBackpic: INCBIN "gfx/pokemon/kangaskhan/back.2bpp.lz" -SECTION "Pics 8", ROMX, BANK[BANK_PICS + 7] +SECTION "gfx/pics.asm@Pics 8", ROMX, BANK[BANK_PICS + 7] SeelFrontpic: INCBIN "gfx/pokemon/seel/front.animated.2bpp.lz" CrobatFrontpic: INCBIN "gfx/pokemon/crobat/front.animated.2bpp.lz" @@ -204,7 +204,7 @@ HitmonchanFrontpic: INCBIN "gfx/pokemon/hitmonchan/front.animated.2bpp.lz" QuagsireFrontpic: INCBIN "gfx/pokemon/quagsire/front.animated.2bpp.lz" -SECTION "Pics 9", ROMX, BANK[BANK_PICS + 8] +SECTION "gfx/pics.asm@Pics 9", ROMX, BANK[BANK_PICS + 8] EkansFrontpic: INCBIN "gfx/pokemon/ekans/front.animated.2bpp.lz" SudowoodoFrontpic: INCBIN "gfx/pokemon/sudowoodo/front.animated.2bpp.lz" @@ -239,7 +239,7 @@ PidgeyFrontpic: INCBIN "gfx/pokemon/pidgey/front.animated.2bpp.lz" ParasectBackpic: INCBIN "gfx/pokemon/parasect/back.2bpp.lz" -SECTION "Pics 10", ROMX, BANK[BANK_PICS + 9] +SECTION "gfx/pics.asm@Pics 10", ROMX, BANK[BANK_PICS + 9] MisdreavusFrontpic: INCBIN "gfx/pokemon/misdreavus/front.animated.2bpp.lz" HoundourFrontpic: INCBIN "gfx/pokemon/houndour/front.animated.2bpp.lz" @@ -278,7 +278,7 @@ HoothootFrontpic: INCBIN "gfx/pokemon/hoothoot/front.animated.2bpp.lz" UnownFBackpic: INCBIN "gfx/pokemon/unown_f/back.2bpp.lz" -SECTION "Pics 11", ROMX, BANK[BANK_PICS + 10] +SECTION "gfx/pics.asm@Pics 11", ROMX, BANK[BANK_PICS + 10] DodrioBackpic: INCBIN "gfx/pokemon/dodrio/back.2bpp.lz" ClefairyFrontpic: INCBIN "gfx/pokemon/clefairy/front.animated.2bpp.lz" @@ -320,7 +320,7 @@ BugCatcherPic: INCBIN "gfx/trainers/bug_catcher.2bpp.lz" SnorlaxBackpic: INCBIN "gfx/pokemon/snorlax/back.2bpp.lz" -SECTION "Pics 12", ROMX, BANK[BANK_PICS + 11] +SECTION "gfx/pics.asm@Pics 12", ROMX, BANK[BANK_PICS + 11] VenusaurBackpic: INCBIN "gfx/pokemon/venusaur/back.2bpp.lz" MoltresBackpic: INCBIN "gfx/pokemon/moltres/back.2bpp.lz" @@ -365,7 +365,7 @@ BulbasaurFrontpic: INCBIN "gfx/pokemon/bulbasaur/front.animated.2bpp.lz" StarmieBackpic: INCBIN "gfx/pokemon/starmie/back.2bpp.lz" -SECTION "Pics 13", ROMX, BANK[BANK_PICS + 12] +SECTION "gfx/pics.asm@Pics 13", ROMX, BANK[BANK_PICS + 12] OmanyteBackpic: INCBIN "gfx/pokemon/omanyte/back.2bpp.lz" PidgeyBackpic: INCBIN "gfx/pokemon/pidgey/back.2bpp.lz" @@ -412,7 +412,7 @@ CooltrainerfPic: INCBIN "gfx/trainers/cooltrainer_f.2bpp.lz" ElectrodeFrontpic: INCBIN "gfx/pokemon/electrode/front.animated.2bpp.lz" -SECTION "Pics 14", ROMX, BANK[BANK_PICS + 13] +SECTION "gfx/pics.asm@Pics 14", ROMX, BANK[BANK_PICS + 13] SudowoodoBackpic: INCBIN "gfx/pokemon/sudowoodo/back.2bpp.lz" FlaaffyBackpic: INCBIN "gfx/pokemon/flaaffy/back.2bpp.lz" @@ -462,7 +462,7 @@ Rival1Pic: INCBIN "gfx/trainers/rival1.2bpp.lz" SwinubBackpic: INCBIN "gfx/pokemon/swinub/back.2bpp.lz" -SECTION "Pics 15", ROMX, BANK[BANK_PICS + 14] +SECTION "gfx/pics.asm@Pics 15", ROMX, BANK[BANK_PICS + 14] MewtwoBackpic: INCBIN "gfx/pokemon/mewtwo/back.2bpp.lz" PokemonProfPic: INCBIN "gfx/trainers/oak.2bpp.lz" @@ -515,7 +515,7 @@ JaninePic: INCBIN "gfx/trainers/janine.2bpp.lz" MagnemiteBackpic: INCBIN "gfx/pokemon/magnemite/back.2bpp.lz" -SECTION "Pics 16", ROMX, BANK[BANK_PICS + 15] +SECTION "gfx/pics.asm@Pics 16", ROMX, BANK[BANK_PICS + 15] HoothootBackpic: INCBIN "gfx/pokemon/hoothoot/back.2bpp.lz" NoctowlBackpic: INCBIN "gfx/pokemon/noctowl/back.2bpp.lz" @@ -572,7 +572,7 @@ PorygonBackpic: INCBIN "gfx/pokemon/porygon/back.2bpp.lz" UnownHBackpic: INCBIN "gfx/pokemon/unown_h/back.2bpp.lz" -SECTION "Pics 17", ROMX, BANK[BANK_PICS + 16] +SECTION "gfx/pics.asm@Pics 17", ROMX, BANK[BANK_PICS + 16] ParasBackpic: INCBIN "gfx/pokemon/paras/back.2bpp.lz" VaporeonBackpic: INCBIN "gfx/pokemon/vaporeon/back.2bpp.lz" @@ -637,7 +637,7 @@ OddishBackpic: INCBIN "gfx/pokemon/oddish/back.2bpp.lz" UnownDBackpic: INCBIN "gfx/pokemon/unown_d/back.2bpp.lz" -SECTION "Pics 18", ROMX, BANK[BANK_PICS + 17] +SECTION "gfx/pics.asm@Pics 18", ROMX, BANK[BANK_PICS + 17] SpinarakBackpic: INCBIN "gfx/pokemon/spinarak/back.2bpp.lz" RaikouBackpic: INCBIN "gfx/pokemon/raikou/back.2bpp.lz" @@ -701,7 +701,7 @@ UnownIBackpic: INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" UnownRBackpic: INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" -SECTION "Pics 19", ROMX, BANK[BANK_PICS + 18] +SECTION "gfx/pics.asm@Pics 19", ROMX, BANK[BANK_PICS + 18] ; Seems to be an accidental copy of the previous bank @@ -767,15 +767,15 @@ INCBIN "gfx/pokemon/unown_i/back.2bpp.lz" INCBIN "gfx/pokemon/unown_r/back.2bpp.lz" -; Sections "Pics 20" to "Pics 24" are not used for any graphics, +; Sections "gfx/pics.asm@Pics 20" to "gfx/pics.asm@Pics 24" are not used for any graphics, ; but entries for their banks exist in FixPicBank (see engine/gfx/load_pics.asm). -SECTION "Pics 20", ROMX, BANK[BANK_PICS + 19] +SECTION "gfx/pics.asm@Pics 20", ROMX, BANK[BANK_PICS + 19] -SECTION "Pics 21", ROMX, BANK[BANK_PICS + 20] +SECTION "gfx/pics.asm@Pics 21", ROMX, BANK[BANK_PICS + 20] -SECTION "Pics 22", ROMX, BANK[BANK_PICS + 21] +SECTION "gfx/pics.asm@Pics 22", ROMX, BANK[BANK_PICS + 21] -SECTION "Pics 23", ROMX, BANK[BANK_PICS + 22] +SECTION "gfx/pics.asm@Pics 23", ROMX, BANK[BANK_PICS + 22] -SECTION "Pics 24", ROMX, BANK[BANK_PICS + 23] +SECTION "gfx/pics.asm@Pics 24", ROMX, BANK[BANK_PICS + 23] diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 1f7a9a1c4ef..05f076a5e79 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -1,4 +1,4 @@ -SECTION "AnimationPointers - EggAnimationIdle", ROMX +SECTION "gfx/pokemon/anims.asm", ROMX INCLUDE "gfx/pokemon/anim_pointers.asm" diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 2779d00adad..10efec6f903 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -1,4 +1,4 @@ -SECTION "BitmasksPointers - EggBitmasks", ROMX +SECTION "gfx/pokemon/bitmasks.asm", ROMX INCLUDE "gfx/pokemon/bitmask_pointers.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 605c5ea0b13..44fb5d19559 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -1,4 +1,4 @@ -SECTION "FramesPointers", ROMX +SECTION "gfx/pokemon/frame_pointers.asm", ROMX FramesPointers: dw BulbasaurFrames diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index 585c9c4b3fe..abef0e7409f 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -1,4 +1,4 @@ -SECTION "ChikoritaFrames - EggFrames", ROMX +SECTION "gfx/pokemon/johto_frames.asm", ROMX JohtoFrames: ; used only for BANK(JohtoFrames) diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 7b35797b80e..ee9239f3125 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -1,4 +1,4 @@ -SECTION "BulbasaurFrames - MewFrames", ROMX +SECTION "gfx/pokemon/kanto_frames.asm", ROMX KantoFrames: ; used only for BANK(KantoFrames) diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm index 5d6c8a16458..b40d9f5f097 100644 --- a/gfx/pokemon/unown_anims.asm +++ b/gfx/pokemon/unown_anims.asm @@ -1,4 +1,4 @@ -SECTION "UnownAnimationPointers - UnownZAnimationIdle", ROMX +SECTION "gfx/pokemon/unown_anims.asm", ROMX INCLUDE "gfx/pokemon/unown_anim_pointers.asm" diff --git a/gfx/pokemon/unown_bitmasks.asm b/gfx/pokemon/unown_bitmasks.asm index fa8654b0837..02b0685f0ac 100644 --- a/gfx/pokemon/unown_bitmasks.asm +++ b/gfx/pokemon/unown_bitmasks.asm @@ -1,4 +1,4 @@ -SECTION "UnownBitmasksPointers - UnownZBitmasks", ROMX +SECTION "gfx/pokemon/unown_bitmasks.asm", ROMX INCLUDE "gfx/pokemon/unown_bitmask_pointers.asm" diff --git a/gfx/pokemon/unown_frames.asm b/gfx/pokemon/unown_frames.asm index f102ae9f169..312120e0169 100644 --- a/gfx/pokemon/unown_frames.asm +++ b/gfx/pokemon/unown_frames.asm @@ -1,4 +1,4 @@ -SECTION "UnownFramesPointers - UnownZFrames", ROMX +SECTION "gfx/pokemon/unown_frames.asm", ROMX INCLUDE "gfx/pokemon/unown_frame_pointers.asm" diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index c4071349ca4..cbd75c5df5d 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -4,7 +4,7 @@ tilecoll: MACRO ENDM -SECTION "Tileset Data 1", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 1", ROMX TilesetKantoGFX: INCBIN "gfx/tilesets/kanto.2bpp.lz" @@ -46,7 +46,7 @@ TilesetPlayersRoomColl: INCLUDE "data/tilesets/players_room_collision.asm" -SECTION "Tileset Data 2", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 2", ROMX TilesetPokecenterGFX: INCBIN "gfx/tilesets/pokecenter.2bpp.lz" @@ -96,7 +96,7 @@ TilesetDarkCaveColl: INCLUDE "data/tilesets/cave_collision.asm" -SECTION "Tileset Data 3", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 3", ROMX TilesetTowerGFX: INCBIN "gfx/tilesets/tower.2bpp.lz" @@ -147,7 +147,7 @@ TilesetForestMeta: INCBIN "data/tilesets/forest_metatiles.bin" -SECTION "Tileset Data 4", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 4", ROMX TilesetEliteFourRoomGFX: INCBIN "gfx/tilesets/elite_four_room.2bpp.lz" @@ -195,7 +195,7 @@ UnusedTilesetDarkCaveColl: INCLUDE "data/tilesets/unused_dark_cave_collision.asm" -SECTION "Tileset Data 5", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 5", ROMX TilesetPokeComCenterGFX: INCBIN "gfx/tilesets/pokecom_center.2bpp.lz" @@ -244,7 +244,7 @@ TilesetTraditionalHouseColl: INCLUDE "data/tilesets/traditional_house_collision.asm" -SECTION "Tileset Data 6", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 6", ROMX TilesetForestGFX: INCBIN "gfx/tilesets/forest.2bpp.lz" @@ -305,7 +305,7 @@ TilesetAerodactylWordRoomColl: INCLUDE "data/tilesets/beta_word_room_collision.asm" -SECTION "Tileset Data 7", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 7", ROMX TilesetRuinsOfAlphGFX: TilesetBetaWordRoomGFX: @@ -322,7 +322,7 @@ TilesetRuinsOfAlphColl: INCLUDE "data/tilesets/ruins_of_alph_collision.asm" -SECTION "Tileset Data 8", ROMX +SECTION "gfx/tilesets.asm@Tileset Data 8", ROMX TilesetHoOhWordRoomMeta: INCBIN "data/tilesets/ho_oh_word_room_metatiles.bin" diff --git a/home.asm b/home.asm index f5449cafcca..09c1b57adae 100644 --- a/home.asm +++ b/home.asm @@ -1,7 +1,7 @@ INCLUDE "constants.asm" -SECTION "NULL", ROM0[$0000] +SECTION "home.asm@NULL", ROM0[$0000] NULL:: @@ -10,7 +10,7 @@ INCLUDE "home/rst.asm" INCLUDE "home/interrupts.asm" -SECTION "Header", ROM0[$0100] +SECTION "home.asm@Header", ROM0[$0100] Start:: nop @@ -19,7 +19,7 @@ Start:: ds $0150 - $0104 -SECTION "Home", ROM0 +SECTION "home.asm@Home", ROM0 INCLUDE "home/init.asm" INCLUDE "home/vblank.asm" diff --git a/home/interrupts.asm b/home/interrupts.asm index 58bbe7e252a..cadda4b4783 100644 --- a/home/interrupts.asm +++ b/home/interrupts.asm @@ -1,16 +1,16 @@ ; Game Boy hardware interrupts -SECTION "vblank", ROM0[$0040] +SECTION "home/interrupts.asm@vblank", ROM0[$0040] jp VBlank -SECTION "lcd", ROM0[$0048] +SECTION "home/interrupts.asm@lcd", ROM0[$0048] jp LCD -SECTION "timer", ROM0[$0050] +SECTION "home/interrupts.asm@timer", ROM0[$0050] jp Timer -SECTION "serial", ROM0[$0058] +SECTION "home/interrupts.asm@serial", ROM0[$0058] jp Serial -SECTION "joypad", ROM0[$0060] +SECTION "home/interrupts.asm@joypad", ROM0[$0060] jp JoypadInt diff --git a/home/rst.asm b/home/rst.asm index 04c1b304997..1dca29a9ff9 100644 --- a/home/rst.asm +++ b/home/rst.asm @@ -1,24 +1,24 @@ ; rst vectors -SECTION "rst0", ROM0[$0000] +SECTION "home/rst.asm@rst0", ROM0[$0000] di jp Start -SECTION "rst8", ROM0[$0008] ; rst FarCall +SECTION "home/rst.asm@rst8", ROM0[$0008] ; rst FarCall jp FarCall_hl -SECTION "rst10", ROM0[$0010] ; rst Bankswitch +SECTION "home/rst.asm@rst10", ROM0[$0010] ; rst Bankswitch ldh [hROMBank], a ld [MBC3RomBank], a ret -SECTION "rst18", ROM0[$0018] +SECTION "home/rst.asm@rst18", ROM0[$0018] rst $38 -SECTION "rst20", ROM0[$0020] +SECTION "home/rst.asm@rst20", ROM0[$0020] rst $38 -SECTION "rst28", ROM0[$0028] ; rst JumpTable +SECTION "home/rst.asm@rst28", ROM0[$0028] ; rst JumpTable push de ld e, a ld d, 0 @@ -33,5 +33,5 @@ SECTION "rst28", ROM0[$0028] ; rst JumpTable ; SECTION "rst30", ROM0 ; rst30 is midst rst28 -SECTION "rst38", ROM0[$0038] +SECTION "home/rst.asm@rst38", ROM0[$0038] rst $38 diff --git a/main.asm b/main.asm index 69f5947dc00..c3b0a048f3a 100644 --- a/main.asm +++ b/main.asm @@ -97,11 +97,11 @@ INCLUDE "engine/link/link.asm" INCLUDE "engine/overworld/wildmons.asm" INCLUDE "engine/battle/link_result.asm" -SECTION "ChrisBackpic", ROMX +SECTION "main.asm@ChrisBackpic", ROMX ChrisBackpic: INCBIN "gfx/player/chris_back.2bpp.lz" -SECTION "DudeBackpic", ROMX +SECTION "main.asm@DudeBackpic", ROMX DudeBackpic: INCBIN "gfx/battle/dude.2bpp.lz" @@ -143,11 +143,11 @@ INCLUDE "data/maps/scenes.asm" INCLUDE "engine/overworld/load_map_part.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm" -SECTION "Shrink1Pic", ROMX +SECTION "main.asm@Shrink1Pic", ROMX Shrink1Pic: INCBIN "gfx/new_game/shrink1.2bpp.lz" -SECTION "Shrink2Pic", ROMX +SECTION "main.asm@Shrink2Pic", ROMX Shrink2Pic: INCBIN "gfx/new_game/shrink2.2bpp.lz" @@ -192,7 +192,7 @@ INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/names.asm" INCLUDE "data/pokemon/unused_pic_banks.asm" -SECTION "UnknownEggPic", ROMX +SECTION "main.asm@UnknownEggPic", ROMX UnknownEggPic:: ; Another egg pic. This is shifted up a few pixels. INCBIN "gfx/unknown/unknown_egg.2bpp.lz" @@ -305,7 +305,7 @@ INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/animations.asm" INCLUDE "engine/events/poisonstep_pals.asm" -SECTION "TheEndGFX", ROMX +SECTION "main.asm@TheEndGFX", ROMX TheEndGFX:: INCBIN "gfx/credits/theend.2bpp" @@ -320,7 +320,7 @@ INCLUDE "gfx/pokemon/unown_bitmasks.asm" INCLUDE "gfx/pokemon/frame_pointers.asm" INCLUDE "gfx/pokemon/kanto_frames.asm" -SECTION "FontInversed", ROMX +SECTION "main.asm@FontInversed", ROMX FontInversed: INCBIN "gfx/font/font_inversed.1bpp" @@ -333,7 +333,7 @@ INCLUDE "engine/games/unown_puzzle.asm" INCLUDE "engine/games/dummy_game.asm" INCLUDE "engine/pokemon/bills_pc.asm" -SECTION "CopyrightGFX", ROMX +SECTION "main.asm@CopyrightGFX", ROMX CopyrightGFX:: INCBIN "gfx/splash/copyright.2bpp" @@ -363,7 +363,7 @@ INCLUDE "mobile/mobile_41.asm" INCLUDE "engine/gfx/load_overworld_font.asm" INCLUDE "mobile/mobile_42.asm" -SECTION "IntroLogoGFX", ROMX +SECTION "main.asm@IntroLogoGFX", ROMX IntroLogoGFX: INCBIN "gfx/intro/logo.2bpp.lz" @@ -444,7 +444,7 @@ INCLUDE "engine/items/print_item_description.asm" INCLUDE "data/moves/names.asm" INCLUDE "engine/overworld/landmarks.asm" -SECTION "UnownFont", ROMX +SECTION "main.asm@UnownFont", ROMX UnownFont: INCBIN "gfx/font/unown_font.2bpp" @@ -456,7 +456,7 @@ INCLUDE "engine/pokedex/pokedex_3.asm" INCLUDE "engine/events/catch_tutorial_input.asm" INCLUDE "engine/pokegear/townmap_convertlinebreakcharacters.asm" -SECTION "PokegearGFX", ROMX +SECTION "main.asm@PokegearGFX", ROMX PokegearGFX: INCBIN "gfx/pokegear/pokegear.2bpp.lz" @@ -471,7 +471,7 @@ INCLUDE "engine/events/odd_egg.asm" ; This section is read by external programs/tools, ; and is as such expected to be at the end of the ROM. -SECTION "Mobile Stadium 2", ROMX[$7de0], BANK[$7f] +SECTION "main.asm@Mobile Stadium 2", ROMX[$7de0], BANK[$7f] if DEF(_CRYSTAL_AU) INCBIN "mobile/stadium/stadium2_au.bin" diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 31fe0b700cb..3cc04ef9c17 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -8,7 +8,7 @@ const AZALEAGYM_GYM_GUY -SECTION "AzaleaGym_MapScripts", ROMX +SECTION "maps/AzaleaGym.asm", ROMX AzaleaGym_MapScripts: db 0 ; scene scripts diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 8a037a344d7..26d061cc720 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -4,7 +4,7 @@ const AZALEAMART_BUG_CATCHER -SECTION "AzaleaMart_MapScripts", ROMX +SECTION "maps/AzaleaMart.asm", ROMX AzaleaMart_MapScripts: db 0 ; scene scripts diff --git a/maps/AzaleaPokecenter1F.asm b/maps/AzaleaPokecenter1F.asm index 2543df4d6df..6c431344480 100644 --- a/maps/AzaleaPokecenter1F.asm +++ b/maps/AzaleaPokecenter1F.asm @@ -5,7 +5,7 @@ const AZALEAPOKECENTER1F_POKEFAN_F -SECTION "AzaleaPokecenter1F_MapScripts", ROMX +SECTION "maps/AzaleaPokecenter1F.asm", ROMX AzaleaPokecenter1F_MapScripts: db 1 ; scene scripts diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index ecf4fe38ad9..a46de2e747c 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -13,7 +13,7 @@ const AZALEATOWN_KURT_OUTSIDE -SECTION "AzaleaTown_MapScripts", ROMX +SECTION "maps/AzaleaTown.asm", ROMX AzaleaTown_MapScripts: db 3 ; scene scripts diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index da21d3e1783..d60052a97e1 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -6,7 +6,7 @@ const BATTLETOWER1F_GRANNY -SECTION "BattleTower1F_MapScripts", ROMX, BANK[BANK_MAP_BATTLE_TOWER] +SECTION "maps/BattleTower1F.asm", ROMX, BANK[BANK_MAP_BATTLE_TOWER] BattleTower1F_MapScripts: db 2 ; scene scripts diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index c1167761613..58fb1e10297 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -3,7 +3,7 @@ const BATTLETOWERBATTLEROOM_RECEPTIONIST -SECTION "BattleTowerBattleRoom_MapScripts", ROMX, BANK[BANK_MAP_BATTLE_TOWER] +SECTION "maps/BattleTowerBattleRoom.asm", ROMX, BANK[BANK_MAP_BATTLE_TOWER] BattleTowerBattleRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index e4af2bec31b..5b47b1270f6 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -2,7 +2,7 @@ const BATTLETOWERELEVATOR_RECEPTIONIST -SECTION "BattleTowerElevator_MapScripts", ROMX, BANK[BANK_MAP_BATTLE_TOWER] +SECTION "maps/BattleTowerElevator.asm", ROMX, BANK[BANK_MAP_BATTLE_TOWER] BattleTowerElevator_MapScripts: db 2 ; scene scripts diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 123502677b5..375987dfdda 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -2,7 +2,7 @@ const BATTLETOWERHALLWAY_RECEPTIONIST -SECTION "BattleTowerHallway_MapScripts", ROMX, BANK[BANK_MAP_BATTLE_TOWER] +SECTION "maps/BattleTowerHallway.asm", ROMX, BANK[BANK_MAP_BATTLE_TOWER] BattleTowerHallway_MapScripts: db 2 ; scene scripts diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 70fdce578fe..042cc0d62cd 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -5,7 +5,7 @@ const BATTLETOWEROUTSIDE_LASS -SECTION "BattleTowerOutside_MapScripts", ROMX +SECTION "maps/BattleTowerOutside.asm", ROMX BattleTowerOutside_MapScripts: db 0 ; scene scripts diff --git a/maps/BillsBrothersHouse.asm b/maps/BillsBrothersHouse.asm index 3ff21abc6cc..fabfb540877 100644 --- a/maps/BillsBrothersHouse.asm +++ b/maps/BillsBrothersHouse.asm @@ -3,7 +3,7 @@ const BILLSBROTHERSHOUSE_YOUNGSTER -SECTION "BillsBrothersHouse_MapScripts", ROMX +SECTION "maps/BillsBrothersHouse.asm", ROMX BillsBrothersHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm index 22f9a0595a4..546d415ba28 100644 --- a/maps/BillsFamilysHouse.asm +++ b/maps/BillsFamilysHouse.asm @@ -4,7 +4,7 @@ const BILLSFAMILYSHOUSE_TWIN -SECTION "BillsFamilysHouse_MapScripts", ROMX +SECTION "maps/BillsFamilysHouse.asm", ROMX BillsFamilysHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 6e84d0a8e5d..2a45a1d6752 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -2,7 +2,7 @@ const BILLSHOUSE_GRAMPS -SECTION "BillsHouse_MapScripts", ROMX +SECTION "maps/BillsHouse.asm", ROMX BillsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index ceb1c280639..31e720a8305 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -10,7 +10,7 @@ const BLACKTHORNCITY_COOLTRAINER_F2 -SECTION "BlackthornCity_MapScripts", ROMX +SECTION "maps/BlackthornCity.asm", ROMX BlackthornCity_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 8809bade404..134f92ac043 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -3,7 +3,7 @@ const BLACKTHORNDRAGONSPEECHHOUSE_EKANS -SECTION "BlackthornDragonSpeechHouse_MapScripts", ROMX +SECTION "maps/BlackthornDragonSpeechHouse.asm", ROMX BlackthornDragonSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornEmysHouse.asm b/maps/BlackthornEmysHouse.asm index d91a351572b..ddb9c8bcc34 100644 --- a/maps/BlackthornEmysHouse.asm +++ b/maps/BlackthornEmysHouse.asm @@ -2,7 +2,7 @@ const BLACKTHORNEMYSHOUSE_EMY -SECTION "BlackthornEmysHouse_MapScripts", ROMX +SECTION "maps/BlackthornEmysHouse.asm", ROMX BlackthornEmysHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 433144dad97..665c3e3c251 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -6,7 +6,7 @@ const BLACKTHORNGYM1F_GYM_GUY -SECTION "BlackthornGym1F_MapScripts", ROMX +SECTION "maps/BlackthornGym1F.asm", ROMX BlackthornGym1F_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 6be9cc2b212..f2bec7bd783 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -9,7 +9,7 @@ const BLACKTHORNGYM2F_BOULDER6 -SECTION "BlackthornGym2F_MapScripts", ROMX +SECTION "maps/BlackthornGym2F.asm", ROMX BlackthornGym2F_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 5e459522437..6c758f10f80 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -4,7 +4,7 @@ const BLACKTHORNMART_BLACK_BELT -SECTION "BlackthornMart_MapScripts", ROMX +SECTION "maps/BlackthornMart.asm", ROMX BlackthornMart_MapScripts: db 0 ; scene scripts diff --git a/maps/BlackthornPokecenter1F.asm b/maps/BlackthornPokecenter1F.asm index fc66aa91f2c..8626e23e131 100644 --- a/maps/BlackthornPokecenter1F.asm +++ b/maps/BlackthornPokecenter1F.asm @@ -5,7 +5,7 @@ const BLACKTHORNPOKECENTER1F_COOLTRAINER_M -SECTION "BlackthornPokecenter1F_MapScripts", ROMX +SECTION "maps/BlackthornPokecenter1F.asm", ROMX BlackthornPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 7a39f9eac40..5f0a4d5d64c 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -2,7 +2,7 @@ const BLUESHOUSE_DAISY -SECTION "BluesHouse_MapScripts", ROMX +SECTION "maps/BluesHouse.asm", ROMX BluesHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index fb524234c3d..8fc738101f7 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -2,7 +2,7 @@ const BRUNOSROOM_BRUNO -SECTION "BrunosRoom_MapScripts", ROMX +SECTION "maps/BrunosRoom.asm", ROMX BrunosRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index bb9cbb9f2ee..b67fcdcf7d0 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -6,7 +6,7 @@ const BURNEDTOWER1F_POKE_BALL -SECTION "BurnedTower1F_MapScripts", ROMX +SECTION "maps/BurnedTower1F.asm", ROMX BurnedTower1F_MapScripts: db 3 ; scene scripts diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 4ce24be6d28..156a8a42941 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -10,7 +10,7 @@ const BURNEDTOWERB1F_EUSINE -SECTION "BurnedTowerB1F_MapScripts", ROMX +SECTION "maps/BurnedTowerB1F.asm", ROMX BurnedTowerB1F_MapScripts: db 2 ; scene scripts diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index a9b9d23446f..5ed8fbce7ee 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -6,7 +6,7 @@ const CELADONCAFE_TEACHER -SECTION "CeladonCafe_MapScripts", ROMX +SECTION "maps/CeladonCafe.asm", ROMX CeladonCafe_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 3afcb519a51..bf3bf35b8f2 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -10,7 +10,7 @@ const CELADONCITY_LASS -SECTION "CeladonCity_MapScripts", ROMX +SECTION "maps/CeladonCity.asm", ROMX CeladonCity_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 866d0ffe6d0..55bcfbe7f85 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -4,7 +4,7 @@ const CELADONDEPTSTORE1F_TEACHER -SECTION "CeladonDeptStore1F_MapScripts", ROMX, BANK[BANK_MAP_CELADON_DEPT_STORE_1F] +SECTION "maps/CeladonDeptStore1F.asm", ROMX, BANK[BANK_MAP_CELADON_DEPT_STORE_1F] CeladonDeptStore1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 47287158d0a..2331272de74 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -5,7 +5,7 @@ const CELADONDEPTSTORE2F_YOUNGSTER -SECTION "CeladonDeptStore2F_MapScripts", ROMX +SECTION "maps/CeladonDeptStore2F.asm", ROMX CeladonDeptStore2F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index e0fc1e757fe..7afedbeb7f6 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -6,7 +6,7 @@ const CELADONDEPTSTORE3F_SUPER_NERD -SECTION "CeladonDeptStore3F_MapScripts", ROMX +SECTION "maps/CeladonDeptStore3F.asm", ROMX CeladonDeptStore3F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 14a79353276..c86835dd218 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -4,7 +4,7 @@ const CELADONDEPTSTORE4F_YOUNGSTER -SECTION "CeladonDeptStore4F_MapScripts", ROMX +SECTION "maps/CeladonDeptStore4F.asm", ROMX CeladonDeptStore4F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 83908083d8b..3fc10f7ed43 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -6,7 +6,7 @@ const CELADONDEPTSTORE5F_TEACHER -SECTION "CeladonDeptStore5F_MapScripts", ROMX +SECTION "maps/CeladonDeptStore5F.asm", ROMX CeladonDeptStore5F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 493992e334e..cda343dcb0c 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -7,7 +7,7 @@ CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350 const CELADONDEPTSTORE6F_YOUNGSTER -SECTION "CeladonDeptStore6F_MapScripts", ROMX, BANK[BANK_MAP_CELADON_DEPT_STORE_1F] +SECTION "maps/CeladonDeptStore6F.asm", ROMX, BANK[BANK_MAP_CELADON_DEPT_STORE_1F] CeladonDeptStore6F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index 1c20fac30d8..3bbeb4756b5 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -1,5 +1,5 @@ -SECTION "CeladonDeptStoreElevator_MapScripts", ROMX +SECTION "maps/CeladonDeptStoreElevator.asm", ROMX CeladonDeptStoreElevator_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index daee5a0ed20..b04b56c6cb4 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -10,7 +10,7 @@ const CELADONGAMECORNER_GRAMPS -SECTION "CeladonGameCorner_MapScripts", ROMX +SECTION "maps/CeladonGameCorner.asm", ROMX CeladonGameCorner_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 09d16f63ebe..2c2d34f77e0 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -10,7 +10,7 @@ CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS EQU 8888 const CELADONGAMECORNERPRIZEROOM_PHARMACIST -SECTION "CeladonGameCornerPrizeRoom_MapScripts", ROMX +SECTION "maps/CeladonGameCornerPrizeRoom.asm", ROMX CeladonGameCornerPrizeRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index db93a55eb14..ddaa6de11fd 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -7,7 +7,7 @@ const CELADONGYM_TWIN2 -SECTION "CeladonGym_MapScripts", ROMX +SECTION "maps/CeladonGym.asm", ROMX CeladonGym_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index c2393aadcf8..bee31af8fc6 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -5,7 +5,7 @@ const CELADONMANSION1F_GROWLITHE2 -SECTION "CeladonMansion1F_MapScripts", ROMX +SECTION "maps/CeladonMansion1F.asm", ROMX CeladonMansion1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index 37fe132ca23..671f1340e0c 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -1,5 +1,5 @@ -SECTION "CeladonMansion2F_MapScripts", ROMX +SECTION "maps/CeladonMansion2F.asm", ROMX CeladonMansion2F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 7ab4af5df7b..7779a113587 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -5,7 +5,7 @@ const CELADONMANSION3F_FISHER -SECTION "CeladonMansion3F_MapScripts", ROMX +SECTION "maps/CeladonMansion3F.asm", ROMX CeladonMansion3F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index ff0e8e02014..975a5b68643 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -2,7 +2,7 @@ const CELADONMANSIONROOF_FISHER -SECTION "CeladonMansionRoof_MapScripts", ROMX +SECTION "maps/CeladonMansionRoof.asm", ROMX CeladonMansionRoof_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 108d1fd558c..408b3e315db 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -2,7 +2,7 @@ const CELADONMANSIONROOFHOUSE_PHARMACIST -SECTION "CeladonMansionRoofHouse_MapScripts", ROMX +SECTION "maps/CeladonMansionRoofHouse.asm", ROMX CeladonMansionRoofHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm index 64da67ebf82..48a51884bea 100644 --- a/maps/CeladonPokecenter1F.asm +++ b/maps/CeladonPokecenter1F.asm @@ -6,7 +6,7 @@ const CELADONPOKECENTER1F_EUSINE -SECTION "CeladonPokecenter1F_MapScripts", ROMX +SECTION "maps/CeladonPokecenter1F.asm", ROMX CeladonPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeladonPokecenter2FBeta.asm b/maps/CeladonPokecenter2FBeta.asm index b71fd55f119..9f06d92360a 100644 --- a/maps/CeladonPokecenter2FBeta.asm +++ b/maps/CeladonPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "CeladonPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/CeladonPokecenter2FBeta.asm", ROMX CeladonPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 479be4200b5..f25a325df25 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -7,7 +7,7 @@ const CERULEANCITY_YOUNGSTER -SECTION "CeruleanCity_MapScripts", ROMX +SECTION "maps/CeruleanCity.asm", ROMX CeruleanCity_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 4dfff6a7199..afd2d7f6a64 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -7,7 +7,7 @@ const CERULEANGYM_GYM_GUY -SECTION "CeruleanGym_MapScripts", ROMX +SECTION "maps/CeruleanGym.asm", ROMX CeruleanGym_MapScripts: db 2 ; scene scripts diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 233ad0d883b..3ed1a7f90be 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -2,7 +2,7 @@ const CERULEANGYMBADGESPEECHHOUSE_POKEFAN_M -SECTION "CeruleanGymBadgeSpeechHouse_MapScripts", ROMX +SECTION "maps/CeruleanGymBadgeSpeechHouse.asm", ROMX CeruleanGymBadgeSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 3638f9261bb..bbf1409cc5c 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -4,7 +4,7 @@ const CERULEANMART_COOLTRAINER_F -SECTION "CeruleanMart_MapScripts", ROMX +SECTION "maps/CeruleanMart.asm", ROMX CeruleanMart_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanPokecenter1F.asm b/maps/CeruleanPokecenter1F.asm index 6809f53965d..de20ff5d4b5 100644 --- a/maps/CeruleanPokecenter1F.asm +++ b/maps/CeruleanPokecenter1F.asm @@ -4,7 +4,7 @@ const CERULEANPOKECENTER1F_GYM_GUY -SECTION "CeruleanPokecenter1F_MapScripts", ROMX +SECTION "maps/CeruleanPokecenter1F.asm", ROMX CeruleanPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanPokecenter2FBeta.asm b/maps/CeruleanPokecenter2FBeta.asm index f57cac4e811..d6249234703 100644 --- a/maps/CeruleanPokecenter2FBeta.asm +++ b/maps/CeruleanPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "CeruleanPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/CeruleanPokecenter2FBeta.asm", ROMX CeruleanPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index 0e17b5d8d7d..23a4713269d 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -4,7 +4,7 @@ const CERULEANPOLICESTATION_DIGLETT -SECTION "CeruleanPoliceStation_MapScripts", ROMX +SECTION "maps/CeruleanPoliceStation.asm", ROMX CeruleanPoliceStation_MapScripts: db 0 ; scene scripts diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 7b20a49535f..6868b709cfb 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -5,7 +5,7 @@ const CERULEANTRADESPEECHHOUSE_ZUBAT -SECTION "CeruleanTradeSpeechHouse_MapScripts", ROMX +SECTION "maps/CeruleanTradeSpeechHouse.asm", ROMX CeruleanTradeSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index d174feee959..a85d7f035fc 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -4,7 +4,7 @@ const CHARCOALKILN_MOLTRES -SECTION "CharcoalKiln_MapScripts", ROMX +SECTION "maps/CharcoalKiln.asm", ROMX CharcoalKiln_MapScripts: db 0 ; scene scripts diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index f5f5f45a398..c927460694e 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -6,7 +6,7 @@ const CHERRYGROVECITY_FISHER -SECTION "CherrygroveCity_MapScripts", ROMX +SECTION "maps/CherrygroveCity.asm", ROMX CherrygroveCity_MapScripts: db 2 ; scene scripts diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 35c7778ea53..f69e263df5b 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -3,7 +3,7 @@ const CHERRYGROVEEVOLUTIONSPEECHHOUSE_YOUNGSTER -SECTION "CherrygroveEvolutionSpeechHouse_MapScripts", ROMX +SECTION "maps/CherrygroveEvolutionSpeechHouse.asm", ROMX CherrygroveEvolutionSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index ba85af56e41..5a630dd79cf 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -3,7 +3,7 @@ const CHERRYGROVEGYMSPEECHHOUSE_BUG_CATCHER -SECTION "CherrygroveGymSpeechHouse_MapScripts", ROMX +SECTION "maps/CherrygroveGymSpeechHouse.asm", ROMX CherrygroveGymSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 50a0c62eaff..4405a53e4d1 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -4,7 +4,7 @@ const CHERRYGROVEMART_YOUNGSTER -SECTION "CherrygroveMart_MapScripts", ROMX +SECTION "maps/CherrygroveMart.asm", ROMX CherrygroveMart_MapScripts: db 0 ; scene scripts diff --git a/maps/CherrygrovePokecenter1F.asm b/maps/CherrygrovePokecenter1F.asm index 6fc4b78c932..1dacd761b0b 100644 --- a/maps/CherrygrovePokecenter1F.asm +++ b/maps/CherrygrovePokecenter1F.asm @@ -5,7 +5,7 @@ const CHERRYGROVEPOKECENTER1F_TEACHER -SECTION "CherrygrovePokecenter1F_MapScripts", ROMX +SECTION "maps/CherrygrovePokecenter1F.asm", ROMX CherrygrovePokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index a39f719b1d6..a772144a8ea 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -13,7 +13,7 @@ const CIANWOODCITY_SUICUNE -SECTION "CianwoodCity_MapScripts", ROMX +SECTION "maps/CianwoodCity.asm", ROMX CianwoodCity_MapScripts: db 2 ; scene scripts diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index f751d5c0970..0c5240dec82 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -10,7 +10,7 @@ const CIANWOODGYM_BOULDER4 -SECTION "CianwoodGym_MapScripts", ROMX +SECTION "maps/CianwoodGym.asm", ROMX CianwoodGym_MapScripts: db 0 ; scene scripts diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index c5423a0ac1c..f48ead6c67b 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -4,7 +4,7 @@ const CIANWOODLUGIASPEECHHOUSE_TWIN -SECTION "CianwoodLugiaSpeechHouse_MapScripts", ROMX +SECTION "maps/CianwoodLugiaSpeechHouse.asm", ROMX CianwoodLugiaSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 4e1061cdfb3..f7acab75bd6 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -2,7 +2,7 @@ const CIANWOODPHARMACY_PHARMACIST -SECTION "CianwoodPharmacy_MapScripts", ROMX +SECTION "maps/CianwoodPharmacy.asm", ROMX CianwoodPharmacy_MapScripts: db 1 ; scene scripts diff --git a/maps/CianwoodPhotoStudio.asm b/maps/CianwoodPhotoStudio.asm index 7231fb972ce..ec1d1965a3f 100644 --- a/maps/CianwoodPhotoStudio.asm +++ b/maps/CianwoodPhotoStudio.asm @@ -2,7 +2,7 @@ const CIANWOODPHOTOSTUDIO_FISHING_GURU -SECTION "CianwoodPhotoStudio_MapScripts", ROMX +SECTION "maps/CianwoodPhotoStudio.asm", ROMX CianwoodPhotoStudio_MapScripts: db 0 ; scene scripts diff --git a/maps/CianwoodPokecenter1F.asm b/maps/CianwoodPokecenter1F.asm index a8b3714494b..c9409c14773 100644 --- a/maps/CianwoodPokecenter1F.asm +++ b/maps/CianwoodPokecenter1F.asm @@ -5,7 +5,7 @@ const CIANWOODPOKECENTER1F_SUPER_NERD -SECTION "CianwoodPokecenter1F_MapScripts", ROMX +SECTION "maps/CianwoodPokecenter1F.asm", ROMX CianwoodPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index e90557ede02..0b7cecb6c97 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -2,7 +2,7 @@ const CINNABARISLAND_BLUE -SECTION "CinnabarIsland_MapScripts", ROMX +SECTION "maps/CinnabarIsland.asm", ROMX CinnabarIsland_MapScripts: db 0 ; scene scripts diff --git a/maps/CinnabarPokecenter1F.asm b/maps/CinnabarPokecenter1F.asm index 61cab9efeb9..30159c3d4e4 100644 --- a/maps/CinnabarPokecenter1F.asm +++ b/maps/CinnabarPokecenter1F.asm @@ -4,7 +4,7 @@ const CINNABARPOKECENTER1F_FISHER -SECTION "CinnabarPokecenter1F_MapScripts", ROMX +SECTION "maps/CinnabarPokecenter1F.asm", ROMX CinnabarPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CinnabarPokecenter2FBeta.asm b/maps/CinnabarPokecenter2FBeta.asm index c108f459faf..3d0c14fd5d7 100644 --- a/maps/CinnabarPokecenter2FBeta.asm +++ b/maps/CinnabarPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "CinnabarPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/CinnabarPokecenter2FBeta.asm", ROMX CinnabarPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 0c251db8da8..5e3d81a3ed5 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,7 +3,7 @@ const COLOSSEUM_CHRIS2 -SECTION "Colosseum_MapScripts", ROMX, BANK[BANK_MAP_COLOSSEUM] +SECTION "maps/Colosseum.asm", ROMX, BANK[BANK_MAP_COLOSSEUM] Colosseum_MapScripts: db 3 ; scene scripts diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index ebe3686db23..bc5da7fe7c0 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -4,7 +4,7 @@ const COPYCATSHOUSE1F_CLEFAIRY -SECTION "CopycatsHouse1F_MapScripts", ROMX +SECTION "maps/CopycatsHouse1F.asm", ROMX CopycatsHouse1F_MapScripts: db 0 ; scene scripts diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 6dec188761a..fd62bfd4081 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -7,7 +7,7 @@ const COPYCATSHOUSE2F_COPYCAT2 ; if player is female -SECTION "CopycatsHouse2F_MapScripts", ROMX +SECTION "maps/CopycatsHouse2F.asm", ROMX CopycatsHouse2F_MapScripts: db 0 ; scene scripts diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 9b920c6a703..696832f3743 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -10,7 +10,7 @@ const DANCETHEATRE_GRANNY -SECTION "DanceTheatre_MapScripts", ROMX +SECTION "maps/DanceTheatre.asm", ROMX DanceTheatre_MapScripts: db 0 ; scene scripts diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 7ed3e110086..d8e7dae8d80 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -4,7 +4,7 @@ const DARKCAVEBLACKTHORNENTRANCE_POKE_BALL2 -SECTION "DarkCaveBlackthornEntrance_MapScripts", ROMX +SECTION "maps/DarkCaveBlackthornEntrance.asm", ROMX DarkCaveBlackthornEntrance_MapScripts: db 0 ; scene scripts diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 89c459f1892..63cea79ed32 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -9,7 +9,7 @@ const DARKCAVEVIOLETENTRANCE_POKE_BALL4 -SECTION "DarkCaveVioletEntrance_MapScripts", ROMX +SECTION "maps/DarkCaveVioletEntrance.asm", ROMX DarkCaveVioletEntrance_MapScripts: db 0 ; scene scripts diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 2e140c03fe8..fb0d1a27809 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -3,7 +3,7 @@ const DAYCARE_GRANNY -SECTION "DayCare_MapScripts", ROMX +SECTION "maps/DayCare.asm", ROMX DayCare_MapScripts: db 0 ; scene scripts diff --git a/maps/DayOfWeekSiblingsHouse.asm b/maps/DayOfWeekSiblingsHouse.asm index 246f92edec1..6981785bc54 100644 --- a/maps/DayOfWeekSiblingsHouse.asm +++ b/maps/DayOfWeekSiblingsHouse.asm @@ -2,7 +2,7 @@ const DAYOFWEEKSIBLINGSHOUSE_POKEDEX -SECTION "DayOfWeekSiblingsHouse_MapScripts", ROMX +SECTION "maps/DayOfWeekSiblingsHouse.asm", ROMX DayOfWeekSiblingsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 88a7cf84be1..ac7653ae21a 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -2,7 +2,7 @@ const DIGLETTSCAVE_POKEFAN_M -SECTION "DiglettsCave_MapScripts", ROMX +SECTION "maps/DiglettsCave.asm", ROMX DiglettsCave_MapScripts: db 0 ; scene scripts diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 6377e56e69d..68c101ecab8 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -5,7 +5,7 @@ const DRAGONSHRINE_CLAIR -SECTION "DragonShrine_MapScripts", ROMX +SECTION "maps/DragonShrine.asm", ROMX DragonShrine_MapScripts: db 2 ; scene scripts diff --git a/maps/DragonsDen1F.asm b/maps/DragonsDen1F.asm index d96f54c050f..4e88eda5cdd 100644 --- a/maps/DragonsDen1F.asm +++ b/maps/DragonsDen1F.asm @@ -1,5 +1,5 @@ -SECTION "DragonsDen1F_MapScripts", ROMX +SECTION "maps/DragonsDen1F.asm", ROMX DragonsDen1F_MapScripts: db 0 ; scene scripts diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 3632e441d4f..aaca83dfc51 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -10,7 +10,7 @@ const DRAGONSDENB1F_POKE_BALL3 -SECTION "DragonsDenB1F_MapScripts", ROMX +SECTION "maps/DragonsDenB1F.asm", ROMX DragonsDenB1F_MapScripts: db 2 ; scene scripts diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 930bdf374c6..8219ef5003c 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -7,7 +7,7 @@ const EARLSPOKEMONACADEMY_POKEDEX -SECTION "EarlsPokemonAcademy_MapScripts", ROMX +SECTION "maps/EarlsPokemonAcademy.asm", ROMX EarlsPokemonAcademy_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b7280f6fd37..822cc4268e2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -8,7 +8,7 @@ const ECRUTEAKCITY_GRAMPS3 -SECTION "EcruteakCity_MapScripts", ROMX +SECTION "maps/EcruteakCity.asm", ROMX EcruteakCity_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index e2545ba48d4..4df036f922c 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -8,7 +8,7 @@ const ECRUTEAKGYM_GRAMPS -SECTION "EcruteakGym_MapScripts", ROMX +SECTION "maps/EcruteakGym.asm", ROMX EcruteakGym_MapScripts: db 2 ; scene scripts diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 7cc6822d85e..0c049b01ddb 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -3,7 +3,7 @@ const ECRUTEAKITEMFINDERHOUSE_POKEDEX -SECTION "EcruteakItemfinderHouse_MapScripts", ROMX +SECTION "maps/EcruteakItemfinderHouse.asm", ROMX EcruteakItemfinderHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 40f5dc5eeb8..53e453f8654 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -3,7 +3,7 @@ const ECRUTEAKLUGIASPEECHHOUSE_YOUNGSTER -SECTION "EcruteakLugiaSpeechHouse_MapScripts", ROMX +SECTION "maps/EcruteakLugiaSpeechHouse.asm", ROMX EcruteakLugiaSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index df9d41da393..f6ede406998 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -4,7 +4,7 @@ const ECRUTEAKMART_GRANNY -SECTION "EcruteakMart_MapScripts", ROMX +SECTION "maps/EcruteakMart.asm", ROMX EcruteakMart_MapScripts: db 0 ; scene scripts diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm index 30d0d6a7d6a..f48da6383ab 100644 --- a/maps/EcruteakPokecenter1F.asm +++ b/maps/EcruteakPokecenter1F.asm @@ -6,7 +6,7 @@ const ECRUTEAKPOKECENTER1F_BILL -SECTION "EcruteakPokecenter1F_MapScripts", ROMX +SECTION "maps/EcruteakPokecenter1F.asm", ROMX EcruteakPokecenter1F_MapScripts: db 2 ; scene scripts diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 49ea4d074ec..fc750f5df8a 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -5,7 +5,7 @@ const ECRUTEAKTINTOWERENTRANCE_GRAMPS -SECTION "EcruteakTinTowerEntrance_MapScripts", ROMX +SECTION "maps/EcruteakTinTowerEntrance.asm", ROMX EcruteakTinTowerEntrance_MapScripts: db 2 ; scene scripts diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index d6032d623cc..1c6edc44596 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -3,7 +3,7 @@ const ELMSHOUSE_ELMS_SON -SECTION "ElmsHouse_MapScripts", ROMX +SECTION "maps/ElmsHouse.asm", ROMX ElmsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 7cf4f75dd05..0ce277fa08e 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -7,7 +7,7 @@ const ELMSLAB_OFFICER -SECTION "ElmsLab_MapScripts", ROMX +SECTION "maps/ElmsLab.asm", ROMX ElmsLab_MapScripts: db 6 ; scene scripts diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 9d7f75d2f6e..cb2899dfb3a 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -5,7 +5,7 @@ const FASTSHIP1F_GENTLEMAN -SECTION "FastShip1F_MapScripts", ROMX +SECTION "maps/FastShip1F.asm", ROMX FastShip1F_MapScripts: db 3 ; scene scripts diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index d5dcabad67a..96d94c98a6c 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -13,7 +13,7 @@ const FASTSHIPB1F_YOUNGSTER2 -SECTION "FastShipB1F_MapScripts", ROMX +SECTION "maps/FastShipB1F.asm", ROMX FastShipB1F_MapScripts: db 2 ; scene scripts diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index d574b8935a7..24d99936de4 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -8,7 +8,7 @@ const FASTSHIPCABINS_NNW_NNE_NE_PHARMACIST -SECTION "FastShipCabins_NNW_NNE_NE_MapScripts", ROMX +SECTION "maps/FastShipCabins_NNW_NNE_NE.asm", ROMX FastShipCabins_NNW_NNE_NE_MapScripts: db 0 ; scene scripts diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 2170ba707c3..4a5a2984662 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -12,7 +12,7 @@ const FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_SUPER_NERD2 -SECTION "FastShipCabins_SE_SSE_CaptainsCabin_MapScripts", ROMX +SECTION "maps/FastShipCabins_SE_SSE_CaptainsCabin.asm", ROMX FastShipCabins_SE_SSE_CaptainsCabin_MapScripts: db 0 ; scene scripts diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 0190d24b4d0..10f11cb45d5 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -5,7 +5,7 @@ const FASTSHIPCABINS_SW_SSW_NW_ROCKER -SECTION "FastShipCabins_SW_SSW_NW_MapScripts", ROMX +SECTION "maps/FastShipCabins_SW_SSW_NW.asm", ROMX FastShipCabins_SW_SSW_NW_MapScripts: db 0 ; scene scripts diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 6de28278fe2..acfaf2e516d 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -3,7 +3,7 @@ const FIGHTINGDOJO_POKE_BALL -SECTION "FightingDojo_MapScripts", ROMX +SECTION "maps/FightingDojo.asm", ROMX FightingDojo_MapScripts: db 0 ; scene scripts diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79caca5a13a..815a7ca7ec9 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -5,7 +5,7 @@ const FUCHSIACITY_FRUIT_TREE -SECTION "FuchsiaCity_MapScripts", ROMX +SECTION "maps/FuchsiaCity.asm", ROMX FuchsiaCity_MapScripts: db 0 ; scene scripts diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 5a52e66af76..43002942407 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -7,7 +7,7 @@ const FUCHSIAGYM_GYM_GUY -SECTION "FuchsiaGym_MapScripts", ROMX +SECTION "maps/FuchsiaGym.asm", ROMX FuchsiaGym_MapScripts: db 0 ; scene scripts diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index dc595de40d3..9c7cfce683b 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -4,7 +4,7 @@ const FUCHSIAMART_COOLTRAINER_F -SECTION "FuchsiaMart_MapScripts", ROMX +SECTION "maps/FuchsiaMart.asm", ROMX FuchsiaMart_MapScripts: db 0 ; scene scripts diff --git a/maps/FuchsiaPokecenter1F.asm b/maps/FuchsiaPokecenter1F.asm index de4d624a85c..06dd3b33167 100644 --- a/maps/FuchsiaPokecenter1F.asm +++ b/maps/FuchsiaPokecenter1F.asm @@ -5,7 +5,7 @@ const FUCHSIAPOKECENTER1F_JANINE_IMPERSONATOR -SECTION "FuchsiaPokecenter1F_MapScripts", ROMX +SECTION "maps/FuchsiaPokecenter1F.asm", ROMX FuchsiaPokecenter1F_MapScripts: db 1 ; scene scripts diff --git a/maps/FuchsiaPokecenter2FBeta.asm b/maps/FuchsiaPokecenter2FBeta.asm index 6bfc00f5f55..d36211ad1c7 100644 --- a/maps/FuchsiaPokecenter2FBeta.asm +++ b/maps/FuchsiaPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "FuchsiaPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/FuchsiaPokecenter2FBeta.asm", ROMX FuchsiaPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index 09feb77c339..923d495faae 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -2,7 +2,7 @@ const GOLDENRODBIKESHOP_CLERK -SECTION "GoldenrodBikeShop_MapScripts", ROMX +SECTION "maps/GoldenrodBikeShop.asm", ROMX GoldenrodBikeShop_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 1860c5f5d5f..71c0ef8657b 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -16,7 +16,7 @@ const GOLDENRODCITY_MOVETUTOR -SECTION "GoldenrodCity_MapScripts", ROMX +SECTION "maps/GoldenrodCity.asm", ROMX GoldenrodCity_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 265e480fa3d..ec5f69c8d6a 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -5,7 +5,7 @@ const GOLDENRODDEPTSTORE1F_GENTLEMAN -SECTION "GoldenrodDeptStore1F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore1F.asm", ROMX GoldenrodDeptStore1F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index 3abe9ec831e..72e1d7c270e 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -6,7 +6,7 @@ const GOLDENRODDEPTSTORE2F_GENTLEMAN -SECTION "GoldenrodDeptStore2F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore2F.asm", ROMX GoldenrodDeptStore2F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 387555fd887..800446299d3 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -4,7 +4,7 @@ const GOLDENRODDEPTSTORE3F_ROCKER -SECTION "GoldenrodDeptStore3F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore3F.asm", ROMX GoldenrodDeptStore3F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index c41b57ade50..265ecbe62c2 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -5,7 +5,7 @@ const GOLDENRODDEPTSTORE4F_GAMEBOY_KID -SECTION "GoldenrodDeptStore4F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore4F.asm", ROMX GoldenrodDeptStore4F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 15c6fb1a67e..08261e33b3c 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,7 +7,7 @@ const GOLDENRODDEPTSTORE5F_RECEPTIONIST -SECTION "GoldenrodDeptStore5F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore5F.asm", ROMX GoldenrodDeptStore5F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 9a9884490a6..7f4bf985f66 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -7,7 +7,7 @@ GOLDENRODDEPTSTORE6F_LEMONADE_PRICE EQU 350 const GOLDENRODDEPTSTORE6F_SUPER_NERD -SECTION "GoldenrodDeptStore6F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStore6F.asm", ROMX GoldenrodDeptStore6F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 2e4d83a1a55..8ce5556c866 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -9,7 +9,7 @@ const GOLDENRODDEPTSTOREB1F_MACHOP -SECTION "GoldenrodDeptStoreB1F_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStoreB1F.asm", ROMX GoldenrodDeptStoreB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 9ff5dd4e5f5..1b690591787 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -1,5 +1,5 @@ -SECTION "GoldenrodDeptStoreElevator_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStoreElevator.asm", ROMX GoldenrodDeptStoreElevator_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 6f3a744dd5c..478b76f2a0e 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,7 +9,7 @@ const GOLDENRODDEPTSTOREROOF_BUG_CATCHER -SECTION "GoldenrodDeptStoreRoof_MapScripts", ROMX +SECTION "maps/GoldenrodDeptStoreRoof.asm", ROMX GoldenrodDeptStoreRoof_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 5b0558ca262..e2227b0b3d2 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -3,7 +3,7 @@ const GOLDENRODFLOWERSHOP_FLORIA -SECTION "GoldenrodFlowerShop_MapScripts", ROMX +SECTION "maps/GoldenrodFlowerShop.asm", ROMX GoldenrodFlowerShop_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ebe35ab76a5..c611aa18022 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -20,7 +20,7 @@ GOLDENRODGAMECORNER_WOBBUFFET_COINS EQU 1500 const GOLDENRODGAMECORNER_MOVETUTOR -SECTION "GoldenrodGameCorner_MapScripts", ROMX +SECTION "maps/GoldenrodGameCorner.asm", ROMX GoldenrodGameCorner_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index f94931b856d..6e2f5daa263 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,7 +7,7 @@ const GOLDENRODGYM_GYM_GUY -SECTION "GoldenrodGym_MapScripts", ROMX +SECTION "maps/GoldenrodGym.asm", ROMX GoldenrodGym_MapScripts: db 2 ; scene scripts diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 7036656c083..15b27ffffd1 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -4,7 +4,7 @@ const GOLDENRODHAPPINESSRATER_TWIN -SECTION "GoldenrodHappinessRater_MapScripts", ROMX +SECTION "maps/GoldenrodHappinessRater.asm", ROMX GoldenrodHappinessRater_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index abf868afbc9..1628e17902f 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -3,7 +3,7 @@ const GOLDENRODMAGNETTRAINSTATION_GENTLEMAN -SECTION "GoldenrodMagnetTrainStation_MapScripts", ROMX +SECTION "maps/GoldenrodMagnetTrainStation.asm", ROMX GoldenrodMagnetTrainStation_MapScripts: db 1 ; scene scripts diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index d6820b951bf..f25ea86bb26 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -2,7 +2,7 @@ const GOLDENRODNAMERATER_NAME_RATER -SECTION "GoldenrodNameRater_MapScripts", ROMX +SECTION "maps/GoldenrodNameRater.asm", ROMX GoldenrodNameRater_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 61ffcbfadc2..185e8ecd678 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -3,7 +3,7 @@ const GOLDENRODPPSPEECHHOUSE_LASS -SECTION "GoldenrodPPSpeechHouse_MapScripts", ROMX +SECTION "maps/GoldenrodPPSpeechHouse.asm", ROMX GoldenrodPPSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm index 6c337b6a84d..92ae8fc3054 100644 --- a/maps/GoldenrodPokecenter1F.asm +++ b/maps/GoldenrodPokecenter1F.asm @@ -6,7 +6,7 @@ const GOLDENRODPOKECENTER1F_POKEFAN_F -SECTION "GoldenrodPokecenter1F_MapScripts", ROMX +SECTION "maps/GoldenrodPokecenter1F.asm", ROMX GoldenrodPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index f8ffd37ec7c..27bc74d3b92 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -13,7 +13,7 @@ GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE EQU 300 const GOLDENRODUNDERGROUND_GRANNY -SECTION "GoldenrodUnderground_MapScripts", ROMX +SECTION "maps/GoldenrodUnderground.asm", ROMX GoldenrodUnderground_MapScripts: db 0 ; scene scripts diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index c16190b54ac..0ff59b0b569 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -45,7 +45,7 @@ ENDM const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER -SECTION "GoldenrodUndergroundSwitchRoomEntrances_MapScripts", ROMX +SECTION "maps/GoldenrodUndergroundSwitchRoomEntrances.asm", ROMX GoldenrodUndergroundSwitchRoomEntrances_MapScripts: db 2 ; scene scripts diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 3e703272bc7..93c6a52a4fd 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -8,7 +8,7 @@ const GOLDENRODUNDERGROUNDWAREHOUSE_POKE_BALL3 -SECTION "GoldenrodUndergroundWarehouse_MapScripts", ROMX +SECTION "maps/GoldenrodUndergroundWarehouse.asm", ROMX GoldenrodUndergroundWarehouse_MapScripts: db 0 ; scene scripts diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index dccc4fa1a8b..1349ca04d50 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -2,7 +2,7 @@ const GUIDEGENTSHOUSE_GRAMPS -SECTION "GuideGentsHouse_MapScripts", ROMX +SECTION "maps/GuideGentsHouse.asm", ROMX GuideGentsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index d95cb3bd561..83631d68ff9 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -2,7 +2,7 @@ const HALLOFFAME_LANCE -SECTION "HallOfFame_MapScripts", ROMX +SECTION "maps/HallOfFame.asm", ROMX HallOfFame_MapScripts: db 2 ; scene scripts diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 0126c0a9dab..c71aa0edade 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -4,7 +4,7 @@ const ICEPATH1F_POKE_BALL3 -SECTION "IcePath1F_MapScripts", ROMX +SECTION "maps/IcePath1F.asm", ROMX IcePath1F_MapScripts: db 0 ; scene scripts diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 0feb6ceed9f..3f2ac9d128d 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -6,7 +6,7 @@ const ICEPATHB1F_POKE_BALL -SECTION "IcePathB1F_MapScripts", ROMX +SECTION "maps/IcePathB1F.asm", ROMX IcePathB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 75b189d8b52..b57fef5dd27 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -2,7 +2,7 @@ const ICEPATHB2FBLACKTHORNSIDE_POKE_BALL -SECTION "IcePathB2FBlackthornSide_MapScripts", ROMX +SECTION "maps/IcePathB2FBlackthornSide.asm", ROMX IcePathB2FBlackthornSide_MapScripts: db 0 ; scene scripts diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 55fad62e5d6..8e6776f5e32 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -7,7 +7,7 @@ const ICEPATHB2FMAHOGANYSIDE_POKE_BALL2 -SECTION "IcePathB2FMahoganySide_MapScripts", ROMX +SECTION "maps/IcePathB2FMahoganySide.asm", ROMX IcePathB2FMahoganySide_MapScripts: db 0 ; scene scripts diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 8bdfcd590ee..7e9a0a57dfe 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -3,7 +3,7 @@ const ICEPATHB3F_ROCK -SECTION "IcePathB3F_MapScripts", ROMX +SECTION "maps/IcePathB3F.asm", ROMX IcePathB3F_MapScripts: db 0 ; scene scripts diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 4adc9958ee0..7289a4072e5 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -12,7 +12,7 @@ const ILEXFOREST_POKE_BALL4 -SECTION "IlexForest_MapScripts", ROMX +SECTION "maps/IlexForest.asm", ROMX IlexForest_MapScripts: db 0 ; scene scripts diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 70fb3b73d23..bac9e1f0c89 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -3,7 +3,7 @@ const ILEXFORESTAZALEAGATE_GRANNY -SECTION "IlexForestAzaleaGate_MapScripts", ROMX +SECTION "maps/IlexForestAzaleaGate.asm", ROMX IlexForestAzaleaGate_MapScripts: db 0 ; scene scripts diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 1c9e9bcb1e5..1f1e12f4f8e 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -7,7 +7,7 @@ const INDIGOPLATEAUPOKECENTER1F_ABRA -SECTION "IndigoPlateauPokecenter1F_MapScripts", ROMX +SECTION "maps/IndigoPlateauPokecenter1F.asm", ROMX IndigoPlateauPokecenter1F_MapScripts: db 1 ; scene scripts diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 791ec4f7a27..1921dc38161 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -2,7 +2,7 @@ const KARENSROOM_KAREN -SECTION "KarensRoom_MapScripts", ROMX +SECTION "maps/KarensRoom.asm", ROMX KarensRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 74c5ee67c9a..a67b139ec98 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -2,7 +2,7 @@ const KOGASROOM_KOGA -SECTION "KogasRoom_MapScripts", ROMX +SECTION "maps/KogasRoom.asm", ROMX KogasRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 246067dbc16..a46a3a77ff2 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -6,7 +6,7 @@ const KURTSHOUSE_TWIN2 -SECTION "KurtsHouse_MapScripts", ROMX +SECTION "maps/KurtsHouse.asm", ROMX KurtsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 68ad608c495..8e025914903 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -13,7 +13,7 @@ const LAKEOFRAGE_POKE_BALL2 -SECTION "LakeOfRage_MapScripts", ROMX +SECTION "maps/LakeOfRage.asm", ROMX LakeOfRage_MapScripts: db 2 ; scene scripts diff --git a/maps/LakeOfRageHiddenPowerHouse.asm b/maps/LakeOfRageHiddenPowerHouse.asm index 03fb78a061b..9384e4dab04 100644 --- a/maps/LakeOfRageHiddenPowerHouse.asm +++ b/maps/LakeOfRageHiddenPowerHouse.asm @@ -2,7 +2,7 @@ const LAKEOFRAGEHIDDENPOWERHOUSE_FISHER -SECTION "LakeOfRageHiddenPowerHouse_MapScripts", ROMX +SECTION "maps/LakeOfRageHiddenPowerHouse.asm", ROMX LakeOfRageHiddenPowerHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm index 676e768b0c9..714bd31a568 100644 --- a/maps/LakeOfRageMagikarpHouse.asm +++ b/maps/LakeOfRageMagikarpHouse.asm @@ -2,7 +2,7 @@ const LAKEOFRAGEMAGIKARPHOUSE_FISHING_GURU -SECTION "LakeOfRageMagikarpHouse_MapScripts", ROMX +SECTION "maps/LakeOfRageMagikarpHouse.asm", ROMX LakeOfRageMagikarpHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index d1af6044fdc..af6e65313a8 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -4,7 +4,7 @@ const LANCESROOM_OAK -SECTION "LancesRoom_MapScripts", ROMX +SECTION "maps/LancesRoom.asm", ROMX LancesRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 61df5c35349..b729ad6008c 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -6,7 +6,7 @@ const LAVRADIOTOWER1F_SUPER_NERD2 -SECTION "LavRadioTower1F_MapScripts", ROMX +SECTION "maps/LavRadioTower1F.asm", ROMX LavRadioTower1F_MapScripts: db 0 ; scene scripts diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 5d47164bbff..546c311a572 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -4,7 +4,7 @@ const LAVENDERMART_ROCKER -SECTION "LavenderMart_MapScripts", ROMX +SECTION "maps/LavenderMart.asm", ROMX LavenderMart_MapScripts: db 0 ; scene scripts diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 04734259404..10a995764ac 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -2,7 +2,7 @@ const LAVENDERNAMERATER_NAME_RATER -SECTION "LavenderNameRater_MapScripts", ROMX +SECTION "maps/LavenderNameRater.asm", ROMX LavenderNameRater_MapScripts: db 1 ; scene scripts diff --git a/maps/LavenderPokecenter1F.asm b/maps/LavenderPokecenter1F.asm index 514b1a2c19d..c432b1533bd 100644 --- a/maps/LavenderPokecenter1F.asm +++ b/maps/LavenderPokecenter1F.asm @@ -5,7 +5,7 @@ const LAVENDERPOKECENTER1F_YOUNGSTER -SECTION "LavenderPokecenter1F_MapScripts", ROMX +SECTION "maps/LavenderPokecenter1F.asm", ROMX LavenderPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/LavenderPokecenter2FBeta.asm b/maps/LavenderPokecenter2FBeta.asm index 85412b84566..b4f480eb160 100644 --- a/maps/LavenderPokecenter2FBeta.asm +++ b/maps/LavenderPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "LavenderPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/LavenderPokecenter2FBeta.asm", ROMX LavenderPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/LavenderSpeechHouse.asm b/maps/LavenderSpeechHouse.asm index a6c28924020..1d5f35cfced 100644 --- a/maps/LavenderSpeechHouse.asm +++ b/maps/LavenderSpeechHouse.asm @@ -2,7 +2,7 @@ const LAVENDERSPEECHHOUSE_POKEFAN_F -SECTION "LavenderSpeechHouse_MapScripts", ROMX +SECTION "maps/LavenderSpeechHouse.asm", ROMX LavenderSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index b70f82eb3cb..c2a2bcad6dc 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -5,7 +5,7 @@ const LAVENDERTOWN_YOUNGSTER -SECTION "LavenderTown_MapScripts", ROMX +SECTION "maps/LavenderTown.asm", ROMX LavenderTown_MapScripts: db 0 ; scene scripts diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index c8ae5df584c..00867d4b3cd 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -8,7 +8,7 @@ const MAHOGANYGYM_GYM_GUY -SECTION "MahoganyGym_MapScripts", ROMX +SECTION "maps/MahoganyGym.asm", ROMX MahoganyGym_MapScripts: db 0 ; scene scripts diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 3f301ca6c01..70419b839a5 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -6,7 +6,7 @@ const MAHOGANYMART1F_GRANNY -SECTION "MahoganyMart1F_MapScripts", ROMX +SECTION "maps/MahoganyMart1F.asm", ROMX MahoganyMart1F_MapScripts: db 2 ; scene scripts diff --git a/maps/MahoganyPokecenter1F.asm b/maps/MahoganyPokecenter1F.asm index 95536fe44d2..4c04aac72f7 100644 --- a/maps/MahoganyPokecenter1F.asm +++ b/maps/MahoganyPokecenter1F.asm @@ -5,7 +5,7 @@ const MAHOGANYPOKECENTER1F_COOLTRAINER_F -SECTION "MahoganyPokecenter1F_MapScripts", ROMX +SECTION "maps/MahoganyPokecenter1F.asm", ROMX MahoganyPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index b1292fc5bd6..f5fe3c79b8f 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -3,7 +3,7 @@ const MAHOGANYREDGYARADOSSPEECHHOUSE_TEACHER -SECTION "MahoganyRedGyaradosSpeechHouse_MapScripts", ROMX +SECTION "maps/MahoganyRedGyaradosSpeechHouse.asm", ROMX MahoganyRedGyaradosSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index b09829cbf48..6aeb5904b71 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -7,7 +7,7 @@ MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300 const MAHOGANYTOWN_LASS -SECTION "MahoganyTown_MapScripts", ROMX +SECTION "maps/MahoganyTown.asm", ROMX MahoganyTown_MapScripts: db 2 ; scene scripts diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index befc76f4a1a..e0c5fe08dbc 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -2,7 +2,7 @@ const MANIASHOUSE_ROCKER -SECTION "ManiasHouse_MapScripts", ROMX +SECTION "maps/ManiasHouse.asm", ROMX ManiasHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 2f6bdc56739..4e41e4e43ee 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,5 +1,5 @@ -SECTION "MobileBattleRoom_MapScripts", ROMX +SECTION "maps/MobileBattleRoom.asm", ROMX MobileBattleRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm index fdde17f7b80..4283509c533 100644 --- a/maps/MobileTradeRoom.asm +++ b/maps/MobileTradeRoom.asm @@ -1,5 +1,5 @@ -SECTION "MobileTradeRoom_MapScripts", ROMX +SECTION "maps/MobileTradeRoom.asm", ROMX MobileTradeRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 976f6a19970..92539414d9d 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -2,7 +2,7 @@ const MOUNTMOON_SILVER -SECTION "MountMoon_MapScripts", ROMX +SECTION "maps/MountMoon.asm", ROMX MountMoon_MapScripts: db 2 ; scene scripts diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 20656cc863b..7598b0fdc0f 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -5,7 +5,7 @@ const MOUNTMOONGIFTSHOP_LASS2 ; day only -SECTION "MountMoonGiftShop_MapScripts", ROMX +SECTION "maps/MountMoonGiftShop.asm", ROMX MountMoonGiftShop_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 31afdf8d49a..82c248dc65b 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -4,7 +4,7 @@ const MOUNTMOONSQUARE_ROCK -SECTION "MountMoonSquare_MapScripts", ROMX +SECTION "maps/MountMoonSquare.asm", ROMX MountMoonSquare_MapScripts: db 1 ; scene scripts diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index a54aa014d92..68649920812 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -11,7 +11,7 @@ const MOUNTMORTAR1FINSIDE_POKE_BALL7 -SECTION "MountMortar1FInside_MapScripts", ROMX +SECTION "maps/MountMortar1FInside.asm", ROMX MountMortar1FInside_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index b6536f1f2e3..e9f99f365fc 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -3,7 +3,7 @@ const MOUNTMORTAR1FOUTSIDE_POKE_BALL2 -SECTION "MountMortar1FOutside_MapScripts", ROMX +SECTION "maps/MountMortar1FOutside.asm", ROMX MountMortar1FOutside_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index d59a2ccef60..7dab3fd83ee 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -8,7 +8,7 @@ const MOUNTMORTAR2FINSIDE_SUPER_NERD -SECTION "MountMortar2FInside_MapScripts", ROMX +SECTION "maps/MountMortar2FInside.asm", ROMX MountMortar2FInside_MapScripts: db 0 ; scene scripts diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 0acfdc19c6d..4f3f9efcb3e 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -8,7 +8,7 @@ const MOUNTMORTARB1F_POKE_BALL5 -SECTION "MountMortarB1F_MapScripts", ROMX +SECTION "maps/MountMortarB1F.asm", ROMX MountMortarB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 7c7eeade298..4a930e3b634 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -2,7 +2,7 @@ const MOVEDELETERSHOUSE_SUPER_NERD -SECTION "MoveDeletersHouse_MapScripts", ROMX +SECTION "maps/MoveDeletersHouse.asm", ROMX MoveDeletersHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 3577059547b..013db400b70 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -6,7 +6,7 @@ const MRFUJISHOUSE_PIDGEY -SECTION "MrFujisHouse_MapScripts", ROMX +SECTION "maps/MrFujisHouse.asm", ROMX MrFujisHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 8ad0a109baf..1c8891e74eb 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -3,7 +3,7 @@ const MRPOKEMONSHOUSE_OAK -SECTION "MrPokemonsHouse_MapScripts", ROMX +SECTION "maps/MrPokemonsHouse.asm", ROMX MrPokemonsHouse_MapScripts: db 2 ; scene scripts diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index ae1a471c6d3..9212c1bf11f 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -2,7 +2,7 @@ const MRPSYCHICSHOUSE_FISHING_GURU -SECTION "MrPsychicsHouse_MapScripts", ROMX +SECTION "maps/MrPsychicsHouse.asm", ROMX MrPsychicsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 442c2567549..a3bbef2c0f0 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -15,7 +15,7 @@ const NATIONALPARK_POKE_BALL2 -SECTION "NationalPark_MapScripts", ROMX +SECTION "maps/NationalPark.asm", ROMX NationalPark_MapScripts: db 0 ; scene scripts diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 09e7386cd96..502ad08e87a 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -13,7 +13,7 @@ const NATIONALPARKBUGCONTEST_POKE_BALL2 -SECTION "NationalParkBugContest_MapScripts", ROMX +SECTION "maps/NationalParkBugContest.asm", ROMX NationalParkBugContest_MapScripts: db 0 ; scene scripts diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 914d7f6f98d..0357e7204a4 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -4,7 +4,7 @@ const NEWBARKTOWN_SILVER -SECTION "NewBarkTown_MapScripts", ROMX +SECTION "maps/NewBarkTown.asm", ROMX NewBarkTown_MapScripts: db 2 ; scene scripts diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 4b0c546786b..ceb965aeb40 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -5,7 +5,7 @@ const OAKSLAB_SCIENTIST3 -SECTION "OaksLab_MapScripts", ROMX +SECTION "maps/OaksLab.asm", ROMX OaksLab_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index b9faef56824..f9ed5ace416 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -4,7 +4,7 @@ const OLIVINECAFE_SAILOR2 -SECTION "OlivineCafe_MapScripts", ROMX +SECTION "maps/OlivineCafe.asm", ROMX OlivineCafe_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index b7a2387cb6b..56e7cca65ab 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -5,7 +5,7 @@ const OLIVINECITY_OLIVINE_RIVAL -SECTION "OlivineCity_MapScripts", ROMX +SECTION "maps/OlivineCity.asm", ROMX OlivineCity_MapScripts: db 2 ; scene scripts diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index b4bf12e8c83..4dfe89e4c55 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -2,7 +2,7 @@ const OLIVINEGOODRODHOUSE_FISHING_GURU -SECTION "OlivineGoodRodHouse_MapScripts", ROMX +SECTION "maps/OlivineGoodRodHouse.asm", ROMX OlivineGoodRodHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 7ec65cab728..a121c469361 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -3,7 +3,7 @@ const OLIVINEGYM_GYM_GUY -SECTION "OlivineGym_MapScripts", ROMX +SECTION "maps/OlivineGym.asm", ROMX OlivineGym_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index 6ef61c399b1..5fcbb570c71 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -3,7 +3,7 @@ const OLIVINEHOUSEBETA_RHYDON -SECTION "OlivineHouseBeta_MapScripts", ROMX +SECTION "maps/OlivineHouseBeta.asm", ROMX OlivineHouseBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 239334b776e..6660aebabba 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -3,7 +3,7 @@ const OLIVINELIGHTHOUSE1F_POKEFAN_F -SECTION "OlivineLighthouse1F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse1F.asm", ROMX OlivineLighthouse1F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index b28fd943413..a358d9da6da 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -3,7 +3,7 @@ const OLIVINELIGHTHOUSE2F_GENTLEMAN -SECTION "OlivineLighthouse2F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse2F.asm", ROMX OlivineLighthouse2F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index ae85f41251b..27f34d943f7 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -5,7 +5,7 @@ const OLIVINELIGHTHOUSE3F_POKE_BALL -SECTION "OlivineLighthouse3F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse3F.asm", ROMX OlivineLighthouse3F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 664f789b1d4..46032bcde36 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -3,7 +3,7 @@ const OLIVINELIGHTHOUSE4F_LASS -SECTION "OlivineLighthouse4F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse4F.asm", ROMX OlivineLighthouse4F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index d0e572f9556..2659ce17bc6 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -6,7 +6,7 @@ const OLIVINELIGHTHOUSE5F_POKE_BALL3 -SECTION "OlivineLighthouse5F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse5F.asm", ROMX OlivineLighthouse5F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 81c52aa93fe..372e5f423c2 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -4,7 +4,7 @@ const OLIVINELIGHTHOUSE6F_POKE_BALL -SECTION "OlivineLighthouse6F_MapScripts", ROMX +SECTION "maps/OlivineLighthouse6F.asm", ROMX OlivineLighthouse6F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b01c6074b11..1a74c2bb7bd 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -4,7 +4,7 @@ const OLIVINEMART_LASS -SECTION "OlivineMart_MapScripts", ROMX +SECTION "maps/OlivineMart.asm", ROMX OlivineMart_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivinePokecenter1F.asm b/maps/OlivinePokecenter1F.asm index 110d0162175..1065a7b4269 100644 --- a/maps/OlivinePokecenter1F.asm +++ b/maps/OlivinePokecenter1F.asm @@ -5,7 +5,7 @@ const OLIVINEPOKECENTER1F_TEACHER -SECTION "OlivinePokecenter1F_MapScripts", ROMX +SECTION "maps/OlivinePokecenter1F.asm", ROMX OlivinePokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index e847c75e0b6..84c40221855 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -8,7 +8,7 @@ const OLIVINEPORT_COOLTRAINER_F -SECTION "OlivinePort_MapScripts", ROMX +SECTION "maps/OlivinePort.asm", ROMX OlivinePort_MapScripts: db 2 ; scene scripts diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 08957cb8716..70baafc7b35 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -2,7 +2,7 @@ const OLIVINEPORTPASSAGE_POKEFAN_M -SECTION "OlivinePortPassage_MapScripts", ROMX +SECTION "maps/OlivinePortPassage.asm", ROMX OlivinePortPassage_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 48f9cd6087b..3f7187c2caa 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -3,7 +3,7 @@ const OLIVINEPUNISHMENTSPEECHHOUSE_LASS -SECTION "OlivinePunishmentSpeechHouse_MapScripts", ROMX +SECTION "maps/OlivinePunishmentSpeechHouse.asm", ROMX OlivinePunishmentSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 082de0d2f8a..c158c191c96 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -2,7 +2,7 @@ const OLIVINETIMSHOUSE_TIM -SECTION "OlivineTimsHouse_MapScripts", ROMX +SECTION "maps/OlivineTimsHouse.asm", ROMX OlivineTimsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index c4d3a5f44c9..156a7949c76 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -3,7 +3,7 @@ const PALLETTOWN_FISHER -SECTION "PalletTown_MapScripts", ROMX +SECTION "maps/PalletTown.asm", ROMX PalletTown_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 177b6aa331e..8836f8e4966 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,7 +6,7 @@ const PEWTERCITY_FRUIT_TREE2 -SECTION "PewterCity_MapScripts", ROMX +SECTION "maps/PewterCity.asm", ROMX PewterCity_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 14c60811f7e..6208bbfed30 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -4,7 +4,7 @@ const PEWTERGYM_GYM_GUY -SECTION "PewterGym_MapScripts", ROMX +SECTION "maps/PewterGym.asm", ROMX PewterGym_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 831b623bb68..80a712c3c95 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -4,7 +4,7 @@ const PEWTERMART_SUPER_NERD -SECTION "PewterMart_MapScripts", ROMX +SECTION "maps/PewterMart.asm", ROMX PewterMart_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index e0f2d22be77..fc8582b6948 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -3,7 +3,7 @@ const PEWTERNIDORANSPEECHHOUSE_NIDORAN_M -SECTION "PewterNidoranSpeechHouse_MapScripts", ROMX +SECTION "maps/PewterNidoranSpeechHouse.asm", ROMX PewterNidoranSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterPokecenter1F.asm b/maps/PewterPokecenter1F.asm index 9d30b4a5deb..76cb830dc83 100644 --- a/maps/PewterPokecenter1F.asm +++ b/maps/PewterPokecenter1F.asm @@ -6,7 +6,7 @@ const PEWTERPOKECENTER1F_CHRIS -SECTION "PewterPokecenter1F_MapScripts", ROMX +SECTION "maps/PewterPokecenter1F.asm", ROMX PewterPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterPokecenter2FBeta.asm b/maps/PewterPokecenter2FBeta.asm index 676c2d8981d..d82c577770d 100644 --- a/maps/PewterPokecenter2FBeta.asm +++ b/maps/PewterPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "PewterPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/PewterPokecenter2FBeta.asm", ROMX PewterPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index ca5a41c072a..5253322f966 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -2,7 +2,7 @@ const PEWTERSNOOZESPEECHHOUSE_GRAMPS -SECTION "PewterSnoozeSpeechHouse_MapScripts", ROMX +SECTION "maps/PewterSnoozeSpeechHouse.asm", ROMX PewterSnoozeSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm index e8a3032ce94..fdbcd7ac51f 100644 --- a/maps/PlayersHouse1F.asm +++ b/maps/PlayersHouse1F.asm @@ -6,7 +6,7 @@ const PLAYERSHOUSE1F_POKEFAN_F -SECTION "PlayersHouse1F_MapScripts", ROMX +SECTION "maps/PlayersHouse1F.asm", ROMX PlayersHouse1F_MapScripts: db 2 ; scene scripts diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index ecc7d791815..a7c3ff522b5 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -5,7 +5,7 @@ const PLAYERSHOUSE2F_BIG_DOLL -SECTION "PlayersHouse2F_MapScripts", ROMX +SECTION "maps/PlayersHouse2F.asm", ROMX PlayersHouse2F_MapScripts: db 0 ; scene scripts diff --git a/maps/PlayersNeighborsHouse.asm b/maps/PlayersNeighborsHouse.asm index 66c594507e9..f6d7c4a8d7f 100644 --- a/maps/PlayersNeighborsHouse.asm +++ b/maps/PlayersNeighborsHouse.asm @@ -3,7 +3,7 @@ const PLAYERSNEIGHBORSHOUSE_POKEFAN_F -SECTION "PlayersNeighborsHouse_MapScripts", ROMX +SECTION "maps/PlayersNeighborsHouse.asm", ROMX PlayersNeighborsHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 014741e8ee2..8ae568e902f 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -2,7 +2,7 @@ const POKESEERSHOUSE_GRANNY -SECTION "PokeSeersHouse_MapScripts", ROMX +SECTION "maps/PokeSeersHouse.asm", ROMX PokeSeersHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 99a131ae3f0..addaea01566 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -5,7 +5,7 @@ const POKECENTER2F_OFFICER -SECTION "Pokecenter2F_MapScripts", ROMX +SECTION "maps/Pokecenter2F.asm", ROMX Pokecenter2F_MapScripts: db 6 ; scene scripts diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm index c4e20d653c1..e44d0cccc4b 100644 --- a/maps/PokecomCenterAdminOfficeMobile.asm +++ b/maps/PokecomCenterAdminOfficeMobile.asm @@ -4,7 +4,7 @@ const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3 -SECTION "PokecomCenterAdminOfficeMobile_MapScripts", ROMX +SECTION "maps/PokecomCenterAdminOfficeMobile.asm", ROMX PokecomCenterAdminOfficeMobile_MapScripts: db 0 ; scene scripts diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 5ef9a15e7c1..f9da23643e2 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -7,7 +7,7 @@ const POKEMONFANCLUB_ODDISH -SECTION "PokemonFanClub_MapScripts", ROMX +SECTION "maps/PokemonFanClub.asm", ROMX PokemonFanClub_MapScripts: db 0 ; scene scripts diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 9898520f9bf..0f2e685e24b 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -8,7 +8,7 @@ const POWERPLANT_FOREST -SECTION "PowerPlant_MapScripts", ROMX +SECTION "maps/PowerPlant.asm", ROMX PowerPlant_MapScripts: db 2 ; scene scripts diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 552eee1ad2a..784ed596d7f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -7,7 +7,7 @@ const RADIOTOWER1F_CARD_WOMAN -SECTION "RadioTower1F_MapScripts", ROMX +SECTION "maps/RadioTower1F.asm", ROMX RadioTower1F_MapScripts: db 0 ; scene scripts diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index dbad16a075f..8cb8abc0d6f 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -12,7 +12,7 @@ const RADIOTOWER2F_RECEPTIONIST -SECTION "RadioTower2F_MapScripts", ROMX +SECTION "maps/RadioTower2F.asm", ROMX RadioTower2F_MapScripts: db 0 ; scene scripts diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 8da4cb480c5..4c9a6484001 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -8,7 +8,7 @@ const RADIOTOWER3F_SCIENTIST -SECTION "RadioTower3F_MapScripts", ROMX +SECTION "maps/RadioTower3F.asm", ROMX RadioTower3F_MapScripts: db 0 ; scene scripts diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 24f53bd30d2..939be5d695d 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -8,7 +8,7 @@ const RADIOTOWER4F_SCIENTIST -SECTION "RadioTower4F_MapScripts", ROMX +SECTION "maps/RadioTower4F.asm", ROMX RadioTower4F_MapScripts: db 0 ; scene scripts diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index d2e891c2f2c..e9fffe2f623 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -6,7 +6,7 @@ const RADIOTOWER5F_POKE_BALL -SECTION "RadioTower5F_MapScripts", ROMX +SECTION "maps/RadioTower5F.asm", ROMX RadioTower5F_MapScripts: db 3 ; scene scripts diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index a1cf0dc2508..0798d75166f 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -2,7 +2,7 @@ const REDSHOUSE1F_REDS_MOM -SECTION "RedsHouse1F_MapScripts", ROMX +SECTION "maps/RedsHouse1F.asm", ROMX RedsHouse1F_MapScripts: db 1 ; scene scripts diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index cda0cd9e04b..e82680871f4 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -1,5 +1,5 @@ -SECTION "RedsHouse2F_MapScripts", ROMX +SECTION "maps/RedsHouse2F.asm", ROMX RedsHouse2F_MapScripts: db 0 ; scene scripts diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index b588cb82b1e..a87cebd7964 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -3,7 +3,7 @@ const ROCKTUNNEL1F_POKE_BALL2 -SECTION "RockTunnel1F_MapScripts", ROMX +SECTION "maps/RockTunnel1F.asm", ROMX RockTunnel1F_MapScripts: db 0 ; scene scripts diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 286fbf47835..f15672f41c3 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -4,7 +4,7 @@ const ROCKTUNNELB1F_POKE_BALL3 -SECTION "RockTunnelB1F_MapScripts", ROMX +SECTION "maps/RockTunnelB1F.asm", ROMX RockTunnelB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/Route1.asm b/maps/Route1.asm index 02865f28777..0b57dcc1390 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -4,7 +4,7 @@ const ROUTE1_FRUIT_TREE -SECTION "Route1_MapScripts", ROMX +SECTION "maps/Route1.asm", ROMX Route1_MapScripts: db 0 ; scene scripts diff --git a/maps/Route10North.asm b/maps/Route10North.asm index 3e9bc9a16ca..5ea3a91ae1f 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -1,5 +1,5 @@ -SECTION "Route10North_MapScripts", ROMX +SECTION "maps/Route10North.asm", ROMX Route10North_MapScripts: db 0 ; scene scripts diff --git a/maps/Route10Pokecenter1F.asm b/maps/Route10Pokecenter1F.asm index 646d03260c4..a1b6567a4e5 100644 --- a/maps/Route10Pokecenter1F.asm +++ b/maps/Route10Pokecenter1F.asm @@ -5,7 +5,7 @@ const ROUTE10POKECENTER1F_COOLTRAINER_F -SECTION "Route10Pokecenter1F_MapScripts", ROMX +SECTION "maps/Route10Pokecenter1F.asm", ROMX Route10Pokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/Route10Pokecenter2FBeta.asm b/maps/Route10Pokecenter2FBeta.asm index 3784903e555..c5cff438938 100644 --- a/maps/Route10Pokecenter2FBeta.asm +++ b/maps/Route10Pokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "Route10Pokecenter2FBeta_MapScripts", ROMX +SECTION "maps/Route10Pokecenter2FBeta.asm", ROMX Route10Pokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/Route10South.asm b/maps/Route10South.asm index ec8a85c1740..2c9c5cc4697 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -3,7 +3,7 @@ const ROUTE10SOUTH_POKEFAN_M2 -SECTION "Route10South_MapScripts", ROMX +SECTION "maps/Route10South.asm", ROMX Route10South_MapScripts: db 0 ; scene scripts diff --git a/maps/Route11.asm b/maps/Route11.asm index 2aecab9289a..d050d9d1480 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -6,7 +6,7 @@ const ROUTE11_FRUIT_TREE -SECTION "Route11_MapScripts", ROMX +SECTION "maps/Route11.asm", ROMX Route11_MapScripts: db 0 ; scene scripts diff --git a/maps/Route12.asm b/maps/Route12.asm index afe484885b6..eb9c1aab531 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -7,7 +7,7 @@ const ROUTE12_POKE_BALL2 -SECTION "Route12_MapScripts", ROMX +SECTION "maps/Route12.asm", ROMX Route12_MapScripts: db 0 ; scene scripts diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 22a7ded9f09..7391a05ff47 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -2,7 +2,7 @@ const ROUTE12SUPERRODHOUSE_FISHING_GURU -SECTION "Route12SuperRodHouse_MapScripts", ROMX +SECTION "maps/Route12SuperRodHouse.asm", ROMX Route12SuperRodHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route13.asm b/maps/Route13.asm index a9b19b0d866..cdf406aab2b 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -6,7 +6,7 @@ const ROUTE13_POKEFAN_M3 -SECTION "Route13_MapScripts", ROMX +SECTION "maps/Route13.asm", ROMX Route13_MapScripts: db 0 ; scene scripts diff --git a/maps/Route14.asm b/maps/Route14.asm index 24e9ed257c3..b4f08636236 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -5,7 +5,7 @@ const ROUTE14_KIM -SECTION "Route14_MapScripts", ROMX +SECTION "maps/Route14.asm", ROMX Route14_MapScripts: db 0 ; scene scripts diff --git a/maps/Route15.asm b/maps/Route15.asm index 0fa39429815..ae1e999f6de 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -8,7 +8,7 @@ const ROUTE15_POKE_BALL -SECTION "Route15_MapScripts", ROMX +SECTION "maps/Route15.asm", ROMX Route15_MapScripts: db 0 ; scene scripts diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 1b9d531583d..47dbff9c86f 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -2,7 +2,7 @@ const ROUTE15FUCHSIAGATE_OFFICER -SECTION "Route15FuchsiaGate_MapScripts", ROMX +SECTION "maps/Route15FuchsiaGate.asm", ROMX Route15FuchsiaGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route16.asm b/maps/Route16.asm index c3060bc8a56..8732f2ee063 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -1,5 +1,5 @@ -SECTION "Route16_MapScripts", ROMX +SECTION "maps/Route16.asm", ROMX Route16_MapScripts: db 0 ; scene scripts diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 2bfc962fe53..86a9a7e5e76 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -2,7 +2,7 @@ const ROUTE16FUCHSIASPEECHHOUSE_SUPER_NERD -SECTION "Route16FuchsiaSpeechHouse_MapScripts", ROMX +SECTION "maps/Route16FuchsiaSpeechHouse.asm", ROMX Route16FuchsiaSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 33f84033278..ae025af3b76 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -2,7 +2,7 @@ const ROUTE16GATE_OFFICER -SECTION "Route16Gate_MapScripts", ROMX +SECTION "maps/Route16Gate.asm", ROMX Route16Gate_MapScripts: db 1 ; scene scripts diff --git a/maps/Route17.asm b/maps/Route17.asm index 1582aeb2434..cee2949a238 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -5,7 +5,7 @@ const ROUTE17_BIKER4 -SECTION "Route17_MapScripts", ROMX +SECTION "maps/Route17.asm", ROMX Route17_MapScripts: db 0 ; scene scripts diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm index 8ce19cc96fb..481258d299a 100644 --- a/maps/Route17Route18Gate.asm +++ b/maps/Route17Route18Gate.asm @@ -2,7 +2,7 @@ const ROUTE17ROUTE18GATE_OFFICER -SECTION "Route17Route18Gate_MapScripts", ROMX +SECTION "maps/Route17Route18Gate.asm", ROMX Route17Route18Gate_MapScripts: db 1 ; scene scripts diff --git a/maps/Route18.asm b/maps/Route18.asm index 6fc454ace60..7a29ddc8adb 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,7 +3,7 @@ const ROUTE18_YOUNGSTER2 -SECTION "Route18_MapScripts", ROMX +SECTION "maps/Route18.asm", ROMX Route18_MapScripts: db 0 ; scene scripts diff --git a/maps/Route19.asm b/maps/Route19.asm index 5e057072a48..d48a00f0af7 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -7,7 +7,7 @@ const ROUTE19_FISHER2 -SECTION "Route19_MapScripts", ROMX +SECTION "maps/Route19.asm", ROMX Route19_MapScripts: db 0 ; scene scripts diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index fabf78b74b5..aab5ad38630 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -2,7 +2,7 @@ const ROUTE19FUCHSIAGATE_OFFICER -SECTION "Route19FuchsiaGate_MapScripts", ROMX +SECTION "maps/Route19FuchsiaGate.asm", ROMX Route19FuchsiaGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route2.asm b/maps/Route2.asm index 1e28d7a987e..5acbf9afc9d 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -9,7 +9,7 @@ const ROUTE2_FRUIT_TREE -SECTION "Route2_MapScripts", ROMX +SECTION "maps/Route2.asm", ROMX Route2_MapScripts: db 0 ; scene scripts diff --git a/maps/Route20.asm b/maps/Route20.asm index e483453ed22..8b80fa8cda1 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -4,7 +4,7 @@ const ROUTE20_SWIMMER_GUY -SECTION "Route20_MapScripts", ROMX +SECTION "maps/Route20.asm", ROMX Route20_MapScripts: db 0 ; scene scripts diff --git a/maps/Route21.asm b/maps/Route21.asm index 4d96b9723c0..21cf03f011a 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -4,7 +4,7 @@ const ROUTE21_FISHER -SECTION "Route21_MapScripts", ROMX +SECTION "maps/Route21.asm", ROMX Route21_MapScripts: db 0 ; scene scripts diff --git a/maps/Route22.asm b/maps/Route22.asm index 69cc385b29b..b835670e000 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -1,5 +1,5 @@ -SECTION "Route22_MapScripts", ROMX +SECTION "maps/Route22.asm", ROMX Route22_MapScripts: db 0 ; scene scripts diff --git a/maps/Route23.asm b/maps/Route23.asm index c49333bdcf4..4b9df8f075f 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -1,5 +1,5 @@ -SECTION "Route23_MapScripts", ROMX +SECTION "maps/Route23.asm", ROMX Route23_MapScripts: db 0 ; scene scripts diff --git a/maps/Route24.asm b/maps/Route24.asm index 7b07390915a..3e1ba25e3ae 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -2,7 +2,7 @@ const ROUTE24_ROCKET -SECTION "Route24_MapScripts", ROMX +SECTION "maps/Route24.asm", ROMX Route24_MapScripts: db 0 ; scene scripts diff --git a/maps/Route25.asm b/maps/Route25.asm index 13120a439d7..dd86f13bad0 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -12,7 +12,7 @@ const ROUTE25_POKE_BALL -SECTION "Route25_MapScripts", ROMX +SECTION "maps/Route25.asm", ROMX Route25_MapScripts: db 2 ; scene scripts diff --git a/maps/Route26.asm b/maps/Route26.asm index e58a70f4cdc..c68056cc963 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -9,7 +9,7 @@ const ROUTE26_POKE_BALL -SECTION "Route26_MapScripts", ROMX +SECTION "maps/Route26.asm", ROMX Route26_MapScripts: db 0 ; scene scripts diff --git a/maps/Route26HealHouse.asm b/maps/Route26HealHouse.asm index a24bf990c87..fdc225b603c 100644 --- a/maps/Route26HealHouse.asm +++ b/maps/Route26HealHouse.asm @@ -2,7 +2,7 @@ const ROUTE26HEALHOUSE_TEACHER -SECTION "Route26HealHouse_MapScripts", ROMX +SECTION "maps/Route26HealHouse.asm", ROMX Route26HealHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route27.asm b/maps/Route27.asm index 6ab8080db3d..76847fd43d3 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -10,7 +10,7 @@ const ROUTE27_FISHER -SECTION "Route27_MapScripts", ROMX +SECTION "maps/Route27.asm", ROMX Route27_MapScripts: db 2 ; scene scripts diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 33dff98dcaa..636a5f377b2 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -2,7 +2,7 @@ const ROUTE27SANDSTORMHOUSE_GRANNY -SECTION "Route27SandstormHouse_MapScripts", ROMX +SECTION "maps/Route27SandstormHouse.asm", ROMX Route27SandstormHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route28.asm b/maps/Route28.asm index c814ec31973..709c7e3174b 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -1,5 +1,5 @@ -SECTION "Route28_MapScripts", ROMX +SECTION "maps/Route28.asm", ROMX Route28_MapScripts: db 0 ; scene scripts diff --git a/maps/Route28SteelWingHouse.asm b/maps/Route28SteelWingHouse.asm index bc0a864a5b0..c01a22a7a30 100644 --- a/maps/Route28SteelWingHouse.asm +++ b/maps/Route28SteelWingHouse.asm @@ -3,7 +3,7 @@ const ROUTE28STEELWINGHOUSE_FEAROW -SECTION "Route28SteelWingHouse_MapScripts", ROMX +SECTION "maps/Route28SteelWingHouse.asm", ROMX Route28SteelWingHouse_MapScripts: db 1 ; scene scripts diff --git a/maps/Route29.asm b/maps/Route29.asm index 5d87ac6f41b..cf6be876a52 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -9,7 +9,7 @@ const ROUTE29_POKE_BALL -SECTION "Route29_MapScripts", ROMX +SECTION "maps/Route29.asm", ROMX Route29_MapScripts: db 2 ; scene scripts diff --git a/maps/Route29Route46Gate.asm b/maps/Route29Route46Gate.asm index abce88d18d4..eed19ef56fc 100644 --- a/maps/Route29Route46Gate.asm +++ b/maps/Route29Route46Gate.asm @@ -3,7 +3,7 @@ const ROUTE29ROUTE46GATE_YOUNGSTER -SECTION "Route29Route46Gate_MapScripts", ROMX +SECTION "maps/Route29Route46Gate.asm", ROMX Route29Route46Gate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 828810b56e2..b17dd1a3435 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -2,7 +2,7 @@ const ROUTE2GATE_SCIENTIST -SECTION "Route2Gate_MapScripts", ROMX +SECTION "maps/Route2Gate.asm", ROMX Route2Gate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route2NuggetHouse.asm b/maps/Route2NuggetHouse.asm index bb5236db913..891369a3d7c 100644 --- a/maps/Route2NuggetHouse.asm +++ b/maps/Route2NuggetHouse.asm @@ -2,7 +2,7 @@ const ROUTE2NUGGETHOUSE_FISHER -SECTION "Route2NuggetHouse_MapScripts", ROMX +SECTION "maps/Route2NuggetHouse.asm", ROMX Route2NuggetHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route3.asm b/maps/Route3.asm index 9935572d215..6c9ed0f375e 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,7 +5,7 @@ const ROUTE3_FISHER2 -SECTION "Route3_MapScripts", ROMX +SECTION "maps/Route3.asm", ROMX Route3_MapScripts: db 0 ; scene scripts diff --git a/maps/Route30.asm b/maps/Route30.asm index 825ed2ad9ef..e4cda70ad19 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -12,7 +12,7 @@ const ROUTE30_POKE_BALL -SECTION "Route30_MapScripts", ROMX +SECTION "maps/Route30.asm", ROMX Route30_MapScripts: db 0 ; scene scripts diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index 0e9d24319ea..b63fbc92720 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -2,7 +2,7 @@ const ROUTE30BERRYHOUSE_POKEFAN_M -SECTION "Route30BerryHouse_MapScripts", ROMX +SECTION "maps/Route30BerryHouse.asm", ROMX Route30BerryHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route31.asm b/maps/Route31.asm index a287ef86a47..5ba0cdf2bd4 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -8,7 +8,7 @@ const ROUTE31_POKE_BALL2 -SECTION "Route31_MapScripts", ROMX +SECTION "maps/Route31.asm", ROMX Route31_MapScripts: db 0 ; scene scripts diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 4a43c9ae687..e38aaa16cc6 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -3,7 +3,7 @@ const ROUTE31VIOLETGATE_COOLTRAINER_F -SECTION "Route31VioletGate_MapScripts", ROMX +SECTION "maps/Route31VioletGate.asm", ROMX Route31VioletGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route32.asm b/maps/Route32.asm index 9639fa8d0c7..85eb085e816 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -15,7 +15,7 @@ const ROUTE32_POKE_BALL2 -SECTION "Route32_MapScripts", ROMX +SECTION "maps/Route32.asm", ROMX Route32_MapScripts: db 3 ; scene scripts diff --git a/maps/Route32Pokecenter1F.asm b/maps/Route32Pokecenter1F.asm index 6526566d34e..5b51dd9d5ba 100644 --- a/maps/Route32Pokecenter1F.asm +++ b/maps/Route32Pokecenter1F.asm @@ -4,7 +4,7 @@ const ROUTE32POKECENTER1F_COOLTRAINER_F -SECTION "Route32Pokecenter1F_MapScripts", ROMX +SECTION "maps/Route32Pokecenter1F.asm", ROMX Route32Pokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm index cb6d4c75baf..66b3d754704 100644 --- a/maps/Route32RuinsOfAlphGate.asm +++ b/maps/Route32RuinsOfAlphGate.asm @@ -4,7 +4,7 @@ const ROUTE32RUINSOFALPHGATE_YOUNGSTER -SECTION "Route32RuinsOfAlphGate_MapScripts", ROMX +SECTION "maps/Route32RuinsOfAlphGate.asm", ROMX Route32RuinsOfAlphGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route33.asm b/maps/Route33.asm index 1a02147c6c7..4f93bf36512 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -4,7 +4,7 @@ const ROUTE33_FRUIT_TREE -SECTION "Route33_MapScripts", ROMX +SECTION "maps/Route33.asm", ROMX Route33_MapScripts: db 0 ; scene scripts diff --git a/maps/Route34.asm b/maps/Route34.asm index a8eb2a500a0..9a3b3983261 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -14,7 +14,7 @@ const ROUTE34_POKE_BALL -SECTION "Route34_MapScripts", ROMX +SECTION "maps/Route34.asm", ROMX Route34_MapScripts: db 0 ; scene scripts diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 519820d3b85..d4f187771e5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -5,7 +5,7 @@ const ROUTE34ILEXFORESTGATE_TEACHER2 -SECTION "Route34IlexForestGate_MapScripts", ROMX +SECTION "maps/Route34IlexForestGate.asm", ROMX Route34IlexForestGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route35.asm b/maps/Route35.asm index d9e0be11077..8abc812155c 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -12,7 +12,7 @@ const ROUTE35_POKE_BALL -SECTION "Route35_MapScripts", ROMX +SECTION "maps/Route35.asm", ROMX Route35_MapScripts: db 0 ; scene scripts diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index 4b48140feb5..6d2ca8c4800 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -4,7 +4,7 @@ const ROUTE35GOLDENRODGATE_FISHER -SECTION "Route35GoldenrodGate_MapScripts", ROMX +SECTION "maps/Route35GoldenrodGate.asm", ROMX Route35GoldenrodGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 94ed2872a74..fb4160505d3 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -4,7 +4,7 @@ const ROUTE35NATIONALPARKGATE_OFFICER2 -SECTION "Route35NationalParkGate_MapScripts", ROMX, BANK[BANK_MAP_ROUTE_35_NATIONAL_PARK_GATE] +SECTION "maps/Route35NationalParkGate.asm", ROMX, BANK[BANK_MAP_ROUTE_35_NATIONAL_PARK_GATE] Route35NationalParkGate_MapScripts: db 3 ; scene scripts diff --git a/maps/Route36.asm b/maps/Route36.asm index 19861980a37..7e1d36d62e7 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -10,7 +10,7 @@ const ROUTE36_SUICUNE -SECTION "Route36_MapScripts", ROMX +SECTION "maps/Route36.asm", ROMX Route36_MapScripts: db 2 ; scene scripts diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 6a3413e6df3..e1ca379ab7e 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -13,7 +13,7 @@ const ROUTE36NATIONALPARKGATE_OFFICER2 -SECTION "Route36NationalParkGate_MapScripts", ROMX, BANK[BANK_MAP_ROUTE_35_NATIONAL_PARK_GATE] +SECTION "maps/Route36NationalParkGate.asm", ROMX, BANK[BANK_MAP_ROUTE_35_NATIONAL_PARK_GATE] Route36NationalParkGate_MapScripts: db 3 ; scene scripts diff --git a/maps/Route36RuinsOfAlphGate.asm b/maps/Route36RuinsOfAlphGate.asm index d7a09d0df60..a77d9eea077 100644 --- a/maps/Route36RuinsOfAlphGate.asm +++ b/maps/Route36RuinsOfAlphGate.asm @@ -3,7 +3,7 @@ const ROUTE36RUINSOFALPHGATE_GRAMPS -SECTION "Route36RuinsOfAlphGate_MapScripts", ROMX +SECTION "maps/Route36RuinsOfAlphGate.asm", ROMX Route36RuinsOfAlphGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route37.asm b/maps/Route37.asm index 560472ce7d4..24ad583006f 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -8,7 +8,7 @@ const ROUTE37_FRUIT_TREE3 -SECTION "Route37_MapScripts", ROMX +SECTION "maps/Route37.asm", ROMX Route37_MapScripts: db 0 ; scene scripts diff --git a/maps/Route38.asm b/maps/Route38.asm index faee6d67b9e..d04968fe45e 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -8,7 +8,7 @@ const ROUTE38_BUENA2 -SECTION "Route38_MapScripts", ROMX +SECTION "maps/Route38.asm", ROMX Route38_MapScripts: db 0 ; scene scripts diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index 8f019decc94..db5020519f7 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -2,7 +2,7 @@ const ROUTE38ECRUTEAKGATE_OFFICER -SECTION "Route38EcruteakGate_MapScripts", ROMX +SECTION "maps/Route38EcruteakGate.asm", ROMX Route38EcruteakGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route39.asm b/maps/Route39.asm index 1d5a759c8c8..01288e19870 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -11,7 +11,7 @@ const ROUTE39_POKEFAN_F2 -SECTION "Route39_MapScripts", ROMX +SECTION "maps/Route39.asm", ROMX Route39_MapScripts: db 0 ; scene scripts diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 1b4901674ab..ba1bf53049a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -4,7 +4,7 @@ const ROUTE39BARN_MOOMOO -SECTION "Route39Barn_MapScripts", ROMX +SECTION "maps/Route39Barn.asm", ROMX Route39Barn_MapScripts: db 0 ; scene scripts diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index b338f51db52..d0ebbf0a22d 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -5,7 +5,7 @@ ROUTE39FARMHOUSE_MILK_PRICE EQU 500 const ROUTE39FARMHOUSE_POKEFAN_F -SECTION "Route39Farmhouse_MapScripts", ROMX +SECTION "maps/Route39Farmhouse.asm", ROMX Route39Farmhouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route4.asm b/maps/Route4.asm index 7914a6e4a00..d55bf85d6a0 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -5,7 +5,7 @@ const ROUTE4_POKE_BALL -SECTION "Route4_MapScripts", ROMX +SECTION "maps/Route4.asm", ROMX Route4_MapScripts: db 0 ; scene scripts diff --git a/maps/Route40.asm b/maps/Route40.asm index 76b8649d84c..640369433e8 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -13,7 +13,7 @@ const ROUTE40_STANDING_YOUNGSTER -SECTION "Route40_MapScripts", ROMX +SECTION "maps/Route40.asm", ROMX Route40_MapScripts: db 0 ; scene scripts diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index e16d953e94f..4772803b6e1 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -3,7 +3,7 @@ const ROUTE40BATTLETOWERGATE_TWIN -SECTION "Route40BattleTowerGate_MapScripts", ROMX +SECTION "maps/Route40BattleTowerGate.asm", ROMX Route40BattleTowerGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route41.asm b/maps/Route41.asm index 015b9060c6b..73a71249c22 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -11,7 +11,7 @@ const ROUTE41_SWIMMER_GIRL5 -SECTION "Route41_MapScripts", ROMX +SECTION "maps/Route41.asm", ROMX Route41_MapScripts: db 0 ; scene scripts diff --git a/maps/Route42.asm b/maps/Route42.asm index 59b965d883f..27b22e8fc84 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -10,7 +10,7 @@ const ROUTE42_SUICUNE -SECTION "Route42_MapScripts", ROMX +SECTION "maps/Route42.asm", ROMX Route42_MapScripts: db 2 ; scene scripts diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 6e8032c8c7a..e4b48e379ba 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -2,7 +2,7 @@ const ROUTE42ECRUTEAKGATE_OFFICER -SECTION "Route42EcruteakGate_MapScripts", ROMX +SECTION "maps/Route42EcruteakGate.asm", ROMX Route42EcruteakGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route43.asm b/maps/Route43.asm index e09fe7fbad1..fbb6c7d7b15 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -9,7 +9,7 @@ const ROUTE43_POKE_BALL -SECTION "Route43_MapScripts", ROMX +SECTION "maps/Route43.asm", ROMX Route43_MapScripts: db 0 ; scene scripts diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index e7389de5d66..f766e5c711d 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,7 +6,7 @@ ROUTE43GATE_TOLL EQU 1000 const ROUTE43GATE_ROCKET2 -SECTION "Route43Gate_MapScripts", ROMX +SECTION "maps/Route43Gate.asm", ROMX Route43Gate_MapScripts: db 2 ; scene scripts diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 62606c392b6..bfa0c41d704 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -2,7 +2,7 @@ const ROUTE43MAHOGANYGATE_OFFICER -SECTION "Route43MahoganyGate_MapScripts", ROMX +SECTION "maps/Route43MahoganyGate.asm", ROMX Route43MahoganyGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route44.asm b/maps/Route44.asm index c536244a843..436bfc074c7 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -12,7 +12,7 @@ const ROUTE44_POKE_BALL3 -SECTION "Route44_MapScripts", ROMX +SECTION "maps/Route44.asm", ROMX Route44_MapScripts: db 0 ; scene scripts diff --git a/maps/Route45.asm b/maps/Route45.asm index f2346a97a6b..56d2183fca1 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -14,7 +14,7 @@ const ROUTE45_YOUNGSTER -SECTION "Route45_MapScripts", ROMX +SECTION "maps/Route45.asm", ROMX Route45_MapScripts: db 0 ; scene scripts diff --git a/maps/Route46.asm b/maps/Route46.asm index 0ce6c4c0140..a96f85cd81b 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -7,7 +7,7 @@ const ROUTE46_POKE_BALL -SECTION "Route46_MapScripts", ROMX +SECTION "maps/Route46.asm", ROMX Route46_MapScripts: db 0 ; scene scripts diff --git a/maps/Route5.asm b/maps/Route5.asm index 5306cd7bd47..3a5675d7e80 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -2,7 +2,7 @@ const ROUTE5_POKEFAN_M -SECTION "Route5_MapScripts", ROMX +SECTION "maps/Route5.asm", ROMX Route5_MapScripts: db 0 ; scene scripts diff --git a/maps/Route5CleanseTagHouse.asm b/maps/Route5CleanseTagHouse.asm index 95d9e30cce4..932178d3aa8 100644 --- a/maps/Route5CleanseTagHouse.asm +++ b/maps/Route5CleanseTagHouse.asm @@ -3,7 +3,7 @@ const ROUTE5CLEANSETAGHOUSE_TEACHER -SECTION "Route5CleanseTagHouse_MapScripts", ROMX +SECTION "maps/Route5CleanseTagHouse.asm", ROMX Route5CleanseTagHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/Route5SaffronGate.asm b/maps/Route5SaffronGate.asm index 521f2639063..86d6dcde2b8 100644 --- a/maps/Route5SaffronGate.asm +++ b/maps/Route5SaffronGate.asm @@ -2,7 +2,7 @@ const ROUTE5SAFFRONGATE_OFFICER -SECTION "Route5SaffronGate_MapScripts", ROMX +SECTION "maps/Route5SaffronGate.asm", ROMX Route5SaffronGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route5UndergroundPathEntrance.asm b/maps/Route5UndergroundPathEntrance.asm index a92d7c02f6c..5b3182f6324 100644 --- a/maps/Route5UndergroundPathEntrance.asm +++ b/maps/Route5UndergroundPathEntrance.asm @@ -2,7 +2,7 @@ const ROUTE5UNDERGROUNDPATHENTRANCE_TEACHER -SECTION "Route5UndergroundPathEntrance_MapScripts", ROMX +SECTION "maps/Route5UndergroundPathEntrance.asm", ROMX Route5UndergroundPathEntrance_MapScripts: db 0 ; scene scripts diff --git a/maps/Route6.asm b/maps/Route6.asm index 8014f396d33..136babcfbb3 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -4,7 +4,7 @@ const ROUTE6_POKEFAN_M3 -SECTION "Route6_MapScripts", ROMX +SECTION "maps/Route6.asm", ROMX Route6_MapScripts: db 0 ; scene scripts diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 043f0e77a2f..76b7f7ff298 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -2,7 +2,7 @@ const ROUTE6SAFFRONGATE_OFFICER -SECTION "Route6SaffronGate_MapScripts", ROMX +SECTION "maps/Route6SaffronGate.asm", ROMX Route6SaffronGate_MapScripts: db 1 ; scene scripts diff --git a/maps/Route6UndergroundPathEntrance.asm b/maps/Route6UndergroundPathEntrance.asm index 2895bcc6149..73f48a16ddc 100644 --- a/maps/Route6UndergroundPathEntrance.asm +++ b/maps/Route6UndergroundPathEntrance.asm @@ -1,5 +1,5 @@ -SECTION "Route6UndergroundPathEntrance_MapScripts", ROMX +SECTION "maps/Route6UndergroundPathEntrance.asm", ROMX Route6UndergroundPathEntrance_MapScripts: db 0 ; scene scripts diff --git a/maps/Route7.asm b/maps/Route7.asm index cbd6bfbe08e..77345eab79f 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -1,5 +1,5 @@ -SECTION "Route7_MapScripts", ROMX +SECTION "maps/Route7.asm", ROMX Route7_MapScripts: db 0 ; scene scripts diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 6f382c2bb3b..376988de418 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -2,7 +2,7 @@ const ROUTE7SAFFRONGATE_OFFICER -SECTION "Route7SaffronGate_MapScripts", ROMX +SECTION "maps/Route7SaffronGate.asm", ROMX Route7SaffronGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route8.asm b/maps/Route8.asm index 57c909000c8..fc16708fb54 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -7,7 +7,7 @@ const ROUTE8_FRUIT_TREE -SECTION "Route8_MapScripts", ROMX +SECTION "maps/Route8.asm", ROMX Route8_MapScripts: db 0 ; scene scripts diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index cec96044443..656d99b9906 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -2,7 +2,7 @@ const ROUTE8SAFFRONGATE_OFFICER -SECTION "Route8SaffronGate_MapScripts", ROMX +SECTION "maps/Route8SaffronGate.asm", ROMX Route8SaffronGate_MapScripts: db 0 ; scene scripts diff --git a/maps/Route9.asm b/maps/Route9.asm index 63e055685f2..3eb37447ba7 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -7,7 +7,7 @@ const ROUTE9_POKEFAN_M2 -SECTION "Route9_MapScripts", ROMX +SECTION "maps/Route9.asm", ROMX Route9_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index a0354165780..0f7195cca58 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,4 +1,4 @@ -SECTION "RuinsOfAlphAerodactylChamber_MapScripts", ROMX +SECTION "maps/RuinsOfAlphAerodactylChamber.asm", ROMX RuinsOfAlphAerodactylChamber_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphAerodactylItemRoom.asm b/maps/RuinsOfAlphAerodactylItemRoom.asm index 2520842e0b7..7416e454afb 100644 --- a/maps/RuinsOfAlphAerodactylItemRoom.asm +++ b/maps/RuinsOfAlphAerodactylItemRoom.asm @@ -5,7 +5,7 @@ const RUINSOFALPHAERODACTYLITEMROOM_POKE_BALL4 -SECTION "RuinsOfAlphAerodactylItemRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphAerodactylItemRoom.asm", ROMX RuinsOfAlphAerodactylItemRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphAerodactylWordRoom.asm b/maps/RuinsOfAlphAerodactylWordRoom.asm index 590ff477e22..9eaa508a0c4 100644 --- a/maps/RuinsOfAlphAerodactylWordRoom.asm +++ b/maps/RuinsOfAlphAerodactylWordRoom.asm @@ -1,5 +1,5 @@ -SECTION "RuinsOfAlphAerodactylWordRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphAerodactylWordRoom.asm", ROMX RuinsOfAlphAerodactylWordRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index a007c04af53..a57f25fc982 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,5 +1,5 @@ -SECTION "RuinsOfAlphHoOhChamber_MapScripts", ROMX +SECTION "maps/RuinsOfAlphHoOhChamber.asm", ROMX RuinsOfAlphHoOhChamber_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphHoOhItemRoom.asm b/maps/RuinsOfAlphHoOhItemRoom.asm index 4cbdd8817a0..af51b3d213d 100644 --- a/maps/RuinsOfAlphHoOhItemRoom.asm +++ b/maps/RuinsOfAlphHoOhItemRoom.asm @@ -5,7 +5,7 @@ const RUINSOFALPHHOOHITEMROOM_POKE_BALL4 -SECTION "RuinsOfAlphHoOhItemRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphHoOhItemRoom.asm", ROMX RuinsOfAlphHoOhItemRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphHoOhWordRoom.asm b/maps/RuinsOfAlphHoOhWordRoom.asm index cfd38392d4b..ed579c37fcb 100644 --- a/maps/RuinsOfAlphHoOhWordRoom.asm +++ b/maps/RuinsOfAlphHoOhWordRoom.asm @@ -1,5 +1,5 @@ -SECTION "RuinsOfAlphHoOhWordRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphHoOhWordRoom.asm", ROMX RuinsOfAlphHoOhWordRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index b4b590da934..0874ac511d9 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -4,7 +4,7 @@ const RUINSOFALPHINNERCHAMBER_GRAMPS -SECTION "RuinsOfAlphInnerChamber_MapScripts", ROMX +SECTION "maps/RuinsOfAlphInnerChamber.asm", ROMX RuinsOfAlphInnerChamber_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 3eebb646974..937fae97936 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -3,7 +3,7 @@ const RUINSOFALPHKABUTOCHAMBER_SCIENTIST -SECTION "RuinsOfAlphKabutoChamber_MapScripts", ROMX, BANK[BANK_MAP_RUINS_OF_ALPH_RESEARCH_CENTER] +SECTION "maps/RuinsOfAlphKabutoChamber.asm", ROMX, BANK[BANK_MAP_RUINS_OF_ALPH_RESEARCH_CENTER] RuinsOfAlphKabutoChamber_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphKabutoItemRoom.asm b/maps/RuinsOfAlphKabutoItemRoom.asm index fbd7952da56..49924c0d693 100644 --- a/maps/RuinsOfAlphKabutoItemRoom.asm +++ b/maps/RuinsOfAlphKabutoItemRoom.asm @@ -5,7 +5,7 @@ const RUINSOFALPHKABUTOITEMROOM_POKE_BALL4 -SECTION "RuinsOfAlphKabutoItemRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphKabutoItemRoom.asm", ROMX RuinsOfAlphKabutoItemRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphKabutoWordRoom.asm b/maps/RuinsOfAlphKabutoWordRoom.asm index f287180f008..cabe6ae4930 100644 --- a/maps/RuinsOfAlphKabutoWordRoom.asm +++ b/maps/RuinsOfAlphKabutoWordRoom.asm @@ -1,5 +1,5 @@ -SECTION "RuinsOfAlphKabutoWordRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphKabutoWordRoom.asm", ROMX RuinsOfAlphKabutoWordRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index d693be71f47..31cb9ce0237 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,4 +1,4 @@ -SECTION "RuinsOfAlphOmanyteChamber_MapScripts", ROMX +SECTION "maps/RuinsOfAlphOmanyteChamber.asm", ROMX RuinsOfAlphOmanyteChamber_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphOmanyteItemRoom.asm b/maps/RuinsOfAlphOmanyteItemRoom.asm index 726caa35385..80a32ad2c06 100644 --- a/maps/RuinsOfAlphOmanyteItemRoom.asm +++ b/maps/RuinsOfAlphOmanyteItemRoom.asm @@ -5,7 +5,7 @@ const RUINSOFALPHOMANYTEITEMROOM_POKE_BALL4 -SECTION "RuinsOfAlphOmanyteItemRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphOmanyteItemRoom.asm", ROMX RuinsOfAlphOmanyteItemRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphOmanyteWordRoom.asm b/maps/RuinsOfAlphOmanyteWordRoom.asm index f17fcf9b0ed..f22a2b0d781 100644 --- a/maps/RuinsOfAlphOmanyteWordRoom.asm +++ b/maps/RuinsOfAlphOmanyteWordRoom.asm @@ -1,5 +1,5 @@ -SECTION "RuinsOfAlphOmanyteWordRoom_MapScripts", ROMX +SECTION "maps/RuinsOfAlphOmanyteWordRoom.asm", ROMX RuinsOfAlphOmanyteWordRoom_MapScripts: db 0 ; scene scripts diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 47debfa4789..c443e9fc80c 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -6,7 +6,7 @@ const RUINSOFALPHOUTSIDE_YOUNGSTER3 -SECTION "RuinsOfAlphOutside_MapScripts", ROMX +SECTION "maps/RuinsOfAlphOutside.asm", ROMX RuinsOfAlphOutside_MapScripts: db 2 ; scene scripts diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 8384327121b..2085c2587ea 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -4,7 +4,7 @@ const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 -SECTION "RuinsOfAlphResearchCenter_MapScripts", ROMX, BANK[BANK_MAP_RUINS_OF_ALPH_RESEARCH_CENTER] +SECTION "maps/RuinsOfAlphResearchCenter.asm", ROMX, BANK[BANK_MAP_RUINS_OF_ALPH_RESEARCH_CENTER] RuinsOfAlphResearchCenter_MapScripts: db 2 ; scene scripts diff --git a/maps/SafariZoneBeta.asm b/maps/SafariZoneBeta.asm index 28422ade5d4..4431936b25b 100644 --- a/maps/SafariZoneBeta.asm +++ b/maps/SafariZoneBeta.asm @@ -1,5 +1,5 @@ -SECTION "SafariZoneBeta_MapScripts", ROMX +SECTION "maps/SafariZoneBeta.asm", ROMX SafariZoneBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/SafariZoneFuchsiaGateBeta.asm b/maps/SafariZoneFuchsiaGateBeta.asm index a9ec6ca577a..817710e8f3d 100644 --- a/maps/SafariZoneFuchsiaGateBeta.asm +++ b/maps/SafariZoneFuchsiaGateBeta.asm @@ -1,5 +1,5 @@ -SECTION "SafariZoneFuchsiaGateBeta_MapScripts", ROMX +SECTION "maps/SafariZoneFuchsiaGateBeta.asm", ROMX SafariZoneFuchsiaGateBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/SafariZoneMainOffice.asm b/maps/SafariZoneMainOffice.asm index 1c6736d0fec..adaf386f54f 100644 --- a/maps/SafariZoneMainOffice.asm +++ b/maps/SafariZoneMainOffice.asm @@ -1,5 +1,5 @@ -SECTION "SafariZoneMainOffice_MapScripts", ROMX +SECTION "maps/SafariZoneMainOffice.asm", ROMX SafariZoneMainOffice_MapScripts: db 0 ; scene scripts diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 34e21280f5d..58f8cdbf5ae 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -2,7 +2,7 @@ const SAFARIZONEWARDENSHOME_LASS -SECTION "SafariZoneWardensHome_MapScripts", ROMX +SECTION "maps/SafariZoneWardensHome.asm", ROMX SafariZoneWardensHome_MapScripts: db 0 ; scene scripts diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index db741bbb75f..ceb352ccd43 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -9,7 +9,7 @@ const SAFFRONCITY_LASS2 -SECTION "SaffronCity_MapScripts", ROMX +SECTION "maps/SaffronCity.asm", ROMX SaffronCity_MapScripts: db 0 ; scene scripts diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 6978b6b9825..75681e71d11 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,7 +7,7 @@ const SAFFRONGYM_GYM_GUY -SECTION "SaffronGym_MapScripts", ROMX +SECTION "maps/SaffronGym.asm", ROMX SaffronGym_MapScripts: db 0 ; scene scripts diff --git a/maps/SaffronMagnetTrainStation.asm b/maps/SaffronMagnetTrainStation.asm index 63e8653c813..4e6361812e2 100644 --- a/maps/SaffronMagnetTrainStation.asm +++ b/maps/SaffronMagnetTrainStation.asm @@ -5,7 +5,7 @@ const SAFFRONMAGNETTRAINSTATION_LASS -SECTION "SaffronMagnetTrainStation_MapScripts", ROMX +SECTION "maps/SaffronMagnetTrainStation.asm", ROMX SaffronMagnetTrainStation_MapScripts: db 1 ; scene scripts diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 8a1fa4bcdc3..5fe203cec8f 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -4,7 +4,7 @@ const SAFFRONMART_COOLTRAINER_F -SECTION "SaffronMart_MapScripts", ROMX +SECTION "maps/SaffronMart.asm", ROMX SaffronMart_MapScripts: db 0 ; scene scripts diff --git a/maps/SaffronPokecenter1F.asm b/maps/SaffronPokecenter1F.asm index bd11a1162a4..b3a6d2760b5 100644 --- a/maps/SaffronPokecenter1F.asm +++ b/maps/SaffronPokecenter1F.asm @@ -5,7 +5,7 @@ const SAFFRONPOKECENTER1F_YOUNGSTER -SECTION "SaffronPokecenter1F_MapScripts", ROMX +SECTION "maps/SaffronPokecenter1F.asm", ROMX SaffronPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/SaffronPokecenter2FBeta.asm b/maps/SaffronPokecenter2FBeta.asm index 2ef20b28b47..bade666313a 100644 --- a/maps/SaffronPokecenter2FBeta.asm +++ b/maps/SaffronPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "SaffronPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/SaffronPokecenter2FBeta.asm", ROMX SaffronPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 03708de8965..9834e802efb 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -3,7 +3,7 @@ const SEAFOAMGYM_GYM_GUY -SECTION "SeafoamGym_MapScripts", ROMX +SECTION "maps/SeafoamGym.asm", ROMX SeafoamGym_MapScripts: db 1 ; scene scripts diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 23a965cfed7..c6ab1ee6d05 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -3,7 +3,7 @@ const SILPHCO1F_OFFICER -SECTION "SilphCo1F_MapScripts", ROMX +SECTION "maps/SilphCo1F.asm", ROMX SilphCo1F_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 672d57d04c2..3f57d97c6b3 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -3,7 +3,7 @@ const SILVERCAVEITEMROOMS_POKE_BALL2 -SECTION "SilverCaveItemRooms_MapScripts", ROMX +SECTION "maps/SilverCaveItemRooms.asm", ROMX SilverCaveItemRooms_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 61264b64a4d..df686957c8f 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -1,5 +1,5 @@ -SECTION "SilverCaveOutside_MapScripts", ROMX +SECTION "maps/SilverCaveOutside.asm", ROMX SilverCaveOutside_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCavePokecenter1F.asm b/maps/SilverCavePokecenter1F.asm index f64393fa0c6..01d14d2a613 100644 --- a/maps/SilverCavePokecenter1F.asm +++ b/maps/SilverCavePokecenter1F.asm @@ -3,7 +3,7 @@ const SILVERCAVEPOKECENTER1F_GRANNY -SECTION "SilverCavePokecenter1F_MapScripts", ROMX +SECTION "maps/SilverCavePokecenter1F.asm", ROMX SilverCavePokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 78943daea48..6be9954f1b8 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -5,7 +5,7 @@ const SILVERCAVEROOM1_POKE_BALL4 -SECTION "SilverCaveRoom1_MapScripts", ROMX +SECTION "maps/SilverCaveRoom1.asm", ROMX SilverCaveRoom1_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 18d3383e281..3cbe758c94f 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -4,7 +4,7 @@ const SILVERCAVEROOM2_POKE_BALL3 -SECTION "SilverCaveRoom2_MapScripts", ROMX +SECTION "maps/SilverCaveRoom2.asm", ROMX SilverCaveRoom2_MapScripts: db 0 ; scene scripts diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index ab58958ed9e..7641e356d0a 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -2,7 +2,7 @@ const SILVERCAVEROOM3_RED -SECTION "SilverCaveRoom3_MapScripts", ROMX +SECTION "maps/SilverCaveRoom3.asm", ROMX SilverCaveRoom3_MapScripts: db 0 ; scene scripts diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 1b09fafe30d..b389867adc0 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,7 +10,7 @@ const SLOWPOKEWELLB1F_POKE_BALL -SECTION "SlowpokeWellB1F_MapScripts", ROMX +SECTION "maps/SlowpokeWellB1F.asm", ROMX SlowpokeWellB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 5d93b8a59ea..2d0e6ccf789 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -3,7 +3,7 @@ const SLOWPOKEWELLB2F_POKE_BALL -SECTION "SlowpokeWellB2F_MapScripts", ROMX +SECTION "maps/SlowpokeWellB2F.asm", ROMX SlowpokeWellB2F_MapScripts: db 0 ; scene scripts diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 1b8ffe48c9a..70bad6bfc84 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -5,7 +5,7 @@ const SOULHOUSE_GRANNY -SECTION "SoulHouse_MapScripts", ROMX +SECTION "maps/SoulHouse.asm", ROMX SoulHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index a34e6e14507..e5164032718 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -7,7 +7,7 @@ const SPROUTTOWER1F_POKE_BALL -SECTION "SproutTower1F_MapScripts", ROMX +SECTION "maps/SproutTower1F.asm", ROMX SproutTower1F_MapScripts: db 0 ; scene scripts diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index f6fe240afac..7b3e8fb3816 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -4,7 +4,7 @@ const SPROUTTOWER2F_POKE_BALL -SECTION "SproutTower2F_MapScripts", ROMX +SECTION "maps/SproutTower2F.asm", ROMX SproutTower2F_MapScripts: db 0 ; scene scripts diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index ff2fd5c9a12..3e7df0ae781 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -8,7 +8,7 @@ const SPROUTTOWER3F_SILVER -SECTION "SproutTower3F_MapScripts", ROMX +SECTION "maps/SproutTower3F.asm", ROMX SproutTower3F_MapScripts: db 2 ; scene scripts diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 8a25f11f1a4..729a8318136 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -7,7 +7,7 @@ const TEAMROCKETBASEB1F_POKE_BALL3 -SECTION "TeamRocketBaseB1F_MapScripts", ROMX +SECTION "maps/TeamRocketBaseB1F.asm", ROMX TeamRocketBaseB1F_MapScripts: db 1 ; scene scripts diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 52cf139efd8..086bfc6aa2e 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -15,7 +15,7 @@ const TEAMROCKETBASEB2F_POKE_BALL -SECTION "TeamRocketBaseB2F_MapScripts", ROMX +SECTION "maps/TeamRocketBaseB2F.asm", ROMX TeamRocketBaseB2F_MapScripts: db 4 ; scene scripts diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index a6644cded11..9fd3ecb563c 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -15,7 +15,7 @@ const TEAMROCKETBASEB3F_POKE_BALL5 -SECTION "TeamRocketBaseB3F_MapScripts", ROMX +SECTION "maps/TeamRocketBaseB3F.asm", ROMX TeamRocketBaseB3F_MapScripts: db 4 ; scene scripts diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 24504c8dfe7..232cb9f0c6d 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,7 +3,7 @@ const TIMECAPSULE_CHRIS2 -SECTION "TimeCapsule_MapScripts", ROMX +SECTION "maps/TimeCapsule.asm", ROMX TimeCapsule_MapScripts: db 2 ; scene scripts diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 4af1aede89d..81f17bb0600 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -11,7 +11,7 @@ const TINTOWER1F_SAGE6 -SECTION "TinTower1F_MapScripts", ROMX +SECTION "maps/TinTower1F.asm", ROMX TinTower1F_MapScripts: db 2 ; scene scripts diff --git a/maps/TinTower2F.asm b/maps/TinTower2F.asm index ca310b42da9..b2a055aa9ae 100644 --- a/maps/TinTower2F.asm +++ b/maps/TinTower2F.asm @@ -1,5 +1,5 @@ -SECTION "TinTower2F_MapScripts", ROMX +SECTION "maps/TinTower2F.asm", ROMX TinTower2F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 1ef3c994565..1831e402337 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -2,7 +2,7 @@ const TINTOWER3F_POKE_BALL -SECTION "TinTower3F_MapScripts", ROMX +SECTION "maps/TinTower3F.asm", ROMX TinTower3F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 130f35b40a3..8549837dd3e 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -4,7 +4,7 @@ const TINTOWER4F_POKE_BALL3 -SECTION "TinTower4F_MapScripts", ROMX +SECTION "maps/TinTower4F.asm", ROMX TinTower4F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 63f3333c88d..f7e3c14222e 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -2,7 +2,7 @@ const TINTOWER5F_POKE_BALL -SECTION "TinTower5F_MapScripts", ROMX +SECTION "maps/TinTower5F.asm", ROMX TinTower5F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index e26664e573d..d1f4f054628 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -2,7 +2,7 @@ const TINTOWER6F_POKE_BALL -SECTION "TinTower6F_MapScripts", ROMX +SECTION "maps/TinTower6F.asm", ROMX TinTower6F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 54d3445fe87..22a0521eaff 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -2,7 +2,7 @@ const TINTOWER7F_POKE_BALL -SECTION "TinTower7F_MapScripts", ROMX +SECTION "maps/TinTower7F.asm", ROMX TinTower7F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 9ad4770be83..12201f57815 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -4,7 +4,7 @@ const TINTOWER8F_POKE_BALL3 -SECTION "TinTower8F_MapScripts", ROMX +SECTION "maps/TinTower8F.asm", ROMX TinTower8F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index c236585898c..bcb0c39cc9e 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -2,7 +2,7 @@ const TINTOWER9F_POKE_BALL -SECTION "TinTower9F_MapScripts", ROMX +SECTION "maps/TinTower9F.asm", ROMX TinTower9F_MapScripts: db 0 ; scene scripts diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 3e36c8758cb..9da8f09af51 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -2,7 +2,7 @@ const TINTOWERROOF_HO_OH -SECTION "TinTowerRoof_MapScripts", ROMX +SECTION "maps/TinTowerRoof.asm", ROMX TinTowerRoof_MapScripts: db 0 ; scene scripts diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 1a711004673..7de7ef0e95f 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -2,7 +2,7 @@ const TOHJOFALLS_POKE_BALL -SECTION "TohjoFalls_MapScripts", ROMX +SECTION "maps/TohjoFalls.asm", ROMX TohjoFalls_MapScripts: db 0 ; scene scripts diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 493954e7763..c0246b6f76b 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,7 +3,7 @@ const TRADECENTER_CHRIS2 -SECTION "TradeCenter_MapScripts", ROMX, BANK[BANK_MAP_COLOSSEUM] +SECTION "maps/TradeCenter.asm", ROMX, BANK[BANK_MAP_COLOSSEUM] TradeCenter_MapScripts: db 2 ; scene scripts diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index ae39ba5d213..fe8bbe8779f 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -6,7 +6,7 @@ const TRAINERHOUSE1F_GENTLEMAN -SECTION "TrainerHouse1F_MapScripts", ROMX +SECTION "maps/TrainerHouse1F.asm", ROMX TrainerHouse1F_MapScripts: db 0 ; scene scripts diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 6e78c9231ea..af4b5d27bf7 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -3,7 +3,7 @@ const TRAINERHOUSEB1F_CHRIS -SECTION "TrainerHouseB1F_MapScripts", ROMX +SECTION "maps/TrainerHouseB1F.asm", ROMX TrainerHouseB1F_MapScripts: db 1 ; scene scripts diff --git a/maps/UndergroundPath.asm b/maps/UndergroundPath.asm index 9ccb638183a..4ad289e8c70 100644 --- a/maps/UndergroundPath.asm +++ b/maps/UndergroundPath.asm @@ -1,5 +1,5 @@ -SECTION "UndergroundPath_MapScripts", ROMX +SECTION "maps/UndergroundPath.asm", ROMX UndergroundPath_MapScripts: db 0 ; scene scripts diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 4ce3c46542d..369823beb83 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -10,7 +10,7 @@ const UNIONCAVE1F_POKE_BALL4 -SECTION "UnionCave1F_MapScripts", ROMX +SECTION "maps/UnionCave1F.asm", ROMX UnionCave1F_MapScripts: db 0 ; scene scripts diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 9cc8000a168..e69881ca9b0 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -8,7 +8,7 @@ const UNIONCAVEB1F_POKE_BALL2 -SECTION "UnionCaveB1F_MapScripts", ROMX +SECTION "maps/UnionCaveB1F.asm", ROMX UnionCaveB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index c820396d547..205ff1fc209 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -7,7 +7,7 @@ const UNIONCAVEB2F_LAPRAS -SECTION "UnionCaveB2F_MapScripts", ROMX +SECTION "maps/UnionCaveB2F.asm", ROMX UnionCaveB2F_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index b0a2c6483dd..d7d2b0f6f98 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -7,7 +7,7 @@ const VERMILIONCITY_POKEFAN_M -SECTION "VermilionCity_MapScripts", ROMX +SECTION "maps/VermilionCity.asm", ROMX VermilionCity_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm index 41210f831a5..662dc4097ea 100644 --- a/maps/VermilionDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionDiglettsCaveSpeechHouse.asm @@ -2,7 +2,7 @@ const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN -SECTION "VermilionDiglettsCaveSpeechHouse_MapScripts", ROMX +SECTION "maps/VermilionDiglettsCaveSpeechHouse.asm", ROMX VermilionDiglettsCaveSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm index d82ef6a36b2..2876dd11fe7 100644 --- a/maps/VermilionFishingSpeechHouse.asm +++ b/maps/VermilionFishingSpeechHouse.asm @@ -2,7 +2,7 @@ const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU -SECTION "VermilionFishingSpeechHouse_MapScripts", ROMX +SECTION "maps/VermilionFishingSpeechHouse.asm", ROMX VermilionFishingSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index a8cbfa77d7b..2c0a87815fe 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -6,7 +6,7 @@ const VERMILIONGYM_GYM_GUY -SECTION "VermilionGym_MapScripts", ROMX +SECTION "maps/VermilionGym.asm", ROMX VermilionGym_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 970f476e99a..fed60062f2b 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -3,7 +3,7 @@ const VERMILIONMAGNETTRAINSPEECHHOUSE_YOUNGSTER -SECTION "VermilionMagnetTrainSpeechHouse_MapScripts", ROMX +SECTION "maps/VermilionMagnetTrainSpeechHouse.asm", ROMX VermilionMagnetTrainSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 1f339420250..7fb8062f49d 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -4,7 +4,7 @@ const VERMILIONMART_BUENA -SECTION "VermilionMart_MapScripts", ROMX +SECTION "maps/VermilionMart.asm", ROMX VermilionMart_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionPokecenter1F.asm b/maps/VermilionPokecenter1F.asm index fe22b572559..39278b234dd 100644 --- a/maps/VermilionPokecenter1F.asm +++ b/maps/VermilionPokecenter1F.asm @@ -5,7 +5,7 @@ const VERMILIONPOKECENTER1F_BUG_CATCHER -SECTION "VermilionPokecenter1F_MapScripts", ROMX +SECTION "maps/VermilionPokecenter1F.asm", ROMX VermilionPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionPokecenter2FBeta.asm b/maps/VermilionPokecenter2FBeta.asm index 84d27e8506d..92af25556e2 100644 --- a/maps/VermilionPokecenter2FBeta.asm +++ b/maps/VermilionPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "VermilionPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/VermilionPokecenter2FBeta.asm", ROMX VermilionPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 5948d814133..67edaffd05c 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -4,7 +4,7 @@ const VERMILIONPORT_SUPER_NERD -SECTION "VermilionPort_MapScripts", ROMX +SECTION "maps/VermilionPort.asm", ROMX VermilionPort_MapScripts: db 2 ; scene scripts diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index f3cdbd513d8..2111304254e 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -2,7 +2,7 @@ const VERMILIONPORTPASSAGE_TEACHER -SECTION "VermilionPortPassage_MapScripts", ROMX +SECTION "maps/VermilionPortPassage.asm", ROMX VermilionPortPassage_MapScripts: db 0 ; scene scripts diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1307cc45211..f5fa476f67c 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -7,7 +7,7 @@ const VICTORYROAD_POKE_BALL5 -SECTION "VictoryRoad_MapScripts", ROMX +SECTION "maps/VictoryRoad.asm", ROMX VictoryRoad_MapScripts: db 2 ; scene scripts diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index f9dd2069cc4..a540de11ccb 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -4,7 +4,7 @@ const VICTORYROADGATE_BLACK_BELT2 -SECTION "VictoryRoadGate_MapScripts", ROMX +SECTION "maps/VictoryRoadGate.asm", ROMX VictoryRoadGate_MapScripts: db 2 ; scene scripts diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 06420e89c7d..b419ed374ec 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -9,7 +9,7 @@ const VIOLETCITY_POKE_BALL2 -SECTION "VioletCity_MapScripts", ROMX +SECTION "maps/VioletCity.asm", ROMX VioletCity_MapScripts: db 0 ; scene scripts diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a10759a5377..734162e5a47 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -5,7 +5,7 @@ const VIOLETGYM_GYM_GUY -SECTION "VioletGym_MapScripts", ROMX +SECTION "maps/VioletGym.asm", ROMX VioletGym_MapScripts: db 0 ; scene scripts diff --git a/maps/VioletKylesHouse.asm b/maps/VioletKylesHouse.asm index 9c4ef5bf185..796bca3d91a 100644 --- a/maps/VioletKylesHouse.asm +++ b/maps/VioletKylesHouse.asm @@ -3,7 +3,7 @@ const VIOLETKYLESHOUSE_KYLE -SECTION "VioletKylesHouse_MapScripts", ROMX +SECTION "maps/VioletKylesHouse.asm", ROMX VioletKylesHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index a9ebd034168..4bf00e4c85a 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -4,7 +4,7 @@ const VIOLETMART_COOLTRAINER_M -SECTION "VioletMart_MapScripts", ROMX +SECTION "maps/VioletMart.asm", ROMX VioletMart_MapScripts: db 0 ; scene scripts diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 5663e601d85..57f921ac9a0 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -4,7 +4,7 @@ const VIOLETNICKNAMESPEECHHOUSE_BIRD -SECTION "VioletNicknameSpeechHouse_MapScripts", ROMX +SECTION "maps/VioletNicknameSpeechHouse.asm", ROMX VioletNicknameSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm index edb81911469..1fb146c150b 100644 --- a/maps/VioletPokecenter1F.asm +++ b/maps/VioletPokecenter1F.asm @@ -6,7 +6,7 @@ const VIOLETPOKECENTER1F_SCIENTIST -SECTION "VioletPokecenter1F_MapScripts", ROMX +SECTION "maps/VioletPokecenter1F.asm", ROMX VioletPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index f79fa27df76..fce4b965b9d 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -5,7 +5,7 @@ const VIRIDIANCITY_YOUNGSTER -SECTION "ViridianCity_MapScripts", ROMX +SECTION "maps/ViridianCity.asm", ROMX ViridianCity_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index bbde8b25755..92842d85a85 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -3,7 +3,7 @@ const VIRIDIANGYM_GYM_GUY -SECTION "ViridianGym_MapScripts", ROMX +SECTION "maps/ViridianGym.asm", ROMX ViridianGym_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 22d02a232cb..55795435a5c 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -4,7 +4,7 @@ const VIRIDIANMART_COOLTRAINER_M -SECTION "ViridianMart_MapScripts", ROMX +SECTION "maps/ViridianMart.asm", ROMX ViridianMart_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index e286065c96f..08f8b6333de 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -5,7 +5,7 @@ const VIRIDIANNICKNAMESPEECHHOUSE_RATTEY -SECTION "ViridianNicknameSpeechHouse_MapScripts", ROMX +SECTION "maps/ViridianNicknameSpeechHouse.asm", ROMX ViridianNicknameSpeechHouse_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianPokecenter1F.asm b/maps/ViridianPokecenter1F.asm index b37b7304120..fdade93fe13 100644 --- a/maps/ViridianPokecenter1F.asm +++ b/maps/ViridianPokecenter1F.asm @@ -5,7 +5,7 @@ const VIRIDIANPOKECENTER1F_BUG_CATCHER -SECTION "ViridianPokecenter1F_MapScripts", ROMX +SECTION "maps/ViridianPokecenter1F.asm", ROMX ViridianPokecenter1F_MapScripts: db 0 ; scene scripts diff --git a/maps/ViridianPokecenter2FBeta.asm b/maps/ViridianPokecenter2FBeta.asm index 055d4c55e42..1a9069c9c87 100644 --- a/maps/ViridianPokecenter2FBeta.asm +++ b/maps/ViridianPokecenter2FBeta.asm @@ -1,5 +1,5 @@ -SECTION "ViridianPokecenter2FBeta_MapScripts", ROMX +SECTION "maps/ViridianPokecenter2FBeta.asm", ROMX ViridianPokecenter2FBeta_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 8eb7b2839ae..935732c70bf 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -7,7 +7,7 @@ const WHIRLISLANDB1F_BOULDER -SECTION "WhirlIslandB1F_MapScripts", ROMX +SECTION "maps/WhirlIslandB1F.asm", ROMX WhirlIslandB1F_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index 9a6728787b7..89207a53455 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -4,7 +4,7 @@ const WHIRLISLANDB2F_POKE_BALL3 -SECTION "WhirlIslandB2F_MapScripts", ROMX +SECTION "maps/WhirlIslandB2F.asm", ROMX WhirlIslandB2F_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandCave.asm b/maps/WhirlIslandCave.asm index 8f3299af0a5..9bfc660e49f 100644 --- a/maps/WhirlIslandCave.asm +++ b/maps/WhirlIslandCave.asm @@ -1,5 +1,5 @@ -SECTION "WhirlIslandCave_MapScripts", ROMX +SECTION "maps/WhirlIslandCave.asm", ROMX WhirlIslandCave_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 04e0ba78acc..a0da6d97bdb 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -2,7 +2,7 @@ const WHIRLISLANDLUGIACHAMBER_LUGIA -SECTION "WhirlIslandLugiaChamber_MapScripts", ROMX +SECTION "maps/WhirlIslandLugiaChamber.asm", ROMX WhirlIslandLugiaChamber_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 164081f8be6..dbb11c5bf99 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -2,7 +2,7 @@ const WHIRLISLANDNE_POKE_BALL -SECTION "WhirlIslandNE_MapScripts", ROMX +SECTION "maps/WhirlIslandNE.asm", ROMX WhirlIslandNE_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandNW.asm b/maps/WhirlIslandNW.asm index 118fe7a81d6..2ddd8dbfc05 100644 --- a/maps/WhirlIslandNW.asm +++ b/maps/WhirlIslandNW.asm @@ -1,5 +1,5 @@ -SECTION "WhirlIslandNW_MapScripts", ROMX +SECTION "maps/WhirlIslandNW.asm", ROMX WhirlIslandNW_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandSE.asm b/maps/WhirlIslandSE.asm index 651cedacd84..f9a27477174 100644 --- a/maps/WhirlIslandSE.asm +++ b/maps/WhirlIslandSE.asm @@ -1,5 +1,5 @@ -SECTION "WhirlIslandSE_MapScripts", ROMX +SECTION "maps/WhirlIslandSE.asm", ROMX WhirlIslandSE_MapScripts: db 0 ; scene scripts diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 04e8aa3358d..56604ef1d10 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -2,7 +2,7 @@ const WHIRLISLANDSW_POKE_BALL -SECTION "WhirlIslandSW_MapScripts", ROMX +SECTION "maps/WhirlIslandSW.asm", ROMX WhirlIslandSW_MapScripts: db 0 ; scene scripts diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index e92d081cf88..9ef6d76d117 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -2,7 +2,7 @@ const WILLSROOM_WILL -SECTION "WillsRoom_MapScripts", ROMX +SECTION "maps/WillsRoom.asm", ROMX WillsRoom_MapScripts: db 2 ; scene scripts diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 5b252ad50f2..d8dbf4a3093 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -7,7 +7,7 @@ const WISETRIOSROOM_SAGE6 -SECTION "WiseTriosRoom_MapScripts", ROMX +SECTION "maps/WiseTriosRoom.asm", ROMX WiseTriosRoom_MapScripts: db 2 ; scene scripts diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 3c3c3384309..546f8a036bf 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -1,4 +1,4 @@ -SECTION "MobileCheckOwnMonAnywhere", ROMX +SECTION "mobile/mobile_12_2.asm@MobileCheckOwnMonAnywhere", ROMX MobileCheckOwnMonAnywhere: ; Like CheckOwnMonAnywhere, but only check for species. @@ -158,7 +158,7 @@ MobileCheckOwnMonAnywhere: ret -SECTION "UnusedFindItemInPCOrBag", ROMX +SECTION "mobile/mobile_12_2.asm@UnusedFindItemInPCOrBag", ROMX UnusedFindItemInPCOrBag: ld a, [wScriptVar] @@ -183,7 +183,7 @@ UnusedFindItemInPCOrBag: ret -SECTION "Function4a94e - Function4adf7", ROMX +SECTION "mobile/mobile_12_2.asm", ROMX Function4a94e: call FadeToMenu diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 54cf224186d..44ec38950f8 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1,4 +1,4 @@ -SECTION "String_89116 - Function8adcc", ROMX, BANK[BANK_MOBILE_22] +SECTION "mobile/mobile_22.asm", ROMX, BANK[BANK_MOBILE_22] String_89116: db "-----@" diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 34a4d736efc..7cf818b1f99 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -1,4 +1,4 @@ -SECTION "Function8b342", ROMX +SECTION "mobile/mobile_22_2.asm@Function8b342", ROMX Function8b342:: ; Loads the map data pointer, then runs through a @@ -35,7 +35,7 @@ Function8b342:: ret -SECTION "Function8b35d", ROMX +SECTION "mobile/mobile_22_2.asm@Function8b35d", ROMX Function8b35d: ld a, h @@ -46,7 +46,7 @@ Function8b35d: ret -SECTION "Function8b363", ROMX +SECTION "mobile/mobile_22_2.asm@Function8b363", ROMX Function8b363: push bc @@ -55,7 +55,7 @@ Function8b363: ret -SECTION "Function8b36c - Unknown_8ba1f", ROMX, BANK[BANK_MOBILE_22] +SECTION "mobile/mobile_22_2.asm", ROMX, BANK[BANK_MOBILE_22] Function8b36c: ; [bc + (0:4)] = -1 diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index f2fa9894177..4d4afc5a31f 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1,4 +1,4 @@ -SECTION "Function100000 - UnknownText_0x1021f4", ROMX, BANK[BANK_MOBILE_40] +SECTION "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (1)", ROMX, BANK[BANK_MOBILE_40] Function100000: ; d: 1 or 2 @@ -1683,7 +1683,7 @@ Function100ae7: ret -SECTION "Function100000 - UnknownText_0x1021f4 (2)", ROMX, BANK[BANK_MOBILE_40] +SECTION "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (ASCII 1)", ROMX, BANK[BANK_MOBILE_40] charmap " ", $20 ; revert to ascii @@ -1691,7 +1691,7 @@ Unknown_100b0a: db "tetsuji", 0 -SECTION "Function100000 - UnknownText_0x1021f4 (3)", ROMX, BANK[BANK_MOBILE_40] +SECTION "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (2)", ROMX, BANK[BANK_MOBILE_40] Function100b12: call Function100dd8 @@ -3617,7 +3617,7 @@ Function101826: ret -SECTION "Function100000 - UnknownText_0x1021f4 (4)", ROMX, BANK[BANK_MOBILE_40] +SECTION "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (ASCII 2)", ROMX, BANK[BANK_MOBILE_40] charmap " ", $20 ; revert to ascii @@ -3637,7 +3637,7 @@ Unknown_101895: .end db 0 -SECTION "Function100000 - UnknownText_0x1021f4 (5)", ROMX, BANK[BANK_MOBILE_40] +SECTION "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (3)", ROMX, BANK[BANK_MOBILE_40] Function1018a8: ld hl, wccb5 @@ -4832,7 +4832,7 @@ UnknownText_0x1021f4: text_end -SECTION "Function1021f9 - Palettes_1032e2", ROMX +SECTION "mobile/mobile_40.asm@Function1021f9 - Palettes_1032e2", ROMX Function1021f9: call Function102233 @@ -6925,7 +6925,7 @@ Palettes_1032e2: RGB 0, 0, 0 -SECTION "Function103302 - MenuData_103648", ROMX +SECTION "mobile/mobile_40.asm@Function103302 - MenuData_103648", ROMX Function103302: call Function103309 @@ -7352,7 +7352,7 @@ MenuData_103648: db "ケーブル@" -SECTION "Function103654", ROMX +SECTION "mobile/mobile_40.asm@Function103654", ROMX Function103654: farcall Mobile_AlwaysReturnNotCarry @@ -7370,7 +7370,7 @@ Function103654: ret -SECTION "Mobile_SelectThreeMons - UnknownText_0x10377b", ROMX +SECTION "mobile/mobile_40.asm@Mobile_SelectThreeMons - UnknownText_0x10377b", ROMX Mobile_SelectThreeMons: farcall Mobile_AlwaysReturnNotCarry @@ -7536,7 +7536,7 @@ UnknownText_0x10377b: text_end -SECTION "Function103780 - Function10378c", ROMX +SECTION "mobile/mobile_40.asm@Function103780 - Function10378c", ROMX Function103780: ld a, [wChosenCableClubRoom] @@ -7579,7 +7579,7 @@ Function10378c: ret -SECTION "Function1037c2 - Function103823", ROMX +SECTION "mobile/mobile_40.asm@Function1037c2 - Function103823", ROMX Function1037c2: call Function103823 @@ -7657,7 +7657,7 @@ Function103823: ret -SECTION "Function10383c - UnknownText_0x103876", ROMX +SECTION "mobile/mobile_40.asm@Function10383c - UnknownText_0x103876", ROMX Function10383c: ld a, $01 @@ -7691,7 +7691,7 @@ UnknownText_0x103876: text_end -SECTION "Function10387b - UnknownText_0x103898", ROMX +SECTION "mobile/mobile_40.asm@Function10387b - UnknownText_0x103898", ROMX Function10387b: farcall Mobile_AlwaysReturnNotCarry diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 7dbbf8dd413..9c61be6bfe9 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -2,7 +2,7 @@ ; which were used for Trainer Rankings in Pokémon News. -SECTION "StubbedTrainerRankings_HallOfFame2 - InitializeTrainerRankings", ROMX +SECTION "mobile/mobile_41.asm@TrainerRankings", ROMX ; Copies certain values at the time the player enters the Hall of Fame. StubbedTrainerRankings_HallOfFame2:: @@ -581,7 +581,7 @@ InitializeTrainerRankings: ret -SECTION "_MobilePrintNum", ROMX +SECTION "mobile/mobile_41.asm@_MobilePrintNum", ROMX _MobilePrintNum:: ; Supports signed 31-bit integers (up to 10 digits) @@ -788,7 +788,7 @@ endr ret -SECTION "Mobile_DummyReturnFalse", ROMX +SECTION "mobile/mobile_41.asm@Mobile_DummyReturnFalse", ROMX ; functions related to the cable club and various NPC scripts referencing communications @@ -798,7 +798,7 @@ Mobile_DummyReturnFalse: ret -SECTION "Stubbed_Function106314 - Function106453", ROMX +SECTION "mobile/mobile_41.asm@Stubbed_Function106314 - Function106453", ROMX Stubbed_Function106314: ret @@ -1016,14 +1016,14 @@ Function106453: ret -SECTION "Stubbed_Function106462", ROMX +SECTION "mobile/mobile_41.asm@Stubbed_Function106462", ROMX Stubbed_Function106462: ret ret -SECTION "Function106464", ROMX +SECTION "mobile/mobile_41.asm@Function106464", ROMX Function106464:: ld de, FontsExtra_SolidBlackGFX @@ -1047,7 +1047,7 @@ Function106464:: ret -SECTION "Function10649b - asm_1064ed", ROMX +SECTION "mobile/mobile_41.asm@Function10649b - asm_1064ed", ROMX Function10649b: ld a, [wTextboxFrame] @@ -1119,7 +1119,7 @@ asm_1064ed: ret -SECTION "Function10650a", ROMX +SECTION "mobile/mobile_41.asm@Function10650a", ROMX Function10650a: ld de, MobilePhoneTilesGFX @@ -1128,7 +1128,7 @@ Function10650a: ret -SECTION "GFX_106514", ROMX +SECTION "mobile/mobile_41.asm@GFX_106514", ROMX GFX_106514: INCBIN "gfx/unknown/106514.2bpp" diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index b12fcec4118..c17a07ab892 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1,4 +1,4 @@ -SECTION "MobileTradeAnimation_SendGivemonToGTS - Palette_1093c7", ROMX +SECTION "mobile/mobile_42.asm", ROMX MobileTradeAnimation_SendGivemonToGTS: ld a, $80 diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index da70c0e844a..bc2d3385064 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -1,4 +1,4 @@ -SECTION "String_114000 - Function115d80", ROMX +SECTION "mobile/mobile_45.asm@String_114000 - Function115d80", ROMX charmap " ", $20 ; revert to ascii @@ -5160,14 +5160,14 @@ Function115d80: INCLUDE "mobile/mobile_45_sprite_engine.asm" -SECTION "GiveOddEgg", ROMX +SECTION "mobile/mobile_45.asm@GiveOddEgg", ROMX GiveOddEgg: farcall _GiveOddEgg ret -SECTION "Function11765d - Unknown_117a47", ROMX +SECTION "mobile/mobile_45.asm@Function11765d - Unknown_117a47", ROMX Function11765d: ldh a, [hInMenu] @@ -5660,7 +5660,7 @@ Unknown_117a47: INCBIN "data/mobile/ascii-sym.txt" -SECTION "MobileStudium - MobileStudium_JumptableIncrement", ROMX +SECTION "mobile/mobile_45.asm@MobileStudium", ROMX ; everything from here to the end of the bank is related to the ; Mobile Stadium option from the continue/newgame menu. diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 04241157357..f22063d0a27 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -1,4 +1,4 @@ -SECTION "Function115d99", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@Function115d99", ROMX Function115d99: ld de, GFX_11601a @@ -19,7 +19,7 @@ Function115d99: ret -SECTION "Function115dc3", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@Function115dc3", ROMX Function115dc3: xor a @@ -31,7 +31,7 @@ Function115dc3: ret -SECTION "Function115dd3 - Unknown_116005", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@Function115dd3 - Unknown_116005", ROMX Function115dd3: ld a, [wc305] @@ -316,13 +316,13 @@ Unknown_116005: dsprite 2, 0, 1, 0, $63, $01 -SECTION "GFX_11601a", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@GFX_11601a", ROMX GFX_11601a:: INCBIN "gfx/unknown/11601a.2bpp" -SECTION "Function11615a", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@Function11615a", ROMX Function11615a: xor a @@ -352,7 +352,7 @@ Function11615a: ret -SECTION "Function11619d - Unknown_117356", ROMX +SECTION "mobile/mobile_45_sprite_engine.asm@Function11619d - Unknown_117356", ROMX Function11619d: ld a, [wc30d] diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 93a0675f907..ee70a334a60 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1,4 +1,4 @@ -SECTION "Function118000 - TilemapPack_11bb7d", ROMX, BANK[BANK_MOBILE_46] +SECTION "mobile/mobile_46.asm@Function118000 - TilemapPack_11bb7d (ASCII)", ROMX, BANK[BANK_MOBILE_46] Function118000: ld a, $1 @@ -2929,7 +2929,7 @@ Unknown_1196b8: db "Sun" -SECTION "Function118000 - TilemapPack_11bb7d (2)", ROMX, BANK[BANK_MOBILE_46] +SECTION "mobile/mobile_46.asm@Function118000 - TilemapPack_11bb7d", ROMX, BANK[BANK_MOBILE_46] ; A hack to use ascii above. Function1196cd: diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 70d38d35b18..2d87a25d55b 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -1,4 +1,4 @@ -SECTION "Unreferenced_Function16c000 - Unknown_16cfb9", ROMX +SECTION "mobile/mobile_5b.asm", ROMX Unreferenced_Function16c000: ; Only for CGB diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index c8534c1532e..bd690d67b8a 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -1,4 +1,4 @@ -SECTION "Function170000", ROMX +SECTION "mobile/mobile_5c.asm@Function170000", ROMX Function170000: ld a, [$c62b] @@ -38,7 +38,7 @@ Function170000: ret -SECTION "Function17005a", ROMX +SECTION "mobile/mobile_5c.asm@Function17005a", ROMX Function17005a: ld a, $5 @@ -76,7 +76,9 @@ Function17005a: call CloseSRAM ret -SECTION "BattleTowerRoomMenu - CheckBTMonMovesForErrors", ROMX + +SECTION "mobile/mobile_5c.asm@BattleTowerRoomMenu", ROMX + INCLUDE "engine/events/battle_tower/battle_tower.asm" Function170be4: @@ -255,7 +257,7 @@ CheckBTMonMovesForErrors: ret -SECTION "Function170cc6 - GFX_171848", ROMX +SECTION "mobile/mobile_5c.asm@Function170cc6 - GFX_171848", ROMX Function170cc6: ldh a, [rSVBK] @@ -305,7 +307,7 @@ GFX_171848: INCBIN "gfx/unknown/171848.2bpp" -SECTION "Function1719c8 - String_171c73", ROMX +SECTION "mobile/mobile_5c.asm@Function1719c8 - String_171c73", ROMX Function1719c8: ldh a, [hInMenu] @@ -670,7 +672,7 @@ String_171c73: next "しました@" -SECTION "Function171c87 - String_172e5d", ROMX +SECTION "mobile/mobile_5c.asm@Function171c87 - String_172e5d", ROMX Function171c87: call DisableLCD @@ -836,7 +838,7 @@ String_172e5d: next "えらんで　ください@" -SECTION "Function172e78 - Attrmap_173517", ROMX +SECTION "mobile/mobile_5c.asm@Function172e78 - Attrmap_173517", ROMX Function172e78: ld a, $7f diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 8cdf4f7efda..607b585eb75 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -1,10 +1,10 @@ -SECTION "MobileAdapterGFX", ROMX +SECTION "mobile/mobile_5e.asm@MobileAdapterGFX", ROMX MobileAdapterGFX:: INCBIN "gfx/mobile/mobile_adapter.2bpp" -SECTION "Function17a68f - GFX_17afa5", ROMX +SECTION "mobile/mobile_5e.asm@Function17a68f - GFX_17afa5", ROMX Function17a68f:: call Function17a6a8 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 887e96f48bd..b62a5e7e073 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1,4 +1,4 @@ -SECTION "Function17c000 - HaveWantPals", ROMX +SECTION "mobile/mobile_5f.asm@Function17c000 - HaveWantPals", ROMX Function17c000: call DisableLCD @@ -175,7 +175,7 @@ HaveWantPals: RGB 0, 0, 0 -SECTION "CheckStringForErrors", ROMX +SECTION "mobile/mobile_5f.asm@CheckStringForErrors", ROMX CheckStringForErrors: ; Valid character ranges: @@ -225,7 +225,7 @@ CheckStringForErrors: ret -SECTION "CheckStringForErrors_IgnoreTerminator", ROMX +SECTION "mobile/mobile_5f.asm@CheckStringForErrors_IgnoreTerminator", ROMX CheckStringForErrors_IgnoreTerminator: ; Find control chars @@ -273,7 +273,7 @@ CheckStringForErrors_IgnoreTerminator: ret -SECTION "Function17d0f3", ROMX +SECTION "mobile/mobile_5f.asm@Function17d0f3", ROMX Function17d0f3: ld a, [wc608 + 5] @@ -334,7 +334,7 @@ Function17d0f3: ret -SECTION "Mobile_CopyDefaultOTName - Mobile_CopyDefaultMailAuthor", ROMX +SECTION "mobile/mobile_5f.asm@Mobile_CopyDefaultOTName - Mobile_CopyDefaultMailAuthor", ROMX Mobile_CopyDefaultOTName: ld hl, Mobile5F_PlayersName @@ -382,7 +382,7 @@ Mobile_CopyDefaultMailAuthor: ret -SECTION "CheckStringContainsLessThanBNextCharacters", ROMX +SECTION "mobile/mobile_5f.asm@CheckStringContainsLessThanBNextCharacters", ROMX CheckStringContainsLessThanBNextCharacters: .loop @@ -404,7 +404,7 @@ CheckStringContainsLessThanBNextCharacters: ret -SECTION "Function17d1f1", ROMX +SECTION "mobile/mobile_5f.asm@Function17d1f1", ROMX Function17d1f1: ld a, [wCurPartySpecies] @@ -433,7 +433,7 @@ Function17d1f1: ret -SECTION "Menu_ChallengeExplanationCancel - MenuData_ChallengeExplanationCancel", ROMX +SECTION "mobile/mobile_5f.asm@Menu_ChallengeExplanationCancel", ROMX ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Parameter: [wScriptVar] = 0..1 @@ -517,7 +517,7 @@ MenuData_ChallengeExplanationCancel: db "Cancel@" -SECTION "Function17d2b6 - Function17d2c0", ROMX +SECTION "mobile/mobile_5f.asm@Function17d2b6 - Function17d2c0", ROMX Function17d2b6: call Function17d2c0 @@ -533,7 +533,7 @@ Function17d2c0: ret -SECTION "Function17d2ce - Function17f524", ROMX +SECTION "mobile/mobile_5f.asm@Function17d2ce - Function17f524", ROMX Function17d2ce: ld a, $5 @@ -4487,7 +4487,7 @@ Function17f524: jr .asm_17f536 -SECTION "BattleTowerMobileError - String_17ff68", ROMX +SECTION "mobile/mobile_5f.asm@BattleTowerMobileError - String_17ff68", ROMX BattleTowerMobileError: call FadeToMenu diff --git a/mobile/news/news.asm b/mobile/news/news.asm index a8f4547f8af..826bd641ce5 100644 --- a/mobile/news/news.asm +++ b/mobile/news/news.asm @@ -1,7 +1,7 @@ ; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449 -SECTION "Unreferenced_Function1f4003", ROMX +SECTION "mobile/news/news.asm@Unreferenced_Function1f4003", ROMX db $cc, $6b, $1e ; unused @@ -19,7 +19,7 @@ Unreferenced_Function1f4003: INCBIN "mobile/news/news_1.bin" -SECTION "Unreferenced_Function1f4dbe", ROMX +SECTION "mobile/news/news.asm@Unreferenced_Function1f4dbe", ROMX Unreferenced_Function1f4dbe: ld a, $6 @@ -35,7 +35,7 @@ Unreferenced_Function1f4dbe: INCBIN "mobile/news/news_2.bin" -SECTION "Function1f5d9f", ROMX +SECTION "mobile/news/news.asm@Function1f5d9f", ROMX Function1f5d9f: ld a, $6 diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index cd7cb5797dd..1dc1c3fd831 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -1,4 +1,4 @@ -SECTION "Mobile_PrintOpponentBattleMessage", ROMX +SECTION "mobile/print_opp_message.asm", ROMX Mobile_PrintOpponentBattleMessage: ld a, c diff --git a/pokecrystal.link b/pokecrystal.link index e04bda8e219..4a7eb0c86af 100644 --- a/pokecrystal.link +++ b/pokecrystal.link @@ -2,1581 +2,1403 @@ ROM0 org $0000 - "NULL" + "home.asm@NULL" org $0000 - "rst0" + "home/rst.asm@rst0" org $0008 - "rst8" + "home/rst.asm@rst8" org $0010 - "rst10" + "home/rst.asm@rst10" org $0018 - "rst18" + "home/rst.asm@rst18" org $0020 - "rst20" + "home/rst.asm@rst20" org $0028 - "rst28" + "home/rst.asm@rst28" org $0038 - "rst38" + "home/rst.asm@rst38" org $0040 - "vblank" + "home/interrupts.asm@vblank" org $0048 - "lcd" + "home/interrupts.asm@lcd" org $0050 - "timer" + "home/interrupts.asm@timer" org $0058 - "serial" + "home/interrupts.asm@serial" org $0060 - "joypad" + "home/interrupts.asm@joypad" org $0100 - "Header" - "Home" + "home.asm@Header" + "home.asm@Home" ROMX $01 - "PlaceWaitingText" ; engine/link/place_waiting_text.asm - "WriteOAMDMACodeToHRAM" ; engine/gfx/load_push_oam.asm - "Facings - InitSprites" ; engine/overworld/map_objects.asm - "_MainMenu - GameInit" ; engine/menus/intro_menu.asm - "ReanchorBGMap_NoOAMUpdate - HDMATransfer_FillBGMap0WithBlack" ; engine/overworld/init_map.asm - "LearnMove - Text_CantForgetHM" ; engine/pokemon/learn.asm - "CorrectNickErrors" ; engine/pokemon/correct_nick_errors.asm - "_Multiply" ; engine/math/multiply.asm - "_Divide" ; engine/math/divide.asm - "ItemAttributes" ; data/items/attributes.asm - "CanObjectMoveInDirection - Function7171" ; engine/overworld/npc_movement.asm - - ; engine/events/happiness_egg.asm - "GetFirstPokemonHappiness - HappinessChanges" - "StepHappiness" - "DayCareStep" - - "GiveShuckle - ReturnShuckle" ; engine/events/shuckle.asm - - ; engine/events/haircut.asm - "BillsGrandfather - CopyPokemonName_Buffer1_Buffer3" - "DummyPredef1" + "engine/link/place_waiting_text.asm" + "engine/gfx/load_push_oam.asm" + "engine/overworld/map_objects.asm" + "engine/menus/intro_menu.asm" + "engine/overworld/init_map.asm" + "engine/pokemon/learn.asm" + "engine/pokemon/correct_nick_errors.asm" + "engine/math/multiply.asm" + "engine/math/divide.asm" + "data/items/attributes.asm" + "engine/overworld/npc_movement.asm" + "engine/events/happiness_egg.asm@ChangeHappiness" + "engine/events/happiness_egg.asm@StepHappiness" + "engine/events/happiness_egg.asm@DayCareStep" + "engine/events/shuckle.asm" + "engine/events/haircut.asm" + "engine/events/haircut.asm@DummyPredef1" ROMX $02 - "BlankScreen" ; engine/menus/blank_screen.asm - - ; engine/overworld/player_object.asm - "SpawnPlayer - CopyTempObjectToObjectStruct" - "TrainerWalkToPlayer" - "SurfStartStep" - "FollowNotExact" - "GetRelativeFacing" - "QueueFollowerFirstStep" - - "_Sine" ; engine/math/sine.asm - "GetPredefPointer - PredefPointers" ; engine/predef.asm - "LoadSGBLayout - SlotMachinePals" ; engine/gfx/color.asm + "engine/menus/blank_screen.asm" + "engine/overworld/player_object.asm@SpawnPlayer" + "engine/overworld/player_object.asm@TrainerWalkToPlayer" + "engine/overworld/player_object.asm@SurfStartStep" + "engine/overworld/player_object.asm@FollowNotExact" + "engine/overworld/player_object.asm@GetRelativeFacing" + "engine/overworld/player_object.asm@QueueFollowerFirstStep" + "engine/math/sine.asm" + "engine/predef.asm" + "engine/gfx/color.asm" ROMX $03 - "CheckTime" ; engine/events/checktime.asm - - ; engine/events/specials.asm - "Special - SpecialsPointers" - "DummySpecial_c224" - "SetPlayerPalette" - "GameCornerPrizeMonCheckDex" - "UnusedSetSeenMon" - "FindPartyMonAboveLevel - FoundNone" - "NameRival" - "NameRater" - "OverworldTownMap" - "UnownPrinter" - "DisplayLinkRecord" - "PlayersHousePC" - "CheckMysteryGift" - "GetMysteryGiftItem" - "BugContestJudging" - "MapRadio" - "UnownPuzzle" - "SlotMachine - CheckCoinsAndCoinCase" - "ClearBGPalettesBufferScreen" - "ScriptReturnCarry - CheckLuckyNumberShowFlag" - "SnorlaxAwake" - "PlayCurMonCry" - "GameboyCheck" - "FadeOutMusic" - "Diploma" - "PrintDiploma" - "TrainerHouse" - - "_PrintNum" ; engine/math/print_num.asm - - ; engine/pokemon/health.asm - "HealParty - HealPartyMon" - "ComputeHPBarPixels - AnimateHPBar" - - "FieldMoveJumptableReset - UnknownText_0xd1d0" ; engine/events/overworld.asm - "_ReceiveItem - GetItemPrice" ; engine/items/items.asm - "_HandlePlayerStep - UpdateOverworldMap" ; engine/overworld/player_step.asm - "_AnimateHPBar - ShortHPBar_CalcPixelFrame" ; engine/battle/anim_hp_bar.asm - - "TryAddMonToParty - InitNickname" ; engine/pokemon/move_mon.asm - - ; engine/pokemon/bills_pc_top.asm - "_BillsPC - ClearPCItemScreen" - "CopyBoxmonToTempMon" - "Unreferenced_Functione5d9" - - "GetBreedMon1LevelGrowth - GetBreedMon2LevelGrowth" ; engine/pokemon/breedmon_level_growth.asm - "BugContest_SetCaughtContestMon" ; engine/events/bug_contest/caught_mon.asm - "_DoItemEffect - GetMthMoveOfCurrentMon" ; engine/items/item_effects.asm - "GetPokeBallWobble - WobbleProbabilities" ; engine/battle_anims/pokeball_wobble.asm - "KnowsMove" ; engine/pokemon/knows_move.asm + "engine/events/checktime.asm" + "engine/events/specials.asm" + "engine/events/specials.asm@DummySpecial_c224" + "engine/events/specials.asm@SetPlayerPalette" + "engine/events/specials.asm@GameCornerPrizeMonCheckDex" + "engine/events/specials.asm@UnusedSetSeenMon" + "engine/events/specials.asm@FindPartyMon" + "engine/events/specials.asm@NameRival" + "engine/events/specials.asm@NameRater" + "engine/events/specials.asm@OverworldTownMap" + "engine/events/specials.asm@UnownPrinter" + "engine/events/specials.asm@DisplayLinkRecord" + "engine/events/specials.asm@PlayersHousePC" + "engine/events/specials.asm@CheckMysteryGift" + "engine/events/specials.asm@GetMysteryGiftItem" + "engine/events/specials.asm@BugContestJudging" + "engine/events/specials.asm@MapRadio" + "engine/events/specials.asm@UnownPuzzle" + "engine/events/specials.asm@StartGameCornerGame" + "engine/events/specials.asm@ClearBGPalettesBufferScreen" + "engine/events/specials.asm@Misc" + "engine/events/specials.asm@SnorlaxAwake" + "engine/events/specials.asm@PlayCurMonCry" + "engine/events/specials.asm@GameboyCheck" + "engine/events/specials.asm@FadeOutMusic" + "engine/events/specials.asm@Diploma" + "engine/events/specials.asm@PrintDiploma" + "engine/events/specials.asm@TrainerHouse" + "engine/math/print_num.asm" + "engine/pokemon/health.asm" + "engine/pokemon/health.asm@AnimateHPBar" + "engine/events/overworld.asm" + "engine/items/items.asm" + "engine/overworld/player_step.asm" + "engine/battle/anim_hp_bar.asm" + "engine/pokemon/move_mon.asm" + "engine/pokemon/bills_pc_top.asm" + "engine/pokemon/bills_pc_top.asm@CopyBoxmonToTempMon" + "engine/pokemon/bills_pc_top.asm@Unreferenced_Functione5d9" + "engine/pokemon/breedmon_level_growth.asm" + "engine/events/bug_contest/caught_mon.asm" + "engine/items/item_effects.asm" + "engine/battle_anims/pokeball_wobble.asm" + "engine/pokemon/knows_move.asm" ROMX $04 - "Pack - PackGFX" ; engine/items/pack.asm - "_InitializeStartDay - CopyDayHourMinToHL" ; engine/overworld/time.asm - "CanLearnTMHMMove - TMHMMoves" ; engine/items/tmhm2.asm - "_NamingScreen - MailEntry_Lowercase" ; engine/menus/naming_screen.asm - "Script_AbortBugContest" ; engine/events/bug_contest/abort.asm - "FindItemInBallScript" ; engine/events/item_ball.asm - "HealMachineAnim" ; engine/events/heal_machine_anim.asm - "Script_BattleWhiteout - GetWhiteoutSpawn" ; engine/events/whiteout.asm - "Script_ForcedMovement" ; engine/events/forced_movement.asm - "ItemFinder" ; engine/events/itemfinder.asm - "StartMenu - UseRegisteredItem" ; engine/menus/start_menu.asm - "Elevator - ElevatorFloorNames" ; engine/events/elevator.asm - - ; engine/events/bug_contest/contest.asm - "GiveParkBalls" - "BugCatchingContestBattleScript - BugCatchingContestText_ContestIsOver" - - "RepelWoreOffScript" ; engine/events/repel.asm - "HiddenItemScript - SetMemEvent" ; engine/events/hidden_item.asm - "CheckFacingTileForStdScript - Script_JumpStdFromRAM" ; engine/events/std_collision.asm - "_BugContestJudging - ContestScore" ; engine/events/bug_contest/judging.asm - "ApplyPokerusTick" ; engine/events/pokerus/apply_pokerus_tick.asm - - ; engine/events/bug_contest/contest_2.asm - "SelectRandomBugContestContestants - BugCatchingContestantEventFlagTable" - "ContestDropOffMons" - "ContestReturnMons" - - "Unreferenced_CorrectPartyErrors" ; engine/pokemon/correct_party_errors.asm - "GetSquareRoot" ; engine/math/get_square_root.asm + "engine/items/pack.asm" + "engine/overworld/time.asm" + "engine/items/tmhm2.asm" + "engine/menus/naming_screen.asm" + "engine/events/bug_contest/abort.asm" + "engine/events/item_ball.asm" + "engine/events/heal_machine_anim.asm" + "engine/events/whiteout.asm" + "engine/events/forced_movement.asm" + "engine/events/itemfinder.asm" + "engine/menus/start_menu.asm" + "engine/events/elevator.asm" + "engine/events/bug_contest/contest.asm@GiveParkBalls" + "engine/events/bug_contest/contest.asm@BugCatchingContestBattleScript" + "engine/events/repel.asm" + "engine/events/hidden_item.asm" + "engine/events/std_collision.asm" + "engine/events/bug_contest/judging.asm" + "engine/events/pokerus/apply_pokerus_tick.asm" + "engine/events/bug_contest/contest_2.asm@SelectRandomBugContestContestants" + "engine/events/bug_contest/contest_2.asm@ContestDropOffMons" + "engine/events/bug_contest/contest_2.asm@ContestReturnMons" + "engine/pokemon/correct_party_errors.asm" + "engine/math/get_square_root.asm" ROMX $05 - ; engine/rtc/rtc.asm - "Unreferenced_StopRTC" - "StartRTC - Function1409b" - "Function140ae" - "_InitTime" - - "GetEmote2bpp - OverworldSprites" ; engine/overworld/overworld.asm - - ; engine/overworld/tile_events.asm - "CheckWarpCollision" - "CheckDirectionalWarp" - "CheckWarpFacingDown" - "CheckGrassCollision" - "CheckCutCollision" - "GetWarpSFX" - - "SaveMenu - Text_SaveOnMoveMonWOMail" ; engine/menus/save.asm - "SpawnPoints - IsSpawnPoint" ; engine/overworld/spawn_points.asm - - ; engine/overworld/map_setup.asm - "RunMapSetupScript - MapSetupCommands" - "DontScrollText" - "ActivateMapAnims" - "SuspendMapAnims" - "LoadObjectsRunCallback_02" - "DelayClearingOldSprites" - "DelayLoadingNewSprites" - "CheckReplaceKrisSprite" - "FadeOldMapMusic" - "RetainOldPalettes" - "RotatePalettesRightMapAndMusic" - "ForceMapMusic" - - "PokemonCenterPC - PokecenterPCText_LinkClosed" ; engine/events/pokecenter_pc.asm - "OpenMartDialog - CheckCoins" ; engine/items/mart.asm - "Marts - DefaultMart" ; data/items/marts.asm - "BankOfMom - MenuData_0x166bd" ; engine/events/mom.asm - "DayCareMan - DayCare_InitBreeding" ; engine/events/daycare.asm - - ; engine/events/print_unown.asm - "_UnownPrinter - UnownDexBTile" - "PlaceUnownPrinterFrontpic" - - "PhotoStudio" ; engine/events/print_photo.asm - - ; engine/pokemon/breeding.asm - "CheckBreedmonCompatibility - DayCareMonCompatibilityText" - "Unreferenced_GetEmptyString" + "engine/rtc/rtc.asm@Unreferenced_StopRTC" + "engine/rtc/rtc.asm@StartRTC - Function1409b" + "engine/rtc/rtc.asm@Function140ae" + "engine/rtc/rtc.asm@_InitTime" + "engine/overworld/overworld.asm" + "engine/overworld/tile_events.asm@CheckWarpCollision" + "engine/overworld/tile_events.asm@CheckDirectionalWarp" + "engine/overworld/tile_events.asm@CheckWarpFacingDown" + "engine/overworld/tile_events.asm@CheckGrassCollision" + "engine/overworld/tile_events.asm@CheckCutCollision" + "engine/overworld/tile_events.asm@GetWarpSFX" + "engine/menus/save.asm" + "engine/overworld/spawn_points.asm" + "engine/overworld/map_setup.asm@RunMapSetupScript" + "engine/overworld/map_setup.asm@DontScrollText" + "engine/overworld/map_setup.asm@ActivateMapAnims" + "engine/overworld/map_setup.asm@SuspendMapAnims" + "engine/overworld/map_setup.asm@LoadObjectsRunCallback_02" + "engine/overworld/map_setup.asm@DelayClearingOldSprites" + "engine/overworld/map_setup.asm@DelayLoadingNewSprites" + "engine/overworld/map_setup.asm@CheckReplaceKrisSprite" + "engine/overworld/map_setup.asm@FadeOldMapMusic" + "engine/overworld/map_setup.asm@RetainOldPalettes" + "engine/overworld/map_setup.asm@RotatePalettesRightMapAndMusic" + "engine/overworld/map_setup.asm@ForceMapMusic" + "engine/events/pokecenter_pc.asm" + "engine/items/mart.asm" + "data/items/marts.asm" + "engine/events/mom.asm" + "engine/events/daycare.asm" + "engine/events/print_unown.asm" + "engine/events/print_unown.asm@PlaceUnownPrinterFrontpic" + "engine/events/print_photo.asm" + "engine/pokemon/breeding.asm" + "engine/pokemon/breeding.asm@Unreferenced_GetEmptyString" ROMX $06 - "Tileset Data 1" ; (not splitting) gfx/tilesets.asm + "gfx/tilesets.asm@Tileset Data 1" ROMX $07 - "LoadMapGroupRoof - Roofs" ; engine/tilesets/mapgroup_roofs.asm - "Tileset Data 2" ; (not splitting) gfx/tilesets.asm - "Music_Credits" ; audio/music/credits.asm - "Music_Clair" ; audio/music/clair.asm - "Music_MobileAdapter" ; audio/music/mobileadapter.asm + "engine/tilesets/mapgroup_roofs.asm" + "gfx/tilesets.asm@Tileset Data 2" + "audio/music/credits.asm" + "audio/music/clair.asm" + "audio/music/mobileadapter.asm" ROMX $08 - ; engine/rtc/restart_clock.asm - "RestartClock_GetWraparoundTime - RestartClock" - "UnreferencedString_HourJP" - "UnreferencedString_MinuteJP" - - "Tileset Data 3" ; (not splitting) gfx/tilesets.asm - "EggMovePointers - NoEggMoves" ; data/pokemon/egg_moves.asm + "engine/rtc/restart_clock.asm" + "gfx/tilesets.asm@Tileset Data 3" + "data/pokemon/egg_moves.asm" ROMX $09 - "StringBufferPointers" ; data/text_buffers.asm - - ; engine/menus/menu.asm - "_2DMenu_ - Place2DMenuCursor" - "_PushWindow" - "_ExitMenu - Error_Cant_ExitMenu" - "_InitVerticalMenuCursor" - - "UpdateItemDescription" ; engine/items/update_item_description.asm - "Pokepic - PokepicMenuHeader" ; engine/events/pokepic.asm - "LoadObjectMasks - GetObjectTimeMask" ; engine/overworld/map_objects_2.asm - "_InitScrollingMenu - ScrollingMenu_GetListItemCoordAndFunctionArgs" ; engine/menus/scrolling_menu.asm - "SwitchItemsInBag - Function24aab" ; engine/items/switch_items.asm - - ; engine/menus/menu_2.asm - "PlaceMenuItemName" - "PlaceMenuItemQuantity" - "PlaceMoneyTopRight - MenuHeader_0x24b1d" - "DisplayCoinCaseBalance - ShowMoney_TerminatorString" - "Unreferenced_Function24b8f" - "StartMenu_DrawBugContestStatusBox - StartMenu_PrintBugContestStatus" - "FindApricornsInBag - ApricornBalls" - - ; engine/pokemon/mon_submenu.asm - "MonMenuOptionStrings - AddMonMenuItem" - "BattleMonMenu - MenuData_0x24edc" - - "LoadBattleMenu - Function24fb2" ; engine/battle/menu.asm - "SelectQuantityToToss - SellItem_MenuHeader" ; engine/items/buy_sell_toss.asm - "TrainerCard - CardRightCornerGFX" ; engine/menus/trainer_card.asm - "ProfOaksPC - OakPCText4" ; engine/events/prof_oaks_pc.asm - - ; engine/overworld/decorations.asm - "InitDecorations" - "_PlayerDecorationMenu - DecorationDesc_GiantOrnament" - "ToggleMaptileDecorations - PadCoords_de" - - "LevelUpHappinessMod" ; engine/pokemon/level_up_happiness.asm - "GetTrainerDVs - TrainerClassDVs" ; engine/battle/read_trainer_dvs.asm - "_ReturnToBattle_UseBall" ; engine/battle/returntobattle_useball.asm - "ConsumeHeldItem - ConsumableEffects" ; engine/battle/consume_held_item.asm - "MoveEffectsPointers - DefenseCurl" ; data/moves/effects_pointers.asm - "Kurt_SelectQuantity_InterpretJoypad" ; engine/events/kurt_selectquantity_interpretjoypad.asm + "data/text_buffers.asm" + "engine/menus/menu.asm@_2DMenu_" + "engine/menus/menu.asm@_PushWindow" + "engine/menus/menu.asm@_ExitMenu" + "engine/menus/menu.asm@_InitVerticalMenuCursor" + "engine/items/update_item_description.asm" + "engine/events/pokepic.asm" + "engine/overworld/map_objects_2.asm" + "engine/menus/scrolling_menu.asm" + "engine/items/switch_items.asm" + "engine/menus/menu_2.asm@PlaceMenuItemName" + "engine/menus/menu_2.asm@PlaceMenuItemQuantity" + "engine/menus/menu_2.asm@PlaceMoneyTextbox" + "engine/menus/menu_2.asm@DisplayCoinCaseBalance" + "engine/menus/menu_2.asm@Unreferenced_Function24b8f" + "engine/menus/menu_2.asm@StartMenu_PrintBugContestStatus" + "engine/menus/menu_2.asm@FindApricornsInBag" + "engine/pokemon/mon_submenu.asm" + "engine/pokemon/mon_submenu.asm@BattleMonMenu" + "engine/battle/menu.asm" + "engine/items/buy_sell_toss.asm" + "engine/menus/trainer_card.asm" + "engine/events/prof_oaks_pc.asm" + "engine/overworld/decorations.asm@InitDecorations" + "engine/overworld/decorations.asm" + "engine/overworld/decorations.asm@ToggleMaptileDecorations" + "engine/pokemon/level_up_happiness.asm" + "engine/battle/read_trainer_dvs.asm" + "engine/battle/returntobattle_useball.asm" + "engine/battle/consume_held_item.asm" + "data/moves/effects.asm" + "engine/events/kurt_selectquantity_interpretjoypad.asm" ROMX $0a - ; engine/link/link.asm - "LinkCommunications - Link_EnsureSync" - "CableClubCheckWhichChris" - "Unreferenced_Gen1LinkCommsBorderGFX" - "Unreferenced_Function29fe4" - - "LoadWildMonData - SwarmWaterWildMons" ; engine/overworld/wildmons.asm - "DetermineLinkBattleResult" ; engine/battle/link_result.asm - "ChrisBackpic" ; main.asm - "DudeBackpic" ; main.asm + "engine/link/link.asm" + "engine/link/link.asm@CableClubCheckWhichChris" + "engine/link/link.asm@Unreferenced_Gen1LinkCommsBorderGFX" + "engine/link/link.asm@Unreferenced_Function29fe4" + "engine/overworld/wildmons.asm" + "engine/battle/link_result.asm" + "main.asm@ChrisBackpic" + "main.asm@DudeBackpic" ROMX $0b - ; engine/battle/trainer_huds.asm - "BattleStart_TrainerHuds - LoadBallIconGFX" - "_ShowLinkBattleParticipants" - - "TrainerClassNames" ; data/trainers/class_names.asm - "AI_Redundant" ; engine/battle/ai/redundant.asm - "MoveDeletion" ; engine/events/move_deleter.asm - - ; engine/link/mystery_gift_2.asm - "PrepMysteryGiftDataToSend" - "MysteryGiftGetItemHeldEffect - MysteryGiftDecos" - - "TMHMPocket - BeatUpDescription" ; engine/items/tmhm.asm - "GivePokerusAndConvertBerries - ConvertBerriesToBerryJuice" ; engine/events/pokerus/pokerus.asm - - ; engine/battle/start_battle.asm - "ShowLinkBattleParticipants" - "FindFirstAliveMonAndStartBattle" - "PlayBattleMusic" - "ClearBattleRAM" - - "PlaceGraphic" ; engine/gfx/place_graphic.asm + "engine/battle/trainer_huds.asm" + "engine/battle/trainer_huds.asm@_ShowLinkBattleParticipants" + "data/trainers/class_names.asm" + "engine/battle/ai/redundant.asm" + "engine/events/move_deleter.asm" + "engine/link/mystery_gift_2.asm@PrepMysteryGiftDataToSend" + "engine/link/mystery_gift_2.asm@MysteryGiftGetItemHeldEffect" + "engine/items/tmhm.asm" + "engine/events/pokerus/pokerus.asm" + "engine/battle/start_battle.asm@ShowLinkBattleParticipants" + "engine/battle/start_battle.asm@FindFirstAliveMonAndStartBattle" + "engine/battle/start_battle.asm@PlayBattleMusic" + "engine/battle/start_battle.asm@ClearBattleRAM" + "engine/gfx/place_graphic.asm" ROMX $0c - "Tileset Data 4" ; (not splitting) gfx/tilesets.asm + "gfx/tilesets.asm@Tileset Data 4" ROMX $0d - "DoPlayerTurn - _CheckBattleScene" ; engine/battle/effect_commands.asm + "engine/battle/effect_commands.asm" ROMX $0e - "AI_SwitchOrTryItem - TextJump_EnemyUsedOn" ; engine/battle/ai/items.asm - "AIScoring - AI_50_50" ; engine/battle/ai/scoring.asm - "GetTrainerClassName - TrainerClassAttributes" ; engine/battle/read_trainer_attributes.asm - "ReadTrainerParty - MysticalmanGroup" ; engine/battle/read_trainer_party.asm + "engine/battle/ai/items.asm" + "engine/battle/ai/scoring.asm" + "engine/battle/read_trainer_attributes.asm" + "engine/battle/read_trainer_party.asm" ROMX $0f - "DoBattle - BattleStartMessage" ; engine/battle/core.asm - "BattleCommandPointers" ; data/battle/effect_command_pointers.asm + "engine/battle/core.asm" + "data/battle/effect_command_pointers.asm" ROMX $10 - "Pokedex - Pokedex_ResetBGMapMode" ; engine/pokedex/pokedex.asm - "Moves" ; data/moves/moves.asm - "EvolvePokemon - CelebiEvosAttacks" ; data/pokemon/evos_attacks.asm + "engine/pokedex/pokedex.asm" + "data/moves/moves.asm" + "data/pokemon/evos_attacks.asm" ROMX $11 - "FruitTreeScript - NothingHereText" ; engine/events/fruit_trees.asm - "AIChooseMove - AIScoringPointers" ; engine/battle/ai/move.asm - "AnimateDexSearchSlowpoke - DoDexSearchSlowpokeFrame" ; engine/pokedex/slowpoke_anim.asm - "DisplayDexEntry - PokedexDataPointerTable" ; engine/pokedex/dex_entry.asm - "SendMailToPC - MailboxPC" ; engine/pokemon/mail.asm + "engine/events/fruit_trees.asm" + "engine/battle/ai/move.asm" + "engine/pokedex/slowpoke_anim.asm" + "engine/pokedex/dex_entry.asm" + "engine/pokemon/mail.asm" ROMX $12 - "InitCrystalData - Function4a6d8" ; engine/crystal.asm - "BeastsCheck - UpdateOTPointer" ; engine/pokemon/search.asm - - ; mobile/mobile_12_2.asm - "MobileCheckOwnMonAnywhere" - "UnusedFindItemInPCOrBag" - "Function4a94e - Function4adf7" - - "AskRememberPassword - Buena_ExitMenu" ; engine/events/buena_menu.asm + "engine/crystal.asm" + "engine/pokemon/search.asm" + "mobile/mobile_12_2.asm@MobileCheckOwnMonAnywhere" + "mobile/mobile_12_2.asm@UnusedFindItemInPCOrBag" + "mobile/mobile_12_2.asm" + "engine/events/buena_menu.asm" ROMX $13 - "SwapTextboxPalettes - TilesetBattleTowerOutsidePalMap" ; engine/tilesets/map_palettes.asm - "TileCollisionTable" ; data/collision_permissions.asm - "EmptyAllSRAMBanks" ; engine/menus/empty_sram.asm - "SaveMenu_CopyTilemapAtOnce" ; engine/menus/savemenu_copytilemapatonce.asm - "CheckSave" ; engine/events/checksave.asm - "MapScenes" ; data/maps/scenes.asm - "_LoadMapPart" ; engine/overworld/load_map_part.asm - "PhoneRing_CopyTilemapAtOnce" ; engine/phone/phonering_copytilemapatonce.asm - "Shrink1Pic" ; main.asm - "Shrink2Pic" ; main.asm - - ; engine/link/link_2.asm - "LinkMonStatsScreen" - "Link_WaitBGMap" - "LinkTextbox2" - - "_ResetClock - ClockResetPassword" ; engine/rtc/reset_password.asm - "_DeleteSaveData" ; engine/menus/delete_save.asm - "Tilesets" ; data/tilesets.asm - "SmallFarFlagAction" ; engine/smallflag.asm - - ; engine/gfx/trademon_frontpic.asm - "GetTrademonFrontpic" - "AnimateTrademonFrontpic" - - "_CheckPokerus" ; engine/events/pokerus/check_pokerus.asm - - ; engine/events/lucky_number.asm - "CheckForLuckyNumberWinners" - "PrintTodaysLuckyNumber" - - "CheckPartyFullAfterContest - SetEggMonCaughtData" ; engine/pokemon/caught_data.asm - "_FindPartyMonAboveLevel - RetroactivelyIgnoreEggs" ; engine/pokemon/search2.asm - "BattleStatsScreenInit - CheckFaintedFrzSlp" ; engine/pokemon/stats_screen.asm - "CatchTutorial" ; engine/events/catch_tutorial.asm - "EvolutionAnimation" ; engine/movie/evolution_animation.asm - - ; engine/movie/init_hof_credits.asm - "InitDisplayForHallOfFame" - "InitDisplayForRedCredits" - "ResetDisplayBetweenHallOfFameMons" - - "GetMobileOTTrainerClass - FemaleTrainers" ; engine/events/battle_tower/get_trainer_class.asm - "BattleIntroSlidingPics" ; engine/battle/sliding_intro.asm - "Mobile_PrintOpponentBattleMessage" ; mobile/print_opp_message.asm - "CheckBattleScene" ; engine/battle/check_battle_scene.asm - "GBCOnlyScreen - GBCOnlyGFX" ; engine/movie/gbc_only.asm - - ; engine/events/poke_seer.asm - "PokeSeer - SeerAdvice5" - "GetCaughtGender" + "engine/tilesets/map_palettes.asm" + "data/collision_permissions.asm" + "engine/menus/empty_sram.asm" + "engine/menus/savemenu_copytilemapatonce.asm" + "engine/events/checksave.asm" + "data/maps/scenes.asm" + "engine/overworld/load_map_part.asm" + "engine/phone/phonering_copytilemapatonce.asm" + "main.asm@Shrink1Pic" + "main.asm@Shrink2Pic" + "engine/link/link_2.asm@LinkMonStatsScreen" + "engine/link/link_2.asm@Link_WaitBGMap" + "engine/link/link_2.asm@LinkTextbox2" + "engine/rtc/reset_password.asm" + "engine/menus/delete_save.asm" + "data/tilesets.asm" + "engine/smallflag.asm" + "engine/gfx/trademon_frontpic.asm@GetTrademonFrontpic" + "engine/gfx/trademon_frontpic.asm@AnimateTrademonFrontpic" + "engine/events/pokerus/check_pokerus.asm" + "engine/events/lucky_number.asm@CheckForLuckyNumberWinners" + "engine/events/lucky_number.asm@PrintTodaysLuckyNumber" + "engine/pokemon/caught_data.asm" + "engine/pokemon/search2.asm" + "engine/pokemon/stats_screen.asm" + "engine/events/catch_tutorial.asm" + "engine/movie/evolution_animation.asm" + "engine/movie/init_hof_credits.asm@InitDisplayForHallOfFame" + "engine/movie/init_hof_credits.asm@InitDisplayForRedCredits" + "engine/movie/init_hof_credits.asm@ResetDisplayBetweenHallOfFameMons" + "engine/events/battle_tower/get_trainer_class.asm" + "engine/battle/sliding_intro.asm" + "mobile/print_opp_message.asm" + "engine/battle/check_battle_scene.asm" + "engine/movie/gbc_only.asm" + "engine/events/poke_seer.asm" + "engine/events/poke_seer.asm@GetCaughtGender" ROMX $14 - ; engine/pokemon/party_menu.asm - "SelectMonFromParty - YouHaveNoPKMNString" - "PrintPartyMenuActionText" - - "DoPoisonStep" ; engine/events/poisonstep.asm - "SweetScentFromMenu - UnknownText_0x5072b" ; engine/events/sweet_scent.asm - "_Squirtbottle" ; engine/events/squirtbottle.asm - "_CardKey" ; engine/events/card_key.asm - "_BasementKey" ; engine/events/basement_key.asm - "_SacredAsh - UnknownText_0x50845" ; engine/events/sacred_ash.asm - "CopyMonToTempMon - GetMonSpecies" ; engine/pokemon/tempmon.asm - "PrintMonTypes - Dark" ; engine/pokemon/types.asm - "Unreferenced_GetGen1TrainerClassName - Gen1TrainerClassNames" ; engine/battle/unreferenced_getgen1trainerclassname.asm - - ; engine/pokemon/mon_stats.asm - "DrawPlayerHP - DrawHP" - "PrintTempMonStats" - "GetGender" - "ListMovePP" - "Unreferenced_Function50cd0" - "Unused_PlaceEnemyHPLevel" - "PlaceStatusString - ParString" - "ListMoves" - - "InitList" ; engine/link/init_list.asm - "CalcLevel - GrowthRates" ; engine/pokemon/experience.asm - "_SwitchPartyMons" ; engine/pokemon/switchpartymons.asm - - ; engine/gfx/load_pics.asm - "GetUnownLetter" - "GetMonFrontpic - LoadOrientedFrontpic" - - "InsertPokemonIntoBox - InsertDataIntoBoxOrParty" ; engine/pokemon/move_mon_wo_mail.asm - "BaseData" ; data/pokemon/base_stats.asm - "PokemonNames" ; data/pokemon/names.asm - "Unreferenced_MonPicBanks" ; data/pokemon/unused_pic_banks.asm - "UnknownEggPic" ; main.asm + "engine/pokemon/party_menu.asm" + "engine/pokemon/party_menu.asm@PrintPartyMenuActionText" + "engine/events/poisonstep.asm" + "engine/events/sweet_scent.asm" + "engine/events/squirtbottle.asm" + "engine/events/card_key.asm" + "engine/events/basement_key.asm" + "engine/events/sacred_ash.asm" + "engine/pokemon/tempmon.asm" + "engine/pokemon/types.asm" + "engine/battle/unreferenced_getgen1trainerclassname.asm" + "engine/pokemon/mon_stats.asm@DrawHP" + "engine/pokemon/mon_stats.asm@PrintTempMonStats" + "engine/pokemon/mon_stats.asm@GetGender" + "engine/pokemon/mon_stats.asm@ListMovePP" + "engine/pokemon/mon_stats.asm@Unreferenced_Function50cd0" + "engine/pokemon/mon_stats.asm@Unused_PlaceEnemyHPLevel" + "engine/pokemon/mon_stats.asm@PlaceStatusString" + "engine/pokemon/mon_stats.asm@ListMoves" + "engine/link/init_list.asm" + "engine/pokemon/experience.asm" + "engine/pokemon/switchpartymons.asm" + "engine/gfx/load_pics.asm@GetUnownLetter" + "engine/gfx/load_pics.asm" + "engine/pokemon/move_mon_wo_mail.asm" + "data/pokemon/base_stats.asm" + "data/pokemon/names.asm" + "data/pokemon/unused_pic_banks.asm" + "main.asm@UnknownEggPic" ROMX $15 - "GoldenrodGym_MapScripts" ; maps/GoldenrodGym.asm - "GoldenrodBikeShop_MapScripts" ; maps/GoldenrodBikeShop.asm - "GoldenrodHappinessRater_MapScripts" ; maps/GoldenrodHappinessRater.asm - "BillsFamilysHouse_MapScripts" ; maps/BillsFamilysHouse.asm - "GoldenrodMagnetTrainStation_MapScripts" ; maps/GoldenrodMagnetTrainStation.asm - "GoldenrodFlowerShop_MapScripts" ; maps/GoldenrodFlowerShop.asm - "GoldenrodPPSpeechHouse_MapScripts" ; maps/GoldenrodPPSpeechHouse.asm - "GoldenrodNameRater_MapScripts" ; maps/GoldenrodNameRater.asm - "GoldenrodDeptStore1F_MapScripts" ; maps/GoldenrodDeptStore1F.asm - "GoldenrodDeptStore2F_MapScripts" ; maps/GoldenrodDeptStore2F.asm - "GoldenrodDeptStore3F_MapScripts" ; maps/GoldenrodDeptStore3F.asm - "GoldenrodDeptStore4F_MapScripts" ; maps/GoldenrodDeptStore4F.asm - "GoldenrodDeptStore5F_MapScripts" ; maps/GoldenrodDeptStore5F.asm - "GoldenrodDeptStore6F_MapScripts" ; maps/GoldenrodDeptStore6F.asm - "GoldenrodDeptStoreElevator_MapScripts" ; maps/GoldenrodDeptStoreElevator.asm - "GoldenrodDeptStoreRoof_MapScripts" ; maps/GoldenrodDeptStoreRoof.asm - "GoldenrodGameCorner_MapScripts" ; maps/GoldenrodGameCorner.asm + "maps/GoldenrodGym.asm" + "maps/GoldenrodBikeShop.asm" + "maps/GoldenrodHappinessRater.asm" + "maps/BillsFamilysHouse.asm" + "maps/GoldenrodMagnetTrainStation.asm" + "maps/GoldenrodFlowerShop.asm" + "maps/GoldenrodPPSpeechHouse.asm" + "maps/GoldenrodNameRater.asm" + "maps/GoldenrodDeptStore1F.asm" + "maps/GoldenrodDeptStore2F.asm" + "maps/GoldenrodDeptStore3F.asm" + "maps/GoldenrodDeptStore4F.asm" + "maps/GoldenrodDeptStore5F.asm" + "maps/GoldenrodDeptStore6F.asm" + "maps/GoldenrodDeptStoreElevator.asm" + "maps/GoldenrodDeptStoreRoof.asm" + "maps/GoldenrodGameCorner.asm" ROMX $16 - "RuinsOfAlphOutside_MapScripts" ; maps/RuinsOfAlphOutside.asm - "RuinsOfAlphHoOhChamber_MapScripts" ; maps/RuinsOfAlphHoOhChamber.asm - "RuinsOfAlphKabutoChamber_MapScripts" ; maps/RuinsOfAlphKabutoChamber.asm - "RuinsOfAlphOmanyteChamber_MapScripts" ; maps/RuinsOfAlphOmanyteChamber.asm - "RuinsOfAlphAerodactylChamber_MapScripts" ; maps/RuinsOfAlphAerodactylChamber.asm - "RuinsOfAlphInnerChamber_MapScripts" ; maps/RuinsOfAlphInnerChamber.asm - "RuinsOfAlphResearchCenter_MapScripts" ; maps/RuinsOfAlphResearchCenter.asm - "RuinsOfAlphHoOhItemRoom_MapScripts" ; maps/RuinsOfAlphHoOhItemRoom.asm - "RuinsOfAlphKabutoItemRoom_MapScripts" ; maps/RuinsOfAlphKabutoItemRoom.asm - "RuinsOfAlphOmanyteItemRoom_MapScripts" ; maps/RuinsOfAlphOmanyteItemRoom.asm - "RuinsOfAlphAerodactylItemRoom_MapScripts" ; maps/RuinsOfAlphAerodactylItemRoom.asm - "RuinsOfAlphHoOhWordRoom_MapScripts" ; maps/RuinsOfAlphHoOhWordRoom.asm - "RuinsOfAlphKabutoWordRoom_MapScripts" ; maps/RuinsOfAlphKabutoWordRoom.asm - "RuinsOfAlphOmanyteWordRoom_MapScripts" ; maps/RuinsOfAlphOmanyteWordRoom.asm - "RuinsOfAlphAerodactylWordRoom_MapScripts" ; maps/RuinsOfAlphAerodactylWordRoom.asm - "UnionCave1F_MapScripts" ; maps/UnionCave1F.asm - "UnionCaveB1F_MapScripts" ; maps/UnionCaveB1F.asm - "UnionCaveB2F_MapScripts" ; maps/UnionCaveB2F.asm - "SlowpokeWellB1F_MapScripts" ; maps/SlowpokeWellB1F.asm - "SlowpokeWellB2F_MapScripts" ; maps/SlowpokeWellB2F.asm - "OlivineLighthouse1F_MapScripts" ; maps/OlivineLighthouse1F.asm - "OlivineLighthouse2F_MapScripts" ; maps/OlivineLighthouse2F.asm - "OlivineLighthouse3F_MapScripts" ; maps/OlivineLighthouse3F.asm - "OlivineLighthouse4F_MapScripts" ; maps/OlivineLighthouse4F.asm + "maps/RuinsOfAlphOutside.asm" + "maps/RuinsOfAlphHoOhChamber.asm" + "maps/RuinsOfAlphKabutoChamber.asm" + "maps/RuinsOfAlphOmanyteChamber.asm" + "maps/RuinsOfAlphAerodactylChamber.asm" + "maps/RuinsOfAlphInnerChamber.asm" + "maps/RuinsOfAlphResearchCenter.asm" + "maps/RuinsOfAlphHoOhItemRoom.asm" + "maps/RuinsOfAlphKabutoItemRoom.asm" + "maps/RuinsOfAlphOmanyteItemRoom.asm" + "maps/RuinsOfAlphAerodactylItemRoom.asm" + "maps/RuinsOfAlphHoOhWordRoom.asm" + "maps/RuinsOfAlphKabutoWordRoom.asm" + "maps/RuinsOfAlphOmanyteWordRoom.asm" + "maps/RuinsOfAlphAerodactylWordRoom.asm" + "maps/UnionCave1F.asm" + "maps/UnionCaveB1F.asm" + "maps/UnionCaveB2F.asm" + "maps/SlowpokeWellB1F.asm" + "maps/SlowpokeWellB2F.asm" + "maps/OlivineLighthouse1F.asm" + "maps/OlivineLighthouse2F.asm" + "maps/OlivineLighthouse3F.asm" + "maps/OlivineLighthouse4F.asm" ROMX $17 - "NationalPark_MapScripts" ; maps/NationalPark.asm - "NationalParkBugContest_MapScripts" ; maps/NationalParkBugContest.asm - "RadioTower1F_MapScripts" ; maps/RadioTower1F.asm - "RadioTower2F_MapScripts" ; maps/RadioTower2F.asm - "RadioTower3F_MapScripts" ; maps/RadioTower3F.asm - "RadioTower4F_MapScripts" ; maps/RadioTower4F.asm + "maps/NationalPark.asm" + "maps/NationalParkBugContest.asm" + "maps/RadioTower1F.asm" + "maps/RadioTower2F.asm" + "maps/RadioTower3F.asm" + "maps/RadioTower4F.asm" ROMX $18 - "RadioTower5F_MapScripts" ; maps/RadioTower5F.asm - "OlivineLighthouse5F_MapScripts" ; maps/OlivineLighthouse5F.asm - "OlivineLighthouse6F_MapScripts" ; maps/OlivineLighthouse6F.asm - "GoldenrodPokecenter1F_MapScripts" ; maps/GoldenrodPokecenter1F.asm - "PokecomCenterAdminOfficeMobile_MapScripts" ; maps/PokecomCenterAdminOfficeMobile.asm - "IlexForestAzaleaGate_MapScripts" ; maps/IlexForestAzaleaGate.asm - "Route34IlexForestGate_MapScripts" ; maps/Route34IlexForestGate.asm - "DayCare_MapScripts" ; maps/DayCare.asm + "maps/RadioTower5F.asm" + "maps/OlivineLighthouse5F.asm" + "maps/OlivineLighthouse6F.asm" + "maps/GoldenrodPokecenter1F.asm" + "maps/PokecomCenterAdminOfficeMobile.asm" + "maps/IlexForestAzaleaGate.asm" + "maps/Route34IlexForestGate.asm" + "maps/DayCare.asm" ROMX $19 - "UnknownText_0x64000 - UnknownText_0x648dc" ; data/phone/text/irwin_caller.asm - "ArnieLovesTheCuteText - UnknownText_0x64c5a" ; data/phone/text/arnie_caller.asm - "AlanGettingStrongerText - UnknownText_0x64f1a" ; data/phone/text/alan_caller.asm - "UnknownText_0x64f74 - UnknownText_0x6520f" ; data/phone/text/dana_caller.asm - "ChadObservingWildText - UnknownText_0x65a63" ; data/phone/text/chad_caller.asm - "DerekCheekPincherText - UnknownText_0x65da6" ; data/phone/text/derek_caller.asm - "TullyGrownText - UnknownText_0x66087" ; data/phone/text/tully_caller.asm - "BrentRareTradeText - UnknownText_0x66579" ; data/phone/text/brent_caller.asm - "UnknownText_0x665ad - UnknownText_0x6691d" ; data/phone/text/tiffany_caller.asm - "VanceLiftoffText - VanceHurryHurryText" ; data/phone/text/vance_caller.asm - "WiltonGrownText - WiltonWantThisText" ; data/phone/text/wilton_caller.asm - "UnknownText_0x66dab - UnknownText_0x66f52" ; data/phone/text/kenji_caller.asm - "ParryNoMatchText - ParryHaventYouGottenToText" ; data/phone/text/parry_caller.asm - "UnknownText_0x6717a - ErinComeBattleText" ; data/phone/text/erin_caller.asm + "data/phone/text/irwin_caller.asm" + "data/phone/text/arnie_caller.asm" + "data/phone/text/alan_caller.asm" + "data/phone/text/dana_caller.asm" + "data/phone/text/chad_caller.asm" + "data/phone/text/derek_caller.asm" + "data/phone/text/tully_caller.asm" + "data/phone/text/brent_caller.asm" + "data/phone/text/tiffany_caller.asm" + "data/phone/text/vance_caller.asm" + "data/phone/text/wilton_caller.asm" + "data/phone/text/kenji_caller.asm" + "data/phone/text/parry_caller.asm" + "data/phone/text/erin_caller.asm" ROMX $1a - "Route11_MapScripts" ; maps/Route11.asm - "VioletMart_MapScripts" ; maps/VioletMart.asm - "VioletGym_MapScripts" ; maps/VioletGym.asm - "EarlsPokemonAcademy_MapScripts" ; maps/EarlsPokemonAcademy.asm - "VioletNicknameSpeechHouse_MapScripts" ; maps/VioletNicknameSpeechHouse.asm - "VioletPokecenter1F_MapScripts" ; maps/VioletPokecenter1F.asm - "VioletKylesHouse_MapScripts" ; maps/VioletKylesHouse.asm - "Route32RuinsOfAlphGate_MapScripts" ; maps/Route32RuinsOfAlphGate.asm - "Route32Pokecenter1F_MapScripts" ; maps/Route32Pokecenter1F.asm - "Route35GoldenrodGate_MapScripts" ; maps/Route35GoldenrodGate.asm - "Route35NationalParkGate_MapScripts" ; maps/Route35NationalParkGate.asm - "Route36RuinsOfAlphGate_MapScripts" ; maps/Route36RuinsOfAlphGate.asm - "Route36NationalParkGate_MapScripts" ; maps/Route36NationalParkGate.asm + "maps/Route11.asm" + "maps/VioletMart.asm" + "maps/VioletGym.asm" + "maps/EarlsPokemonAcademy.asm" + "maps/VioletNicknameSpeechHouse.asm" + "maps/VioletPokecenter1F.asm" + "maps/VioletKylesHouse.asm" + "maps/Route32RuinsOfAlphGate.asm" + "maps/Route32Pokecenter1F.asm" + "maps/Route35GoldenrodGate.asm" + "maps/Route35NationalParkGate.asm" + "maps/Route36RuinsOfAlphGate.asm" + "maps/Route36NationalParkGate.asm" ROMX $1b - "Route8_MapScripts" ; maps/Route8.asm - "MahoganyMart1F_MapScripts" ; maps/MahoganyMart1F.asm - "TeamRocketBaseB1F_MapScripts" ; maps/TeamRocketBaseB1F.asm - "TeamRocketBaseB2F_MapScripts" ; maps/TeamRocketBaseB2F.asm - "TeamRocketBaseB3F_MapScripts" ; maps/TeamRocketBaseB3F.asm - "IlexForest_MapScripts" ; maps/IlexForest.asm + "maps/Route8.asm" + "maps/MahoganyMart1F.asm" + "maps/TeamRocketBaseB1F.asm" + "maps/TeamRocketBaseB2F.asm" + "maps/TeamRocketBaseB3F.asm" + "maps/IlexForest.asm" ROMX $1c - "LakeOfRage_MapScripts" ; maps/LakeOfRage.asm - "CeladonDeptStore1F_MapScripts" ; maps/CeladonDeptStore1F.asm - "CeladonDeptStore2F_MapScripts" ; maps/CeladonDeptStore2F.asm - "CeladonDeptStore3F_MapScripts" ; maps/CeladonDeptStore3F.asm - "CeladonDeptStore4F_MapScripts" ; maps/CeladonDeptStore4F.asm - "CeladonDeptStore5F_MapScripts" ; maps/CeladonDeptStore5F.asm - "CeladonDeptStore6F_MapScripts" ; maps/CeladonDeptStore6F.asm - "CeladonDeptStoreElevator_MapScripts" ; maps/CeladonDeptStoreElevator.asm - "CeladonMansion1F_MapScripts" ; maps/CeladonMansion1F.asm - "CeladonMansion2F_MapScripts" ; maps/CeladonMansion2F.asm - "CeladonMansion3F_MapScripts" ; maps/CeladonMansion3F.asm - "CeladonMansionRoof_MapScripts" ; maps/CeladonMansionRoof.asm - "CeladonMansionRoofHouse_MapScripts" ; maps/CeladonMansionRoofHouse.asm - "CeladonPokecenter1F_MapScripts" ; maps/CeladonPokecenter1F.asm - "CeladonPokecenter2FBeta_MapScripts" ; maps/CeladonPokecenter2FBeta.asm - "CeladonGameCorner_MapScripts" ; maps/CeladonGameCorner.asm - "CeladonGameCornerPrizeRoom_MapScripts" ; maps/CeladonGameCornerPrizeRoom.asm - "CeladonGym_MapScripts" ; maps/CeladonGym.asm - "CeladonCafe_MapScripts" ; maps/CeladonCafe.asm - "Route16FuchsiaSpeechHouse_MapScripts" ; maps/Route16FuchsiaSpeechHouse.asm - "Route16Gate_MapScripts" ; maps/Route16Gate.asm - "Route7SaffronGate_MapScripts" ; maps/Route7SaffronGate.asm - "Route17Route18Gate_MapScripts" ; maps/Route17Route18Gate.asm + "maps/LakeOfRage.asm" + "maps/CeladonDeptStore1F.asm" + "maps/CeladonDeptStore2F.asm" + "maps/CeladonDeptStore3F.asm" + "maps/CeladonDeptStore4F.asm" + "maps/CeladonDeptStore5F.asm" + "maps/CeladonDeptStore6F.asm" + "maps/CeladonDeptStoreElevator.asm" + "maps/CeladonMansion1F.asm" + "maps/CeladonMansion2F.asm" + "maps/CeladonMansion3F.asm" + "maps/CeladonMansionRoof.asm" + "maps/CeladonMansionRoofHouse.asm" + "maps/CeladonPokecenter1F.asm" + "maps/CeladonPokecenter2FBeta.asm" + "maps/CeladonGameCorner.asm" + "maps/CeladonGameCornerPrizeRoom.asm" + "maps/CeladonGym.asm" + "maps/CeladonCafe.asm" + "maps/Route16FuchsiaSpeechHouse.asm" + "maps/Route16Gate.asm" + "maps/Route7SaffronGate.asm" + "maps/Route17Route18Gate.asm" ROMX $1d - "DiglettsCave_MapScripts" ; maps/DiglettsCave.asm - "MountMoon_MapScripts" ; maps/MountMoon.asm - "UndergroundPath_MapScripts" ; maps/UndergroundPath.asm - "RockTunnel1F_MapScripts" ; maps/RockTunnel1F.asm - "RockTunnelB1F_MapScripts" ; maps/RockTunnelB1F.asm - "SafariZoneFuchsiaGateBeta_MapScripts" ; maps/SafariZoneFuchsiaGateBeta.asm - "SafariZoneBeta_MapScripts" ; maps/SafariZoneBeta.asm - "VictoryRoad_MapScripts" ; maps/VictoryRoad.asm - "OlivinePort_MapScripts" ; maps/OlivinePort.asm - "VermilionPort_MapScripts" ; maps/VermilionPort.asm - "FastShip1F_MapScripts" ; maps/FastShip1F.asm - "FastShipCabins_NNW_NNE_NE_MapScripts" ; maps/FastShipCabins_NNW_NNE_NE.asm - "FastShipCabins_SW_SSW_NW_MapScripts" ; maps/FastShipCabins_SW_SSW_NW.asm - "FastShipCabins_SE_SSE_CaptainsCabin_MapScripts" ; maps/FastShipCabins_SE_SSE_CaptainsCabin.asm - "FastShipB1F_MapScripts" ; maps/FastShipB1F.asm - "OlivinePortPassage_MapScripts" ; maps/OlivinePortPassage.asm - "VermilionPortPassage_MapScripts" ; maps/VermilionPortPassage.asm - "MountMoonSquare_MapScripts" ; maps/MountMoonSquare.asm - "MountMoonGiftShop_MapScripts" ; maps/MountMoonGiftShop.asm - "TinTowerRoof_MapScripts" ; maps/TinTowerRoof.asm + "maps/DiglettsCave.asm" + "maps/MountMoon.asm" + "maps/UndergroundPath.asm" + "maps/RockTunnel1F.asm" + "maps/RockTunnelB1F.asm" + "maps/SafariZoneFuchsiaGateBeta.asm" + "maps/SafariZoneBeta.asm" + "maps/VictoryRoad.asm" + "maps/OlivinePort.asm" + "maps/VermilionPort.asm" + "maps/FastShip1F.asm" + "maps/FastShipCabins_NNW_NNE_NE.asm" + "maps/FastShipCabins_SW_SSW_NW.asm" + "maps/FastShipCabins_SE_SSE_CaptainsCabin.asm" + "maps/FastShipB1F.asm" + "maps/OlivinePortPassage.asm" + "maps/VermilionPortPassage.asm" + "maps/MountMoonSquare.asm" + "maps/MountMoonGiftShop.asm" + "maps/TinTowerRoof.asm" ROMX $1e - "Route34_MapScripts" ; maps/Route34.asm - "ElmsLab_MapScripts" ; maps/ElmsLab.asm - "PlayersHouse1F_MapScripts" ; maps/PlayersHouse1F.asm - "PlayersHouse2F_MapScripts" ; maps/PlayersHouse2F.asm - "PlayersNeighborsHouse_MapScripts" ; maps/PlayersNeighborsHouse.asm - "ElmsHouse_MapScripts" ; maps/ElmsHouse.asm - "Route26HealHouse_MapScripts" ; maps/Route26HealHouse.asm - "DayOfWeekSiblingsHouse_MapScripts" ; maps/DayOfWeekSiblingsHouse.asm - "Route27SandstormHouse_MapScripts" ; maps/Route27SandstormHouse.asm - "Route29Route46Gate_MapScripts" ; maps/Route29Route46Gate.asm + "maps/Route34.asm" + "maps/ElmsLab.asm" + "maps/PlayersHouse1F.asm" + "maps/PlayersHouse2F.asm" + "maps/PlayersNeighborsHouse.asm" + "maps/ElmsHouse.asm" + "maps/Route26HealHouse.asm" + "maps/DayOfWeekSiblingsHouse.asm" + "maps/Route27SandstormHouse.asm" + "maps/Route29Route46Gate.asm" ROMX $1f - "Route22_MapScripts" ; maps/Route22.asm - "GoldenrodUnderground_MapScripts" ; maps/GoldenrodUnderground.asm - "GoldenrodUndergroundSwitchRoomEntrances_MapScripts" ; maps/GoldenrodUndergroundSwitchRoomEntrances.asm - "GoldenrodDeptStoreB1F_MapScripts" ; maps/GoldenrodDeptStoreB1F.asm - "GoldenrodUndergroundWarehouse_MapScripts" ; maps/GoldenrodUndergroundWarehouse.asm - "MountMortar1FOutside_MapScripts" ; maps/MountMortar1FOutside.asm - "MountMortar1FInside_MapScripts" ; maps/MountMortar1FInside.asm - "MountMortar2FInside_MapScripts" ; maps/MountMortar2FInside.asm - "MountMortarB1F_MapScripts" ; maps/MountMortarB1F.asm - "IcePath1F_MapScripts" ; maps/IcePath1F.asm - "IcePathB1F_MapScripts" ; maps/IcePathB1F.asm - "IcePathB2FMahoganySide_MapScripts" ; maps/IcePathB2FMahoganySide.asm - "IcePathB2FBlackthornSide_MapScripts" ; maps/IcePathB2FBlackthornSide.asm - "IcePathB3F_MapScripts" ; maps/IcePathB3F.asm - "LavenderPokecenter1F_MapScripts" ; maps/LavenderPokecenter1F.asm - "LavenderPokecenter2FBeta_MapScripts" ; maps/LavenderPokecenter2FBeta.asm - "MrFujisHouse_MapScripts" ; maps/MrFujisHouse.asm - "LavenderSpeechHouse_MapScripts" ; maps/LavenderSpeechHouse.asm - "LavenderNameRater_MapScripts" ; maps/LavenderNameRater.asm - "LavenderMart_MapScripts" ; maps/LavenderMart.asm - "SoulHouse_MapScripts" ; maps/SoulHouse.asm - "LavRadioTower1F_MapScripts" ; maps/LavRadioTower1F.asm - "Route8SaffronGate_MapScripts" ; maps/Route8SaffronGate.asm - "Route12SuperRodHouse_MapScripts" ; maps/Route12SuperRodHouse.asm + "maps/Route22.asm" + "maps/GoldenrodUnderground.asm" + "maps/GoldenrodUndergroundSwitchRoomEntrances.asm" + "maps/GoldenrodDeptStoreB1F.asm" + "maps/GoldenrodUndergroundWarehouse.asm" + "maps/MountMortar1FOutside.asm" + "maps/MountMortar1FInside.asm" + "maps/MountMortar2FInside.asm" + "maps/MountMortarB1F.asm" + "maps/IcePath1F.asm" + "maps/IcePathB1F.asm" + "maps/IcePathB2FMahoganySide.asm" + "maps/IcePathB2FBlackthornSide.asm" + "maps/IcePathB3F.asm" + "maps/LavenderPokecenter1F.asm" + "maps/LavenderPokecenter2FBeta.asm" + "maps/MrFujisHouse.asm" + "maps/LavenderSpeechHouse.asm" + "maps/LavenderNameRater.asm" + "maps/LavenderMart.asm" + "maps/SoulHouse.asm" + "maps/LavRadioTower1F.asm" + "maps/Route8SaffronGate.asm" + "maps/Route12SuperRodHouse.asm" ROMX $20 - ; engine/overworld/player_movement.asm - "DoPlayerMovement - CheckStandingOnIce" - "StopPlayerForEvent" - - "EngineFlagAction - EngineFlags" ; engine/events/engine_flags.asm - "_GetVarAction" ; engine/overworld/variables.asm - "BattleText_PlayerPickedUpPayDayMoney - BattleText_0x8188e" ; data/text/battle.asm - "ColorTest - Function823c7" ; engine/menus/debug.asm + "engine/overworld/player_movement.asm" + "engine/overworld/player_movement.asm@StopPlayerForEvent" + "engine/events/engine_flags.asm" + "engine/overworld/variables.asm" + "data/text/battle.asm" + "engine/menus/debug.asm" ROMX $21 - "Printer_StartTransmission - String84a25" ; engine/printer/printer.asm - "AnimObj00GFX - AnimObjAeroblastGFX" ; gfx/battle_anims.asm - "HallOfFame - HOF_AnimatePlayerPic" ; engine/events/halloffame.asm + "engine/printer/printer.asm" + "gfx/battle_anims.asm" + "engine/events/halloffame.asm" ROMX $22 - "Kurt_PrintTextWhichApricorn - Kurt_GetRidOfItem" ; engine/events/kurt.asm - - ; engine/gfx/player_gfx.asm - "Unreferenced_Function88248" - "MovePlayerPicRight - MovePlayerPic" - "ShowPlayerNamingChoices - Unreferenced_GetPlayerNameArray" - "GetPlayerIcon" - "GetCardPic - CardGFX" - "GetPlayerBackpic - GetKrisBackpic" - "KrisBackpic" - - "String_89116 - Function8adcc" ; mobile/mobile_22.asm - - ; engine/events/unown_walls.asm - "HoOhChamber" - "OmanyteChamber" - "SpecialAerodactylChamber" - "SpecialKabutoChamber" - "DisplayUnownWords - _DisplayUnownWords_CopyWord" - - ; engine/events/buena.asm - "BuenasPassword" - "BuenaPrize - BuenaPrizeItems" - - "GiveDratini" ; engine/events/dratini.asm - "CheckForMobileBattleRules - Function_HasPartyAnEgg" ; engine/events/battle_tower/rules.asm - - ; mobile/mobile_22_2.asm - "Function8b342" - "Function8b35d" - "Function8b363" - "Function8b36c - Unknown_8ba1f" + "engine/events/kurt.asm" + "engine/gfx/player_gfx.asm@Unreferenced_Function88248" + "engine/gfx/player_gfx.asm@MovePlayerPic" + "engine/gfx/player_gfx.asm@ShowPlayerNamingChoices" + "engine/gfx/player_gfx.asm@GetPlayerIcon" + "engine/gfx/player_gfx.asm@GetCardPic" + "engine/gfx/player_gfx.asm@GetPlayerPic" + "mobile/mobile_22.asm" + "engine/events/unown_walls.asm@HoOhChamber" + "engine/events/unown_walls.asm@OmanyteChamber" + "engine/events/unown_walls.asm@SpecialAerodactylChamber" + "engine/events/unown_walls.asm@SpecialKabutoChamber" + "engine/events/unown_walls.asm@DisplayUnownWords" + "engine/events/buena.asm@BuenasPassword" + "engine/events/buena.asm@BuenaPrize" + "engine/events/dratini.asm" + "engine/events/battle_tower/rules.asm" + "mobile/mobile_22_2.asm@Function8b342" + "mobile/mobile_22_2.asm@Function8b35d" + "mobile/mobile_22_2.asm@Function8b363" + "mobile/mobile_22_2.asm" ROMX $23 - ; engine/tilesets/timeofday_pals.asm - "DummyPredef35 - DummyPredef36" - "UpdateTimeOfDayPal - GetTimePalFade" - - ; engine/battle/battle_transition.asm - "DoBattleTransition - StartTrainerBattle_ZoomToBlack" - "Unreferenced_Function8c7c9" - - ; engine/events/field_moves.asm - "PlayWhirlpoolSound" - "BlindingFlash" - "ShakeHeadbuttTree - Cut_Headbutt_GetPixelFacing" - "FlyFromAnim - FlyFunction_FrameTimer" - - "MagnetTrain - MagnetTrainTilemap4" ; engine/events/magnet_train.asm - "BattleStart_CopyTilemapAtOnce" ; engine/battle/battlestart_copytilemapatonce.asm - "ClearSpriteAnims" ; engine/gfx/sprites.asm - "PlaySpriteAnimationsAndDelayFrame - BigmonIcon" ; engine/gfx/sprites.asm + "engine/tilesets/timeofday_pals.asm@DummyPredef" + "engine/tilesets/timeofday_pals.asm" + "engine/battle/battle_transition.asm" + "engine/battle/battle_transition.asm@Unreferenced_Function8c7c9" + "engine/events/field_moves.asm@PlayWhirlpoolSound" + "engine/events/field_moves.asm@BlindingFlash" + "engine/events/field_moves.asm@Trees" + "engine/events/field_moves.asm@Fly" + "engine/events/magnet_train.asm" + "engine/battle/battlestart_copytilemapatonce.asm" + "engine/gfx/sprites.asm@ClearSpriteAnims" + "engine/gfx/sprites.asm" ROMX $24 - "AddPhoneNumber - PermanentNumbers" ; engine/phone/numbers.asm - "FarPlaceString - UnknownText_0x9066d" ; engine/phone/phone.asm - "InitClock - AdjustHourForAMorPM" ; engine/rtc/timeset.asm - "PokeGear - PlayRadio" ; engine/pokegear/pokegear.asm - "PokegearMap - Unreferenced_Function92311" ; engine/pokegear/map.asm - "Fish - TimeFishGroups" ; engine/events/fish.asm - "_SlotMachine - Slots3LZ" ; engine/games/slot_machine.asm + "engine/phone/numbers.asm" + "engine/phone/phone.asm" + "engine/rtc/timeset.asm" + "engine/pokegear/pokegear.asm" + "engine/pokegear/map.asm" + "engine/events/fish.asm" + "engine/games/slot_machine.asm" ROMX $25 - "MapGroupPointers - MapGroup_Cherrygrove" ; data/maps/maps.asm - "NewBarkTown_MapAttributes - Route31VioletGate_MapAttributes" ; data/maps/attributes.asm - - ; engine/overworld/events.asm - "OverworldLoop - ContestMons" - "DoBikeStep" - "ClearCmdQueue" - "HandleCmdQueue - CmdQueue_Type3" - "CmdQueue_StoneTable" + "data/maps/maps.asm" + "data/maps/attributes.asm" + "engine/overworld/events.asm" + "engine/overworld/events.asm@DoBikeStep" + "engine/overworld/events.asm@ClearCmdQueue" + "engine/overworld/events.asm@HandleCmdQueue" + "engine/overworld/events.asm@CmdQueue_StoneTable" ROMX $26 - "EcruteakTinTowerEntrance_MapScripts" ; maps/EcruteakTinTowerEntrance.asm - "WiseTriosRoom_MapScripts" ; maps/WiseTriosRoom.asm - "EcruteakPokecenter1F_MapScripts" ; maps/EcruteakPokecenter1F.asm - "EcruteakLugiaSpeechHouse_MapScripts" ; maps/EcruteakLugiaSpeechHouse.asm - "DanceTheatre_MapScripts" ; maps/DanceTheatre.asm - "EcruteakMart_MapScripts" ; maps/EcruteakMart.asm - "EcruteakGym_MapScripts" ; maps/EcruteakGym.asm - "EcruteakItemfinderHouse_MapScripts" ; maps/EcruteakItemfinderHouse.asm - "ViridianGym_MapScripts" ; maps/ViridianGym.asm - "ViridianNicknameSpeechHouse_MapScripts" ; maps/ViridianNicknameSpeechHouse.asm - "TrainerHouse1F_MapScripts" ; maps/TrainerHouse1F.asm - "TrainerHouseB1F_MapScripts" ; maps/TrainerHouseB1F.asm - "ViridianMart_MapScripts" ; maps/ViridianMart.asm - "ViridianPokecenter1F_MapScripts" ; maps/ViridianPokecenter1F.asm - "ViridianPokecenter2FBeta_MapScripts" ; maps/ViridianPokecenter2FBeta.asm - "Route2NuggetHouse_MapScripts" ; maps/Route2NuggetHouse.asm - "Route2Gate_MapScripts" ; maps/Route2Gate.asm - "VictoryRoadGate_MapScripts" ; maps/VictoryRoadGate.asm + "maps/EcruteakTinTowerEntrance.asm" + "maps/WiseTriosRoom.asm" + "maps/EcruteakPokecenter1F.asm" + "maps/EcruteakLugiaSpeechHouse.asm" + "maps/DanceTheatre.asm" + "maps/EcruteakMart.asm" + "maps/EcruteakGym.asm" + "maps/EcruteakItemfinderHouse.asm" + "maps/ViridianGym.asm" + "maps/ViridianNicknameSpeechHouse.asm" + "maps/TrainerHouse1F.asm" + "maps/TrainerHouseB1F.asm" + "maps/ViridianMart.asm" + "maps/ViridianPokecenter1F.asm" + "maps/ViridianPokecenter2FBeta.asm" + "maps/Route2NuggetHouse.asm" + "maps/Route2Gate.asm" + "maps/VictoryRoadGate.asm" ROMX $27 - "OlivinePokecenter1F_MapScripts" ; maps/OlivinePokecenter1F.asm - "OlivineGym_MapScripts" ; maps/OlivineGym.asm - "OlivineTimsHouse_MapScripts" ; maps/OlivineTimsHouse.asm - "OlivineHouseBeta_MapScripts" ; maps/OlivineHouseBeta.asm - "OlivinePunishmentSpeechHouse_MapScripts" ; maps/OlivinePunishmentSpeechHouse.asm - "OlivineGoodRodHouse_MapScripts" ; maps/OlivineGoodRodHouse.asm - "OlivineCafe_MapScripts" ; maps/OlivineCafe.asm - "OlivineMart_MapScripts" ; maps/OlivineMart.asm - "Route38EcruteakGate_MapScripts" ; maps/Route38EcruteakGate.asm - "Route39Barn_MapScripts" ; maps/Route39Barn.asm - "Route39Farmhouse_MapScripts" ; maps/Route39Farmhouse.asm - "ManiasHouse_MapScripts" ; maps/ManiasHouse.asm - "CianwoodGym_MapScripts" ; maps/CianwoodGym.asm - "CianwoodPokecenter1F_MapScripts" ; maps/CianwoodPokecenter1F.asm - "CianwoodPharmacy_MapScripts" ; maps/CianwoodPharmacy.asm - "CianwoodPhotoStudio_MapScripts" ; maps/CianwoodPhotoStudio.asm - "CianwoodLugiaSpeechHouse_MapScripts" ; maps/CianwoodLugiaSpeechHouse.asm - "PokeSeersHouse_MapScripts" ; maps/PokeSeersHouse.asm - "BattleTower1F_MapScripts" ; maps/BattleTower1F.asm - "BattleTowerBattleRoom_MapScripts" ; maps/BattleTowerBattleRoom.asm - "BattleTowerElevator_MapScripts" ; maps/BattleTowerElevator.asm - "BattleTowerHallway_MapScripts" ; maps/BattleTowerHallway.asm - "Route40BattleTowerGate_MapScripts" ; maps/Route40BattleTowerGate.asm - "BattleTowerOutside_MapScripts" ; maps/BattleTowerOutside.asm + "maps/OlivinePokecenter1F.asm" + "maps/OlivineGym.asm" + "maps/OlivineTimsHouse.asm" + "maps/OlivineHouseBeta.asm" + "maps/OlivinePunishmentSpeechHouse.asm" + "maps/OlivineGoodRodHouse.asm" + "maps/OlivineCafe.asm" + "maps/OlivineMart.asm" + "maps/Route38EcruteakGate.asm" + "maps/Route39Barn.asm" + "maps/Route39Farmhouse.asm" + "maps/ManiasHouse.asm" + "maps/CianwoodGym.asm" + "maps/CianwoodPokecenter1F.asm" + "maps/CianwoodPharmacy.asm" + "maps/CianwoodPhotoStudio.asm" + "maps/CianwoodLugiaSpeechHouse.asm" + "maps/PokeSeersHouse.asm" + "maps/BattleTower1F.asm" + "maps/BattleTowerBattleRoom.asm" + "maps/BattleTowerElevator.asm" + "maps/BattleTowerHallway.asm" + "maps/Route40BattleTowerGate.asm" + "maps/BattleTowerOutside.asm" ROMX $28 - "Phone_GenericCall_Male - BikeShopPhoneCallerScript" ; engine/phone/scripts/generic_caller.asm - "BuenaPhoneCalleeScript - UnknownText_0xa1e2f" ; engine/phone/buenas_password.asm + "engine/phone/caller_scripts.asm" + "engine/phone/scripts/buena.asm" ROMX $29 - "AnthonyAskNumber1Text - AnthonyRematchText" ; data/phone/text/anthony_overworld.asm - "ToddAskNumber1Text - UnusedText_0xa43ca" ; data/phone/text/todd_overworld.asm - "GinaAskNumber1Text - GinaPackFullText" ; data/phone/text/gina_overworld.asm - "IrwinAskNumber1Text - IrwinPhoneFullText" ; data/phone/text/irwin_overworld.asm - "ArnieAskNumber1Text - ArnieRematchText" ; data/phone/text/arnie_overworld.asm - "AlanAskNumber1Text - AlanPackFullText" ; data/phone/text/alan_overworld.asm - "DanaAskNumber1Text - DanaPackFullText" ; data/phone/text/dana_overworld.asm - "ChadAskNumber1Text - ChadRematchText" ; data/phone/text/chad_overworld.asm - "DerekAskNumber1Text - DerekPackFullText" ; data/phone/text/derek_overworld.asm - "TullyAskNumber1Text - TullyPackFullText" ; data/phone/text/tully_overworld.asm - "BrentAskNumber1Text - BrentRematchText" ; data/phone/text/brent_overworld.asm - "TiffanyAskNumber1Text - TiffanyPackFullText" ; data/phone/text/tiffany_overworld.asm - "VanceAskNumber1Text - VanceRematchGiftText" ; data/phone/text/vance_overworld.asm - "WiltonAskNumber1Text - WiltonPackFullText" ; data/phone/text/wilton_overworld.asm - "KenjiAskNumber1Text - KenjiPackFullText" ; data/phone/text/kenji_overworld.asm - "ParryAskNumber1Text - ParryRematchGiftText" ; data/phone/text/parry_overworld.asm - "ErinAskNumber1Text - ErinRematchGiftText" ; data/phone/text/erin_overworld.asm + "data/phone/text/anthony_overworld.asm" + "data/phone/text/todd_overworld.asm" + "data/phone/text/gina_overworld.asm" + "data/phone/text/irwin_overworld.asm" + "data/phone/text/arnie_overworld.asm" + "data/phone/text/alan_overworld.asm" + "data/phone/text/dana_overworld.asm" + "data/phone/text/chad_overworld.asm" + "data/phone/text/derek_overworld.asm" + "data/phone/text/tully_overworld.asm" + "data/phone/text/brent_overworld.asm" + "data/phone/text/tiffany_overworld.asm" + "data/phone/text/vance_overworld.asm" + "data/phone/text/wilton_overworld.asm" + "data/phone/text/kenji_overworld.asm" + "data/phone/text/parry_overworld.asm" + "data/phone/text/erin_overworld.asm" ROMX $2a - "Map Blocks 1" ; (not splitting) data/maps/blocks.asm + "Map Blocks 1" ROMX $2b - "Map Blocks 2" ; (not splitting) data/maps/blocks.asm + "Map Blocks 2" ROMX $2c - "Map Blocks 3" ; (not splitting) data/maps/blocks.asm + "Map Blocks 3" ROMX $2d - "Tileset Data 5" ; (not splitting) gfx/tilesets.asm + "gfx/tilesets.asm@Tileset Data 5" ROMX $2e - "ReturnFromMapSetupScript - PlaceMapNameFrame" ; engine/events/map_name_sign.asm - "CheckForHiddenItems" ; engine/events/checkforhiddenitems.asm - "TreeMonEncounter - GetTreeScore" ; engine/events/treemons.asm - "LoadFishingGFX - KrisFishingGFX" ; engine/events/fishing_gfx.asm - "PlayRadioShow - NextRadioLine" ; engine/pokegear/radio.asm - - ; engine/pokemon/mail_2.asm - "ReadPartyMonMail - PortraitMailBorderGFX" - "ItemIsMail - MailItems" + "engine/events/map_name_sign.asm" + "engine/events/checkforhiddenitems.asm" + "engine/events/treemons.asm" + "engine/events/fishing_gfx.asm" + "engine/pokegear/radio.asm" + "engine/pokemon/mail_2.asm@ReadAnyMail" + "engine/pokemon/mail_2.asm@ItemIsMail" ROMX $2f - ; engine/events/std_scripts.asm - "StdScripts" - "PokecenterNurseScript" - "DifficultBookshelfScript" - "PictureBookshelfScript" - "MagazineBookshelfScript" - "TeamRocketOathScript" - "IncenseBurnerScript" - "MerchandiseShelfScript" - "TownMapScript" - "WindowScript" - "TVScript" - "HomepageScript" - "Radio1Script" - "Radio2Script" - "TrashCanScript" - "PCScript" - "ElevatorButtonScript" - "StrengthBoulderScript" - "SmashRockScript" - "PokecenterSignScript" - "MartSignScript" - "DayToTextScript" - "GoldenrodRocketsScript" - "RadioTowerRocketsScript" - "BugContestResultsWarpScript - BugContestResults_CopyContestantsToResults" - "InitializeEventsScript" - "AskNumber1MScript" - "AskNumber2MScript" - "RegisteredNumberMScript" - "NumberAcceptedMScript" - "NumberDeclinedMScript" - "PhoneFullMScript" - "RematchMScript" - "GiftMScript" - "PackFullMScript" - "RematchGiftMScript" - "AskNumber1FScript" - "AskNumber2FScript" - "RegisteredNumberFScript" - "NumberAcceptedFScript" - "NumberDeclinedFScript" - "PhoneFullFScript" - "RematchFScript" - "GiftFScript" - "PackFullFScript" - "RematchGiftFScript" - "GymStatue1Script" - "GymStatue2Script" - "ReceiveItemScript" - "ReceiveTogepiEggScript" - "GameCornerCoinVendorScript - CoinVendor_IntroScript" - "HappinessCheckScript" - "Movement_ContestResults_WalkAfterWarp" - - "UnusedPhoneScript" ; engine/phone/scripts/unused.asm - "MomPhoneCalleeScript - MomPhoneLectureScript" ; engine/phone/scripts/mom.asm - "BillPhoneCalleeScript - BillPhoneCallerScript" ; engine/phone/scripts/bill.asm - "ElmPhoneCalleeScript - ElmPhoneCallerScript" ; engine/phone/scripts/elm.asm - "JackPhoneCalleeScript - JackBattleTrivia" ; engine/phone/scripts/jack.asm - "BeverlyPhoneCalleeScript - BeverlyPhoneCallerScript" ; engine/phone/scripts/beverly.asm - "HueyPhoneCalleeScript - HueyWantsBattle" ; engine/phone/scripts/huey.asm - "GavenPhoneCalleeScript - GavenFoundRare" ; engine/phone/scripts/gaven.asm - "BethPhoneCalleeScript - BethWantsBattle" ; engine/phone/scripts/beth.asm - "JosePhoneCalleeScript - JoseHasStarPiece" ; engine/phone/scripts/jose.asm - "ReenaPhoneCalleeScript - ReenaWantsBattle" ; engine/phone/scripts/reena.asm - "JoeyPhoneCalleeScript - JoeyWantsBattle" ; engine/phone/scripts/joey.asm - "WadePhoneCalleeScript - WadeHasItem2" ; engine/phone/scripts/wade.asm - "RalphPhoneCalleeScript - Ralph_SetUpSwarm" ; engine/phone/scripts/ralph.asm - "LizPhoneCalleeScript - LizGossipScript" ; engine/phone/scripts/liz.asm - "AnthonyPhoneCalleeScript - AnthonyTriesDunsparceSwarm" ; engine/phone/scripts/anthony.asm - "ToddPhoneCalleeScript - ToddDeptStoreSale" ; engine/phone/scripts/todd.asm - "GinaPhoneCalleeScript - GinaHasLeafStone" ; engine/phone/scripts/gina.asm - "IrwinPhoneCalleeScript - IrwinPhoneCallerScript" ; engine/phone/scripts/irwin.asm - "ArniePhoneCalleeScript - ArnieYanmaAlreadySwarming" ; engine/phone/scripts/arnie.asm - "AlanPhoneCalleeScript - AlanHasFireStone" ; engine/phone/scripts/alan.asm - "DanaPhoneCalleeScript - DanaHasThunderstone" ; engine/phone/scripts/dana.asm - "ChadPhoneCalleeScript - ChadOakGossip" ; engine/phone/scripts/chad.asm - "DerekPhoneCalleeScript - DerekPhoneCallerScript" ; engine/phone/scripts/derek.asm - "TullyPhoneCalleeScript - TullyFoundWaterStone" ; engine/phone/scripts/tully.asm - "BrentPhoneCalleeScript - BrentBillTrivia" ; engine/phone/scripts/brent.asm - "TiffanyPhoneCalleeScript - TiffanyHasPinkBow" ; engine/phone/scripts/tiffany.asm - "VancePhoneCalleeScript - VanceWantsRematch" ; engine/phone/scripts/vance.asm - "WiltonPhoneCalleeScript - WiltonHasItem" ; engine/phone/scripts/wilton.asm - "KenjiPhoneCalleeScript - KenjiPhoneCallerScript" ; engine/phone/scripts/kenji.asm - "ParryPhoneCalleeScript - ParryWantsBattle" ; engine/phone/scripts/parry.asm - "ErinPhoneCalleeScript - ErinWantsBattle" ; engine/phone/scripts/erin.asm - - ; engine/phone/scripts/generic_callee.asm - "PhoneScript_Random2 - PhoneScript_MonFlavorText" - "GrandmaString - BrotherString" - - "TalkToTrainerScript - AlreadyBeatenTrainerScript" ; engine/events/trainer_scripts.asm + "engine/events/std_scripts.asm" + "engine/events/std_scripts.asm@PokecenterNurseScript" + "engine/events/std_scripts.asm@DifficultBookshelfScript" + "engine/events/std_scripts.asm@PictureBookshelfScript" + "engine/events/std_scripts.asm@MagazineBookshelfScript" + "engine/events/std_scripts.asm@TeamRocketOathScript" + "engine/events/std_scripts.asm@IncenseBurnerScript" + "engine/events/std_scripts.asm@MerchandiseShelfScript" + "engine/events/std_scripts.asm@TownMapScript" + "engine/events/std_scripts.asm@WindowScript" + "engine/events/std_scripts.asm@TVScript" + "engine/events/std_scripts.asm@HomepageScript" + "engine/events/std_scripts.asm@Radio1Script" + "engine/events/std_scripts.asm@Radio2Script" + "engine/events/std_scripts.asm@TrashCanScript" + "engine/events/std_scripts.asm@PCScript" + "engine/events/std_scripts.asm@ElevatorButtonScript" + "engine/events/std_scripts.asm@StrengthBoulderScript" + "engine/events/std_scripts.asm@SmashRockScript" + "engine/events/std_scripts.asm@PokecenterSignScript" + "engine/events/std_scripts.asm@MartSignScript" + "engine/events/std_scripts.asm@DayToTextScript" + "engine/events/std_scripts.asm@GoldenrodRocketsScript" + "engine/events/std_scripts.asm@RadioTowerRocketsScript" + "engine/events/std_scripts.asm@BugContestResultsScript" + "engine/events/std_scripts.asm@InitializeEventsScript" + "engine/events/std_scripts.asm@AskNumber1MScript" + "engine/events/std_scripts.asm@AskNumber2MScript" + "engine/events/std_scripts.asm@RegisteredNumberMScript" + "engine/events/std_scripts.asm@NumberAcceptedMScript" + "engine/events/std_scripts.asm@NumberDeclinedMScript" + "engine/events/std_scripts.asm@PhoneFullMScript" + "engine/events/std_scripts.asm@RematchMScript" + "engine/events/std_scripts.asm@GiftMScript" + "engine/events/std_scripts.asm@PackFullMScript" + "engine/events/std_scripts.asm@RematchGiftMScript" + "engine/events/std_scripts.asm@AskNumber1FScript" + "engine/events/std_scripts.asm@AskNumber2FScript" + "engine/events/std_scripts.asm@RegisteredNumberFScript" + "engine/events/std_scripts.asm@NumberAcceptedFScript" + "engine/events/std_scripts.asm@NumberDeclinedFScript" + "engine/events/std_scripts.asm@PhoneFullFScript" + "engine/events/std_scripts.asm@RematchFScript" + "engine/events/std_scripts.asm@GiftFScript" + "engine/events/std_scripts.asm@PackFullFScript" + "engine/events/std_scripts.asm@RematchGiftFScript" + "engine/events/std_scripts.asm@GymStatue1Script" + "engine/events/std_scripts.asm@GymStatue2Script" + "engine/events/std_scripts.asm@ReceiveItemScript" + "engine/events/std_scripts.asm@ReceiveTogepiEggScript" + "engine/events/std_scripts.asm@GameCornerCoinVendorScript" + "engine/events/std_scripts.asm@HappinessCheckScript" + "engine/events/std_scripts.asm@Movement_ContestResults_WalkAfterWarp" + "engine/phone/scripts/unused.asm" + "engine/phone/scripts/mom.asm" + "engine/phone/scripts/bill.asm" + "engine/phone/scripts/elm.asm" + "engine/phone/scripts/jack.asm" + "engine/phone/scripts/beverly.asm" + "engine/phone/scripts/huey.asm" + "engine/phone/scripts/gaven.asm" + "engine/phone/scripts/beth.asm" + "engine/phone/scripts/jose.asm" + "engine/phone/scripts/reena.asm" + "engine/phone/scripts/joey.asm" + "engine/phone/scripts/wade.asm" + "engine/phone/scripts/ralph.asm" + "engine/phone/scripts/liz.asm" + "engine/phone/scripts/anthony.asm" + "engine/phone/scripts/todd.asm" + "engine/phone/scripts/gina.asm" + "engine/phone/scripts/irwin.asm" + "engine/phone/scripts/arnie.asm" + "engine/phone/scripts/alan.asm" + "engine/phone/scripts/dana.asm" + "engine/phone/scripts/chad.asm" + "engine/phone/scripts/derek.asm" + "engine/phone/scripts/tully.asm" + "engine/phone/scripts/brent.asm" + "engine/phone/scripts/tiffany.asm" + "engine/phone/scripts/vance.asm" + "engine/phone/scripts/wilton.asm" + "engine/phone/scripts/kenji.asm" + "engine/phone/scripts/parry.asm" + "engine/phone/scripts/erin.asm" + "engine/phone/scripts/generic_callee.asm" + "engine/phone/scripts/generic_callee.asm@TiffanysFamilyMembers" + "engine/events/trainer_scripts.asm" ROMX $30 - "Sprites 1" ; (not splitting) gfx/sprites.asm + "Sprites 1" ROMX $31 - "Sprites 2" ; (not splitting) gfx/sprites.asm + "Sprites 2" ROMX $32 - "ExecuteBGEffects - BattleBGEffects_Cosine" ; engine/battle_anims/bg_effects.asm - "BattleAnimations - BattleAnim_ShowMon_1" ; data/moves/animations.asm - "LoadPoisonBGPals" ; engine/events/poisonstep_pals.asm - "TheEndGFX" ; main.asm + "engine/battle_anims/bg_effects.asm" + "data/moves/animations.asm" + "engine/events/poisonstep_pals.asm" + "main.asm@TheEndGFX" ROMX $33 - ; engine/events/bug_contest/display_stats.asm - "DisplayCaughtContestMonStats - SwitchMonText" - "DisplayAlreadyCaughtText" - "DummyPredef2F - DummyPredef39" - - "PlayBattleAnim - AnimObjGFX" ; engine/battle_anims/core.asm - "Music_PostCredits" ; audio/music/PostCredits.asm + "engine/events/bug_contest/display_stats.asm@DisplayCaughtContestMonStats" + "engine/events/bug_contest/display_stats.asm@DisplayAlreadyCaughtText" + "engine/events/bug_contest/display_stats.asm@DummyPredef" + "engine/battle_anims/core.asm" + "audio/music/postcredits.asm" ROMX $34 - "Unused_AnimateMon_Slow_Normal - HOF_AnimateFrontpic" ; engine/gfx/pic_animation.asm - "AnimationPointers - EggAnimationIdle" ; gfx/pokemon/anims.asm - "UnownAnimationPointers - UnownZAnimationIdle" ; gfx/pokemon/unown_anims.asm - "BitmasksPointers - EggBitmasks" ; gfx/bitmasks.asm - "UnownBitmasksPointers - UnownZBitmasks" ; gfx/pokemon/unown_bitmasks.asm + "engine/gfx/pic_animation.asm" + "gfx/pokemon/anims.asm" + "gfx/pokemon/unown_anims.asm" + "gfx/pokemon/bitmasks.asm" + "gfx/pokemon/unown_bitmasks.asm" ROMX $35 - "FramesPointers" ; gfx/pokemon/frame_pointers.asm - "BulbasaurFrames - MewFrames" ; gfx/pokemon/kanto_frames.asm + "gfx/pokemon/frame_pointers.asm" + "gfx/pokemon/kanto_frames.asm" ROMX $36 - "FontInversed" ; main.asm - "ChikoritaFrames - EggFrames" ; gfx/pokemon/johto_frames.asm - "UnownFramesPointers - UnownZFrames" ; gfx/pokemon/unown_frames.asm + "main.asm@FontInversed" + "gfx/pokemon/johto_frames.asm" + "gfx/pokemon/unown_frames.asm" ROMX $37 - "Tileset Data 6" ; (not splitting) gfx/tilesets.asm + "gfx/tilesets.asm@Tileset Data 6" ROMX $38 - "RotateUnownFrontpic - UnownPrinter_GBPrinterRectangle" ; engine/events/print_unown_2.asm - - ; engine/games/card_flip.asm - "Unknown_e00ed" - "_CardFlip - CardFlipTilemap" - - "_UnownPuzzle - OmanytePuzzleLZ" ; engine/games/unown_puzzle.asm - "_DummyGame - LZ_e2221" ; engine/games/dummy_game.asm - - ; engine/pokemon/bills_pc.asm - "_DepositPKMN - PCString_NoReleasingEGGS" - "_ChangeBox - BillsPC_PlaceChangeBoxString" + "engine/events/print_unown_2.asm" + "engine/games/card_flip.asm@Unknown_e00ed" + "engine/games/card_flip.asm" + "engine/games/unown_puzzle.asm" + "engine/games/dummy_game.asm" + "engine/pokemon/bills_pc.asm" + "engine/pokemon/bills_pc.asm@_ChangeBox" ROMX $39 - "CopyrightGFX" ; main.asm - "_OptionsMenu - Options_UpdateCursorPosition" ; engine/menus/options_menu.asm - - ; engine/movie/crystal_intro.asm - "Copyright_GFPresents - GameFreakLogo" - "CrystalIntro - IntroGrass4GFX" + "main.asm@CopyrightGFX" + "engine/menus/options_menu.asm" + "engine/movie/crystal_intro.asm@Copyright_GFPresents" + "engine/movie/crystal_intro.asm" ROMX $3a - "_MapSetup_Sound_Off - SFX" ; audio/engine.asm - "Music_Route36" ; audio/music/Route36.asm - "Music_RivalBattle" ; audio/music/RivalBattle.asm - "Music_RocketBattle" ; audio/music/RocketBattle.asm - "Music_ElmsLab" ; audio/music/ElmsLab.asm - "Music_DarkCave" ; audio/music/DarkCave.asm - "Music_JohtoGymBattle" ; audio/music/JohtoGymBattle.asm - "Music_ChampionBattle" ; audio/music/ChampionBattle.asm - "Music_SSAqua" ; audio/music/SSAqua.asm - "Music_NewBarkTown" ; audio/music/NewBarkTown.asm - "Music_GoldenrodCity" ; audio/music/GoldenrodCity.asm - "Music_VermilionCity" ; audio/music/VermilionCity.asm - "Music_TitleScreen" ; audio/music/TitleScreen.asm - "Music_RuinsOfAlphInterior" ; audio/music/RuinsOfAlphInterior.asm - "Music_LookPokemaniac" ; audio/music/LookPokemaniac.asm - "Music_TrainerVictory" ; audio/music/TrainerVictory.asm + "audio/engine.asm" + "audio/music/route36.asm" + "audio/music/rivalbattle.asm" + "audio/music/rocketbattle.asm" + "audio/music/elmslab.asm" + "audio/music/darkcave.asm" + "audio/music/johtogymbattle.asm" + "audio/music/championbattle.asm" + "audio/music/ssaqua.asm" + "audio/music/newbarktown.asm" + "audio/music/goldenrodcity.asm" + "audio/music/vermilioncity.asm" + "audio/music/titlescreen.asm" + "audio/music/ruinsofalphinterior.asm" + "audio/music/lookpokemaniac.asm" + "audio/music/trainervictory.asm" ROMX $3b - "Music_Route1" ; audio/music/Route1.asm - "Music_Route3" ; audio/music/Route3.asm - "Music_Route12" ; audio/music/Route12.asm - "Music_KantoGymBattle" ; audio/music/KantoGymBattle.asm - "Music_KantoTrainerBattle" ; audio/music/KantoTrainerBattle.asm - "Music_KantoWildBattle" ; audio/music/KantoWildBattle.asm - "Music_PokemonCenter" ; audio/music/PokemonCenter.asm - "Music_LookLass" ; audio/music/LookLass.asm - "Music_LookOfficer" ; audio/music/LookOfficer.asm - "Music_Route2" ; audio/music/Route2.asm - "Music_MtMoon" ; audio/music/MtMoon.asm - "Music_ShowMeAround" ; audio/music/ShowMeAround.asm - "Music_GameCorner" ; audio/music/GameCorner.asm - "Music_Bicycle" ; audio/music/Bicycle.asm - "Music_LookSage" ; audio/music/LookSage.asm - "Music_PokemonChannel" ; audio/music/PokemonChannel.asm - "Music_Lighthouse" ; audio/music/Lighthouse.asm - "Music_LakeOfRage" ; audio/music/LakeOfRage.asm - "Music_IndigoPlateau" ; audio/music/IndigoPlateau.asm - "Music_Route37" ; audio/music/Route37.asm - "Music_RocketHideout" ; audio/music/RocketHideout.asm - "Music_DragonsDen" ; audio/music/DragonsDen.asm - "Music_RuinsOfAlphRadio" ; audio/music/RuinsOfAlphRadio.asm - "Music_LookBeauty" ; audio/music/LookBeauty.asm - "Music_Route26" ; audio/music/Route26.asm - "Music_EcruteakCity" ; audio/music/EcruteakCity.asm - "Music_LakeOfRageRocketRadio" ; audio/music/LakeOfRageRocketRadio.asm - "Music_MagnetTrain" ; audio/music/MagnetTrain.asm - "Music_LavenderTown" ; audio/music/LavenderTown.asm - "Music_DancingHall" ; audio/music/DancingHall.asm - "Music_ContestResults" ; audio/music/ContestResults.asm - "Music_Route30" ; audio/music/Route30.asm + "audio/music/route1.asm" + "audio/music/route3.asm" + "audio/music/route12.asm" + "audio/music/kantogymbattle.asm" + "audio/music/kantotrainerbattle.asm" + "audio/music/kantowildbattle.asm" + "audio/music/pokemoncenter.asm" + "audio/music/looklass.asm" + "audio/music/lookofficer.asm" + "audio/music/route2.asm" + "audio/music/mtmoon.asm" + "audio/music/showmearound.asm" + "audio/music/gamecorner.asm" + "audio/music/bicycle.asm" + "audio/music/looksage.asm" + "audio/music/pokemonchannel.asm" + "audio/music/lighthouse.asm" + "audio/music/lakeofrage.asm" + "audio/music/indigoplateau.asm" + "audio/music/route37.asm" + "audio/music/rockethideout.asm" + "audio/music/dragonsden.asm" + "audio/music/ruinsofalphradio.asm" + "audio/music/lookbeauty.asm" + "audio/music/route26.asm" + "audio/music/ecruteakcity.asm" + "audio/music/lakeofragerocketradio.asm" + "audio/music/magnettrain.asm" + "audio/music/lavendertown.asm" + "audio/music/dancinghall.asm" + "audio/music/contestresults.asm" + "audio/music/route30.asm" ROMX $3c - "Music_VioletCity" ; audio/music/VioletCity.asm - "Music_Route29" ; audio/music/Route29.asm - "Music_HallOfFame" ; audio/music/HallOfFame.asm - "Music_HealPokemon" ; audio/music/HealPokemon.asm - "Music_Evolution" ; audio/music/Evolution.asm - "Music_Printer" ; audio/music/Printer.asm - - ; audio/sfx.asm - "Sfx_PokeballsPlacedOnTable - Sfx_Elevator_Ch8" - "Sfx_StopSlot - Sfx_StopSlot_Ch5" - "Sfx_GlassTing - Sfx_GlassTing_Ch5" - "Sfx_GlassTing2 - Sfx_GlassTing2_Ch6" - - "PokemonCries" ; data/pokemon/cries.asm - - ; audio/cries.asm - "Cry_Marill - Cry_Aipom_Ch8" - "Cry_Nidoran_M - Cry_Rattata_Ch8" + "audio/music/violetcity.asm" + "audio/music/route29.asm" + "audio/music/halloffame.asm" + "audio/music/healpokemon.asm" + "audio/music/evolution.asm" + "audio/music/printer.asm" + "audio/sfx.asm" + "audio/sfx.asm@Sfx_StopSlot" + "audio/sfx.asm@Sfx_GlassTing" + "audio/sfx.asm@Sfx_GlassTing2" + "data/pokemon/cries.asm" + "audio/cries.asm@Johto" + "audio/cries.asm@Kanto" ROMX $3d - "Music_ViridianCity" ; audio/music/ViridianCity.asm - "Music_CeladonCity" ; audio/music/CeladonCity.asm - "Music_WildPokemonVictory" ; audio/music/WildPokemonVictory.asm - "Music_SuccessfulCapture" ; audio/music/SuccessfulCapture.asm - "Music_GymLeaderVictory" ; audio/music/GymLeaderVictory.asm - "Music_MtMoonSquare" ; audio/music/MtMoonSquare.asm - "Music_Gym" ; audio/music/Gym.asm - "Music_PalletTown" ; audio/music/PalletTown.asm - "Music_ProfOaksPokemonTalk" ; audio/music/ProfOaksPokemonTalk.asm - "Music_ProfOak" ; audio/music/ProfOak.asm - "Music_LookRival" ; audio/music/LookRival.asm - "Music_AfterTheRivalFight" ; audio/music/AfterTheRivalFight.asm - "Music_Surf" ; audio/music/Surf.asm - "Music_NationalPark" ; audio/music/NationalPark.asm - "Music_AzaleaTown" ; audio/music/AzaleaTown.asm - "Music_CherrygroveCity" ; audio/music/CherrygroveCity.asm - "Music_UnionCave" ; audio/music/UnionCave.asm - "Music_JohtoWildBattle" ; audio/music/JohtoWildBattle.asm - "Music_JohtoWildBattleNight" ; audio/music/JohtoWildBattleNight.asm - "Music_JohtoTrainerBattle" ; audio/music/JohtoTrainerBattle.asm - "Music_LookYoungster" ; audio/music/LookYoungster.asm - "Music_TinTower" ; audio/music/TinTower.asm - "Music_SproutTower" ; audio/music/SproutTower.asm - "Music_BurnedTower" ; audio/music/BurnedTower.asm - "Music_Mom" ; audio/music/Mom.asm - "Music_VictoryRoad" ; audio/music/VictoryRoad.asm - "Music_PokemonLullaby" ; audio/music/PokemonLullaby.asm - "Music_PokemonMarch" ; audio/music/PokemonMarch.asm - "Music_GoldSilverOpening" ; audio/music/GoldSilverOpening.asm - "Music_GoldSilverOpening2" ; audio/music/GoldSilverOpening2.asm - "Music_LookHiker" ; audio/music/LookHiker.asm - "Music_LookRocket" ; audio/music/LookRocket.asm - "Music_RocketTheme" ; audio/music/RocketTheme.asm - "Music_MainMenu" ; audio/music/MainMenu.asm - "Music_LookKimonoGirl" ; audio/music/LookKimonoGirl.asm - "Music_PokeFluteChannel" ; audio/music/PokeFluteChannel.asm - "Music_BugCatchingContest" ; audio/music/BugCatchingContest.asm + "audio/music/viridiancity.asm" + "audio/music/celadoncity.asm" + "audio/music/wildpokemonvictory.asm" + "audio/music/successfulcapture.asm" + "audio/music/gymleadervictory.asm" + "audio/music/mtmoonsquare.asm" + "audio/music/gym.asm" + "audio/music/pallettown.asm" + "audio/music/profoakspokemontalk.asm" + "audio/music/profoak.asm" + "audio/music/lookrival.asm" + "audio/music/aftertherivalfight.asm" + "audio/music/surf.asm" + "audio/music/nationalpark.asm" + "audio/music/azaleatown.asm" + "audio/music/cherrygrovecity.asm" + "audio/music/unioncave.asm" + "audio/music/johtowildbattle.asm" + "audio/music/johtowildbattlenight.asm" + "audio/music/johtotrainerbattle.asm" + "audio/music/lookyoungster.asm" + "audio/music/tintower.asm" + "audio/music/sprouttower.asm" + "audio/music/burnedtower.asm" + "audio/music/mom.asm" + "audio/music/victoryroad.asm" + "audio/music/pokemonlullaby.asm" + "audio/music/pokemonmarch.asm" + "audio/music/goldsilveropening.asm" + "audio/music/goldsilveropening2.asm" + "audio/music/lookhiker.asm" + "audio/music/lookrocket.asm" + "audio/music/rockettheme.asm" + "audio/music/mainmenu.asm" + "audio/music/lookkimonogirl.asm" + "audio/music/pokeflutechannel.asm" + "audio/music/bugcatchingcontest.asm" ROMX $3e - "FontExtra - Footprints" ; gfx/font.asm - - ; engine/gfx/load_font.asm - "Unreferenced_fb434 - Unreferenced_Functionfb43f" - "_LoadStandardFont" - "_LoadFontsExtra1 - LoadStatsScreenPageTilesGFX" - - ; engine/link/time_capsule.asm - "ValidateOTTrademon" - "Functionfb5dd" - "PlaceTradePartnerNamesAndParty" - - "KantoMonSpecials" ; data/pokemon/gen1_base_special.asm - "_NameRater - NameRaterDoneText" ; engine/events/name_rater.asm - "PlaySlowCry" ; engine/events/play_slow_cry.asm - "NewPokedexEntry" ; engine/pokedex/new_pokedex_entry.asm - "ConvertMon_2to1 - Pokered_MonIndices" ; engine/link/time_capsule_2.asm - - ; engine/pokedex/unown_dex.asm - "UpdateUnownDex" - "PrintUnownWord - UnownWordZ" - - "CheckMagikarpLength - MagikarpHouseSign" ; engine/events/magikarp.asm - "HiddenPowerDamage" ; engine/battle/hidden_power.asm - - ; engine/battle/misc.asm - "_DisappearUser - GetPlayerBackpicCoords" - "DoWeatherModifiers - WeatherMoveModifiers" - "DoBadgeTypeBoosts - BadgeTypeBoosts" + "gfx/font.asm" + "engine/gfx/load_font.asm@Unreferenced" + "engine/gfx/load_font.asm@_LoadStandardFont" + "engine/gfx/load_font.asm" + "engine/link/time_capsule.asm@ValidateOTTrademon" + "engine/link/time_capsule.asm@Functionfb5dd" + "engine/link/time_capsule.asm@PlaceTradePartnerNamesAndParty" + "data/pokemon/gen1_base_special.asm" + "engine/events/name_rater.asm" + "engine/events/play_slow_cry.asm" + "engine/pokedex/new_pokedex_entry.asm" + "engine/link/time_capsule_2.asm" + "engine/pokedex/unown_dex.asm@UpdateUnownDex" + "engine/pokedex/unown_dex.asm@PrintUnownWord" + "engine/events/magikarp.asm" + "engine/battle/hidden_power.asm" + "engine/battle/misc.asm@AppearDisappearUser" + "engine/battle/misc.asm@DoWeatherModifiers" + "engine/battle/misc.asm@DoBadgeTypeBoosts" ROMX $3f - "_AnimateTileset - WhirlpoolTiles4" ; engine/tilesets/tileset_anims.asm - "NPCTrade - TradeAfterText3" ; engine/events/npc_trade.asm - - ; engine/events/mom_phone.asm - "MomTriesToBuySomething - _MomText_ItsInRoom" - "DummyPredef3A" + "engine/tilesets/tileset_anims.asm" + "engine/events/npc_trade.asm" + "engine/events/mom_phone.asm" + "engine/events/mom_phone.asm@DummyPredef3A" ROMX $40 - ; mobile/mobile_40.asm - "Function100000 - UnknownText_0x1021f4" - "Function100000 - UnknownText_0x1021f4 (2)" - "Function100000 - UnknownText_0x1021f4 (3)" - "Function100000 - UnknownText_0x1021f4 (4)" - "Function100000 - UnknownText_0x1021f4 (5)" - "Function1021f9 - Palettes_1032e2" - "Function103302 - MenuData_103648" - "Function103654" - "Mobile_SelectThreeMons - UnknownText_0x10377b" - "Function103780 - Function10378c" - "Function1037c2 - Function103823" - "Function10383c - UnknownText_0x103876" - "Function10387b - UnknownText_0x103898" + "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (1)" + "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (ASCII 1)" + "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (2)" + "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (ASCII 2)" + "mobile/mobile_40.asm@Function100000 - UnknownText_0x1021f4 (3)" + "mobile/mobile_40.asm@Function1021f9 - Palettes_1032e2" + "mobile/mobile_40.asm@Function103302 - MenuData_103648" + "mobile/mobile_40.asm@Function103654" + "mobile/mobile_40.asm@Mobile_SelectThreeMons - UnknownText_0x10377b" + "mobile/mobile_40.asm@Function103780 - Function10378c" + "mobile/mobile_40.asm@Function1037c2 - Function103823" + "mobile/mobile_40.asm@Function10383c - UnknownText_0x103876" + "mobile/mobile_40.asm@Function10387b - UnknownText_0x103898" ROMX $41 - "HDMATransferAttrMapAndTileMapToWRAMBank3 - HDMATransfer_OnlyTopFourRows" ; engine/gfx/dma_transfer.asm - "ShockEmote - GrassRustleGFX" ; gfx/emotes.asm - - ; engine/overworld/warp_connection.asm - "HandleNewMap - InitCommandQueue" - "EnterMapConnection" - "LoadWarpData" - "LoadMapTimeOfDay" - "LoadGraphics" - "LoadMapPalettes" - "RefreshMapSprites" - "CheckMovingOffEdgeOfMap" - "GetCoordOfUpperLeftCorner" - - "DoMysteryGift - MysteryGiftJP_GFX" ; engine/link/mystery_gift.asm - "DisplayUsedMoveText - UpdateUsedMoves" ; engine/battle/used_move_text.asm - - ; mobile/mobile_41.asm - "StubbedTrainerRankings_HallOfFame2 - InitializeTrainerRankings" - "_MobilePrintNum" - "Mobile_DummyReturnFalse" - "Stubbed_Function106314 - Function106453" - "Stubbed_Function106462" - "Function106464" - "Function10649b - asm_1064ed" - "Function10650a" - "GFX_106514" - - "LoadOverworldFont" ; engine/gfx/load_overworld_font.asm + "engine/gfx/dma_transfer.asm" + "gfx/emotes.asm" + "engine/overworld/warp_connection.asm@HandleNewMap" + "engine/overworld/warp_connection.asm@EnterMapConnection" + "engine/overworld/warp_connection.asm@LoadWarpData" + "engine/overworld/warp_connection.asm@LoadMapTimeOfDay" + "engine/overworld/warp_connection.asm@LoadGraphics" + "engine/overworld/warp_connection.asm@LoadMapPalettes" + "engine/overworld/warp_connection.asm@RefreshMapSprites" + "engine/overworld/warp_connection.asm@CheckMovingOffEdgeOfMap" + "engine/overworld/warp_connection.asm@GetCoordOfUpperLeftCorner" + "engine/link/mystery_gift.asm" + "engine/battle/used_move_text.asm" + "mobile/mobile_41.asm@TrainerRankings" + "mobile/mobile_41.asm@_MobilePrintNum" + "mobile/mobile_41.asm@Mobile_DummyReturnFalse" + "mobile/mobile_41.asm@Stubbed_Function106314 - Function106453" + "mobile/mobile_41.asm@Stubbed_Function106462" + "mobile/mobile_41.asm@Function106464" + "mobile/mobile_41.asm@Function10649b - asm_1064ed" + "mobile/mobile_41.asm@Function10650a" + "mobile/mobile_41.asm@GFX_106514" + "engine/gfx/load_overworld_font.asm" ROMX $42 - "MobileTradeAnimation_SendGivemonToGTS - Palette_1093c7" ; mobile/mobile_42.asm - "IntroLogoGFX" ; main.asm - "Credits - CreditsStrings" ; engine/movie/credits.asm + "mobile/mobile_42.asm" + "main.asm@IntroLogoGFX" + "engine/movie/credits.asm" ROMX $43 - "UnusedTitleScreen - UnusedTitleFG_OAM" ; engine/movie/unused_title.asm - "Function10ed51 - TitleScreenPalettes" ; engine/movie/title.asm + "engine/movie/unused_title.asm" + "engine/movie/title.asm" ROMX $44 - "Mobile Adapter SDK" ; (not splitting) lib/mobile/main.asm + "Mobile Adapter SDK" ROMX $45 - "String_114000 - Function115d80" ; mobile/mobile_45.asm - - ; mobile/mobile_45_sprite_engine.asm - "Function115d99" - "Function115dc3" - "Function115dd3 - Unknown_116005" - "GFX_11601a" - "Function11615a" - "Function11619d - Unknown_117356" - - ; mobile/mobile_45.asm (cont.) - "GiveOddEgg" - "Function11765d - Unknown_117a47" - "MobileStudium - MobileStudium_JumptableIncrement" + "mobile/mobile_45.asm@String_114000 - Function115d80" + "mobile/mobile_45_sprite_engine.asm@Function115d99" + "mobile/mobile_45_sprite_engine.asm@Function115dc3" + "mobile/mobile_45_sprite_engine.asm@Function115dd3 - Unknown_116005" + "mobile/mobile_45_sprite_engine.asm@GFX_11601a" + "mobile/mobile_45_sprite_engine.asm@Function11615a" + "mobile/mobile_45_sprite_engine.asm@Function11619d - Unknown_117356" + "mobile/mobile_45.asm@GiveOddEgg" + "mobile/mobile_45.asm@Function11765d - Unknown_117a47" + "mobile/mobile_45.asm@MobileStudium" ROMX $46 - "Function118000 - TilemapPack_11bb7d" - "Function118000 - TilemapPack_11bb7d (2)" + "mobile/mobile_46.asm@Function118000 - TilemapPack_11bb7d (ASCII)" + "mobile/mobile_46.asm@Function118000 - TilemapPack_11bb7d" ROMX $47 - "BattleTowerText - BTWinF15" ; engine/events/battle_tower/trainer_text.asm + "engine/events/battle_tower/trainer_text.asm" ROMX $48 org $4000 - "PokemonPicPointers" ; data/pokemon/pic_pointers.asm - "Pics 1" ; (not splitting) gfx/pics.asm + "data/pokemon/pic_pointers.asm" + "gfx/pics.asm@Pics 1" ROMX $49 org $4000 - "UnownPicPointers" ; data/pokemon/unown_pic_pointers.asm - "Pics 2" ; (not splitting) gfx/pics.asm + "data/pokemon/unown_pic_pointers.asm" + "gfx/pics.asm@Pics 2" ROMX $4a - "TrainerPicPointers" ; data/trainers/pic_pointers.asm - "Pics 3" ; (not splitting) gfx/pics.asm + "data/trainers/pic_pointers.asm" + "gfx/pics.asm@Pics 3" ROMX $4b - "Pics 4" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 4" ROMX $4c - "Pics 5" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 5" ROMX $4d - "Pics 6" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 6" ROMX $4e - "Pics 7" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 7" ROMX $4f - "Pics 8" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 8" ROMX $50 - "Pics 9" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 9" ROMX $51 - "Pics 10" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 10" ROMX $52 - "Pics 11" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 11" ROMX $53 - "Pics 12" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 12" ROMX $54 - "Pics 13" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 13" ROMX $55 - "Pics 14" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 14" ROMX $56 - "Pics 15" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 15" ROMX $57 - "Pics 16" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 16" ROMX $58 - "Pics 17" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 17" ROMX $59 - "Pics 18" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 18" ROMX $5a - "Pics 19" ; (not splitting) gfx/pics.asm + "gfx/pics.asm@Pics 19" ROMX $5b - "Unreferenced_Function16c000 - Unknown_16cfb9" ; mobile/mobile_5b.asm - - ; engine/link/link_trade.asm - "LinkCommsBorderGFX - LinkTextbox" - "Function16d6ce - Function16d6e1" - "LinkTradeMenu" - - "Pics 20" ; (not splitting) gfx/pics.asm + "mobile/mobile_5b.asm" + "engine/link/link_trade.asm@_LoadTradeScreenBorder" + "engine/link/link_trade.asm@Function16d6ce" + "engine/link/link_trade.asm@LinkTradeMenu" + "gfx/pics.asm@Pics 20" ROMX $5c - ; mobile/mobile_5c.asm - "Function170000" - "Function17005a" - "BattleTowerRoomMenu - CheckBTMonMovesForErrors" - "Function170cc6 - GFX_171848" - "Function1719c8 - String_171c73" - "Function171c87 - String_172e5d" - "Function172e78 - Attrmap_173517" - - "Pics 21" ; (not splitting) gfx/pics.asm + "mobile/mobile_5c.asm@Function170000" + "mobile/mobile_5c.asm@Function17005a" + "mobile/mobile_5c.asm@BattleTowerRoomMenu" + "mobile/mobile_5c.asm@Function170cc6 - GFX_171848" + "mobile/mobile_5c.asm@Function1719c8 - String_171c73" + "mobile/mobile_5c.asm@Function171c87 - String_172e5d" + "mobile/mobile_5c.asm@Function172e78 - Attrmap_173517" + "gfx/pics.asm@Pics 21" ROMX $5d - "UnknownText_0x174000" ; data/phone/text/bike_shop.asm - "JackIntelligenceText - UnknownText_0x174638" ; data/phone/text/jack_caller.asm - "UnknownText_0x174688 - UnknownText_0x174895" ; data/phone/text/beverly_caller.asm - "UnknownText_0x1748ea - UnknownText_0x1749c7" ; data/phone/text/huey_caller.asm - "GavenGreaterText - UnknownText_0x174c49" ; data/phone/text/gaven_caller.asm - "UnknownText_0x174c7f - BethForgetDealText" ; data/phone/text/beth_caller.asm - "JoseAromaText - UnknownText_0x17529c" ; data/phone/text/jose_caller.asm - "UnknownText_0x1752f5 - UnknownText_0x1754e5" ; data/phone/text/reena_caller.asm - "JoeySharperText - UnknownText_0x175786" ; data/phone/text/joey_caller.asm - "WadeAreYouGrowingText - UnknownText_0x175b6d" ; data/phone/text/wade_caller.asm - "RalphNeglectingKidsText - UnknownText_0x175f70" ; data/phone/text/ralph_caller.asm - "UnknownText_0x175fda - UnknownText_0x1769da" ; data/phone/text/liz_caller.asm - "AnthonyAteBerriesText - UnknownText_0x176dd1" ; data/phone/text/anthony_caller.asm - "ToddLooksCuteLikeMeText - UnknownText_0x17717c" ; data/phone/text/todd_caller.asm - "UnknownText_0x1771fd - UnknownText_0x17750e" ; data/phone/text/gina_caller.asm - "Pics 22" ; (not splitting) gfx/pics.asm + "data/phone/text/bike_shop.asm" + "data/phone/text/jack_caller.asm" + "data/phone/text/beverly_caller.asm" + "data/phone/text/huey_caller.asm" + "data/phone/text/gaven_caller.asm" + "data/phone/text/beth_caller.asm" + "data/phone/text/jose_caller.asm" + "data/phone/text/reena_caller.asm" + "data/phone/text/joey_caller.asm" + "data/phone/text/wade_caller.asm" + "data/phone/text/ralph_caller.asm" + "data/phone/text/liz_caller.asm" + "data/phone/text/anthony_caller.asm" + "data/phone/text/todd_caller.asm" + "data/phone/text/gina_caller.asm" + "gfx/pics.asm@Pics 22" ROMX $5e - "_UpdateBattleHUDs" ; engine/battle/update_battle_huds.asm - "Music_MobileAdapterMenu" ; audio/music/MobileAdapterMenu.asm - "Music_BuenasPassword" ; audio/music/BuenasPassword.asm - "Music_LookMysticalMan" ; audio/music/LookMysticalMan.asm - "Music_CrystalOpening" ; audio/music/CrystalOpening.asm - "Music_BattleTowerTheme" ; audio/music/BattleTowerTheme.asm - "Music_SuicuneBattle" ; audio/music/SuicuneBattle.asm - "Music_BattleTowerLobby" ; audio/music/BattleTowerLobby.asm - "Music_MobileCenter" ; audio/music/MobileCenter.asm - - ; audio/sfx_crystal.asm - "Sfx_IntroUnown1 - Sfx_IntroUnown1_Ch5" - "Sfx_IntroUnown2 - Sfx_IntroUnown2_Ch6" - "Sfx_IntroUnown3 - Sfx_IntroUnown3_Ch7" - "Sfx_DittoPopUp - Sfx_DittoPopUp_Ch5" - "Sfx_DittoTransform - Sfx_DittoTransform_Ch5" - "Sfx_IntroSuicune1 - Sfx_IntroSuicune1_Ch8" - "Sfx_IntroPichu - Sfx_IntroPichu_Ch5" - "Sfx_IntroSuicune2 - Sfx_IntroSuicune2_Ch8" - "Sfx_IntroSuicune3 - Sfx_IntroSuicune3_Ch8" - "Sfx_DittoBounce - Sfx_DittoBounce_Ch5" - "Sfx_IntroSuicune4 - Sfx_IntroSuicune4_Ch8" - "Sfx_GameFreakPresents - Sfx_GameFreakPresents_Ch5" - "Sfx_Tingle - Sfx_Tingle_Ch5" - "Sfx_TwoPcBeeps - Sfx_TwoPcBeeps_Ch5" - "Sfx_4NoteDitty - Sfx_4NoteDitty_Ch7" - "Sfx_Twinkle - Sfx_Twinkle_Ch5" - - ; mobile/mobile_5e.asm - "MobileAdapterGFX" - "Function17a68f - GFX_17afa5" - - "Pics 23" ; (not splitting) gfx/pics.asm + "engine/battle/update_battle_huds.asm" + "audio/music/mobileadaptermenu.asm" + "audio/music/buenaspassword.asm" + "audio/music/lookmysticalman.asm" + "audio/music/crystalopening.asm" + "audio/music/battletowertheme.asm" + "audio/music/suicunebattle.asm" + "audio/music/battletowerlobby.asm" + "audio/music/mobilecenter.asm" + "audio/sfx_crystal.asm@Sfx_IntroUnown1" + "audio/sfx_crystal.asm@Sfx_IntroUnown2" + "audio/sfx_crystal.asm@Sfx_IntroUnown3" + "audio/sfx_crystal.asm@Sfx_DittoPopUp" + "audio/sfx_crystal.asm@Sfx_DittoTransform" + "audio/sfx_crystal.asm@Sfx_IntroSuicune1" + "audio/sfx_crystal.asm@Sfx_IntroPichu" + "audio/sfx_crystal.asm@Sfx_IntroSuicune2" + "audio/sfx_crystal.asm@Sfx_IntroSuicune3" + "audio/sfx_crystal.asm@Sfx_DittoBounce" + "audio/sfx_crystal.asm@Sfx_IntroSuicune4" + "audio/sfx_crystal.asm@Sfx_GameFreakPresents" + "audio/sfx_crystal.asm@Sfx_Tingle" + "audio/sfx_crystal.asm@Sfx_TwoPcBeeps" + "audio/sfx_crystal.asm@Sfx_4NoteDitty" + "audio/sfx_crystal.asm@Sfx_Twinkle" + "mobile/mobile_5e.asm@MobileAdapterGFX" + "mobile/mobile_5e.asm@Function17a68f - GFX_17afa5" + "gfx/pics.asm@Pics 23" ROMX $5f - ; mobile/mobile_5f.asm - "Function17c000 - HaveWantPals" - "CheckStringForErrors" - "CheckStringForErrors_IgnoreTerminator" - "Function17d0f3" - "Mobile_CopyDefaultOTName - Mobile_CopyDefaultMailAuthor" - "CheckStringContainsLessThanBNextCharacters" - "Function17d1f1" - "Menu_ChallengeExplanationCancel - MenuData_ChallengeExplanationCancel" - "Function17d2b6 - Function17d2c0" - "Function17d2ce - Function17f524" - "BattleTowerMobileError - String_17ff68" - - "Pics 24" ; (not splitting) gfx/pics.asm + "mobile/mobile_5f.asm@Function17c000 - HaveWantPals" + "mobile/mobile_5f.asm@CheckStringForErrors" + "mobile/mobile_5f.asm@CheckStringForErrors_IgnoreTerminator" + "mobile/mobile_5f.asm@Function17d0f3" + "mobile/mobile_5f.asm@Mobile_CopyDefaultOTName - Mobile_CopyDefaultMailAuthor" + "mobile/mobile_5f.asm@CheckStringContainsLessThanBNextCharacters" + "mobile/mobile_5f.asm@Function17d1f1" + "mobile/mobile_5f.asm@Menu_ChallengeExplanationCancel" + "mobile/mobile_5f.asm@Function17d2b6 - Function17d2c0" + "mobile/mobile_5f.asm@Function17d2ce - Function17f524" + "mobile/mobile_5f.asm@BattleTowerMobileError - String_17ff68" + "gfx/pics.asm@Pics 24" ROMX $60 - "IndigoPlateauPokecenter1F_MapScripts" ; maps/IndigoPlateauPokecenter1F.asm - "WillsRoom_MapScripts" ; maps/WillsRoom.asm - "KogasRoom_MapScripts" ; maps/KogasRoom.asm - "BrunosRoom_MapScripts" ; maps/BrunosRoom.asm - "KarensRoom_MapScripts" ; maps/KarensRoom.asm - "LancesRoom_MapScripts" ; maps/LancesRoom.asm - "HallOfFame_MapScripts" ; maps/HallOfFame.asm - "Pokedex Entries 001-064" ; data/pokemon/dex_entries.asm + "maps/IndigoPlateauPokecenter1F.asm" + "maps/WillsRoom.asm" + "maps/KogasRoom.asm" + "maps/BrunosRoom.asm" + "maps/KarensRoom.asm" + "maps/LancesRoom.asm" + "maps/HallOfFame.asm" + "data/pokemon/dex_entries.asm@Pokedex Entries 001-064" ROMX $61 - "CeruleanCity_MapScripts" ; maps/CeruleanCity.asm - "SproutTower1F_MapScripts" ; maps/SproutTower1F.asm - "SproutTower2F_MapScripts" ; maps/SproutTower2F.asm - "SproutTower3F_MapScripts" ; maps/SproutTower3F.asm - "TinTower1F_MapScripts" ; maps/TinTower1F.asm - "TinTower2F_MapScripts" ; maps/TinTower2F.asm - "TinTower3F_MapScripts" ; maps/TinTower3F.asm - "TinTower4F_MapScripts" ; maps/TinTower4F.asm - "TinTower5F_MapScripts" ; maps/TinTower5F.asm - "TinTower6F_MapScripts" ; maps/TinTower6F.asm - "TinTower7F_MapScripts" ; maps/TinTower7F.asm - "TinTower8F_MapScripts" ; maps/TinTower8F.asm - "TinTower9F_MapScripts" ; maps/TinTower9F.asm - "BurnedTower1F_MapScripts" ; maps/BurnedTower1F.asm - "BurnedTowerB1F_MapScripts" ; maps/BurnedTowerB1F.asm + "maps/CeruleanCity.asm" + "maps/SproutTower1F.asm" + "maps/SproutTower2F.asm" + "maps/SproutTower3F.asm" + "maps/TinTower1F.asm" + "maps/TinTower2F.asm" + "maps/TinTower3F.asm" + "maps/TinTower4F.asm" + "maps/TinTower5F.asm" + "maps/TinTower6F.asm" + "maps/TinTower7F.asm" + "maps/TinTower8F.asm" + "maps/TinTower9F.asm" + "maps/BurnedTower1F.asm" + "maps/BurnedTowerB1F.asm" ROMX $62 - "CeruleanGymBadgeSpeechHouse_MapScripts" ; maps/CeruleanGymBadgeSpeechHouse.asm - "CeruleanPoliceStation_MapScripts" ; maps/CeruleanPoliceStation.asm - "CeruleanTradeSpeechHouse_MapScripts" ; maps/CeruleanTradeSpeechHouse.asm - "CeruleanPokecenter1F_MapScripts" ; maps/CeruleanPokecenter1F.asm - "CeruleanPokecenter2FBeta_MapScripts" ; maps/CeruleanPokecenter2FBeta.asm - "CeruleanGym_MapScripts" ; maps/CeruleanGym.asm - "CeruleanMart_MapScripts" ; maps/CeruleanMart.asm - "Route10Pokecenter1F_MapScripts" ; maps/Route10Pokecenter1F.asm - "Route10Pokecenter2FBeta_MapScripts" ; maps/Route10Pokecenter2FBeta.asm - "PowerPlant_MapScripts" ; maps/PowerPlant.asm - "BillsHouse_MapScripts" ; maps/BillsHouse.asm - "FightingDojo_MapScripts" ; maps/FightingDojo.asm - "SaffronGym_MapScripts" ; maps/SaffronGym.asm - "SaffronMart_MapScripts" ; maps/SaffronMart.asm - "SaffronPokecenter1F_MapScripts" ; maps/SaffronPokecenter1F.asm - "SaffronPokecenter2FBeta_MapScripts" ; maps/SaffronPokecenter2FBeta.asm - "MrPsychicsHouse_MapScripts" ; maps/MrPsychicsHouse.asm - "SaffronMagnetTrainStation_MapScripts" ; maps/SaffronMagnetTrainStation.asm - "SilphCo1F_MapScripts" ; maps/SilphCo1F.asm - "CopycatsHouse1F_MapScripts" ; maps/CopycatsHouse1F.asm - "CopycatsHouse2F_MapScripts" ; maps/CopycatsHouse2F.asm - "Route5UndergroundPathEntrance_MapScripts" ; maps/Route5UndergroundPathEntrance.asm - "Route5SaffronGate_MapScripts" ; maps/Route5SaffronGate.asm - "Route5CleanseTagHouse_MapScripts" ; maps/Route5CleanseTagHouse.asm + "maps/CeruleanGymBadgeSpeechHouse.asm" + "maps/CeruleanPoliceStation.asm" + "maps/CeruleanTradeSpeechHouse.asm" + "maps/CeruleanPokecenter1F.asm" + "maps/CeruleanPokecenter2FBeta.asm" + "maps/CeruleanGym.asm" + "maps/CeruleanMart.asm" + "maps/Route10Pokecenter1F.asm" + "maps/Route10Pokecenter2FBeta.asm" + "maps/PowerPlant.asm" + "maps/BillsHouse.asm" + "maps/FightingDojo.asm" + "maps/SaffronGym.asm" + "maps/SaffronMart.asm" + "maps/SaffronPokecenter1F.asm" + "maps/SaffronPokecenter2FBeta.asm" + "maps/MrPsychicsHouse.asm" + "maps/SaffronMagnetTrainStation.asm" + "maps/SilphCo1F.asm" + "maps/CopycatsHouse1F.asm" + "maps/CopycatsHouse2F.asm" + "maps/Route5UndergroundPathEntrance.asm" + "maps/Route5SaffronGate.asm" + "maps/Route5CleanseTagHouse.asm" ROMX $63 - "PewterCity_MapScripts" ; maps/PewterCity.asm - "WhirlIslandNW_MapScripts" ; maps/WhirlIslandNW.asm - "WhirlIslandNE_MapScripts" ; maps/WhirlIslandNE.asm - "WhirlIslandSW_MapScripts" ; maps/WhirlIslandSW.asm - "WhirlIslandCave_MapScripts" ; maps/WhirlIslandCave.asm - "WhirlIslandSE_MapScripts" ; maps/WhirlIslandSE.asm - "WhirlIslandB1F_MapScripts" ; maps/WhirlIslandB1F.asm - "WhirlIslandB2F_MapScripts" ; maps/WhirlIslandB2F.asm - "WhirlIslandLugiaChamber_MapScripts" ; maps/WhirlIslandLugiaChamber.asm - "SilverCaveRoom1_MapScripts" ; maps/SilverCaveRoom1.asm - "SilverCaveRoom2_MapScripts" ; maps/SilverCaveRoom2.asm - "SilverCaveRoom3_MapScripts" ; maps/SilverCaveRoom3.asm - "SilverCaveItemRooms_MapScripts" ; maps/SilverCaveItemRooms.asm - "DarkCaveVioletEntrance_MapScripts" ; maps/DarkCaveVioletEntrance.asm - "DarkCaveBlackthornEntrance_MapScripts" ; maps/DarkCaveBlackthornEntrance.asm - "DragonsDen1F_MapScripts" ; maps/DragonsDen1F.asm - "DragonsDenB1F_MapScripts" ; maps/DragonsDenB1F.asm - "DragonShrine_MapScripts" ; maps/DragonShrine.asm - "TohjoFalls_MapScripts" ; maps/TohjoFalls.asm - "AzaleaPokecenter1F_MapScripts" ; maps/AzaleaPokecenter1F.asm - "CharcoalKiln_MapScripts" ; maps/CharcoalKiln.asm - "AzaleaMart_MapScripts" ; maps/AzaleaMart.asm - "KurtsHouse_MapScripts" ; maps/KurtsHouse.asm - "AzaleaGym_MapScripts" ; maps/AzaleaGym.asm + "maps/PewterCity.asm" + "maps/WhirlIslandNW.asm" + "maps/WhirlIslandNE.asm" + "maps/WhirlIslandSW.asm" + "maps/WhirlIslandCave.asm" + "maps/WhirlIslandSE.asm" + "maps/WhirlIslandB1F.asm" + "maps/WhirlIslandB2F.asm" + "maps/WhirlIslandLugiaChamber.asm" + "maps/SilverCaveRoom1.asm" + "maps/SilverCaveRoom2.asm" + "maps/SilverCaveRoom3.asm" + "maps/SilverCaveItemRooms.asm" + "maps/DarkCaveVioletEntrance.asm" + "maps/DarkCaveBlackthornEntrance.asm" + "maps/DragonsDen1F.asm" + "maps/DragonsDenB1F.asm" + "maps/DragonShrine.asm" + "maps/TohjoFalls.asm" + "maps/AzaleaPokecenter1F.asm" + "maps/CharcoalKiln.asm" + "maps/AzaleaMart.asm" + "maps/KurtsHouse.asm" + "maps/AzaleaGym.asm" ROMX $64 - "MahoganyTown_MapScripts" ; maps/MahoganyTown.asm - "Route32_MapScripts" ; maps/Route32.asm - "VermilionFishingSpeechHouse_MapScripts" ; maps/VermilionFishingSpeechHouse.asm - "VermilionPokecenter1F_MapScripts" ; maps/VermilionPokecenter1F.asm - "VermilionPokecenter2FBeta_MapScripts" ; maps/VermilionPokecenter2FBeta.asm - "PokemonFanClub_MapScripts" ; maps/PokemonFanClub.asm - "VermilionMagnetTrainSpeechHouse_MapScripts" ; maps/VermilionMagnetTrainSpeechHouse.asm - "VermilionMart_MapScripts" ; maps/VermilionMart.asm - "VermilionDiglettsCaveSpeechHouse_MapScripts" ; maps/VermilionDiglettsCaveSpeechHouse.asm - "VermilionGym_MapScripts" ; maps/VermilionGym.asm - "Route6SaffronGate_MapScripts" ; maps/Route6SaffronGate.asm - "Route6UndergroundPathEntrance_MapScripts" ; maps/Route6UndergroundPathEntrance.asm - "Pokecenter2F_MapScripts" ; maps/Pokecenter2F.asm - "TradeCenter_MapScripts" ; maps/TradeCenter.asm - "Colosseum_MapScripts" ; maps/Colosseum.asm - "TimeCapsule_MapScripts" ; maps/TimeCapsule.asm - "MobileTradeRoom_MapScripts" ; maps/MobileTradeRoom.asm - "MobileBattleRoom_MapScripts" ; maps/MobileBattleRoom.asm + "maps/MahoganyTown.asm" + "maps/Route32.asm" + "maps/VermilionFishingSpeechHouse.asm" + "maps/VermilionPokecenter1F.asm" + "maps/VermilionPokecenter2FBeta.asm" + "maps/PokemonFanClub.asm" + "maps/VermilionMagnetTrainSpeechHouse.asm" + "maps/VermilionMart.asm" + "maps/VermilionDiglettsCaveSpeechHouse.asm" + "maps/VermilionGym.asm" + "maps/Route6SaffronGate.asm" + "maps/Route6UndergroundPathEntrance.asm" + "maps/Pokecenter2F.asm" + "maps/TradeCenter.asm" + "maps/Colosseum.asm" + "maps/TimeCapsule.asm" + "maps/MobileTradeRoom.asm" + "maps/MobileBattleRoom.asm" ROMX $65 - "Route36_MapScripts" ; maps/Route36.asm - "FuchsiaCity_MapScripts" ; maps/FuchsiaCity.asm - "BlackthornGym1F_MapScripts" ; maps/BlackthornGym1F.asm - "BlackthornGym2F_MapScripts" ; maps/BlackthornGym2F.asm - "BlackthornDragonSpeechHouse_MapScripts" ; maps/BlackthornDragonSpeechHouse.asm - "BlackthornEmysHouse_MapScripts" ; maps/BlackthornEmysHouse.asm - "BlackthornMart_MapScripts" ; maps/BlackthornMart.asm - "BlackthornPokecenter1F_MapScripts" ; maps/BlackthornPokecenter1F.asm - "MoveDeletersHouse_MapScripts" ; maps/MoveDeletersHouse.asm - "FuchsiaMart_MapScripts" ; maps/FuchsiaMart.asm - "SafariZoneMainOffice_MapScripts" ; maps/SafariZoneMainOffice.asm - "FuchsiaGym_MapScripts" ; maps/FuchsiaGym.asm - "BillsBrothersHouse_MapScripts" ; maps/BillsBrothersHouse.asm - "FuchsiaPokecenter1F_MapScripts" ; maps/FuchsiaPokecenter1F.asm - "FuchsiaPokecenter2FBeta_MapScripts" ; maps/FuchsiaPokecenter2FBeta.asm - "SafariZoneWardensHome_MapScripts" ; maps/SafariZoneWardensHome.asm - "Route15FuchsiaGate_MapScripts" ; maps/Route15FuchsiaGate.asm - "CherrygroveMart_MapScripts" ; maps/CherrygroveMart.asm - "CherrygrovePokecenter1F_MapScripts" ; maps/CherrygrovePokecenter1F.asm - "CherrygroveGymSpeechHouse_MapScripts" ; maps/CherrygroveGymSpeechHouse.asm - "GuideGentsHouse_MapScripts" ; maps/GuideGentsHouse.asm - "CherrygroveEvolutionSpeechHouse_MapScripts" ; maps/CherrygroveEvolutionSpeechHouse.asm - "Route30BerryHouse_MapScripts" ; maps/Route30BerryHouse.asm - "MrPokemonsHouse_MapScripts" ; maps/MrPokemonsHouse.asm - "Route31VioletGate_MapScripts" ; maps/Route31VioletGate.asm + "maps/Route36.asm" + "maps/FuchsiaCity.asm" + "maps/BlackthornGym1F.asm" + "maps/BlackthornGym2F.asm" + "maps/BlackthornDragonSpeechHouse.asm" + "maps/BlackthornEmysHouse.asm" + "maps/BlackthornMart.asm" + "maps/BlackthornPokecenter1F.asm" + "maps/MoveDeletersHouse.asm" + "maps/FuchsiaMart.asm" + "maps/SafariZoneMainOffice.asm" + "maps/FuchsiaGym.asm" + "maps/BillsBrothersHouse.asm" + "maps/FuchsiaPokecenter1F.asm" + "maps/FuchsiaPokecenter2FBeta.asm" + "maps/SafariZoneWardensHome.asm" + "maps/Route15FuchsiaGate.asm" + "maps/CherrygroveMart.asm" + "maps/CherrygrovePokecenter1F.asm" + "maps/CherrygroveGymSpeechHouse.asm" + "maps/GuideGentsHouse.asm" + "maps/CherrygroveEvolutionSpeechHouse.asm" + "maps/Route30BerryHouse.asm" + "maps/MrPokemonsHouse.asm" + "maps/Route31VioletGate.asm" ROMX $66 - "AzaleaTown_MapScripts" ; maps/AzaleaTown.asm - "GoldenrodCity_MapScripts" ; maps/GoldenrodCity.asm - "SaffronCity_MapScripts" ; maps/SaffronCity.asm - "MahoganyRedGyaradosSpeechHouse_MapScripts" ; maps/MahoganyRedGyaradosSpeechHouse.asm - "MahoganyGym_MapScripts" ; maps/MahoganyGym.asm - "MahoganyPokecenter1F_MapScripts" ; maps/MahoganyPokecenter1F.asm - "Route42EcruteakGate_MapScripts" ; maps/Route42EcruteakGate.asm - "LakeOfRageHiddenPowerHouse_MapScripts" ; maps/LakeOfRageHiddenPowerHouse.asm - "LakeOfRageMagikarpHouse_MapScripts" ; maps/LakeOfRageMagikarpHouse.asm - "Route43MahoganyGate_MapScripts" ; maps/Route43MahoganyGate.asm - "Route43Gate_MapScripts" ; maps/Route43Gate.asm - "RedsHouse1F_MapScripts" ; maps/RedsHouse1F.asm - "RedsHouse2F_MapScripts" ; maps/RedsHouse2F.asm - "BluesHouse_MapScripts" ; maps/BluesHouse.asm - "OaksLab_MapScripts" ; maps/OaksLab.asm + "maps/AzaleaTown.asm" + "maps/GoldenrodCity.asm" + "maps/SaffronCity.asm" + "maps/MahoganyRedGyaradosSpeechHouse.asm" + "maps/MahoganyGym.asm" + "maps/MahoganyPokecenter1F.asm" + "maps/Route42EcruteakGate.asm" + "maps/LakeOfRageHiddenPowerHouse.asm" + "maps/LakeOfRageMagikarpHouse.asm" + "maps/Route43MahoganyGate.asm" + "maps/Route43Gate.asm" + "maps/RedsHouse1F.asm" + "maps/RedsHouse2F.asm" + "maps/BluesHouse.asm" + "maps/OaksLab.asm" ROMX $67 - "CherrygroveCity_MapScripts" ; maps/CherrygroveCity.asm - "Route35_MapScripts" ; maps/Route35.asm - "Route43_MapScripts" ; maps/Route43.asm - "Route44_MapScripts" ; maps/Route44.asm - "Route45_MapScripts" ; maps/Route45.asm - "Route19_MapScripts" ; maps/Route19.asm - "Route25_MapScripts" ; maps/Route25.asm + "maps/CherrygroveCity.asm" + "maps/Route35.asm" + "maps/Route43.asm" + "maps/Route44.asm" + "maps/Route45.asm" + "maps/Route19.asm" + "maps/Route25.asm" ROMX $68 - "CianwoodCity_MapScripts" ; maps/CianwoodCity.asm - "Route27_MapScripts" ; maps/Route27.asm - "Route29_MapScripts" ; maps/Route29.asm - "Route30_MapScripts" ; maps/Route30.asm - "Route38_MapScripts" ; maps/Route38.asm - "Route13_MapScripts" ; maps/Route13.asm - "PewterNidoranSpeechHouse_MapScripts" ; maps/PewterNidoranSpeechHouse.asm - "PewterGym_MapScripts" ; maps/PewterGym.asm - "PewterMart_MapScripts" ; maps/PewterMart.asm - "PewterPokecenter1F_MapScripts" ; maps/PewterPokecenter1F.asm - "PewterPokecenter2FBeta_MapScripts" ; maps/PewterPokecenter2FBeta.asm - "PewterSnoozeSpeechHouse_MapScripts" ; maps/PewterSnoozeSpeechHouse.asm + "maps/CianwoodCity.asm" + "maps/Route27.asm" + "maps/Route29.asm" + "maps/Route30.asm" + "maps/Route38.asm" + "maps/Route13.asm" + "maps/PewterNidoranSpeechHouse.asm" + "maps/PewterGym.asm" + "maps/PewterMart.asm" + "maps/PewterPokecenter1F.asm" + "maps/PewterPokecenter2FBeta.asm" + "maps/PewterSnoozeSpeechHouse.asm" ROMX $69 - "EcruteakCity_MapScripts" ; maps/EcruteakCity.asm - "BlackthornCity_MapScripts" ; maps/BlackthornCity.asm - "Route26_MapScripts" ; maps/Route26.asm - "Route28_MapScripts" ; maps/Route28.asm - "Route31_MapScripts" ; maps/Route31.asm - "Route39_MapScripts" ; maps/Route39.asm - "Route40_MapScripts" ; maps/Route40.asm - "Route41_MapScripts" ; maps/Route41.asm - "Route12_MapScripts" ; maps/Route12.asm + "maps/EcruteakCity.asm" + "maps/BlackthornCity.asm" + "maps/Route26.asm" + "maps/Route28.asm" + "maps/Route31.asm" + "maps/Route39.asm" + "maps/Route40.asm" + "maps/Route41.asm" + "maps/Route12.asm" ROMX $6a - "NewBarkTown_MapScripts" ; maps/NewBarkTown.asm - "VioletCity_MapScripts" ; maps/VioletCity.asm - "OlivineCity_MapScripts" ; maps/OlivineCity.asm - "Route37_MapScripts" ; maps/Route37.asm - "Route42_MapScripts" ; maps/Route42.asm - "Route46_MapScripts" ; maps/Route46.asm - "ViridianCity_MapScripts" ; maps/ViridianCity.asm - "CeladonCity_MapScripts" ; maps/CeladonCity.asm - "Route15_MapScripts" ; maps/Route15.asm - "VermilionCity_MapScripts" ; maps/VermilionCity.asm - "Route9_MapScripts" ; maps/Route9.asm - "CinnabarPokecenter1F_MapScripts" ; maps/CinnabarPokecenter1F.asm - "CinnabarPokecenter2FBeta_MapScripts" ; maps/CinnabarPokecenter2FBeta.asm - "Route19FuchsiaGate_MapScripts" ; maps/Route19FuchsiaGate.asm - "SeafoamGym_MapScripts" ; maps/SeafoamGym.asm + "maps/NewBarkTown.asm" + "maps/VioletCity.asm" + "maps/OlivineCity.asm" + "maps/Route37.asm" + "maps/Route42.asm" + "maps/Route46.asm" + "maps/ViridianCity.asm" + "maps/CeladonCity.asm" + "maps/Route15.asm" + "maps/VermilionCity.asm" + "maps/Route9.asm" + "maps/CinnabarPokecenter1F.asm" + "maps/CinnabarPokecenter2FBeta.asm" + "maps/Route19FuchsiaGate.asm" + "maps/SeafoamGym.asm" ROMX $6b - "Route33_MapScripts" ; maps/Route33.asm - "Route2_MapScripts" ; maps/Route2.asm - "Route1_MapScripts" ; maps/Route1.asm - "PalletTown_MapScripts" ; maps/PalletTown.asm - "Route21_MapScripts" ; maps/Route21.asm - "CinnabarIsland_MapScripts" ; maps/CinnabarIsland.asm - "Route20_MapScripts" ; maps/Route20.asm - "Route18_MapScripts" ; maps/Route18.asm - "Route17_MapScripts" ; maps/Route17.asm - "Route16_MapScripts" ; maps/Route16.asm - "Route7_MapScripts" ; maps/Route7.asm - "Route14_MapScripts" ; maps/Route14.asm - "LavenderTown_MapScripts" ; maps/LavenderTown.asm - "Route6_MapScripts" ; maps/Route6.asm - "Route5_MapScripts" ; maps/Route5.asm - "Route24_MapScripts" ; maps/Route24.asm - "Route3_MapScripts" ; maps/Route3.asm - "Route4_MapScripts" ; maps/Route4.asm - "Route10South_MapScripts" ; maps/Route10South.asm - "Route23_MapScripts" ; maps/Route23.asm - "SilverCavePokecenter1F_MapScripts" ; maps/SilverCavePokecenter1F.asm - "Route28SteelWingHouse_MapScripts" ; maps/Route28SteelWingHouse.asm + "maps/Route33.asm" + "maps/Route2.asm" + "maps/Route1.asm" + "maps/PalletTown.asm" + "maps/Route21.asm" + "maps/CinnabarIsland.asm" + "maps/Route20.asm" + "maps/Route18.asm" + "maps/Route17.asm" + "maps/Route16.asm" + "maps/Route7.asm" + "maps/Route14.asm" + "maps/LavenderTown.asm" + "maps/Route6.asm" + "maps/Route5.asm" + "maps/Route24.asm" + "maps/Route3.asm" + "maps/Route4.asm" + "maps/Route10South.asm" + "maps/Route23.asm" + "maps/SilverCavePokecenter1F.asm" + "maps/Route28SteelWingHouse.asm" ROMX $6c - "NurseMornText - RegisteredNumber2Text" ; data/text/std_text.asm - "JackAskNumber1Text - JackRematchText" ; data/phone/text/jack_overworld.asm - "BeverlyAskNumber1Text - BeverlyPackFullText" ; data/phone/text/beverly_overworld.asm - "HueyAskNumber1Text - HueyRematchGiftText" ; data/phone/text/huey_overworld.asm - "GavenAskNumber1Text - GavenRematchText" ; data/phone/text/gaven_overworld.asm - "BethAskNumber1Text - BethRematchText" ; data/phone/text/beth_overworld.asm - "JoseAskNumber1Text - JosePackFullText" ; data/phone/text/jose_overworld.asm - "ReenaAskNumber1Text - ReenaRematchText" ; data/phone/text/reena_overworld.asm - "JoeyAskNumber1Text - JoeyRematchGiftText" ; data/phone/text/joey_overworld.asm - "WadeAskNumber1Text - WadePackFullText" ; data/phone/text/wade_overworld.asm - "RalphAskNumber1Text - RalphRematchText" ; data/phone/text/ralph_overworld.asm - "LizAskNumber1Text - LizRematchText" ; data/phone/text/liz_overworld.asm - "SilverCaveOutside_MapScripts" ; maps/SilverCaveOutside.asm - "Route10North_MapScripts" ; maps/Route10North.asm + "data/text/std_text.asm" + "data/phone/text/jack_overworld.asm" + "data/phone/text/beverly_overworld.asm" + "data/phone/text/huey_overworld.asm" + "data/phone/text/gaven_overworld.asm" + "data/phone/text/beth_overworld.asm" + "data/phone/text/jose_overworld.asm" + "data/phone/text/reena_overworld.asm" + "data/phone/text/joey_overworld.asm" + "data/phone/text/wade_overworld.asm" + "data/phone/text/ralph_overworld.asm" + "data/phone/text/liz_overworld.asm" + "maps/SilverCaveOutside.asm" + "maps/Route10North.asm" ROMX $6d - "MomPhoneGreetingText - MomPhoneLectureText" ; data/phone/text/mom.asm - "BillPhoneMornGreetingText - BillPhoneNewlyFullText" ; data/phone/text/bill.asm - "ElmPhoneStartText - ElmPhoneUnusedText" ; data/phone/text/elm.asm - "UnknownText_0x1b4dc5 - UnknownText_0x1b4ecd" ; data/phone/text/jack_callee.asm - "UnknownText_0x1b4f21 - UnknownText_0x1b502b" ; data/phone/text/beverly_callee.asm - "UnknownText_0x1b5073 - UnknownText_0x1b5154" ; data/phone/text/huey_callee.asm - "UnknownText_0x1b518b - UnknownText_0x1b522b" ; data/phone/text/unknown_callee.asm - "UnknownText_0x1b5270 - UnknownText_0x1b5393" ; data/phone/text/gaven_callee.asm - "UnknownText_0x1b53f7 - UnknownText_0x1b5510" ; data/phone/text/beth_callee.asm - "UnknownText_0x1b55ae - UnknownText_0x1b5694" ; data/phone/text/jose_callee.asm - "UnknownText_0x1b5702 - UnknownText_0x1b5819" ; data/phone/text/reena_callee.asm - "UnknownText_0x1b589a - UnknownText_0x1b59b2" ; data/phone/text/joey_callee.asm - "UnknownText_0x1b5a3b - UnknownText_0x1b5b68" ; data/phone/text/wade_callee.asm - "UnknownText_0x1b5c10 - UnknownText_0x1b5d51" ; data/phone/text/ralph_callee.asm - "UnknownText_0x1b5d9f - UnknownText_0x1b5ebe" ; data/phone/text/liz_callee.asm - "UnknownText_0x1b5f7a - UnknownText_0x1b606f" ; data/phone/text/anthony_callee.asm - "UnknownText_0x1b60f5 - UnknownText_0x1b61f2" ; data/phone/text/todd_callee.asm - "UnknownText_0x1b626a - UnknownText_0x1b6352" ; data/phone/text/gina_callee.asm - "UnknownText_0x1b638c - UnknownText_0x1b642c" ; data/phone/text/irwin_callee.asm - "UnknownText_0x1b6454 - UnknownText_0x1b656c" ; data/phone/text/arnie_callee.asm - "UnknownText_0x1b659d - UnknownText_0x1b6652" ; data/phone/text/alan_callee.asm - "UnknownText_0x1b66c8 - UnknownText_0x1b6795" ; data/phone/text/dana_callee.asm - "UnknownText_0x1b67e2 - UnknownText_0x1b68e8" ; data/phone/text/chad_callee.asm - "UnknownText_0x1b69a8 - UnknownText_0x1b6ac2" ; data/phone/text/derek_callee.asm - "UnknownText_0x1b6b39 - UnknownText_0x1b6c56" ; data/phone/text/tully_callee.asm - "UnknownText_0x1b6c96 - UnknownText_0x1b6db9" ; data/phone/text/brent_callee.asm - "UnknownText_0x1b6e7c - UnknownText_0x1b6f60" ; data/phone/text/tiffany_callee.asm - "UnknownText_0x1b7019 - UnknownText_0x1b7161" ; data/phone/text/vance_callee.asm - "UnknownText_0x1b71d5 - UnknownText_0x1b72d0" ; data/phone/text/wilton_callee.asm - "UnknownText_0x1b730b - UnknownText_0x1b73af" ; data/phone/text/kenji_callee.asm - "UnknownText_0x1b73c7 - UnknownText_0x1b74c8" ; data/phone/text/parry_callee.asm - "UnknownText_0x1b751a - UnknownText_0x1b75e5" ; data/phone/text/erin_callee.asm - "UnusedPhoneText" ; data/phone/text/unused.asm + "data/phone/text/mom.asm" + "data/phone/text/bill.asm" + "data/phone/text/elm.asm" + "data/phone/text/jack_callee.asm" + "data/phone/text/beverly_callee.asm" + "data/phone/text/huey_callee.asm" + "data/phone/text/unknown_callee.asm" + "data/phone/text/gaven_callee.asm" + "data/phone/text/beth_callee.asm" + "data/phone/text/jose_callee.asm" + "data/phone/text/reena_callee.asm" + "data/phone/text/joey_callee.asm" + "data/phone/text/wade_callee.asm" + "data/phone/text/ralph_callee.asm" + "data/phone/text/liz_callee.asm" + "data/phone/text/anthony_callee.asm" + "data/phone/text/todd_callee.asm" + "data/phone/text/gina_callee.asm" + "data/phone/text/irwin_callee.asm" + "data/phone/text/arnie_callee.asm" + "data/phone/text/alan_callee.asm" + "data/phone/text/dana_callee.asm" + "data/phone/text/chad_callee.asm" + "data/phone/text/derek_callee.asm" + "data/phone/text/tully_callee.asm" + "data/phone/text/brent_callee.asm" + "data/phone/text/tiffany_callee.asm" + "data/phone/text/vance_callee.asm" + "data/phone/text/wilton_callee.asm" + "data/phone/text/kenji_callee.asm" + "data/phone/text/parry_callee.asm" + "data/phone/text/erin_callee.asm" + "data/phone/text/unused.asm" ROMX $6e - "Pokedex Entries 065-128" ; data/pokemon/dex_entries.asm + "data/pokemon/dex_entries.asm@Pokedex Entries 065-128" ROMX $6f - "Text 1" ; (not splitting) data/text/common_1.asm + "data/text/common_1.asm" ROMX $70 - "Text 2" ; (not splitting) data/text/common_2.asm + "data/text/common_2.asm" ROMX $71 - "Text 3" ; (not splitting) data/text/common_3.asm + "data/text/common_3.asm" ROMX $72 - "ItemNames" ; data/items/names.asm - "PrintItemDescription - TeruSama33Desc" ; engine/items/print_item_description.asm - "MoveNames" ; data/moves/names.asm - - ; engine/overworld/landmarks.asm - "GetLandmarkCoords - SpecialMapName" - "RegionCheck" + "data/items/names.asm" + "engine/items/print_item_description.asm" + "data/moves/names.asm" + "engine/overworld/landmarks.asm" + "engine/overworld/landmarks.asm@RegionCheck" ROMX $73 - "Pokedex Entries 129-192" ; data/pokemon/dex_entries.asm + "data/pokemon/dex_entries.asm@Pokedex Entries 129-192" ROMX $74 - "Pokedex Entries 193-251" ; data/pokemon/dex_entries.asm + "data/pokemon/dex_entries.asm@Pokedex Entries 193-251" ROMX $77 - "UnownFont" ; main.asm - - ; engine/printer/print_party.asm - "PrintPage1" - "PrintPage2" - "GBPrinterString_Null - GBPrinterString_PrinterError4" - "PrintPartyMonPage1 - GBPrinterLvIcon" - - "Tileset Data 7" ; (not splitting) gfx/tilesets.asm - - ; engine/rtc/print_hours_mins.asm - "Unreferenced_Function1dd6a9" - "PrintHoursMins - String_PM" - - "_Diploma - DiplomaPage2Tilemap" ; engine/events/diploma.asm - - ; engine/pokedex/pokedex_3.asm - "LoadSGBPokedexGFX - SGBPokedexGFX_LZ" - "LoadQuestionMarkPic" - "DrawPokedexListWindow - Bank77_FillColumn" - - "_DudeAutoInput_A - DudeAutoInput_DownA" ; engine/events/catch_tutorial_input.asm - "TownMap_ConvertLineBreakCharacters" ; engine/pokegear/townmap_convertlinebreakcharacters.asm - "PokegearGFX" ; main.asm - - ; engine/pokemon/european_mail.asm - "IsMailEuropean" - "StandardEnglishFont - SpanishItalianFont" - "HandleFrenchGermanMail" - "DeutenEnglischenPost" - "HandleSpanishItalianMail" + "main.asm@UnownFont" + "engine/printer/print_party.asm@PrintPage1" + "engine/printer/print_party.asm@PrintPage2" + "engine/printer/print_party.asm@GBPrinterStrings" + "engine/printer/print_party.asm@PrintPartyMon" + "gfx/tilesets.asm@Tileset Data 7" + "engine/rtc/print_hours_mins.asm@Unreferenced_Function1dd6a9" + "engine/rtc/print_hours_mins.asm" + "engine/events/diploma.asm" + "engine/pokedex/pokedex_3.asm@LoadSGBPokedexGFX" + "engine/pokedex/pokedex_3.asm@LoadQuestionMarkPic" + "engine/pokedex/pokedex_3.asm@DrawPokedexWindow" + "engine/events/catch_tutorial_input.asm" + "engine/pokegear/townmap_convertlinebreakcharacters.asm" + "main.asm@PokegearGFX" + "engine/pokemon/european_mail.asm@IsMailEuropean" + "engine/pokemon/european_mail.asm@Fonts" + "engine/pokemon/european_mail.asm@FrenchGerman" + "engine/pokemon/european_mail.asm@English" + "engine/pokemon/european_mail.asm@SpanishItalian" ROMX $78 - "Tileset Data 8" ; (not splitting) gfx/tilesets.asm + "gfx/tilesets.asm@Tileset Data 8" ROMX $7b - "Battle Tower Trainer Text" ; (not splitting) data/battle_tower/trainer_text.asm + "data/battle_tower/trainer_text.asm" ROMX $7c - "Battle Tower Trainer Data" ; (not splitting) data/battle_tower/unknown.asm + "data/battle_tower/unknown.asm" ROMX $7d - ; mobile/news/news.asm - "Unreferenced_Function1f4003" - "Unreferenced_Function1f4dbe" - "Function1f5d9f" + "mobile/news/news.asm@Unreferenced_Function1f4003" + "mobile/news/news.asm@Unreferenced_Function1f4dbe" + "mobile/news/news.asm@Function1f5d9f" ROMX $7e - "Function_LoadOpponentTrainerAndPokemons - BattleTowerMons10" ; engine/events/battle_tower/load_trainer.asm - "_GiveOddEgg - OddEgg1End" ; engine/events/odd_egg.asm + "engine/events/battle_tower/load_trainer.asm" + "engine/events/odd_egg.asm" ROMX $7f org $7de0 - "Mobile Stadium 2" ; main.asm + "main.asm@Mobile Stadium 2" WRAM0 "Stack" "Audio RAM"