Reorganize macros

2017-12-14 00:36:24 -05:00
parent 8745915dbd
commit e48a401290
48 changed files with 1637 additions and 2030 deletions
--- a/gfx/trainer_pic_pointers.asm
+++ b/gfx/trainer_pic_pointers.asm
@@ -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