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/items | |
| 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/items')
| -rwxr-xr-x | engine/items/items.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index 3bb2ec9e..38e8a704 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -166,7 +166,7 @@ ItemUseBall: ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. ld a, [wCurMap] - cp POKEMONTOWER_6 + cp POKEMON_TOWER_6F jr nz, .loop ld a, [wEnemyMonSpecies2] cp MAROWAK @@ -1511,7 +1511,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used |