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/pokemon/add_mon.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/pokemon/add_mon.asm')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index ab167a24..7eaca222 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -65,7 +65,7 @@ _AddPartyMon:: ld d, h push hl ld a, [wCurPartySpecies] - ld [wd0b5], a + ld [wCurSpecies], a call GetMonHeader ld hl, wMonHeader ld a, [hli] @@ -81,11 +81,11 @@ _AddPartyMon:: ; If the mon is being added to the player's party, update the pokedex. ld a, [wCurPartySpecies] - ld [wd11e], a + ld [wPokedexNum], a push de predef IndexToPokedex pop de - ld a, [wd11e] + ld a, [wPokedexNum] dec a ld c, a ld b, FLAG_TEST @@ -93,7 +93,7 @@ _AddPartyMon:: call FlagAction ld a, c ; whether the mon was already flagged as owned ld [wUnusedAlreadyOwnedFlag], a - ld a, [wd11e] + ld a, [wPokedexNum] dec a ld c, a ld b, FLAG_SET @@ -323,9 +323,9 @@ _AddEnemyMonToPlayerParty:: ld bc, NAME_LENGTH call CopyData ; write new mon's nickname (from an enemy mon) ld a, [wCurPartySpecies] - ld [wd11e], a + ld [wPokedexNum], a predef IndexToPokedex - ld a, [wd11e] + ld a, [wPokedexNum] dec a ld c, a ld b, FLAG_SET |