diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-12-01 20:46:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-01 13:46:28 -0600 |
| commit | 8bb03542bd0dd01b1e4fce990751edc0822a878f (patch) | |
| tree | dff208d50fead04c5a2dcffd7e23e774c0e8afaf /engine/items/item_effects.asm | |
| parent | Correct comment (diff) | |
| download | pokeyellow-8bb03542bd0dd01b1e4fce990751edc0822a878f.tar.gz pokeyellow-8bb03542bd0dd01b1e4fce990751edc0822a878f.tar.xz pokeyellow-8bb03542bd0dd01b1e4fce990751edc0822a878f.zip | |
Update `StatusScreen`, add `*_STATS_BOX` constants (#546)
Diffstat (limited to 'engine/items/item_effects.asm')
| -rw-r--r-- | engine/items/item_effects.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index a716ebb7..90853bee 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1400,15 +1400,15 @@ ItemUseMedicine: xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a call LoadMonData - ld d, $01 - callfar PrintStatsBox ; display new stats text box - call WaitForTextScrollButtonPress ; wait for button press + ld d, LEVEL_UP_STATS_BOX + callfar PrintStatsBox + call WaitForTextScrollButtonPress xor a ; PLAYER_PARTY_DATA ld [wMonDataLocation], a - predef LearnMoveFromLevelUp ; learn level up move, if any + predef LearnMoveFromLevelUp xor a ld [wForceEvolution], a - callfar TryEvolvingMon ; evolve pokemon, if appropriate + callfar TryEvolvingMon ld a, $01 ld [wUpdateSpritesEnabled], a pop af @@ -1433,11 +1433,11 @@ INCLUDE "data/battle/stat_names.asm" ItemUseBait: ld hl, ThrewBaitText call PrintText - ld hl, wEnemyMonActualCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate srl [hl] ; halve catch rate ld a, BAIT_ANIM - ld hl, wSafariBaitFactor ; bait factor - ld de, wSafariEscapeFactor ; escape factor + ld hl, wSafariBaitFactor + ld de, wSafariEscapeFactor jr BaitRockCommon ; for CASCADEBADGE when used from the @@ -1446,7 +1446,7 @@ ItemUseBait: ItemUseRock: ld hl, ThrewRockText call PrintText - ld hl, wEnemyMonActualCatchRate ; catch rate + ld hl, wEnemyMonActualCatchRate ld a, [hl] add a ; double catch rate jr nc, .noCarry @@ -1454,8 +1454,8 @@ ItemUseRock: .noCarry ld [hl], a ld a, ROCK_ANIM - ld hl, wSafariEscapeFactor ; escape factor - ld de, wSafariBaitFactor ; bait factor + ld hl, wSafariEscapeFactor + ld de, wSafariBaitFactor BaitRockCommon: ld [wAnimationID], a |