thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use monster struct macros in wram. Rename related labels for consistency.

Browse source
This commit is contained in:
yenatch 2014-06-14 04:12:40 -07:00
parent 9eefed45f7
commit 53ae0e93fa
53 changed files with 860 additions and 1018 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/daycarem.asm
View file

@ -17,7 +17,7 @@ DayCareMText1: ; 56254 (15:6254)
and a
ld hl, DayCareMText_5643b
jp nz, DayCareMScript_56409
ld a, [W_NUMINPARTY]
ld a, [wPartyCount]
dec a
ld hl, DayCareMText_56445
jp z, DayCareMScript_56409
@ -41,7 +41,7 @@ DayCareMText1: ; 56254 (15:6254)
xor a
ld [wcc2b], a
ld a, [wWhichPokemon]
ld hl, W_PARTYMON1NAME
ld hl, wPartyMonNicks
call GetPartyMonName
ld hl, DayCareMText_56419
call PrintText
@ -71,7 +71,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
jr c, .asm_56315
ld d, $64
callab CalcExperience
ld hl, wda6d
ld hl, wDayCareMonExp
ld a, [H_NUMTOPRINT]
ld [hli], a
ld a, [$ff97]
@ -83,7 +83,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
.asm_56315
xor a
ld [wTrainerEngageDistance], a
ld hl, wda62
ld hl, wDayCareMonBoxLevel
ld a, [hl]
ld [wTrainerSpriteOffset], a
cp d
@ -99,7 +99,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
.asm_56333
call PrintText
ld a, [W_NUMINPARTY]
ld a, [wPartyCount]
cp $6
ld hl, DayCareMText_56440
jp z, .asm_56403
@ -168,14 +168,14 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld a, $2
ld [wcf95], a
call Func_3a68
ld a, [W_DAYCAREMONDATA]
ld a, [wDayCareMonSpecies]
ld [wcf91], a
ld a, [W_NUMINPARTY]
ld a, [wPartyCount]
dec a
push af
ld bc, $002c
push bc
ld hl, W_PARTYMON1_MOVE1
ld hl, wPartyMon1Moves
call AddNTimes
ld d, h
ld e, l
@ -185,7 +185,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
call Predef
pop bc
pop af
ld hl, W_PARTYMON1_HP
ld hl, wPartyMon1HP
call AddNTimes
ld d, h
ld e, l
@ -203,7 +203,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
.asm_56403
ld a, [wTrainerSpriteOffset]
ld [wda62], a
ld [wDayCareMonBoxLevel], a
DayCareMScript_56409: ; 56409 (15:6409)
call PrintText

6
scripts/namerater.asm
View file

@ -9,15 +9,15 @@ NameRaterScript_1da15: ; 1da15 (7:5a15)
ret
NameRaterScript_1da20: ; 1da20 (7:5a20)
ld hl, W_PARTYMON1OT
ld hl, wPartyMonOT
ld bc, $000b
ld a, [wWhichPokemon]
call AddNTimes
ld de, W_PLAYERNAME
ld de, wPlayerName
ld c, $b
call .asm_1da47
jr c, .asm_1da52 ; 0x1da34 $1c
ld hl, W_PARTYMON1_OTID
ld hl, wPartyMon1OTID
ld bc, $002c
ld a, [wWhichPokemon]
call AddNTimes