diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-17 21:24:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-17 21:24:23 -0400 |
| commit | 758a46aa1ffc78baaf4e6822f44a2500f0161bc1 (patch) | |
| tree | 8c1499f2bb0b49650b91e00182f095b252801a3a /src/data.c | |
| parent | b919702f7d10fd2968e1be23f15c6758b9d8c116 (diff) | |
| parent | b0fc59cf5f319bf2219a0cdc6cb011bcffdb16d0 (diff) | |
Merge pull request #126 from ultima-soul/data_dump
Some more data dumping
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/data.c b/src/data.c index 0f3c7ea67..42c9cfaab 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[] = @@ -275,9 +275,15 @@ 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" #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" +#include "data/trainer_graphics/front_pic_tables.h" |