From ff594ccb8267623cc38528a3ad127a8b18585b1f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 17 Oct 2021 03:22:55 -0400 Subject: Fix leftover icon_shadow names --- graphics/wonder_card/icon_shadow.png | Bin 167 -> 0 bytes graphics/wonder_card/icon_shadow_1.pal | 19 --------------- graphics/wonder_card/icon_shadow_2.pal | 19 --------------- graphics/wonder_card/icon_shadow_3.pal | 19 --------------- graphics/wonder_card/icon_shadow_4.pal | 19 --------------- graphics/wonder_card/icon_shadow_5.pal | 19 --------------- graphics/wonder_card/icon_shadow_6.pal | 19 --------------- graphics/wonder_card/icon_shadow_7.pal | 19 --------------- graphics/wonder_card/icon_shadow_8.pal | 19 --------------- graphics/wonder_card/stamp_shadow.png | Bin 0 -> 167 bytes graphics/wonder_card/stamp_shadow_1.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_2.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_3.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_4.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_5.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_6.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_7.pal | 19 +++++++++++++++ graphics/wonder_card/stamp_shadow_8.pal | 19 +++++++++++++++ src/mystery_gift_view.c | 40 ++++++++++++++++---------------- 19 files changed, 172 insertions(+), 172 deletions(-) delete mode 100644 graphics/wonder_card/icon_shadow.png delete mode 100644 graphics/wonder_card/icon_shadow_1.pal delete mode 100644 graphics/wonder_card/icon_shadow_2.pal delete mode 100644 graphics/wonder_card/icon_shadow_3.pal delete mode 100644 graphics/wonder_card/icon_shadow_4.pal delete mode 100644 graphics/wonder_card/icon_shadow_5.pal delete mode 100644 graphics/wonder_card/icon_shadow_6.pal delete mode 100644 graphics/wonder_card/icon_shadow_7.pal delete mode 100644 graphics/wonder_card/icon_shadow_8.pal create mode 100644 graphics/wonder_card/stamp_shadow.png create mode 100644 graphics/wonder_card/stamp_shadow_1.pal create mode 100644 graphics/wonder_card/stamp_shadow_2.pal create mode 100644 graphics/wonder_card/stamp_shadow_3.pal create mode 100644 graphics/wonder_card/stamp_shadow_4.pal create mode 100644 graphics/wonder_card/stamp_shadow_5.pal create mode 100644 graphics/wonder_card/stamp_shadow_6.pal create mode 100644 graphics/wonder_card/stamp_shadow_7.pal create mode 100644 graphics/wonder_card/stamp_shadow_8.pal diff --git a/graphics/wonder_card/icon_shadow.png b/graphics/wonder_card/icon_shadow.png deleted file mode 100644 index ae1c92a93..000000000 Binary files a/graphics/wonder_card/icon_shadow.png and /dev/null differ diff --git a/graphics/wonder_card/icon_shadow_1.pal b/graphics/wonder_card/icon_shadow_1.pal deleted file mode 100644 index 7314ddbc8..000000000 --- a/graphics/wonder_card/icon_shadow_1.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -189 189 164 -205 205 172 -213 213 189 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_2.pal b/graphics/wonder_card/icon_shadow_2.pal deleted file mode 100644 index 333dd9280..000000000 --- a/graphics/wonder_card/icon_shadow_2.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -82 82 106 -164 156 180 -246 238 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_3.pal b/graphics/wonder_card/icon_shadow_3.pal deleted file mode 100644 index 3fca3cdf3..000000000 --- a/graphics/wonder_card/icon_shadow_3.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -246 139 139 -246 180 180 -255 230 230 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_4.pal b/graphics/wonder_card/icon_shadow_4.pal deleted file mode 100644 index f5125b4c9..000000000 --- a/graphics/wonder_card/icon_shadow_4.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -164 213 131 -197 230 180 -238 255 230 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_5.pal b/graphics/wonder_card/icon_shadow_5.pal deleted file mode 100644 index e8ec07ab5..000000000 --- a/graphics/wonder_card/icon_shadow_5.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -156 197 238 -197 222 246 -238 246 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_6.pal b/graphics/wonder_card/icon_shadow_6.pal deleted file mode 100644 index 783979089..000000000 --- a/graphics/wonder_card/icon_shadow_6.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -213 213 90 -222 222 139 -238 238 197 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_7.pal b/graphics/wonder_card/icon_shadow_7.pal deleted file mode 100644 index 1c74daace..000000000 --- a/graphics/wonder_card/icon_shadow_7.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -205 189 98 -222 205 115 -230 222 98 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/icon_shadow_8.pal b/graphics/wonder_card/icon_shadow_8.pal deleted file mode 100644 index d1d92ba57..000000000 --- a/graphics/wonder_card/icon_shadow_8.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -90 197 148 -197 197 197 -205 205 205 -213 213 213 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 -255 0 255 diff --git a/graphics/wonder_card/stamp_shadow.png b/graphics/wonder_card/stamp_shadow.png new file mode 100644 index 000000000..ae1c92a93 Binary files /dev/null and b/graphics/wonder_card/stamp_shadow.png differ diff --git a/graphics/wonder_card/stamp_shadow_1.pal b/graphics/wonder_card/stamp_shadow_1.pal new file mode 100644 index 000000000..7314ddbc8 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +189 189 164 +205 205 172 +213 213 189 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_2.pal b/graphics/wonder_card/stamp_shadow_2.pal new file mode 100644 index 000000000..333dd9280 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_2.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +82 82 106 +164 156 180 +246 238 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_3.pal b/graphics/wonder_card/stamp_shadow_3.pal new file mode 100644 index 000000000..3fca3cdf3 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_3.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +246 139 139 +246 180 180 +255 230 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_4.pal b/graphics/wonder_card/stamp_shadow_4.pal new file mode 100644 index 000000000..f5125b4c9 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +164 213 131 +197 230 180 +238 255 230 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_5.pal b/graphics/wonder_card/stamp_shadow_5.pal new file mode 100644 index 000000000..e8ec07ab5 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_5.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +156 197 238 +197 222 246 +238 246 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_6.pal b/graphics/wonder_card/stamp_shadow_6.pal new file mode 100644 index 000000000..783979089 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_6.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +213 213 90 +222 222 139 +238 238 197 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_7.pal b/graphics/wonder_card/stamp_shadow_7.pal new file mode 100644 index 000000000..1c74daace --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_7.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +205 189 98 +222 205 115 +230 222 98 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/graphics/wonder_card/stamp_shadow_8.pal b/graphics/wonder_card/stamp_shadow_8.pal new file mode 100644 index 000000000..d1d92ba57 --- /dev/null +++ b/graphics/wonder_card/stamp_shadow_8.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +90 197 148 +197 197 197 +205 205 205 +213 213 213 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 +255 0 255 diff --git a/src/mystery_gift_view.c b/src/mystery_gift_view.c index 1bd3e2a21..444ca8bd0 100644 --- a/src/mystery_gift_view.c +++ b/src/mystery_gift_view.c @@ -137,32 +137,32 @@ static const u32 sWonderCardBgGfx7[] = INCBIN_U32("graphics/wonder_card/bg7. static const u32 sWonderCardBgTilemap7[] = INCBIN_U32("graphics/wonder_card/bg7.bin.lz"); static const u32 sWonderCardBgGfx8[] = INCBIN_U32("graphics/wonder_card/bg8.4bpp.lz"); static const u32 sWonderCardBgTilemap8[] = INCBIN_U32("graphics/wonder_card/bg8.bin.lz"); -static const u16 sIconShadowPal1[] = INCBIN_U16("graphics/wonder_card/icon_shadow_1.gbapal"); -static const u16 sIconShadowPal2[] = INCBIN_U16("graphics/wonder_card/icon_shadow_2.gbapal"); -static const u16 sIconShadowPal3[] = INCBIN_U16("graphics/wonder_card/icon_shadow_3.gbapal"); -static const u16 sIconShadowPal4[] = INCBIN_U16("graphics/wonder_card/icon_shadow_4.gbapal"); -static const u16 sIconShadowPal5[] = INCBIN_U16("graphics/wonder_card/icon_shadow_5.gbapal"); -static const u16 sIconShadowPal6[] = INCBIN_U16("graphics/wonder_card/icon_shadow_6.gbapal"); -static const u16 sIconShadowPal7[] = INCBIN_U16("graphics/wonder_card/icon_shadow_7.gbapal"); -static const u16 sIconShadowPal8[] = INCBIN_U16("graphics/wonder_card/icon_shadow_8.gbapal"); -static const u32 sIconShadowGfx[] = INCBIN_U32("graphics/wonder_card/icon_shadow.4bpp.lz"); +static const u16 sStampShadowPal1[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_1.gbapal"); +static const u16 sStampShadowPal2[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_2.gbapal"); +static const u16 sStampShadowPal3[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_3.gbapal"); +static const u16 sStampShadowPal4[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_4.gbapal"); +static const u16 sStampShadowPal5[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_5.gbapal"); +static const u16 sStampShadowPal6[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_6.gbapal"); +static const u16 sStampShadowPal7[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_7.gbapal"); +static const u16 sStampShadowPal8[] = INCBIN_U16("graphics/wonder_card/stamp_shadow_8.gbapal"); +static const u32 sStampShadowGfx[] = INCBIN_U32("graphics/wonder_card/stamp_shadow.4bpp.lz"); static const struct CompressedSpriteSheet sSpriteSheet_StampShadow = { - sIconShadowGfx, 0x100, TAG_STAMP_SHADOW + sStampShadowGfx, 0x100, TAG_STAMP_SHADOW }; static const struct SpritePalette sSpritePalettes_StampShadow[] = { - {sIconShadowPal1, TAG_STAMP_SHADOW}, - {sIconShadowPal2, TAG_STAMP_SHADOW}, - {sIconShadowPal3, TAG_STAMP_SHADOW}, - {sIconShadowPal4, TAG_STAMP_SHADOW}, - {sIconShadowPal5, TAG_STAMP_SHADOW}, - {sIconShadowPal6, TAG_STAMP_SHADOW}, - {sIconShadowPal7, TAG_STAMP_SHADOW}, - {sIconShadowPal8, TAG_STAMP_SHADOW} + {sStampShadowPal1, TAG_STAMP_SHADOW}, + {sStampShadowPal2, TAG_STAMP_SHADOW}, + {sStampShadowPal3, TAG_STAMP_SHADOW}, + {sStampShadowPal4, TAG_STAMP_SHADOW}, + {sStampShadowPal5, TAG_STAMP_SHADOW}, + {sStampShadowPal6, TAG_STAMP_SHADOW}, + {sStampShadowPal7, TAG_STAMP_SHADOW}, + {sStampShadowPal8, TAG_STAMP_SHADOW} }; -static const struct SpriteTemplate sSpriteTemplate_IconShadow = { +static const struct SpriteTemplate sSpriteTemplate_StampShadow = { .tileTag = TAG_STAMP_SHADOW, .paletteTag = TAG_STAMP_SHADOW, .oam = &gOamData_AffineOff_ObjNormal_32x16, @@ -503,7 +503,7 @@ static void CreateCardSprites(void) { sWonderCardData->stampSpriteIds[i][0] = SPRITE_NONE; sWonderCardData->stampSpriteIds[i][1] = SPRITE_NONE; - sWonderCardData->stampSpriteIds[i][0] = CreateSprite(&sSpriteTemplate_IconShadow, 216 - 32 * i, 144, 8); + sWonderCardData->stampSpriteIds[i][0] = CreateSprite(&sSpriteTemplate_StampShadow, 216 - 32 * i, 144, 8); if (sWonderCardData->cardMetadata.stampData[STAMP_SPECIES][i] != SPECIES_NONE) sWonderCardData->stampSpriteIds[i][1] = CreateMonIconNoPersonality(GetIconSpeciesNoPersonality(sWonderCardData->cardMetadata.stampData[STAMP_SPECIES][i]), SpriteCallbackDummy, -- cgit v1.2.3