From 8249a58a2cedc0b3ec9f5033a4745c13e49a86ae Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 21:24:16 -0400 Subject: Split trainers and port species and move names --- src/data/trainer_graphics/back_pic_anims.h | 91 +++++++++++++++++++++++++++++ src/data/trainer_graphics/back_pic_tables.h | 27 +++++++++ 2 files changed, 118 insertions(+) create mode 100644 src/data/trainer_graphics/back_pic_anims.h create mode 100644 src/data/trainer_graphics/back_pic_tables.h (limited to 'src/data/trainer_graphics') diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h new file mode 100644 index 000000000..83f67bc52 --- /dev/null +++ b/src/data/trainer_graphics/back_pic_anims.h @@ -0,0 +1,91 @@ + +static const union AnimCmd sAnimCmd_Red_1[] = { + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 24), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sAnimCmd_Leaf_1[] = { + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(2, 6), + ANIMCMD_FRAME(3, 6), + ANIMCMD_FRAME(4, 24), + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sAnimCmd_PokeDude_1[] = { + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(2, 9), + ANIMCMD_FRAME(3, 24), + ANIMCMD_FRAME(0, 9), + ANIMCMD_END +}; + +static const union AnimCmd sAnimCmd_OldMan_1[] = { + ANIMCMD_FRAME(1, 24), + ANIMCMD_FRAME(2, 9), + ANIMCMD_FRAME(3, 24), + ANIMCMD_FRAME(0, 9), + ANIMCMD_END +}; + +static const union AnimCmd sAnimCmd_RSBrendan_1[] = { + ANIMCMD_FRAME(0, 24), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(2, 24), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(3, 50), + ANIMCMD_END +}; + +static const union AnimCmd sAnimCmd_RSMay_1[] = { + ANIMCMD_FRAME(0, 24), + ANIMCMD_FRAME(1, 9), + ANIMCMD_FRAME(2, 24), + ANIMCMD_FRAME(0, 9), + ANIMCMD_FRAME(3, 50), + ANIMCMD_END +}; + +const union AnimCmd *const sBackAnims_Red[] = { + sAnim_GeneralFrame0, + sAnimCmd_Red_1 +}; + +const union AnimCmd *const sBackAnims_Leaf[] = { + sAnim_GeneralFrame0, + sAnimCmd_Leaf_1 +}; + +const union AnimCmd *const sBackAnims_PokeDude[] = { + sAnim_GeneralFrame0, + sAnimCmd_PokeDude_1 +}; + +const union AnimCmd *const sBackAnims_OldMan[] = { + sAnim_GeneralFrame0, + sAnimCmd_OldMan_1 +}; + +const union AnimCmd *const sBackAnims_RSBrendan[] = { + sAnim_GeneralFrame3, + sAnimCmd_RSBrendan_1 +}; + +const union AnimCmd *const sBackAnims_RSMay[] = { + sAnim_GeneralFrame3, + sAnimCmd_RSMay_1 +}; + +const union AnimCmd *const *const gTrainerBackAnimsPtrTable[] = { + sBackAnims_Red, + sBackAnims_Leaf, + sBackAnims_RSBrendan, + sBackAnims_RSMay, + sBackAnims_PokeDude, + sBackAnims_OldMan +}; diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h new file mode 100644 index 000000000..115cc6550 --- /dev/null +++ b/src/data/trainer_graphics/back_pic_tables.h @@ -0,0 +1,27 @@ +const struct MonCoords gTrainerBackPicCoords[] = { + {.size = 8, .y_offset = 5}, + {.size = 8, .y_offset = 5}, + {.size = 8, .y_offset = 4}, + {.size = 8, .y_offset = 4}, + {.size = 8, .y_offset = 4}, + {.size = 8, .y_offset = 4} +}; + +const struct CompressedSpriteSheet gTrainerBackPicTable[] = { + { (const u32 *)gTrainerBackPic_Red, 0x2800, 0 }, + { (const u32 *)gTrainerBackPic_Leaf, 0x2800, 1 }, + { (const u32 *)gTrainerBackPic_RSBrendan, 0x2000, 2 }, + { (const u32 *)gTrainerBackPic_RSMay, 0x2000, 3 }, + { (const u32 *)gTrainerBackPic_PokeDude, 0x2000, 4 }, + { (const u32 *)gTrainerBackPic_OldMan, 0x2000, 5 } +}; + +const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = { + { gTrainerPalette_RedBackPic, 0 }, + { gTrainerPalette_LeafBackPic, 1 }, + { gTrainerPalette_RSBrendan1, 2 }, + { gTrainerPalette_RSMay1, 3 }, + { gTrainerPalette_PokeDudeBackPic, 4 }, + { gTrainerPalette_OldManBackPic, 5 } +}; + -- cgit v1.2.3 From 14c10b14171c666dd12593eb4a04c40e1077c57d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 21:38:13 -0400 Subject: Update back_pic_anims.h --- src/data/trainer_graphics/back_pic_anims.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/data/trainer_graphics') diff --git a/src/data/trainer_graphics/back_pic_anims.h b/src/data/trainer_graphics/back_pic_anims.h index 83f67bc52..2e107c21e 100644 --- a/src/data/trainer_graphics/back_pic_anims.h +++ b/src/data/trainer_graphics/back_pic_anims.h @@ -1,4 +1,3 @@ - static const union AnimCmd sAnimCmd_Red_1[] = { ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(2, 6), -- cgit v1.2.3 From 3efd2e1210b4149628197446d063df0fc11281ab Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 22 Oct 2019 21:38:39 -0400 Subject: Update back_pic_tables.h --- src/data/trainer_graphics/back_pic_tables.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/data/trainer_graphics') diff --git a/src/data/trainer_graphics/back_pic_tables.h b/src/data/trainer_graphics/back_pic_tables.h index 115cc6550..86e7824c1 100644 --- a/src/data/trainer_graphics/back_pic_tables.h +++ b/src/data/trainer_graphics/back_pic_tables.h @@ -24,4 +24,3 @@ const struct CompressedSpritePalette gTrainerBackPicPaletteTable[] = { { gTrainerPalette_PokeDudeBackPic, 4 }, { gTrainerPalette_OldManBackPic, 5 } }; - -- cgit v1.2.3