diff options
author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /engine/battle/common_text.asm | |
parent | 108245cb21abb3abac051b7db84ed6c694192a61 (diff) | |
parent | c7796024590fec48ac79756793c1a6e3b54daf8f (diff) |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'engine/battle/common_text.asm')
-rw-r--r-- | engine/battle/common_text.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 3d46c947..4a138048 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -3,9 +3,9 @@ PrintBeginningBattleText: dec a jr nz, .trainerBattle ld a, [wCurMap] - cp POKEMONTOWER_3 + cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] |