More sync with battle controllers

include/battle.h

@@ -521,16 +521,6 @@ struct BattleScripting
     u8 field_23;
 };
 
-enum
-{
-    BACK_PIC_RED,
-    BACK_PIC_LEAF,
-    BACK_PIC_RS_BRENDAN,
-    BACK_PIC_RS_MAY,
-    BACK_PIC_POKEDUDE,
-    BACK_PIC_OLDMAN
-};
-
 struct BattleSpriteInfo
 {
     /*0x0*/ u16 invisible : 1; // 0x1

include/battle_controllers.h

@@ -181,7 +181,7 @@ enum
     CONTROLLER_HITANIMATION,
     CONTROLLER_CANTSWITCH,
     CONTROLLER_PLAYSE,
-    CONTROLLER_PLAYFANFAREORBGM,
+    CONTROLLER_PLAYFANFARE,
     CONTROLLER_FAINTINGCRY,
     CONTROLLER_INTROSLIDE,
     CONTROLLER_INTROTRAINERBALLTHROW,

include/battle_gfx_sfx_util.h

@@ -15,7 +15,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
 void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId);
 void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId);
 void DecompressTrainerBackPalette(u16 a1, u8 a2);
-void BattleGfxSfxDummy3(u8 a1);
+void BattleGfxSfxDummy3(u8 gender);
 void FreeTrainerFrontPicPaletteAndTile(u16 frontPicId);
 bool8 BattleLoadAllHealthBoxesGfx(u8 state);
 void LoadBattleBarGfx(u8 arg0);

include/constants/trainers.h

@@ -167,6 +167,14 @@
 #define TRAINER_PIC_LADY                  146
 #define TRAINER_PIC_PAINTER               147
 
+// The player back pics are assumed to alternate according to the gender values (MALE/FEMALE)
+#define TRAINER_BACK_PIC_RED                    0
+#define TRAINER_BACK_PIC_LEAF                   1
+#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN  2
+#define TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY      3
+#define TRAINER_BACK_PIC_POKEDUDE               4
+#define TRAINER_BACK_PIC_OLD_MAN                5
+
 // Leftover from R/S
 #define TRAINER_SECRET_BASE                 1024