trainer back pics

pret · Nov 8, 2015 · 3d1b659 · 3d1b659
1 parent a221c03
commit 3d1b659
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 27 deletions.
diff --git a/asm/emerald.s b/asm/emerald.s
@@ -162487,7 +162487,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80
 	bl gpu_pal_alloc_new
 	adds r4, r0, 0
 	lsls r4, 24
-	ldr r1, =gUnknown_08305D8C
+	ldr r1, =gTrainerBackPicPaletteTable
 	ldr r0, =0x03005d90
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x8]
@@ -164913,7 +164913,7 @@ sub_805DF84: ; 805DF84
 	bl battle_get_per_side_status
 	lsls r0, 24
 	lsls r5, 3
-	ldr r2, =gUnknown_08305D4C
+	ldr r2, =gTrainerBackPicTable
 	adds r2, r5, r2
 	ldr r1, =0x020244d4
 	ldr r1, [r1]
@@ -164924,7 +164924,7 @@ sub_805DF84: ; 805DF84
 	adds r0, r2, 0
 	movs r2, 0
 	bl LZ77UnCompAnyRam
-	ldr r0, =gUnknown_08305D8C
+	ldr r0, =gTrainerBackPicPaletteTable
 	adds r5, r0
 	ldr r0, [r5]
 	lsls r4, 20
@@ -642591,7 +642591,7 @@ sub_814DAA8: ; 814DAA8
 	adds r1, r4
 	ldrb r0, [r1, 0x13]
 @0814DC06:
-	ldr r1, =gUnknown_08305D8C
+	ldr r1, =gTrainerBackPicPaletteTable
 	lsls r0, 3
 	adds r0, r1
 	ldr r0, [r0]
@@ -699554,7 +699554,7 @@ sub_816A90C: ; 816A90C
 	bl gpu_pal_alloc_new
 	adds r4, r0, 0
 	lsls r4, 24
-	ldr r0, =gUnknown_08305D8C
+	ldr r0, =gTrainerBackPicPaletteTable
 	ldr r0, [r0, 0x30]
 	lsrs r4, 20
 	movs r2, 0x80
@@ -765447,7 +765447,7 @@ sub_818CA64: ; 818CA64
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x8]
 @0818CB5A:
-	ldr r1, =gUnknown_08305D8C
+	ldr r1, =gTrainerBackPicPaletteTable
 	lsls r0, 3
 	adds r0, r1
 	ldr r0, [r0]
@@ -766065,7 +766065,7 @@ load_pokemon_image_TODO: ; 818CFF4
 	.pool
 @0818D080:
 	lsls r0, r7, 3
-	ldr r1, =gUnknown_08305D4C
+	ldr r1, =gTrainerBackPicTable
 	adds r0, r1
 	adds r1, r5, 0
 	adds r2, r7, 0
@@ -861971,7 +861971,7 @@ sub_81BE10C: ; 81BE10C
 	ldr r0, =0x00000c03
 	cmp r1, r0
 	bne @081BE1FC
-	ldr r0, =gUnknown_08305D8C
+	ldr r0, =gTrainerBackPicPaletteTable
 	ldr r0, [r0, 0x38]
 	lsls r4, 4
 	movs r2, 0x80

diff --git a/constants/trainer_constants.s b/constants/trainer_constants.s
@@ -945,8 +945,8 @@
 	.set TRAINER_PIC_PYRAMID_KING_BRANDON,  88
 	.set TRAINER_PIC_RED,                   89
 	.set TRAINER_PIC_LEAF,                  90
-	.set TRAINER_PIC_BRENDAN_2,             91
-	.set TRAINER_PIC_MAY_2,                 92
+	.set TRAINER_PIC_RUBY_SAPPHIRE_BRENDAN, 91
+	.set TRAINER_PIC_RUBY_SAPPHIRE_MAY,     92
 
 	.set TRAINER_CLASS_HIKER,           0x0
 	.set TRAINER_CLASS_TEAM_AQUA_1,     0x1

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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