From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- src/decompress.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/decompress.c') diff --git a/src/decompress.c b/src/decompress.c index 8f573fecb..014e8a76f 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -2,6 +2,7 @@ #include "decompress.h" #include "species.h" #include "asm.h" +#include "text.h" #define WRAM 0x02000000 -- cgit v1.2.3 From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/decompress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/decompress.c') diff --git a/src/decompress.c b/src/decompress.c index 014e8a76f..071bf5f81 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -1,7 +1,7 @@ #include "global.h" #include "decompress.h" -#include "species.h" #include "asm.h" +#include "species.h" #include "text.h" #define WRAM 0x02000000 -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/decompress.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/decompress.c') diff --git a/src/decompress.c b/src/decompress.c index 071bf5f81..5906491c6 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -23,7 +23,7 @@ void LZDecompressVram(const void *src, void *dest) void LoadCompressedObjectPic(const struct SpriteSheet *a) { struct SpriteSheet spriteSheet; - + LZ77UnCompWram(a->data, (void *)WRAM); spriteSheet.data = (void *)WRAM; spriteSheet.size = a->size; @@ -34,7 +34,7 @@ void LoadCompressedObjectPic(const struct SpriteSheet *a) void LoadCompressedObjectPicOverrideBuffer(const struct SpriteSheet *a, void *buffer) { struct SpriteSheet spriteSheet; - + LZ77UnCompWram(a->data, buffer); spriteSheet.data = buffer; spriteSheet.size = a->size; @@ -45,7 +45,7 @@ void LoadCompressedObjectPicOverrideBuffer(const struct SpriteSheet *a, void *bu void LoadCompressedObjectPalette(const struct SpritePalette *a) { struct SpritePalette spritePalette; - + LZ77UnCompWram(a->data, (void *)WRAM); spritePalette.data = (void *)WRAM; spritePalette.tag = a->tag; @@ -55,7 +55,7 @@ void LoadCompressedObjectPalette(const struct SpritePalette *a) void LoadCompressedObjectPaletteOverrideBuffer(const struct SpritePalette *a, void *buffer) { struct SpritePalette spritePalette; - + LZ77UnCompWram(a->data, buffer); spritePalette.data = buffer; spritePalette.tag = a->tag; @@ -73,7 +73,7 @@ void DecompressPicFromTable_2(const struct SpriteSheet *a, u8 b, u8 c, void *d, void HandleLoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g) { u32 frontOrBack; - + // gUnknown_081FAF4C appears to be a list of pointers to locations to store poke pics for back and front pic here. the first and third pointers are used for back while the others are used for front. if (dest == gUnknown_081FAF4C[0] || dest == gUnknown_081FAF4C[2]) frontOrBack = 0; // backPic @@ -86,11 +86,11 @@ void HandleLoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 void LoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g, u32 frontOrBack) { u8 frontOrBack8 = frontOrBack; - + if (species == SPECIES_UNOWN) { u16 i = (((g & 0x3000000) >> 18) | ((g & 0x30000) >> 12) | ((g & 0x300) >> 6) | (g & 3)) % 0x1C; - + // if it is Unown A, set the index to where Unown begins, otherwise add the egg index to get the correct letter to load. if (i == 0) i = SPECIES_UNOWN; -- cgit v1.2.3 From ed8f49d5e1418309cbc4f705a242d073258c8639 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 28 Jan 2017 13:51:14 -0800 Subject: tabs to spaces --- src/decompress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/decompress.c') diff --git a/src/decompress.c b/src/decompress.c index 5906491c6..fb91ebd67 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -74,7 +74,7 @@ void HandleLoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 { u32 frontOrBack; - // gUnknown_081FAF4C appears to be a list of pointers to locations to store poke pics for back and front pic here. the first and third pointers are used for back while the others are used for front. + // gUnknown_081FAF4C appears to be a list of pointers to locations to store poke pics for back and front pic here. the first and third pointers are used for back while the others are used for front. if (dest == gUnknown_081FAF4C[0] || dest == gUnknown_081FAF4C[2]) frontOrBack = 0; // backPic else @@ -91,7 +91,7 @@ void LoadSpecialPokePic(const struct SpriteSheet *spriteSheet, u32 b, u32 c, u32 { u16 i = (((g & 0x3000000) >> 18) | ((g & 0x30000) >> 12) | ((g & 0x300) >> 6) | (g & 3)) % 0x1C; - // if it is Unown A, set the index to where Unown begins, otherwise add the egg index to get the correct letter to load. + // if it is Unown A, set the index to where Unown begins, otherwise add the egg index to get the correct letter to load. if (i == 0) i = SPECIES_UNOWN; else -- cgit v1.2.3