movemon and removepokemon wram variables

This commit is contained in:
YamaArashi 2015-07-12 23:36:56 -07:00
parent 4a8c9993ad
commit bcfca2e267
8 changed files with 66 additions and 51 deletions

View file

@ -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