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

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

View file

@ -30,7 +30,7 @@ asm_ef82: ; ef82 (3:6f82)
ld a, $1
ld [wcd6a], a
ld a, [wWhichPokemon] ; wWhichPokemon
ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
ld hl, wPartyMonNicks ; wPartyMonNicks
call GetPartyMonName
ld hl, wd730
set 6, [hl]

View file

@ -24,7 +24,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld a, [wMusicHeaderPointer]
and a
jr nz, .asm_70464
ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld a, [wPartyCount] ; wPartyCount
ld b, a
.asm_7046e
call Func_70503