diff options
Diffstat (limited to 'data/graphics')
| -rw-r--r-- | data/graphics/trainers/trainer_back_pic_palette_table.s | 11 | ||||
| -rw-r--r-- | data/graphics/trainers/trainer_back_pic_table.s | 11 | ||||
| -rw-r--r-- | data/graphics/trainers/trainer_graphics.s | 58 | ||||
| -rw-r--r-- | data/graphics/trainers/trainer_palette_table.s | 4 | ||||
| -rw-r--r-- | data/graphics/trainers/trainer_pic_table.s | 4 |
5 files changed, 80 insertions, 8 deletions
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 |