From c93c8aedbc118f8258d05d10e0aead55191e93b4 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 15 Oct 2019 20:37:48 -0700 Subject: Dump trainer front_pic_anims --- src/data.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 0f3c7ea67..d75f05b68 100644 --- a/src/data.c +++ b/src/data.c @@ -281,3 +281,5 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #include "data/pokemon_graphics/back_pic_table.h" #include "data/pokemon_graphics/palette_table.h" #include "data/pokemon_graphics/shiny_palette_table.h" + +#include "data/trainer_graphics/front_pic_anims.h" -- cgit v1.2.3 From cb192791eb4def67ab50480a7ace9a89737ad324 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Tue, 15 Oct 2019 22:49:41 -0700 Subject: Dump gTrainerFrontPicCoords --- src/data.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index d75f05b68..861bd57ec 100644 --- a/src/data.c +++ b/src/data.c @@ -283,3 +283,4 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #include "data/pokemon_graphics/shiny_palette_table.h" #include "data/trainer_graphics/front_pic_anims.h" +#include "data/trainer_graphics/front_pic_tables.h" -- cgit v1.2.3 From 5f6672ee078d878fd089ed0d5925d46ee21511db Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 16 Oct 2019 22:52:41 -0700 Subject: Rename trainer front pics and palettes. --- src/data.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 861bd57ec..cc715bd15 100644 --- a/src/data.c +++ b/src/data.c @@ -75,20 +75,20 @@ const struct SpriteFrameImage gTrainerBackPicTable_OldMan[] = gTrainerBackPic_OldMan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireBrendan[] = +const struct SpriteFrameImage gTrainerBackPicTable_RSBrendan[] = { - gTrainerBackPic_RubySapphireBrendan, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800, - gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800, + gTrainerBackPic_RSBrendan, 0x0800, + gTrainerBackPic_RSBrendan + 0x0800, 0x0800, + gTrainerBackPic_RSBrendan + 0x1000, 0x0800, + gTrainerBackPic_RSBrendan + 0x1800, 0x0800, }; -const struct SpriteFrameImage gTrainerBackPicTable_RubySapphireMay[] = +const struct SpriteFrameImage gTrainerBackPicTable_RSMay[] = { - gTrainerBackPic_RubySapphireMay, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800, - gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800, + gTrainerBackPic_RSMay, 0x0800, + gTrainerBackPic_RSMay + 0x0800, 0x0800, + gTrainerBackPic_RSMay + 0x1000, 0x0800, + gTrainerBackPic_RSMay + 0x1800, 0x0800, }; static const union AnimCmd sAnim_GeneralFrame0[] = -- cgit v1.2.3 From 790966aec02d9e8540a1adcf39b7b6c0be55c0d5 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 17 Oct 2019 00:23:41 -0700 Subject: Dump gTrainerFrontPicTable and gTrainerFrontPicPaletteTable. --- src/data.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index cc715bd15..42c9cfaab 100644 --- a/src/data.c +++ b/src/data.c @@ -275,6 +275,9 @@ const union AnimCmd *const gSpriteAnimTable_82349BC[] = #define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species} #define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG} +#define TRAINER_SPRITE(trainerPic, sprite, size) [TRAINER_PIC_##trainerPic] = {sprite, size, TRAINER_PIC_##trainerPic} +#define TRAINER_PAL(trainerPic, pal) [TRAINER_PIC_##trainerPic] = {pal, TRAINER_PIC_##trainerPic} + #include "data/pokemon_graphics/front_pic_coordinates.h" #include "data/pokemon_graphics/front_pic_table.h" #include "data/pokemon_graphics/back_pic_coordinates.h" -- cgit v1.2.3