Reorganize macros

This commit is contained in:
Remy Oukaour
2017-12-14 00:36:24 -05:00
parent 8745915dbd
commit e48a401290
48 changed files with 1637 additions and 2030 deletions

View File

@@ -1,6 +1,5 @@
; Pic animation arrangement.
AnimateMon_Slow_Normal: ; d0000
hlcoord 12, 0
ld a, [wBattleMode]
@@ -53,23 +52,18 @@ AnimateMon_Unused: ; d003a
ret
; d0042
POKEANIM: MACRO
pokeanim: MACRO
rept _NARG
; Workaround for a bug where macro args can't come after the start of a symbol
if !def(\1_POKEANIM)
\1_POKEANIM equs "PokeAnim_\1_"
endc
db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
shift
endr
db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2
ENDM
PokeAnims: ; d0042
dw .Slow
dw .Normal
@@ -81,15 +75,15 @@ PokeAnims: ; d0042
dw .Egg1
dw .Egg2
.Slow: POKEANIM StereoCry, Setup2, Play
.Normal: POKEANIM StereoCry, Setup, Play
.Menu: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Trade: POKEANIM Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: POKEANIM Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: POKEANIM Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Unused: POKEANIM CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Egg1: POKEANIM Setup, Play
.Egg2: POKEANIM Extra, Play
.Slow: pokeanim StereoCry, Setup2, Play
.Normal: pokeanim StereoCry, Setup, Play
.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Trade: pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play
.Egg1: pokeanim Setup, Play
.Egg2: pokeanim Extra, Play
AnimateFrontpic: ; d008e

File diff suppressed because it is too large Load Diff

View File

@@ -1,54 +1,54 @@
UnownPicPointers::
; entries correspond to Unown letters, two apiece
add_pic UnownAFrontpic
add_pic UnownABackpic
add_pic UnownBFrontpic
add_pic UnownBBackpic
add_pic UnownCFrontpic
add_pic UnownCBackpic
add_pic UnownDFrontpic
add_pic UnownDBackpic
add_pic UnownEFrontpic
add_pic UnownEBackpic
add_pic UnownFFrontpic
add_pic UnownFBackpic
add_pic UnownGFrontpic
add_pic UnownGBackpic
add_pic UnownHFrontpic
add_pic UnownHBackpic
add_pic UnownIFrontpic
add_pic UnownIBackpic
add_pic UnownJFrontpic
add_pic UnownJBackpic
add_pic UnownKFrontpic
add_pic UnownKBackpic
add_pic UnownLFrontpic
add_pic UnownLBackpic
add_pic UnownMFrontpic
add_pic UnownMBackpic
add_pic UnownNFrontpic
add_pic UnownNBackpic
add_pic UnownOFrontpic
add_pic UnownOBackpic
add_pic UnownPFrontpic
add_pic UnownPBackpic
add_pic UnownQFrontpic
add_pic UnownQBackpic
add_pic UnownRFrontpic
add_pic UnownRBackpic
add_pic UnownSFrontpic
add_pic UnownSBackpic
add_pic UnownTFrontpic
add_pic UnownTBackpic
add_pic UnownUFrontpic
add_pic UnownUBackpic
add_pic UnownVFrontpic
add_pic UnownVBackpic
add_pic UnownWFrontpic
add_pic UnownWBackpic
add_pic UnownXFrontpic
add_pic UnownXBackpic
add_pic UnownYFrontpic
add_pic UnownYBackpic
add_pic UnownZFrontpic
add_pic UnownZBackpic
dba_pic UnownAFrontpic
dba_pic UnownABackpic
dba_pic UnownBFrontpic
dba_pic UnownBBackpic
dba_pic UnownCFrontpic
dba_pic UnownCBackpic
dba_pic UnownDFrontpic
dba_pic UnownDBackpic
dba_pic UnownEFrontpic
dba_pic UnownEBackpic
dba_pic UnownFFrontpic
dba_pic UnownFBackpic
dba_pic UnownGFrontpic
dba_pic UnownGBackpic
dba_pic UnownHFrontpic
dba_pic UnownHBackpic
dba_pic UnownIFrontpic
dba_pic UnownIBackpic
dba_pic UnownJFrontpic
dba_pic UnownJBackpic
dba_pic UnownKFrontpic
dba_pic UnownKBackpic
dba_pic UnownLFrontpic
dba_pic UnownLBackpic
dba_pic UnownMFrontpic
dba_pic UnownMBackpic
dba_pic UnownNFrontpic
dba_pic UnownNBackpic
dba_pic UnownOFrontpic
dba_pic UnownOBackpic
dba_pic UnownPFrontpic
dba_pic UnownPBackpic
dba_pic UnownQFrontpic
dba_pic UnownQBackpic
dba_pic UnownRFrontpic
dba_pic UnownRBackpic
dba_pic UnownSFrontpic
dba_pic UnownSBackpic
dba_pic UnownTFrontpic
dba_pic UnownTBackpic
dba_pic UnownUFrontpic
dba_pic UnownUBackpic
dba_pic UnownVFrontpic
dba_pic UnownVBackpic
dba_pic UnownWFrontpic
dba_pic UnownWBackpic
dba_pic UnownXFrontpic
dba_pic UnownXBackpic
dba_pic UnownYFrontpic
dba_pic UnownYBackpic
dba_pic UnownZFrontpic
dba_pic UnownZBackpic