diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 13:59:23 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 13:59:23 -0400 |
| commit | 3eae968b305cbc80fa7d09447046001aa0bd39f6 (patch) | |
| tree | 7788782f208acfdaedfc622b2011b7d4a5f81321 /scripts/daycarem.asm | |
| parent | a06c558e2cfdeb47dc9af0a2ebeb5906802b4c7e (diff) | |
Daycare
Diffstat (limited to 'scripts/daycarem.asm')
| -rwxr-xr-x | scripts/daycarem.asm | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 4a46e648..b80b3dac 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -50,11 +50,21 @@ DayCareMText1: ; 56254 (15:6254) ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon + callab IsThisPartymonStarterPikachu + push af xor a ld [wRemoveMonFromBox], a call RemovePokemon + pop af + jr c, .depositedPikachuIntoDayCare ld a, [wcf91] call PlayCry + jr .asm_562e3 + +.depositedPikachuIntoDayCare + ldpikacry e, PikachuCry28 + callab PlayPikachuSoundClip +.asm_562e3 ld hl, DayCareComeSeeMeInAWhileText jp .done @@ -197,8 +207,27 @@ DayCareMText1: ; 56254 (15:6254) ld a, [hl] ld [de], a + ld a, [wPartyCount] + dec a + ld [wWhichPokemon], a + callab IsThisPartymonStarterPikachu + jr c, .withdrewPikachuFromDayCare ld a, [wcf91] call PlayCry + jr .asm_56430 + +.withdrewPikachuFromDayCare + ld a, $6 + ld [wd431], a + + ; GameFreak... TriHard + ld hl, Func_fc4fa + ld b, BANK(Func_fc4fa) + ld hl, Bankswitch + + ldpikacry e, PikachuCry35 + callab PlayPikachuSoundClip +.asm_56430 ld hl, DayCareGotMonBackText jr .done |