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/core.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
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/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9265503d..056a9588 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3371,9 +3371,9 @@ IsGhostBattle: dec a ret nz ld a, [wCurMap] - cp POKEMONTOWER_1 + cp POKEMON_TOWER_1F jr c, .next - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr nc, .next ld b, SILPH_SCOPE call IsItemInBag |