From 75bf32e0d125b61ad3cdcfa96a69764c7a121e00 Mon Sep 17 00:00:00 2001 From: Aaghat Date: Sun, 17 Sep 2023 17:07:58 +0530 Subject: [PATCH] Applied requested changes --- graphics/pokedex/hgss/RES_HGSS_palette.pal | 19 ------------------- include/pokemon_summary_screen.h | 4 ++-- src/pokedex_plus_hgss.c | 4 ++-- src/pokemon_summary_screen.c | 8 ++++---- 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 graphics/pokedex/hgss/RES_HGSS_palette.pal diff --git a/graphics/pokedex/hgss/RES_HGSS_palette.pal b/graphics/pokedex/hgss/RES_HGSS_palette.pal deleted file mode 100644 index 96fe4b782a..0000000000 --- a/graphics/pokedex/hgss/RES_HGSS_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -193 33 177 -249 249 249 -225 225 225 -201 201 201 -169 169 169 -129 129 129 -249 153 161 -233 49 49 -193 33 41 -145 17 33 -249 153 161 -193 33 41 -141 251 184 -52 66 162 -194 181 66 -0 0 0 \ No newline at end of file diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index c7839479f7..b313b59d9b 100755 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -8,8 +8,8 @@ extern u8 gLastViewedMonIndex; extern const u8 *const gMoveDescriptionPointers[]; extern const u8 gNotDoneYetDescription[]; extern const u8 *const gNatureNamePointers[]; -extern const struct SpriteTemplate sSpriteTemplate_MoveTypes; -extern const struct CompressedSpriteSheet sSpriteSheet_MoveTypes; +extern const struct SpriteTemplate gSpriteTemplate_MoveTypes; +extern const struct CompressedSpriteSheet gSpriteSheet_MoveTypes; void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)); void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove); diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index da9a320935..5e6d8992b1 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -4292,12 +4292,12 @@ static void CreateTypeIconSprites(void) { u8 i; - LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); + LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes); LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); for (i = 0; i < 2; i++) { if (sPokedexView->typeIconSpriteIds[i] == 0xFF) - sPokedexView->typeIconSpriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 10, 10, 2); + sPokedexView->typeIconSpriteIds[i] = CreateSprite(&gSpriteTemplate_MoveTypes, 10, 10, 2); SetSpriteInvisibility(i, TRUE); } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 7b8f7fa99b..9e7834c113 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -935,13 +935,13 @@ static const union AnimCmd *const sSpriteAnimTable_MoveTypes[NUMBER_OF_MON_TYPES sSpriteAnim_CategoryTough, }; -const struct CompressedSpriteSheet sSpriteSheet_MoveTypes = +const struct CompressedSpriteSheet gSpriteSheet_MoveTypes = { .data = gMoveTypes_Gfx, .size = (NUMBER_OF_MON_TYPES + CONTEST_CATEGORIES_COUNT) * 0x100, .tag = TAG_MOVE_TYPES }; -const struct SpriteTemplate sSpriteTemplate_MoveTypes = +const struct SpriteTemplate gSpriteTemplate_MoveTypes = { .tileTag = TAG_MOVE_TYPES, .paletteTag = TAG_MOVE_TYPES, @@ -1427,7 +1427,7 @@ static bool8 DecompressGraphics(void) sMonSummaryScreen->switchCounter++; break; case 7: - LoadCompressedSpriteSheet(&sSpriteSheet_MoveTypes); + LoadCompressedSpriteSheet(&gSpriteSheet_MoveTypes); sMonSummaryScreen->switchCounter++; break; case 8: @@ -3882,7 +3882,7 @@ static void CreateMoveTypeIcons(void) for (i = SPRITE_ARR_ID_TYPE; i < SPRITE_ARR_ID_TYPE + TYPE_ICON_SPRITE_COUNT; i++) { if (sMonSummaryScreen->spriteIds[i] == SPRITE_NONE) - sMonSummaryScreen->spriteIds[i] = CreateSprite(&sSpriteTemplate_MoveTypes, 0, 0, 2); + sMonSummaryScreen->spriteIds[i] = CreateSprite(&gSpriteTemplate_MoveTypes, 0, 0, 2); SetSpriteInvisibility(i, TRUE); }