diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-09-18 21:41:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-18 21:41:58 -0400 |
| commit | 5a622f628de6908210091a05956b0d8ce3620237 (patch) | |
| tree | 9cc32420b50f09531c58f4c5019ef167e133b95c /engine/events/prize_menu.asm | |
| parent | Split `hSpriteIndexOrTextID` into `hSpriteIndex` and `hTextID` (#462) (diff) | |
| download | pokeyellow-5a622f628de6908210091a05956b0d8ce3620237.tar.gz pokeyellow-5a622f628de6908210091a05956b0d8ce3620237.tar.xz pokeyellow-5a622f628de6908210091a05956b0d8ce3620237.zip | |
Identify remaining uses of `wd0b5` and `wd11e` (#463)
Diffstat (limited to 'engine/events/prize_menu.asm')
| -rw-r--r-- | engine/events/prize_menu.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm index f99cdaaa..816637bf 100644 --- a/engine/events/prize_menu.asm +++ b/engine/events/prize_menu.asm @@ -88,34 +88,34 @@ GetPrizeMenuId: cp 2 ; is TM_menu? jr nz, .putMonName ld a, [wPrize1] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetItemName hlcoord 2, 4 call PlaceString ld a, [wPrize2] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetItemName hlcoord 2, 6 call PlaceString ld a, [wPrize3] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetItemName hlcoord 2, 8 call PlaceString jr .putNoThanksText .putMonName ld a, [wPrize1] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName hlcoord 2, 4 call PlaceString ld a, [wPrize2] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName hlcoord 2, 6 call PlaceString ld a, [wPrize3] - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName hlcoord 2, 8 call PlaceString @@ -189,7 +189,7 @@ HandlePrizeChoice: ld hl, wPrize1 add hl, de ld a, [hl] - ld [wd11e], a + ld [wNamedObjectIndex], a ld a, [wWhichPrizeWindow] cp 2 ; is prize a TM? jr nz, .getMonName @@ -208,9 +208,9 @@ HandlePrizeChoice: call HasEnoughCoins jr c, .notEnoughCoins ld a, [wWhichPrizeWindow] - cp $02 + cp 2 ; is prize a TM? jr nz, .giveMon - ld a, [wd11e] + ld a, [wNamedObjectIndex] ld b, a ld a, 1 ld c, a @@ -218,7 +218,7 @@ HandlePrizeChoice: jr nc, .bagFull jr .subtractCoins .giveMon - ld a, [wd11e] + ld a, [wNamedObjectIndex] ld [wCurPartySpecies], a push af call GetPrizeMonLevel |