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 /scripts/OaksLab.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 'scripts/OaksLab.asm')
| -rw-r--r-- | scripts/OaksLab.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index e89e0ee8..89d6ef80 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -322,7 +322,7 @@ OaksLabRivalChoosesStarterScript: ld a, [wRivalStarterTemp] ld [wRivalStarter], a ld [wCurPartySpecies], a - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a @@ -825,7 +825,7 @@ OaksLabBulbasaurPokeBallText: OaksLabSelectedPokeBallScript: ld [wCurPartySpecies], a - ld [wd11e], a + ld [wPokedexNum], a ld a, b ld [wSpriteIndex], a CheckEvent EVENT_GOT_STARTER @@ -899,7 +899,7 @@ OaksLabMonChoiceMenu: jr nz, OaksLabMonChoiceEnd ld a, [wCurPartySpecies] ld [wPlayerStarter], a - ld [wd11e], a + ld [wNamedObjectIndex], a call GetMonName ld a, [wSpriteIndex] cp OAKSLAB_CHARMANDER_POKE_BALL @@ -927,7 +927,7 @@ OaksLabMonChoiceMenu: ld a, 5 ld [wCurEnemyLevel], a ld a, [wCurPartySpecies] - ld [wd11e], a + ld [wPokedexNum], a call AddPartyMon ld hl, wStatusFlags4 set BIT_GOT_STARTER, [hl] |