diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /scripts/Daycare.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/Daycare.asm')
| -rw-r--r-- | scripts/Daycare.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm index 26f4342a..a39361d5 100644 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm @@ -58,7 +58,7 @@ DaycareGentlemanText: call RemovePokemon pop af jr c, .depositedPikachuIntoDayCare - ld a, [wcf91] + ld a, [wCurPartySpecies] call PlayCry jr .asm_562e3 @@ -179,7 +179,7 @@ DaycareGentlemanText: ld [wMoveMonType], a call MoveMon ld a, [wDayCareMonSpecies] - ld [wcf91], a + ld [wCurPartySpecies], a ld a, [wPartyCount] dec a push af @@ -213,7 +213,7 @@ DaycareGentlemanText: ld [wWhichPokemon], a callfar IsThisPartymonStarterPikachu jr c, .withdrewPikachuFromDayCare - ld a, [wcf91] + ld a, [wCurPartySpecies] call PlayCry jr .asm_56430 |