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 ++++++++++---------- src/pokemon.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') 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[] = diff --git a/src/pokemon.c b/src/pokemon.c index 5433dd593..33413acab 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1527,7 +1527,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .paletteTag = 0, .oam = &gUnknown_824F018, .anims = NULL, - .images = gTrainerBackPicTable_RubySapphireBrendan, + .images = gTrainerBackPicTable_RSBrendan, .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, @@ -1536,7 +1536,7 @@ const struct SpriteTemplate gUnknown_825DF50[] = .paletteTag = 0, .oam = &gUnknown_824F018, .anims = NULL, - .images = gTrainerBackPicTable_RubySapphireMay, + .images = gTrainerBackPicTable_RSMay, .affineAnims = gSpriteAffineAnimTable_82348C8, .callback = sub_80120C4, }, -- cgit v1.2.3