diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-12 23:36:56 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-12 23:36:56 -0700 |
| commit | bcfca2e267a6ee023271d90e27e4a7fde06f66fc (patch) | |
| tree | 1634bd88b2aab601344a6bdbf8e6a9ec7a3c62c2 /scripts/daycarem.asm | |
| parent | 4a8c9993ad182296131ef87111e1b6d6e2af4201 (diff) | |
movemon and removepokemon wram variables
Diffstat (limited to 'scripts/daycarem.asm')
| -rwxr-xr-x | scripts/daycarem.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 83b9b3a7..f48584dc 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -45,13 +45,13 @@ DayCareMText1: ; 56254 (15:6254) call GetPartyMonName ld hl, DayCareMText_56419 call PrintText - ld a, $1 + ld a, 1 ld [W_DAYCARE_IN_USE], a - ld a, $3 - ld [wcf95], a + ld a, PARTY_TO_DAYCARE + ld [wMoveMonType], a call MoveMon xor a - ld [wcf95], a + ld [wRemoveMonFromBox], a call RemovePokemon ld a, [wcf91] call PlayCry @@ -163,21 +163,21 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) call DisplayTextBoxID ld hl, DayCareMText_5644f call PrintText - ld a, $2 - ld [wcf95], a + ld a, DAYCARE_TO_PARTY + ld [wMoveMonType], a call MoveMon ld a, [wDayCareMonSpecies] ld [wcf91], a ld a, [wPartyCount] dec a push af - ld bc, $002c + ld bc, wPartyMon2 - wPartyMon1 push bc ld hl, wPartyMon1Moves call AddNTimes ld d, h ld e, l - ld a, $1 + ld a, 1 ld [wHPBarMaxHP], a predef WriteMonMoves pop bc @@ -186,7 +186,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) call AddNTimes ld d, h ld e, l - ld bc, $0021 + ld bc, wPartyMon1MaxHP - wPartyMon1HP add hl, bc ld a, [hli] ld [de], a |