Use a macro instead of manually subtracting $36 from pic banks.

This commit is contained in:
yenatch
2015-03-03 17:19:27 -05:00
parent 59434fbe4d
commit 275780271e
5 changed files with 630 additions and 626 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,68 +1,68 @@
dbw BANK(FalknerPic) - $36, FalknerPic add_pic FalknerPic
dbw BANK(WhitneyPic) - $36, WhitneyPic add_pic WhitneyPic
dbw BANK(BugsyPic) - $36, BugsyPic add_pic BugsyPic
dbw BANK(MortyPic) - $36, MortyPic add_pic MortyPic
dbw BANK(PrycePic) - $36, PrycePic add_pic PrycePic
dbw BANK(JasminePic) - $36, JasminePic add_pic JasminePic
dbw BANK(ChuckPic) - $36, ChuckPic add_pic ChuckPic
dbw BANK(ClairPic) - $36, ClairPic add_pic ClairPic
dbw BANK(Rival1Pic) - $36, Rival1Pic add_pic Rival1Pic
dbw BANK(PokemonProfPic) - $36, PokemonProfPic add_pic PokemonProfPic
dbw BANK(WillPic) - $36, WillPic add_pic WillPic
dbw BANK(CalPic) - $36, CalPic add_pic CalPic
dbw BANK(BrunoPic) - $36, BrunoPic add_pic BrunoPic
dbw BANK(KarenPic) - $36, KarenPic add_pic KarenPic
dbw BANK(KogaPic) - $36, KogaPic add_pic KogaPic
dbw BANK(ChampionPic) - $36, ChampionPic add_pic ChampionPic
dbw BANK(BrockPic) - $36, BrockPic add_pic BrockPic
dbw BANK(MistyPic) - $36, MistyPic add_pic MistyPic
dbw BANK(LtSurgePic) - $36, LtSurgePic add_pic LtSurgePic
dbw BANK(ScientistPic) - $36, ScientistPic add_pic ScientistPic
dbw BANK(ErikaPic) - $36, ErikaPic add_pic ErikaPic
dbw BANK(YoungsterPic) - $36, YoungsterPic add_pic YoungsterPic
dbw BANK(SchoolboyPic) - $36, SchoolboyPic add_pic SchoolboyPic
dbw BANK(BirdKeeperPic) - $36, BirdKeeperPic add_pic BirdKeeperPic
dbw BANK(LassPic) - $36, LassPic add_pic LassPic
dbw BANK(JaninePic) - $36, JaninePic add_pic JaninePic
dbw BANK(CooltrainermPic) - $36, CooltrainermPic add_pic CooltrainermPic
dbw BANK(CooltrainerfPic) - $36, CooltrainerfPic add_pic CooltrainerfPic
dbw BANK(BeautyPic) - $36, BeautyPic add_pic BeautyPic
dbw BANK(PokemaniacPic) - $36, PokemaniacPic add_pic PokemaniacPic
dbw BANK(GruntmPic) - $36, GruntmPic add_pic GruntmPic
dbw BANK(GentlemanPic) - $36, GentlemanPic add_pic GentlemanPic
dbw BANK(SkierPic) - $36, SkierPic add_pic SkierPic
dbw BANK(TeacherPic) - $36, TeacherPic add_pic TeacherPic
dbw BANK(SabrinaPic) - $36, SabrinaPic add_pic SabrinaPic
dbw BANK(BugCatcherPic) - $36, BugCatcherPic add_pic BugCatcherPic
dbw BANK(FisherPic) - $36, FisherPic add_pic FisherPic
dbw BANK(SwimmermPic) - $36, SwimmermPic add_pic SwimmermPic
dbw BANK(SwimmerfPic) - $36, SwimmerfPic add_pic SwimmerfPic
dbw BANK(SailorPic) - $36, SailorPic add_pic SailorPic
dbw BANK(SuperNerdPic) - $36, SuperNerdPic add_pic SuperNerdPic
dbw BANK(Rival2Pic) - $36, Rival2Pic add_pic Rival2Pic
dbw BANK(GuitaristPic) - $36, GuitaristPic add_pic GuitaristPic
dbw BANK(HikerPic) - $36, HikerPic add_pic HikerPic
dbw BANK(BikerPic) - $36, BikerPic add_pic BikerPic
dbw BANK(BlainePic) - $36, BlainePic add_pic BlainePic
dbw BANK(BurglarPic) - $36, BurglarPic add_pic BurglarPic
dbw BANK(FirebreatherPic) - $36, FirebreatherPic add_pic FirebreatherPic
dbw BANK(JugglerPic) - $36, JugglerPic add_pic JugglerPic
dbw BANK(BlackbeltTPic) - $36, BlackbeltTPic add_pic BlackbeltTPic
dbw BANK(ExecutivemPic) - $36, ExecutivemPic add_pic ExecutivemPic
dbw BANK(PsychicTPic) - $36, PsychicTPic add_pic PsychicTPic
dbw BANK(PicnickerPic) - $36, PicnickerPic add_pic PicnickerPic
dbw BANK(CamperPic) - $36, CamperPic add_pic CamperPic
dbw BANK(ExecutivefPic) - $36, ExecutivefPic add_pic ExecutivefPic
dbw BANK(SagePic) - $36, SagePic add_pic SagePic
dbw BANK(MediumPic) - $36, MediumPic add_pic MediumPic
dbw BANK(BoarderPic) - $36, BoarderPic add_pic BoarderPic
dbw BANK(PokefanmPic) - $36, PokefanmPic add_pic PokefanmPic
dbw BANK(KimonoGirlPic) - $36, KimonoGirlPic add_pic KimonoGirlPic
dbw BANK(TwinsPic) - $36, TwinsPic add_pic TwinsPic
dbw BANK(PokefanfPic) - $36, PokefanfPic add_pic PokefanfPic
dbw BANK(RedPic) - $36, RedPic add_pic RedPic
dbw BANK(BluePic) - $36, BluePic add_pic BluePic
dbw BANK(OfficerPic) - $36, OfficerPic add_pic OfficerPic
dbw BANK(GruntfPic) - $36, GruntfPic add_pic GruntfPic
dbw BANK(MysticalmanPic) - $36, MysticalmanPic add_pic MysticalmanPic

View File

@@ -1,53 +1,53 @@
dbw BANK(UnownAFrontpic) - $36, UnownAFrontpic add_pic UnownAFrontpic
dbw BANK(UnownABackpic) - $36, UnownABackpic add_pic UnownABackpic
dbw BANK(UnownBFrontpic) - $36, UnownBFrontpic add_pic UnownBFrontpic
dbw BANK(UnownBBackpic) - $36, UnownBBackpic add_pic UnownBBackpic
dbw BANK(UnownCFrontpic) - $36, UnownCFrontpic add_pic UnownCFrontpic
dbw BANK(UnownCBackpic) - $36, UnownCBackpic add_pic UnownCBackpic
dbw BANK(UnownDFrontpic) - $36, UnownDFrontpic add_pic UnownDFrontpic
dbw BANK(UnownDBackpic) - $36, UnownDBackpic add_pic UnownDBackpic
dbw BANK(UnownEFrontpic) - $36, UnownEFrontpic add_pic UnownEFrontpic
dbw BANK(UnownEBackpic) - $36, UnownEBackpic add_pic UnownEBackpic
dbw BANK(UnownFFrontpic) - $36, UnownFFrontpic add_pic UnownFFrontpic
dbw BANK(UnownFBackpic) - $36, UnownFBackpic add_pic UnownFBackpic
dbw BANK(UnownGFrontpic) - $36, UnownGFrontpic add_pic UnownGFrontpic
dbw BANK(UnownGBackpic) - $36, UnownGBackpic add_pic UnownGBackpic
dbw BANK(UnownHFrontpic) - $36, UnownHFrontpic add_pic UnownHFrontpic
dbw BANK(UnownHBackpic) - $36, UnownHBackpic add_pic UnownHBackpic
dbw BANK(UnownIFrontpic) - $36, UnownIFrontpic add_pic UnownIFrontpic
dbw BANK(UnownIBackpic) - $36, UnownIBackpic add_pic UnownIBackpic
dbw BANK(UnownJFrontpic) - $36, UnownJFrontpic add_pic UnownJFrontpic
dbw BANK(UnownJBackpic) - $36, UnownJBackpic add_pic UnownJBackpic
dbw BANK(UnownKFrontpic) - $36, UnownKFrontpic add_pic UnownKFrontpic
dbw BANK(UnownKBackpic) - $36, UnownKBackpic add_pic UnownKBackpic
dbw BANK(UnownLFrontpic) - $36, UnownLFrontpic add_pic UnownLFrontpic
dbw BANK(UnownLBackpic) - $36, UnownLBackpic add_pic UnownLBackpic
dbw BANK(UnownMFrontpic) - $36, UnownMFrontpic add_pic UnownMFrontpic
dbw BANK(UnownMBackpic) - $36, UnownMBackpic add_pic UnownMBackpic
dbw BANK(UnownNFrontpic) - $36, UnownNFrontpic add_pic UnownNFrontpic
dbw BANK(UnownNBackpic) - $36, UnownNBackpic add_pic UnownNBackpic
dbw BANK(UnownOFrontpic) - $36, UnownOFrontpic add_pic UnownOFrontpic
dbw BANK(UnownOBackpic) - $36, UnownOBackpic add_pic UnownOBackpic
dbw BANK(UnownPFrontpic) - $36, UnownPFrontpic add_pic UnownPFrontpic
dbw BANK(UnownPBackpic) - $36, UnownPBackpic add_pic UnownPBackpic
dbw BANK(UnownQFrontpic) - $36, UnownQFrontpic add_pic UnownQFrontpic
dbw BANK(UnownQBackpic) - $36, UnownQBackpic add_pic UnownQBackpic
dbw BANK(UnownRFrontpic) - $36, UnownRFrontpic add_pic UnownRFrontpic
dbw BANK(UnownRBackpic) - $36, UnownRBackpic add_pic UnownRBackpic
dbw BANK(UnownSFrontpic) - $36, UnownSFrontpic add_pic UnownSFrontpic
dbw BANK(UnownSBackpic) - $36, UnownSBackpic add_pic UnownSBackpic
dbw BANK(UnownTFrontpic) - $36, UnownTFrontpic add_pic UnownTFrontpic
dbw BANK(UnownTBackpic) - $36, UnownTBackpic add_pic UnownTBackpic
dbw BANK(UnownUFrontpic) - $36, UnownUFrontpic add_pic UnownUFrontpic
dbw BANK(UnownUBackpic) - $36, UnownUBackpic add_pic UnownUBackpic
dbw BANK(UnownVFrontpic) - $36, UnownVFrontpic add_pic UnownVFrontpic
dbw BANK(UnownVBackpic) - $36, UnownVBackpic add_pic UnownVBackpic
dbw BANK(UnownWFrontpic) - $36, UnownWFrontpic add_pic UnownWFrontpic
dbw BANK(UnownWBackpic) - $36, UnownWBackpic add_pic UnownWBackpic
dbw BANK(UnownXFrontpic) - $36, UnownXFrontpic add_pic UnownXFrontpic
dbw BANK(UnownXBackpic) - $36, UnownXBackpic add_pic UnownXBackpic
dbw BANK(UnownYFrontpic) - $36, UnownYFrontpic add_pic UnownYFrontpic
dbw BANK(UnownYBackpic) - $36, UnownYBackpic add_pic UnownYBackpic
dbw BANK(UnownZFrontpic) - $36, UnownZFrontpic add_pic UnownZFrontpic
dbw BANK(UnownZBackpic) - $36, UnownZBackpic add_pic UnownZBackpic

View File

@@ -6,6 +6,7 @@ INCLUDE "macros/move_effect.asm"
INCLUDE "macros/move_anim.asm" INCLUDE "macros/move_anim.asm"
INCLUDE "macros/movement.asm" INCLUDE "macros/movement.asm"
INCLUDE "macros/map.asm" INCLUDE "macros/map.asm"
INCLUDE "macros/pic.asm"
INCLUDE "macros/predef.asm" INCLUDE "macros/predef.asm"
INCLUDE "macros/rst.asm" INCLUDE "macros/rst.asm"
INCLUDE "macros/mobile.asm" INCLUDE "macros/mobile.asm"

4
macros/pic.asm Normal file
View File

@@ -0,0 +1,4 @@
add_pic: MACRO
db BANK(\1) - $36
dw \1
ENDM