trainer back pics

7 files changed, 86 insertions, 17 deletions

diff --git a/data/data2.s b/data/data2.s
index 24f600a58..af1f42b62 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1411,11 +1411,11 @@ gUnknown_08305D0C: ; 8305D0C
 gUnknown_08305D2C: ; 8305D2C
 	.incbin "base_emerald.gba", 0x305d2c, 0x20
 
-gUnknown_08305D4C: ; 8305D4C
-	.incbin "base_emerald.gba", 0x305d4c, 0x40
+; 8305D4C
+	.include "data/graphics/trainers/trainer_back_pic_table.s"
 
-gUnknown_08305D8C: ; 8305D8C
-	.incbin "base_emerald.gba", 0x305d8c, 0x40
+; 8305D8C
+	.include "data/graphics/trainers/trainer_back_pic_palette_table.s"
 
 gUnknown_08305DCC: ; 8305DCC
 	.incbin "base_emerald.gba", 0x305dcc, 0x3ce0
@@ -12365,9 +12365,6 @@ gUnknown_08C2EA9C: ; 8C2EA9C
 ; 8D51DC8
 	.include "data/graphics/trainers/trainer_graphics.s"
 
-; 8D66480
-	.incbin "base_emerald.gba", 0xd66480, 0x11050
-
 	.align 2, 0
 
 gMonIcon_QuestionMark: ; 8D774D0
diff --git a/data/graphics/trainers/trainer_back_pic_palette_table.s b/data/graphics/trainers/trainer_back_pic_palette_table.s
new file mode 100644
index 000000000..d8dc57c4a
--- /dev/null
+++ b/data/graphics/trainers/trainer_back_pic_palette_table.s
@@ -0,0 +1,11 @@
+	.align 2, 0
+
+gTrainerBackPicPaletteTable: ; 8305D8C
+	obj_pal gTrainerPalette_Brendan, 0
+	obj_pal gTrainerPalette_May, 1
+	obj_pal gTrainerBackPicPalette_Red, 2
+	obj_pal gTrainerBackPicPalette_Leaf, 3
+	obj_pal gTrainerPalette_RubySapphireBrendan, 4
+	obj_pal gTrainerPalette_RubySapphireMay, 5
+	obj_pal gTrainerPalette_Wally, 6
+	obj_pal gTrainerPalette_Steven, 7
diff --git a/data/graphics/trainers/trainer_back_pic_table.s b/data/graphics/trainers/trainer_back_pic_table.s
new file mode 100644
index 000000000..87799c1e2
--- /dev/null
+++ b/data/graphics/trainers/trainer_back_pic_table.s
@@ -0,0 +1,11 @@
+	.align 2, 0
+
+gTrainerBackPicTable: ; 8305D4C
+	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
+	obj_tiles gTrainerBackPic_May, 0x2000, 1
+	obj_tiles gTrainerBackPic_Red, 0x2800, 2
+	obj_tiles gTrainerBackPic_Leaf, 0x2800, 3
+	obj_tiles gTrainerBackPic_RubySapphireBrendan, 0x2000, 4
+	obj_tiles gTrainerBackPic_RubySapphireMay, 0x2000, 5
+	obj_tiles gTrainerBackPic_Wally, 0x2000, 6
+	obj_tiles gTrainerBackPic_Steven, 0x2000, 7
diff --git a/data/graphics/trainers/trainer_graphics.s b/data/graphics/trainers/trainer_graphics.s
index 4a6512bf5..1b91d17c2 100644
--- a/data/graphics/trainers/trainer_graphics.s
+++ b/data/graphics/trainers/trainer_graphics.s
@@ -910,20 +910,70 @@ gTrainerPalette_Leaf: ; 8D65DF4
 
 	.align 2, 0
 
-gTrainerPic_Brendan2: ; 8D65E1C
+gTrainerPic_RubySapphireBrendan: ; 8D65E1C
 	.incbin "base_emerald.gba", 0xd65e1c, 0x314
 
 	.align 2, 0
 
-gTrainerPalette_Brendan2: ; 8D66130
+gTrainerPalette_RubySapphireBrendan: ; 8D66130
 	.incbin "base_emerald.gba", 0xd66130, 0x28
 
 	.align 2, 0
 
-gTrainerPic_May2: ; 8D66158
+gTrainerPic_RubySapphireMay: ; 8D66158
 	.incbin "base_emerald.gba", 0xd66158, 0x300
 
 	.align 2, 0
 
-gTrainerPalette_May2: ; 8D66458
+gTrainerPalette_RubySapphireMay: ; 8D66458
 	.incbin "base_emerald.gba", 0xd66458, 0x28
+
+	.align 2, 0
+
+gTrainerBackPic_Brendan: ; 8D66480
+	.incbin "base_emerald.gba", 0xd66480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPic_May: ; 8D68480
+	.incbin "base_emerald.gba", 0xd68480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPic_Red: ; 8D6A480
+	.incbin "base_emerald.gba", 0xd6a480, 0x2800
+
+	.align 2, 0
+
+gTrainerBackPic_Leaf: ; 8D6CC80
+	.incbin "base_emerald.gba", 0xd6cc80, 0x2800
+
+	.align 2, 0
+
+gTrainerBackPic_RubySapphireBrendan: ; 8D6F480
+	.incbin "base_emerald.gba", 0xd6f480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPic_RubySapphireMay: ; 8D71480
+	.incbin "base_emerald.gba", 0xd71480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPic_Wally: ; 8D73480
+	.incbin "base_emerald.gba", 0xd73480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPic_Steven: ; 8D75480
+	.incbin "base_emerald.gba", 0xd75480, 0x2000
+
+	.align 2, 0
+
+gTrainerBackPicPalette_Red: ; 8D77480
+	.incbin "base_emerald.gba", 0xd77480, 0x28
+
+	.align 2, 0
+
+gTrainerBackPicPalette_Leaf: ; 8D774A8
+	.incbin "base_emerald.gba", 0xd774a8, 0x28
diff --git a/data/graphics/trainers/trainer_palette_table.s b/data/graphics/trainers/trainer_palette_table.s
index bf0b6f2e6..d1368e79a 100644
--- a/data/graphics/trainers/trainer_palette_table.s
+++ b/data/graphics/trainers/trainer_palette_table.s
@@ -92,5 +92,5 @@ gTrainerPaletteTable: ; 830593C
 	obj_pal gTrainerPalette_PyramidKingBrandon, 88
 	obj_pal gTrainerPalette_Red, 89
 	obj_pal gTrainerPalette_Leaf, 90
-	obj_pal gTrainerPalette_Brendan2, 91
-	obj_pal gTrainerPalette_May2, 92
+	obj_pal gTrainerPalette_RubySapphireBrendan, 91
+	obj_pal gTrainerPalette_RubySapphireMay, 92
diff --git a/data/graphics/trainers/trainer_pic_table.s b/data/graphics/trainers/trainer_pic_table.s
index c255c0ceb..9a75ec1cf 100644
--- a/data/graphics/trainers/trainer_pic_table.s
+++ b/data/graphics/trainers/trainer_pic_table.s
@@ -92,5 +92,5 @@ gTrainerPicTable: ; 8305654
 	obj_tiles gTrainerPic_PyramidKingBrandon, 0x800, 88
 	obj_tiles gTrainerPic_Red, 0x800, 89
 	obj_tiles gTrainerPic_Leaf, 0x800, 90
-	obj_tiles gTrainerPic_Brendan2, 0x800, 91
-	obj_tiles gTrainerPic_May2, 0x800, 92
+	obj_tiles gTrainerPic_RubySapphireBrendan, 0x800, 91
+	obj_tiles gTrainerPic_RubySapphireMay, 0x800, 92
diff --git a/data/trainers.s b/data/trainers.s
index 36baace99..230972be7 100644
--- a/data/trainers.s
+++ b/data/trainers.s
@@ -10241,7 +10241,7 @@ gTrainers: ; 8310030
 	.byte 0 ; party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
 	.byte TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN_2
+	.byte TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN
 	.charmapstr "BRENDAN$", 12
 	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
 	.4byte FALSE ; is double battle
@@ -10253,7 +10253,7 @@ gTrainers: ; 8310030
 	.byte 0 ; party type flags
 	.byte TRAINER_CLASS_NAME_PKMN_TRAINER_4
 	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE ; gender flag and encounter music
-	.byte TRAINER_PIC_MAY_2
+	.byte TRAINER_PIC_RUBY_SAPPHIRE_MAY
 	.charmapstr "MAY$", 12
 	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE ; items
 	.4byte FALSE ; is double battle