summaryrefslogtreecommitdiff
path: root/engine/battle/common_text.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /engine/battle/common_text.asm
parentb8954732a3eaa3a784a6e3eaaa68977a9ccd9816 (diff)
Sync with pokered
Diffstat (limited to 'engine/battle/common_text.asm')
-rw-r--r--engine/battle/common_text.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index d84d0300..e8f4f002 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,[wBattleType]