From c7796024590fec48ac79756793c1a6e3b54daf8f Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 1 Jan 2019 15:06:23 -0500 Subject: Rename map files, labels, and constants to be consistent and work with Polished Map --- engine/items/items.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/items') 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 -- cgit v1.2.3