From 9f50ba1ce38dfad92477acf16e2f159c9f410072 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 7 Nov 2018 12:35:31 -0600 Subject: [PATCH] Fix incorrect compressed types, part 2 --- include/battle_anim.h | 6 +- include/decompress.h | 6 +- include/graphics.h | 137 ++++++++++++++++++++--------------- src/battle_anim.c | 56 +++++++------- src/berry_blender.c | 13 +--- src/contest.c | 5 -- src/decompress.c | 9 ++- src/diploma.c | 2 +- src/item_menu.c | 1 - src/pokemon_summary_screen.c | 12 +-- src/slot_machine.c | 11 +-- 11 files changed, 130 insertions(+), 128 deletions(-) diff --git a/include/battle_anim.h b/include/battle_anim.h index 6484bd6c2..653be10b8 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -27,9 +27,9 @@ struct UnknownAnimStruct2 struct BattleAnimBackground { - void *image; - void *palette; - void *tilemap; + const u32 *image; + const u32 *palette; + const u32 *tilemap; }; #define ANIM_ARGS_COUNT 8 diff --git a/include/decompress.h b/include/decompress.h index e98181c82..853230aea 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -5,8 +5,8 @@ extern u8 gDecompressionBuffer[0x4000]; -void LZDecompressWram(const void *src, void *dest); -void LZDecompressVram(const void *src, void *dest); +void LZDecompressWram(const u32 *src, void *dest); +void LZDecompressVram(const u32 *src, void *dest); u16 LoadCompressedObjectPic(const struct CompressedSpriteSheet *src); void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer); @@ -28,6 +28,6 @@ void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic); -u32 GetDecompressedDataSize(const u8 *ptr); +u32 GetDecompressedDataSize(const u32 *ptr); #endif // GUARD_DECOMPRESS_H diff --git a/include/graphics.h b/include/graphics.h index d17899a9c..a2c86a67d 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4005,16 +4005,16 @@ extern const u32 gCreditsCopyrightEnd_Gfx[]; extern const u8 gPokenavConditionMarker_Gfx[]; extern const u16 gPokenavConditionMarker_Pal[]; -extern const u8 gUnknown_08D9862C[]; -extern const u8 gUnknown_08D98CC8[]; -extern const u8 gUnknown_08D987FC[]; -extern const u8 gUnknown_08D9898C[]; -extern const u8 gUnknown_08D98B28[]; -extern const u8 gUnknown_08D9853C[]; -extern const u8 gUnknown_08D85620[]; +extern const u32 gUnknown_08D9862C[]; +extern const u32 gUnknown_08D98CC8[]; +extern const u32 gUnknown_08D987FC[]; +extern const u32 gUnknown_08D9898C[]; +extern const u32 gUnknown_08D98B28[]; +extern const u32 gUnknown_08D9853C[]; +extern const u16 gUnknown_08D85620[]; extern const u16 gSummaryScreenWindow_Tilemap[]; -extern const u16 gMoveTypes_Pal[]; -extern const u8 gUnknown_08D97D0C[]; +extern const u32 gMoveTypes_Pal[]; +extern const u32 gUnknown_08D97D0C[]; extern const u16 gSummaryScreenPowAcc_Tilemap[]; extern const u16 gUnknown_08DC3C34[]; @@ -4026,7 +4026,7 @@ extern const u32 gStatusGfx_Icons[]; extern const u32 gStatusPal_Icons[]; extern const u32 gBuyMenuFrame_Gfx[]; -extern const u16 gBuyMenuFrame_Tilemap[]; +extern const u32 gBuyMenuFrame_Tilemap[]; extern const u32 gMenuMoneyGfx[]; extern const u32 gMenuMoneyPal[]; @@ -4648,53 +4648,74 @@ extern const u32 gBattleAnimSpritePalette_286[]; extern const u32 gBattleAnimSpritePalette_287[]; extern const u32 gBattleAnimSpritePalette_288[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundImage_21[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_18[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_21[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_22[]; -extern struct BattleAnimBackground gBattleAnimBackgroundPalette_24[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_00[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_02[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_03[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_04[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_05[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_06[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_07[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_08[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_09[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_10[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_11[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_12[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_13[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_14[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_15[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_16[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_17[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_20[]; -extern struct BattleAnimBackground gBattleAnimBackgroundTilemap_21[]; +extern const u32 gBattleAnimBackgroundImage_00[]; +extern const u32 gBattleAnimBackgroundImage_02[]; +extern const u32 gBattleAnimBackgroundImage_03[]; +extern const u32 gBattleAnimBackgroundImage_04[]; +extern const u32 gBattleAnimBackgroundImage_07[]; +extern const u32 gBattleAnimBackgroundImage_09[]; +extern const u32 gBattleAnimBackgroundImage_11[]; +extern const u32 gBattleAnimBackgroundImage_12[]; +extern const u32 gBattleAnimBackgroundImage_15[]; +extern const u32 gBattleAnimBackgroundImage_16[]; +extern const u32 gBattleAnimBackgroundImage_17[]; +extern const u32 gBattleAnimBackgroundImage_20[]; +extern const u32 gBattleAnimBackgroundImage_21[]; +extern const u32 gBattleAnimBackgroundPalette_00[]; +extern const u32 gBattleAnimBackgroundPalette_02[]; +extern const u32 gBattleAnimBackgroundPalette_03[]; +extern const u32 gBattleAnimBackgroundPalette_04[]; +extern const u32 gBattleAnimBackgroundPalette_07[]; +extern const u32 gBattleAnimBackgroundPalette_09[]; +extern const u32 gBattleAnimBackgroundPalette_11[]; +extern const u32 gBattleAnimBackgroundPalette_12[]; +extern const u32 gBattleAnimBackgroundPalette_15[]; +extern const u32 gBattleAnimBackgroundPalette_16[]; +extern const u32 gBattleAnimBackgroundPalette_17[]; +extern const u32 gBattleAnimBackgroundPalette_18[]; +extern const u32 gBattleAnimBackgroundPalette_20[]; +extern const u32 gBattleAnimBackgroundPalette_21[]; +extern const u32 gBattleAnimBackgroundPalette_22[]; +extern const u32 gBattleAnimBackgroundPalette_24[]; +extern const u32 gBattleAnimBackgroundTilemap_00[]; +extern const u32 gBattleAnimBackgroundTilemap_02[]; +extern const u32 gBattleAnimBackgroundTilemap_03[]; +extern const u32 gBattleAnimBackgroundTilemap_04[]; +extern const u32 gBattleAnimBackgroundTilemap_05[]; +extern const u32 gBattleAnimBackgroundTilemap_06[]; +extern const u32 gBattleAnimBackgroundTilemap_07[]; +extern const u32 gBattleAnimBackgroundTilemap_08[]; +extern const u32 gBattleAnimBackgroundTilemap_09[]; +extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gBattleAnimBackgroundTilemap_11[]; +extern const u32 gBattleAnimBackgroundTilemap_12[]; +extern const u32 gBattleAnimBackgroundTilemap_13[]; +extern const u32 gBattleAnimBackgroundTilemap_14[]; +extern const u32 gBattleAnimBackgroundTilemap_15[]; +extern const u32 gBattleAnimBackgroundTilemap_16[]; +extern const u32 gBattleAnimBackgroundTilemap_17[]; +extern const u32 gBattleAnimBackgroundTilemap_20[]; +extern const u32 gBattleAnimBackgroundTilemap_21[]; + +extern const u32 gUnknown_08D9A88C[]; +extern const u32 gContestMiscGfx[]; +extern const u32 gContestAudienceGfx[]; +extern const u32 gUnknown_08C16FA8[]; +extern const u32 gUnknown_08C16E90[]; +extern const u32 gUnknown_08C17170[]; + +// Berry blender +extern const u32 gBerryBlenderArrowTiles[]; +extern const u32 gBerryBlenderStartTiles[]; +extern const u32 gBerryBlenderMarubatsuTiles[]; +extern const u32 gBerryBlenderParticlesTiles[]; +extern const u32 gBerryBlenderCountdownNumbersTiles[]; +extern const u16 gBerryBlenderMiscPalette[]; +extern const u16 gBerryBlenderArrowPalette[]; +extern const u32 sBlenderCenterGfx[]; +extern const u32 gUnknown_08D91DB8[]; +extern const u32 gUnknown_08D927EC[]; + +extern const u32 gSlotMachineReelTime_Gfx[]; #endif //GUARD_GRAPHICS_H diff --git a/src/battle_anim.c b/src/battle_anim.c index 09df12c3e..aa9637889 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1362,33 +1362,33 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = const struct BattleAnimBackground gBattleAnimBackgroundTable[] = { - &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, - &gBattleAnimBackgroundImage_00, &gBattleAnimBackgroundPalette_00, &gBattleAnimBackgroundTilemap_00, - &gBattleAnimBackgroundImage_02, &gBattleAnimBackgroundPalette_02, &gBattleAnimBackgroundTilemap_02, - &gBattleAnimBackgroundImage_03, &gBattleAnimBackgroundPalette_03, &gBattleAnimBackgroundTilemap_03, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_04, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_05, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_04, &gBattleAnimBackgroundTilemap_06, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_07, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_07, &gBattleAnimBackgroundTilemap_08, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_09, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_09, &gBattleAnimBackgroundTilemap_10, - &gBattleAnimBackgroundImage_11, &gBattleAnimBackgroundPalette_11, &gBattleAnimBackgroundTilemap_11, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_12, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_13, - &gBattleAnimBackgroundImage_12, &gBattleAnimBackgroundPalette_12, &gBattleAnimBackgroundTilemap_14, - &gBattleAnimBackgroundImage_15, &gBattleAnimBackgroundPalette_15, &gBattleAnimBackgroundTilemap_15, - &gBattleAnimBackgroundImage_16, &gBattleAnimBackgroundPalette_16, &gBattleAnimBackgroundTilemap_16, - &gBattleAnimBackgroundImage_17, &gBattleAnimBackgroundPalette_17, &gBattleAnimBackgroundTilemap_17, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_07, - &gBattleAnimBackgroundImage_07, &gBattleAnimBackgroundPalette_18, &gBattleAnimBackgroundTilemap_08, - &gBattleAnimBackgroundImage_20, &gBattleAnimBackgroundPalette_20, &gBattleAnimBackgroundTilemap_20, - &gBattleAnimBackgroundImage_21, &gBattleAnimBackgroundPalette_21, &gBattleAnimBackgroundTilemap_21, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_09, - &gBattleAnimBackgroundImage_09, &gBattleAnimBackgroundPalette_22, &gBattleAnimBackgroundTilemap_10, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_04, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_05, - &gBattleAnimBackgroundImage_04, &gBattleAnimBackgroundPalette_24, &gBattleAnimBackgroundTilemap_06, + {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00}, + {gBattleAnimBackgroundImage_00, gBattleAnimBackgroundPalette_00, gBattleAnimBackgroundTilemap_00}, + {gBattleAnimBackgroundImage_02, gBattleAnimBackgroundPalette_02, gBattleAnimBackgroundTilemap_02}, + {gBattleAnimBackgroundImage_03, gBattleAnimBackgroundPalette_03, gBattleAnimBackgroundTilemap_03}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_04}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_05}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_04, gBattleAnimBackgroundTilemap_06}, + {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_07}, + {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_07, gBattleAnimBackgroundTilemap_08}, + {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_09}, + {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_09, gBattleAnimBackgroundTilemap_10}, + {gBattleAnimBackgroundImage_11, gBattleAnimBackgroundPalette_11, gBattleAnimBackgroundTilemap_11}, + {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_12}, + {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_13}, + {gBattleAnimBackgroundImage_12, gBattleAnimBackgroundPalette_12, gBattleAnimBackgroundTilemap_14}, + {gBattleAnimBackgroundImage_15, gBattleAnimBackgroundPalette_15, gBattleAnimBackgroundTilemap_15}, + {gBattleAnimBackgroundImage_16, gBattleAnimBackgroundPalette_16, gBattleAnimBackgroundTilemap_16}, + {gBattleAnimBackgroundImage_17, gBattleAnimBackgroundPalette_17, gBattleAnimBackgroundTilemap_17}, + {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_07}, + {gBattleAnimBackgroundImage_07, gBattleAnimBackgroundPalette_18, gBattleAnimBackgroundTilemap_08}, + {gBattleAnimBackgroundImage_20, gBattleAnimBackgroundPalette_20, gBattleAnimBackgroundTilemap_20}, + {gBattleAnimBackgroundImage_21, gBattleAnimBackgroundPalette_21, gBattleAnimBackgroundTilemap_21}, + {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_09}, + {gBattleAnimBackgroundImage_09, gBattleAnimBackgroundPalette_22, gBattleAnimBackgroundTilemap_10}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_04}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_05}, + {gBattleAnimBackgroundImage_04, gBattleAnimBackgroundPalette_24, gBattleAnimBackgroundTilemap_06}, }; static void (* const sScriptCmdTable[])(void) = @@ -2450,7 +2450,7 @@ static void LoadMoveBg(u16 bgId) { if (IsContest()) { - const void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; + const u32 *tilemap = gBattleAnimBackgroundTable[bgId].tilemap; void *dmaSrc; void *dmaDest; diff --git a/src/berry_blender.c b/src/berry_blender.c index 951c68bd1..fca544e03 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -32,6 +32,7 @@ #include "tv.h" #include "item_menu.h" #include "battle_records.h" +#include "graphics.h" #define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_GOOD 1 @@ -134,18 +135,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern u8 gInGameOpponentsNo; extern u8 gUnknown_020322D5; -// graphics -extern const u8 gBerryBlenderArrowTiles[]; -extern const u8 gBerryBlenderStartTiles[]; -extern const u8 gBerryBlenderMarubatsuTiles[]; -extern const u8 gBerryBlenderParticlesTiles[]; -extern const u8 gBerryBlenderCountdownNumbersTiles[]; -extern const u16 gBerryBlenderMiscPalette[]; -extern const u16 gBerryBlenderArrowPalette[]; -extern const u8 sBlenderCenterGfx[]; -extern const u8 gUnknown_08D91DB8[]; -extern const u8 gUnknown_08D927EC[]; - // text extern const u8 gText_SavingDontTurnOff2[]; extern const u8 gText_Space[]; diff --git a/src/contest.c b/src/contest.c index 20e5619f0..76e13781c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -206,11 +206,6 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; -extern const u8 gContestMiscGfx[]; -extern const u8 gContestAudienceGfx[]; -extern const u8 gUnknown_08C16FA8[]; -extern const u8 gUnknown_08C16E90[]; -extern const u8 gUnknown_08C17170[]; extern const u16 gUnknown_08587C30[]; extern const struct BgTemplate gUnknown_08587F34[4]; extern const struct WindowTemplate gUnknown_08587F44[]; diff --git a/src/decompress.c b/src/decompress.c index 83a9db0b6..da1df436b 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -12,12 +12,12 @@ extern const struct CompressedSpriteSheet gMonBackPicTable[]; static void DuplicateDeoxysTiles(void *pointer, s32 species); -void LZDecompressWram(const void *src, void *dest) +void LZDecompressWram(const u32 *src, void *dest) { LZ77UnCompWram(src, dest); } -void LZDecompressVram(const void *src, void *dest) +void LZDecompressVram(const u32 *src, void *dest) { LZ77UnCompVram(src, dest); } @@ -459,9 +459,10 @@ _08034964:\n\ .syntax divided"); } -u32 GetDecompressedDataSize(const u8 *ptr) +u32 GetDecompressedDataSize(const u32 *ptr) { - return (ptr[3] << 16) | (ptr[2] << 8) | (ptr[1]); + const u8 *ptr8 = (const u8 *)ptr; + return (ptr8[3] << 16) | (ptr8[2] << 8) | (ptr8[1]); } bool8 LoadCompressedObjectPicUsingHeap(const struct CompressedSpriteSheet* src) diff --git a/src/diploma.c b/src/diploma.c index e2f2c6d07..f8556eb7d 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -80,7 +80,7 @@ void CB2_ShowDiploma(void) decompress_and_copy_tile_data_to_vram(1, &sDiplomaTiles, 0, 0, 0); while (free_temp_tile_data_buffers_if_possible()) ; - LZDecompressWram(&sDiplomaTilemap, sDiplomaTilemapPtr); + LZDecompressWram(sDiplomaTilemap, sDiplomaTilemapPtr); CopyBgTilemapBufferToVram(1); DisplayDiplomaText(); BlendPalettes(-1, 16, 0); diff --git a/src/item_menu.c b/src/item_menu.c index 0cbcc13d0..2c0ac09ef 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -447,7 +447,6 @@ EWRAM_DATA u16 gSpecialVar_ItemId = 0; EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; extern u8 *gPocketNamesStringsTable[]; -extern u8 gUnknown_08D9A88C[]; extern struct ListMenuTemplate gUnknown_08613F9C; extern const u8 gMoveNames[][0xD]; extern u8* gReturnToXStringsTable[]; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 11f46b475..f152e70a4 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1229,28 +1229,28 @@ static bool8 SummaryScreen_DecompressGraphics(void) case 1: if (free_temp_tile_data_buffers_if_possible() != 1) { - LZDecompressWram(&gUnknown_08D9862C, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); + LZDecompressWram(gUnknown_08D9862C, pssData->bgTilemapBuffers[PSS_PAGE_INFO][0]); pssData->unk40F0++; } break; case 2: - LZDecompressWram(&gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]); + LZDecompressWram(gUnknown_08D98CC8, pssData->bgTilemapBuffers[PSS_PAGE_INFO][1]); pssData->unk40F0++; break; case 3: - LZDecompressWram(&gUnknown_08D987FC, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); + LZDecompressWram(gUnknown_08D987FC, pssData->bgTilemapBuffers[PSS_PAGE_SKILLS][1]); pssData->unk40F0++; break; case 4: - LZDecompressWram(&gUnknown_08D9898C, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); + LZDecompressWram(gUnknown_08D9898C, pssData->bgTilemapBuffers[PSS_PAGE_BATTLE_MOVES][1]); pssData->unk40F0++; break; case 5: - LZDecompressWram(&gUnknown_08D98B28, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); + LZDecompressWram(gUnknown_08D98B28, pssData->bgTilemapBuffers[PSS_PAGE_CONTEST_MOVES][1]); pssData->unk40F0++; break; case 6: - LoadCompressedPalette(&gUnknown_08D9853C, 0, 0x100); + LoadCompressedPalette(gUnknown_08D9853C, 0, 0x100); LoadPalette(&gUnknown_08D85620, 0x81, 0x1E); pssData->unk40F0++; break; diff --git a/src/slot_machine.c b/src/slot_machine.c index d7557af95..01ef6d85c 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -32,9 +32,6 @@ extern const u8 gText_YouveGot9999Coins[]; extern const u8 gText_YouveRunOutOfCoins[]; extern const u8 gText_ReelTimeHelp[]; -// gfx -extern const u8 gSlotMachineReelTime_Gfx[]; - enum { SLOT_MACHINE_TAG_7_RED, @@ -380,7 +377,7 @@ extern const u16 sSlotMatchFlags[]; extern const u16 sSlotPayouts[]; extern const u8 *const gUnknown_083EDCE4; extern const u8 *const gUnknown_083EDCDC; -extern const u8 sReelTimeGfx[]; +extern const u32 sReelTimeGfx[]; extern const struct SpriteSheet sSlotMachineSpriteSheets[]; extern const struct SpritePalette gSlotMachineSpritePalettes[]; extern const u16 *const gUnknown_083EDE20; @@ -4105,9 +4102,9 @@ s16 sub_8102D5C(s16 a0) LoadSpriteSheet(gUnknown_0203AB2C); } -extern const u8 gSlotMachineMenu_Gfx[]; -extern const u8 gSlotMachineMenu_Tilemap[]; -extern const u8 gUnknown_08DCEC70[]; +extern const u32 gSlotMachineMenu_Gfx[]; +extern const u16 gSlotMachineMenu_Tilemap[]; +extern const u16 gUnknown_08DCEC70[]; extern const u16 gSlotMachineMenu_Pal[]; /*static */void sub_8106448(void)