You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Reorganize macros
This commit is contained in:
Remy Oukaour
@@ -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
@@ -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
|
||||
|
||||
@@ -1,69 +1,69 @@
|
||||
TrainerPicPointers::
|
||||
; entries correspond to trainer classes (see constants/trainer_constants.asm)
|
||||
add_pic FalknerPic
|
||||
add_pic WhitneyPic
|
||||
add_pic BugsyPic
|
||||
add_pic MortyPic
|
||||
add_pic PrycePic
|
||||
add_pic JasminePic
|
||||
add_pic ChuckPic
|
||||
add_pic ClairPic
|
||||
add_pic Rival1Pic
|
||||
add_pic PokemonProfPic
|
||||
add_pic WillPic
|
||||
add_pic CalPic
|
||||
add_pic BrunoPic
|
||||
add_pic KarenPic
|
||||
add_pic KogaPic
|
||||
add_pic ChampionPic
|
||||
add_pic BrockPic
|
||||
add_pic MistyPic
|
||||
add_pic LtSurgePic
|
||||
add_pic ScientistPic
|
||||
add_pic ErikaPic
|
||||
add_pic YoungsterPic
|
||||
add_pic SchoolboyPic
|
||||
add_pic BirdKeeperPic
|
||||
add_pic LassPic
|
||||
add_pic JaninePic
|
||||
add_pic CooltrainermPic
|
||||
add_pic CooltrainerfPic
|
||||
add_pic BeautyPic
|
||||
add_pic PokemaniacPic
|
||||
add_pic GruntmPic
|
||||
add_pic GentlemanPic
|
||||
add_pic SkierPic
|
||||
add_pic TeacherPic
|
||||
add_pic SabrinaPic
|
||||
add_pic BugCatcherPic
|
||||
add_pic FisherPic
|
||||
add_pic SwimmermPic
|
||||
add_pic SwimmerfPic
|
||||
add_pic SailorPic
|
||||
add_pic SuperNerdPic
|
||||
add_pic Rival2Pic
|
||||
add_pic GuitaristPic
|
||||
add_pic HikerPic
|
||||
add_pic BikerPic
|
||||
add_pic BlainePic
|
||||
add_pic BurglarPic
|
||||
add_pic FirebreatherPic
|
||||
add_pic JugglerPic
|
||||
add_pic BlackbeltTPic
|
||||
add_pic ExecutivemPic
|
||||
add_pic PsychicTPic
|
||||
add_pic PicnickerPic
|
||||
add_pic CamperPic
|
||||
add_pic ExecutivefPic
|
||||
add_pic SagePic
|
||||
add_pic MediumPic
|
||||
add_pic BoarderPic
|
||||
add_pic PokefanmPic
|
||||
add_pic KimonoGirlPic
|
||||
add_pic TwinsPic
|
||||
add_pic PokefanfPic
|
||||
add_pic RedPic
|
||||
add_pic BluePic
|
||||
add_pic OfficerPic
|
||||
add_pic GruntfPic
|
||||
add_pic MysticalmanPic
|
||||
dba_pic FalknerPic
|
||||
dba_pic WhitneyPic
|
||||
dba_pic BugsyPic
|
||||
dba_pic MortyPic
|
||||
dba_pic PrycePic
|
||||
dba_pic JasminePic
|
||||
dba_pic ChuckPic
|
||||
dba_pic ClairPic
|
||||
dba_pic Rival1Pic
|
||||
dba_pic PokemonProfPic
|
||||
dba_pic WillPic
|
||||
dba_pic CalPic
|
||||
dba_pic BrunoPic
|
||||
dba_pic KarenPic
|
||||
dba_pic KogaPic
|
||||
dba_pic ChampionPic
|
||||
dba_pic BrockPic
|
||||
dba_pic MistyPic
|
||||
dba_pic LtSurgePic
|
||||
dba_pic ScientistPic
|
||||
dba_pic ErikaPic
|
||||
dba_pic YoungsterPic
|
||||
dba_pic SchoolboyPic
|
||||
dba_pic BirdKeeperPic
|
||||
dba_pic LassPic
|
||||
dba_pic JaninePic
|
||||
dba_pic CooltrainermPic
|
||||
dba_pic CooltrainerfPic
|
||||
dba_pic BeautyPic
|
||||
dba_pic PokemaniacPic
|
||||
dba_pic GruntmPic
|
||||
dba_pic GentlemanPic
|
||||
dba_pic SkierPic
|
||||
dba_pic TeacherPic
|
||||
dba_pic SabrinaPic
|
||||
dba_pic BugCatcherPic
|
||||
dba_pic FisherPic
|
||||
dba_pic SwimmermPic
|
||||
dba_pic SwimmerfPic
|
||||
dba_pic SailorPic
|
||||
dba_pic SuperNerdPic
|
||||
dba_pic Rival2Pic
|
||||
dba_pic GuitaristPic
|
||||
dba_pic HikerPic
|
||||
dba_pic BikerPic
|
||||
dba_pic BlainePic
|
||||
dba_pic BurglarPic
|
||||
dba_pic FirebreatherPic
|
||||
dba_pic JugglerPic
|
||||
dba_pic BlackbeltTPic
|
||||
dba_pic ExecutivemPic
|
||||
dba_pic PsychicTPic
|
||||
dba_pic PicnickerPic
|
||||
dba_pic CamperPic
|
||||
dba_pic ExecutivefPic
|
||||
dba_pic SagePic
|
||||
dba_pic MediumPic
|
||||
dba_pic BoarderPic
|
||||
dba_pic PokefanmPic
|
||||
dba_pic KimonoGirlPic
|
||||
dba_pic TwinsPic
|
||||
dba_pic PokefanfPic
|
||||
dba_pic RedPic
|
||||
dba_pic BluePic
|
||||
dba_pic OfficerPic
|
||||
dba_pic GruntfPic
|
||||
dba_pic MysticalmanPic
|
||||
|
||||
Reference in New Issue
Block a user