From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified. --- engine/items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/items') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index a89031b4..466b1423 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1507,7 +1507,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneGateCurScript], a + ld [wSafariZoneGateCurScript], a ; SCRIPT_SAFARIZONEGATE_DEFAULT inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used -- cgit v1.3.1-sl0p From 64061e2092a47095f4ad6a8c2ac35f38db4bc107 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Fri, 17 Nov 2023 22:36:21 -0600 Subject: .calculateHPBarCoords incorrectly referenced OAM Resolves #411 Co-Authored-By: SnDream <12762219+sndream@users.noreply.github.com> --- engine/items/item_effects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/items') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 466b1423..927f54cb 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1175,7 +1175,7 @@ ItemUseMedicine: xor a ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data .calculateHPBarCoords - ld hl, wShadowOAMSprite36 + hlcoord 4, -1 ld bc, 2 * SCREEN_WIDTH inc d .calculateHPBarCoordsLoop -- cgit v1.3.1-sl0p