diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-23 17:50:50 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-23 17:50:50 -0400 |
| commit | 0a62d48df2d73c11ca13e4c3015d3d3abfa20292 (patch) | |
| tree | 530f89782772bb76a76fbdd28247f1c6e3248483 /engine/battle/common_text.asm | |
| parent | Merge pull request #243 from Nog-Frog/rename-unused-cd40 (diff) | |
| download | pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.gz pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.tar.xz pokeyellow-0a62d48df2d73c11ca13e4c3015d3d3abfa20292.zip | |
Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
Diffstat (limited to 'engine/battle/common_text.asm')
| -rw-r--r-- | engine/battle/common_text.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 4a138048..e541d604 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -5,7 +5,7 @@ PrintBeginningBattleText: ld a, [wCurMap] cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp MR_FUJIS_HOUSE + cp POKEMON_TOWER_7F + 1 jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] |