dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect compressed types, part 2

Browse Source
This commit is contained in:
Diegoisawesome
2018-11-07 12:35:31 -06:00
parent 18839a4872
commit 9f50ba1ce3
11 changed files with 130 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/battle_anim.h
View File

@@ -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

6
include/decompress.h
View File

@@ -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

137
include/graphics.h
View File

@@ -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