diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /engine/battle/battle_transitions.asm | |
| parent | 90430e6dee9e207dc0b618d07566f83617343f60 (diff) | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'engine/battle/battle_transitions.asm')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 985a1eb2..1967d33b 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels: ld [wBattleTransitionSpiralDirection], a ret -; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, -; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE +; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] @@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap: ; is equal to one of these maps DungeonMaps1: db VIRIDIAN_FOREST - db ROCK_TUNNEL_1 - db SEAFOAM_ISLANDS_1 - db ROCK_TUNNEL_2 + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F db $FF ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps DungeonMaps2: ; all MT_MOON maps - db MT_MOON_1 - db MT_MOON_3 + db MT_MOON_1F + db MT_MOON_B2F - ; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME - db SS_ANNE_1 + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F db HALL_OF_FAME - ; all POKEMONTOWER maps and Lavender Town buildings + ; all POKEMON_TOWER maps and Lavender Town buildings db LAVENDER_POKECENTER - db LAVENDER_HOUSE_2 + db LAVENDER_CUBONE_HOUSE - ; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps, - ; except for SILPH_CO_1F + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_2F - db UNKNOWN_DUNGEON_1 + db CERULEAN_CAVE_1F db $FF LoadBattleTransitionTile: |