diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-13 11:10:03 -0500 |
| commit | b88572fbccecc8d125fe8a50365751f0530d1a9a (patch) | |
| tree | 46a733a0ad7259689b9b5577f109751f34f42956 /engine/pikachu | |
| parent | 5f8f221bad050e54c150d1c5ca8d827284235091 (diff) | |
Add constants for player and rival starters
Diffstat (limited to 'engine/pikachu')
| -rwxr-xr-x | engine/pikachu/pikachu_emotions.asm | 2 | ||||
| -rwxr-xr-x | engine/pikachu/pikachu_status.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm index 61db6e80..f4963f17 100755 --- a/engine/pikachu/pikachu_emotions.asm +++ b/engine/pikachu/pikachu_emotions.asm @@ -381,7 +381,7 @@ IsPlayerPikachuAsleepInParty: ld a, [hl] cp $ff jr z, .done - cp PIKACHU + cp STARTER_PIKACHU jr nz, .curMonNotStarterPikachu callfar IsThisPartymonStarterPikachu jr nc, .curMonNotStarterPikachu diff --git a/engine/pikachu/pikachu_status.asm b/engine/pikachu/pikachu_status.asm index c73d3b3f..5fc92ead 100755 --- a/engine/pikachu/pikachu_status.asm +++ b/engine/pikachu/pikachu_status.asm @@ -9,7 +9,7 @@ IsStarterPikachuInOurParty:: push hl inc a jr z, .noPlayerPikachu - cp PIKACHU + 1 + cp STARTER_PIKACHU + 1 jr nz, .curMonNotPlayerPikachu ld h, d ld l, e @@ -79,7 +79,7 @@ asm_fce21: ld a, [wWhichPokemon] call AddNTimes ld a, [hl] - cp PIKACHU + cp STARTER_PIKACHU jr nz, .notPlayerPikachu ld bc, wPartyMon1OTID - wPartyMon1 add hl, bc @@ -189,7 +189,7 @@ IsSurfingPikachuInThePlayersParty:: push hl inc a jr z, .noSurfingPlayerPikachu - cp PIKACHU+1 + cp STARTER_PIKACHU + 1 jr nz, .curMonNotSurfingPlayerPikachu ld h, d ld l, e |