review change battle controllers

include/battle.h

@@ -894,7 +894,7 @@ void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
 void DoStatusAnimation(bool8 isStatus2, u32 status);
 void DoSpecialBattleAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId);
 bool8 DoBattleAnimationFromTable(u8 active, u8 atkBank, u8 defBank, u8 tableId, u16 argument);
-void SetBattleSpriteInvisibilityBitToSpriteInvisibility(u8 bank);
+void CopyBattleSpriteInvisibility(u8 bank);
 u16 ChooseMoveAndTargetInBattlePalace(void);
 void LoadBattleBarGfx(u8 arg0);
 bool8 mplay_80342A4(u8 bank);

include/battle_controllers.h

@@ -167,10 +167,11 @@ enum
     CONTROLLER_LINKSTANDBYMSG,
     CONTROLLER_RESETACTIONMOVESELECTION,
     CONTROLLER_55,
-    CONTROLLER_56
+    /*new controllers should go after 55 and before 56*/
+    CONTROLLER_56,
+    CONTROLLER_CMDS_COUNT
 };
 
-#define CONTOLLER_CMDS_COUNT CONTROLLER_56 + 1
 
 // general functions
 void HandleLinkBattleSetup(void);
@@ -180,9 +181,9 @@ void sub_8033648(void);
 void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
 
 // emitters
-void EmitGetMonData(u8 bufferId, u8 requestId, u8 monsToCheck);
+void EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck);
 void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
-void EmitSetMonData(u8 bufferId, u8 requestId, u8 monsToCheck, u8 bytes, void *data);
+void EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data);
 void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
 void EmitLoadMonSprite(u8 bufferId);
 void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);

include/data2.h

@@ -10,6 +10,7 @@ struct MonCoords
 };
 
 extern struct MonCoords gTrainerBackPicCoords[];
+extern struct MonCoords gTrainerFrontPicCoords[];
 
 extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[][13];

include/trainer_classes.h

@@ -3,16 +3,16 @@
 
 enum
 {
-    CLASS_PKMN_TRAINER0, //0
-    CLASS_PKMN_TRAINER1, //1
-    CLASS_HIKER, //2
-    CLASS_TEAM_AQUA, //3
-    CLASS_PKMN_BREEDER, //4
-    CLASS_COOLTRAINER, //5
-    CLASS_BIRDKEEPER, //6
-    CLASS_COLLECTOR, //7
-    CLASS_SWIMMER_MALE, //8
-    CLASS_TEAM_MAGMA, //9
+    CLASS_PKMN_TRAINER0, // 0
+    CLASS_PKMN_TRAINER1, // 1
+    CLASS_HIKER, // 2
+    CLASS_TEAM_AQUA, // 3
+    CLASS_PKMN_BREEDER, // 4
+    CLASS_COOLTRAINER, // 5
+    CLASS_BIRDKEEPER, // 6
+    CLASS_COLLECTOR, // 7
+    CLASS_SWIMMER_MALE, // 8
+    CLASS_TEAM_MAGMA, // 9
     CLASS_EXPERT, // 0xA
     CLASS_AQUA_ADMIN, // 0xB
     CLASS_BLACK_BELT, // 0xC
@@ -36,11 +36,32 @@ enum
     CLASS_GENTLEMAN, // 0x1E
     CLASS_ELITE_FOUR, // 0x1F
     CLASS_LEADER, // 0x20
-    CLASS_CHAMPION = 0x26,
-    CLASS_MAGMA_ADMIN = 0x31,
-    CLASS_PKMN_TRAINER_RIVAL = 0x32,
-    CLASS_MAGMA_LEADER = 0x35,
-    CLASS_SALON_MAIDEN = 0x3A,
+    CLASS_SCHOOL_KID, // 0x21
+    CLASS_SCHOOL_SR_JR, // 0x22
+    CLASS_WINSTRATE, // 0x23
+    CLASS_POKE_FAN, // 0x24
+    CLASS_YOUNGSTER, // 0x25
+    CLASS_CHAMPION, // 0x26
+    CLASS_FISHERMAN, // 0x27
+    CLASS_TRIATHLETE, // 0x28
+    CLASS_DRAGON_TAMER, // 0x29
+    CLASS_NINJA_BOY, // 0x2A
+    CLASS_BATTLE_GIRL, // 0x2B
+    CLASS_PARASOL_LADY, // 0x2C
+    CLASS_SWIMMER_FEMALE, // 0x2D
+    CLASS_TWINS, // 0x2E
+    CLASS_SAILOR, // 0x2F
+    CLASS_COOLTRAINER_2, // 0x30
+    CLASS_MAGMA_ADMIN, // 0x31
+    CLASS_PKMN_TRAINER_RIVAL, // 0x32
+    CLASS_BUG_CATCHER, // 0x33
+    CLASS_PKMN_RANGER, // 0x34
+    CLASS_MAGMA_LEADER, // 0x35
+    CLASS_LASS, // 0x36
+    CLASS_YOUNG_COUPLE, // 0x37
+    CLASS_OLD_COUPLE, // 0x38
+    CLASS_SIS_AND_BRO, // 0x39
+    CLASS_SALON_MAIDEN, // 0x3A
     CLASS_DOME_ACE, // 0x3B
     CLASS_PALACE_MAVEN, // 0x3C
     CLASS_ARENA_TYCOON, // 0x3D

include/trainer_front_sprites.h

@@ -0,0 +1,101 @@
+#ifndef GUARD_TRAINER_FRONT_SPRITES_H
+#define GUARD_TRAINER_FRONT_SPRITES_H
+
+enum
+{
+    TRAINER_FRONT_PIC_HIKER,
+    TRAINER_FRONT_PIC_AQUA_GRUNT_M,
+    TRAINER_FRONT_PIC_PKMN_BREEDER_F,
+    TRAINER_FRONT_PIC_COOLTRAINER_M,
+    TRAINER_FRONT_PIC_BIRD_KEEPER,
+    TRAINER_FRONT_PIC_COLLECTOR,
+    TRAINER_FRONT_PIC_AQUA_GRUNT_F,
+    TRAINER_FRONT_PIC_SWIMMER_M,
+    TRAINER_FRONT_PIC_MAGMA_GRUNT_M,
+    TRAINER_FRONT_PIC_EXPERT_M,
+    TRAINER_FRONT_PIC_AQUA_ADMIN_M,
+    TRAINER_FRONT_PIC_BLACK_BELT,
+    TRAINER_FRONT_PIC_AQUA_ADMIN_F,
+    TRAINER_FRONT_PIC_AQUA_LEADER,
+    TRAINER_FRONT_PIC_HEX_MANIAC,
+    TRAINER_FRONT_PIC_AROMA_LADY,
+    TRAINER_FRONT_PIC_RUIN_MANIAC,
+    TRAINER_FRONT_PIC_INTERVIEWER,
+    TRAINER_FRONT_PIC_TUBER_F,
+    TRAINER_FRONT_PIC_TUBER_M,
+    TRAINER_FRONT_PIC_COOLTRAINER_F,
+    TRAINER_FRONT_PIC_LADY,
+    TRAINER_FRONT_PIC_BEAUTY,
+    TRAINER_FRONT_PIC_RICH_BOY,
+    TRAINER_FRONT_PIC_EXPERT_F,
+    TRAINER_FRONT_PIC_POKE_MANIAC,
+    TRAINER_FRONT_PIC_MAGMA_GRUNT_F,
+    TRAINER_FRONT_PIC_GUITARIST,
+    TRAINER_FRONT_PIC_KINDLER,
+    TRAINER_FRONT_PIC_CAMPER,
+    TRAINER_FRONT_PIC_PICNICKER,
+    TRAINER_FRONT_PIC_BUG_MANIAC,
+    TRAINER_FRONT_PIC_PKMN_BREEDER_M,
+    TRAINER_FRONT_PIC_PSYCHIC_M,
+    TRAINER_FRONT_PIC_PSYCHIC_F,
+    TRAINER_FRONT_PIC_GENTLEMAN,
+    TRAINER_FRONT_PIC_SIDNEY,
+    TRAINER_FRONT_PIC_PHOEBE,
+    TRAINER_FRONT_PIC_GLACIA,
+    TRAINER_FRONT_PIC_DRAKE,
+    TRAINER_FRONT_PIC_ROXANNE,
+    TRAINER_FRONT_PIC_BRAWLY,
+    TRAINER_FRONT_PIC_WATTSON,
+    TRAINER_FRONT_PIC_FLANNERY,
+    TRAINER_FRONT_PIC_NORMAN,
+    TRAINER_FRONT_PIC_WINONA,
+    TRAINER_FRONT_PIC_TATE_LIZA,
+    TRAINER_FRONT_PIC_JUAN,
+    TRAINER_FRONT_PIC_SCHOOL_KID_M,
+    TRAINER_FRONT_PIC_SCHOOL_KID_F,
+    TRAINER_FRONT_PIC_SR_JR,
+    TRAINER_FRONT_PIC_POKÉFAN_M,
+    TRAINER_FRONT_PIC_POKÉFAN_F,
+    TRAINER_FRONT_PIC_YOUNGSTER,
+    TRAINER_FRONT_PIC_WALLACE,
+    TRAINER_FRONT_PIC_FISHERMAN,
+    TRAINER_FRONT_PIC_TRIATHLETE_BIKER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_BIKER_F,
+    TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_JOGGER_F,
+    TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_M,
+    TRAINER_FRONT_PIC_TRIATHLETE_SWIMMER_F,
+    TRAINER_FRONT_PIC_DRAGON_TAMER,
+    TRAINER_FRONT_PIC_NINJA_BOY,
+    TRAINER_FRONT_PIC_BATTLE_GIRL,
+    TRAINER_FRONT_PIC_PARASOL_LADY,
+    TRAINER_FRONT_PIC_SWIMMER_F,
+    TRAINER_FRONT_PIC_TWINS,
+    TRAINER_FRONT_PIC_SAILOR,
+    TRAINER_FRONT_PIC_MAGMA_ADMIN_M,
+    TRAINER_FRONT_PIC_WALLY,
+    TRAINER_FRONT_PIC_BRENDAN_E,
+    TRAINER_FRONT_PIC_MAY_E,
+    TRAINER_FRONT_PIC_BUG_CATCHER,
+    TRAINER_FRONT_PIC_PKMN_RANGER_M,
+    TRAINER_FRONT_PIC_PKMN_RANGER_F,
+    TRAINER_FRONT_PIC_MAGMA_LEADER,
+    TRAINER_FRONT_PIC_LASS,
+    TRAINER_FRONT_PIC_YOUNG_COUPLE,
+    TRAINER_FRONT_PIC_OLD_COUPLE,
+    TRAINER_FRONT_PIC_SIS_AND_BRO,
+    TRAINER_FRONT_PIC_STEVEN,
+    TRAINER_FRONT_PIC_ANABEL,
+    TRAINER_FRONT_PIC_TUCKER,
+    TRAINER_FRONT_PIC_SPENSER,
+    TRAINER_FRONT_PIC_GRETA,
+    TRAINER_FRONT_PIC_NOLAND,
+    TRAINER_FRONT_PIC_LUCY,
+    TRAINER_FRONT_PIC_BRANDON,
+    TRAINER_FRONT_PIC_RED,
+    TRAINER_FRONT_PIC_LEAF,
+    TRAINER_FRONT_PIC_BRENDAN_RS,
+    TRAINER_FRONT_PIC_MAY_RS
+};
+
+#endif // GUARD_TRAINER_FRONT_SPRITES_H