diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /engine/items | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index c495f991..4430c6fb 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -171,7 +171,7 @@ ItemUseBall: jp nz, .captured ld a, $1 ld [wCapturedMonSpecies], a - CheckEvent EVENT_02F + CheckEvent EVENT_INITIAL_CATCH_TRAINING ld b, $63 jp nz, .setAnimData jp .captured @@ -1295,7 +1295,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 @@ -1650,7 +1650,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 |