diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-08-04 10:05:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-04 10:05:33 -0400 |
| commit | 77d051479bd0ed96cc2efdba52f837afd1e119c3 (patch) | |
| tree | 72a22aeb8dd6edc10323f0ee72fe9dbf73e5481a /scripts | |
| parent | Identify wcd6d as wNameBuffer and others (#455) (diff) | |
| download | pokeyellow-77d051479bd0ed96cc2efdba52f837afd1e119c3.tar.gz pokeyellow-77d051479bd0ed96cc2efdba52f837afd1e119c3.tar.xz pokeyellow-77d051479bd0ed96cc2efdba52f837afd1e119c3.zip | |
Identify wcf91 as wCurPartySpecies, wCurItem, and wCurListMenuItem (#457)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/CeruleanBadgeHouse.asm | 2 | ||||
| -rw-r--r-- | scripts/Daycare.asm | 6 | ||||
| -rw-r--r-- | scripts/FightingDojo.asm | 4 | ||||
| -rw-r--r-- | scripts/OaksLab.asm | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/scripts/CeruleanBadgeHouse.asm b/scripts/CeruleanBadgeHouse.asm index 417198e1..b1f6db7f 100644 --- a/scripts/CeruleanBadgeHouse.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -34,7 +34,7 @@ CeruleanBadgeHouseMiddleAgedManText: call DisplayListMenuID jr c, .done ld hl, CeruleanBadgeHouseBadgeTextPointers - ld a, [wcf91] + ld a, [wCurItem] sub BOULDERBADGE add a ld d, $0 diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm index a3e9e286..05b69935 100644 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm @@ -54,7 +54,7 @@ DaycareGentlemanText: xor a ld [wRemoveMonFromBox], a call RemovePokemon - ld a, [wcf91] + ld a, [wCurPartySpecies] call PlayCry ld hl, .ComeSeeMeInAWhileText jp .done @@ -169,7 +169,7 @@ DaycareGentlemanText: ld [wMoveMonType], a call MoveMon ld a, [wDayCareMonSpecies] - ld [wcf91], a + ld [wCurPartySpecies], a ld a, [wPartyCount] dec a push af @@ -198,7 +198,7 @@ DaycareGentlemanText: ld a, [hl] ld [de], a - ld a, [wcf91] + ld a, [wCurPartySpecies] call PlayCry ld hl, .GotMonBackText jr .done diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index 75427049..4522b906 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -239,7 +239,7 @@ FightingDojoHitmonleePokeBallText: ld a, [wCurrentMenuItem] and a jr nz, .done - ld a, [wcf91] + ld a, [wCurPartySpecies] ld b, a ld c, 30 call GivePokemon @@ -273,7 +273,7 @@ FightingDojoHitmonchanPokeBallText: ld a, [wCurrentMenuItem] and a jr nz, .done - ld a, [wcf91] + ld a, [wCurPartySpecies] ld b, a ld c, 30 call GivePokemon diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index dc9e56df..087e6a37 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -321,7 +321,7 @@ OaksLabRivalChoosesStarterScript: call Delay3 ld a, [wRivalStarterTemp] ld [wRivalStarter], a - ld [wcf91], a + ld [wCurPartySpecies], a ld [wd11e], a call GetMonName ld a, OAKSLAB_RIVAL @@ -824,7 +824,7 @@ OaksLabBulbasaurPokeBallText: ld b, OAKSLAB_BULBASAUR_POKE_BALL OaksLabSelectedPokeBallScript: - ld [wcf91], a + ld [wCurPartySpecies], a ld [wd11e], a ld a, b ld [wSpriteIndex], a @@ -897,7 +897,7 @@ OaksLabMonChoiceMenu: ld a, [wCurrentMenuItem] and a jr nz, OaksLabMonChoiceEnd - ld a, [wcf91] + ld a, [wCurPartySpecies] ld [wPlayerStarter], a ld [wd11e], a call GetMonName @@ -926,7 +926,7 @@ OaksLabMonChoiceMenu: ld [wMonDataLocation], a ld a, 5 ld [wCurEnemyLevel], a - ld a, [wcf91] + ld a, [wCurPartySpecies] ld [wd11e], a call AddPartyMon ld hl, wStatusFlags4 |