From 77ea015d667d111de27420eb896567deb9a677ea Mon Sep 17 00:00:00 2001 From: pfero Date: Thu, 31 May 2018 03:49:15 +0200 Subject: party_pointers.asm -> party_pointers.inc In the same vein as evos_attacks_pointers.inc, they depend on being in the same bank, and thus belong in the same section. --- data/trainers/parties.asm | 3 ++ data/trainers/party_pointers.asm | 65 ---------------------------------------- data/trainers/party_pointers.inc | 64 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 65 deletions(-) delete mode 100644 data/trainers/party_pointers.asm create mode 100644 data/trainers/party_pointers.inc (limited to 'data/trainers') diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index c28a5da..a74296e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -9,6 +9,9 @@ INCLUDE "constants.asm" ; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves ; - db -1 ; end +SECTION "Trainer Parties", ROMX[$5110], BANK[$E] + +INCLUDE "data/trainers/party_pointers.inc" ; TODO: decode all data diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm deleted file mode 100644 index f410435..0000000 --- a/data/trainers/party_pointers.asm +++ /dev/null @@ -1,65 +0,0 @@ -SECTION "TrainerGroups", ROMX[$5110],BANK[$E] - -TrainerGroups: ; 0x039110 - dw HayatoGroup - dw AkaneGroup - dw TsukishiGroup - dw EnokiGroup - dw OkeraGroup - dw MikanGroup - dw BlueGroup - dw GamaGroup - dw RivalGroup - dw OkidoGroup - dw SakakiGroup - dw ProtagonistGroup - dw SibaGroup - dw KasumiGroup - dw KannaGroup - dw WataruGroup - dw GerugeMemberMGroup - dw Trio1Group - dw Trio2Group - dw Trio3Group - dw RocketFGroup - dw YoungsterGroup - dw SchoolboyGroup - dw FledglingGroup - dw LassGroup - dw ProdigyGroup - dw ProfessionalMGroup - dw ProfessionalFGroup - dw BeautyGroup - dw PokeManiacGroup - dw RocketMGroup - dw GentlemanGroup - dw TeacherMGroup - dw TeacherFGroup - dw ManchildGroup - dw BugCatcherBoyGroup - dw FisherGroup - dw SwimmerFGroup - dw SwimmerMGroup - dw SailorGroup - dw SuperNerdGroup - dw EngineerGroup - dw RockerGroup - dw HikerGroup - dw BikerGroup - dw RockClimberGroup - dw BurglarGroup - dw FirebreatherGroup - dw JugglerGroup - dw BlackbeltGroup - dw SportsmanGroup - dw PsychicGroup - dw KungFuMasterGroup - dw FortuneTellerGroup - dw HooliganGroup - dw SageGroup - dw MediumGroup - dw SoldierGroup - dw GerugeMemberFGroup - dw KimonoGirlGroup - dw TwinsGroup - ; no entries for GerugeMember♂ duplicate, EliteFour♂, or EliteFour♀ diff --git a/data/trainers/party_pointers.inc b/data/trainers/party_pointers.inc new file mode 100644 index 0000000..5f93043 --- /dev/null +++ b/data/trainers/party_pointers.inc @@ -0,0 +1,64 @@ + +TrainerGroups: ; 0x039110 + dw HayatoGroup + dw AkaneGroup + dw TsukishiGroup + dw EnokiGroup + dw OkeraGroup + dw MikanGroup + dw BlueGroup + dw GamaGroup + dw RivalGroup + dw OkidoGroup + dw SakakiGroup + dw ProtagonistGroup + dw SibaGroup + dw KasumiGroup + dw KannaGroup + dw WataruGroup + dw GerugeMemberMGroup + dw Trio1Group + dw Trio2Group + dw Trio3Group + dw RocketFGroup + dw YoungsterGroup + dw SchoolboyGroup + dw FledglingGroup + dw LassGroup + dw ProdigyGroup + dw ProfessionalMGroup + dw ProfessionalFGroup + dw BeautyGroup + dw PokeManiacGroup + dw RocketMGroup + dw GentlemanGroup + dw TeacherMGroup + dw TeacherFGroup + dw ManchildGroup + dw BugCatcherBoyGroup + dw FisherGroup + dw SwimmerFGroup + dw SwimmerMGroup + dw SailorGroup + dw SuperNerdGroup + dw EngineerGroup + dw RockerGroup + dw HikerGroup + dw BikerGroup + dw RockClimberGroup + dw BurglarGroup + dw FirebreatherGroup + dw JugglerGroup + dw BlackbeltGroup + dw SportsmanGroup + dw PsychicGroup + dw KungFuMasterGroup + dw FortuneTellerGroup + dw HooliganGroup + dw SageGroup + dw MediumGroup + dw SoldierGroup + dw GerugeMemberFGroup + dw KimonoGirlGroup + dw TwinsGroup + ; no entries for GerugeMember♂ duplicate, EliteFour♂, or EliteFour♀ -- cgit v1.2.3