Merge branch 'master' into link

2017-11-27 20:05:51 -05:00
parent 73b0f9eb53 18c6b8efc2
commit cbd2718b5e
106 changed files with 13373 additions and 14129 deletions
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -29,5 +29,6 @@ void LoadSpecialPokePic_2(const struct CompressedSpriteSheet *src, void *dest, s
 void LoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality, bool8 isFrontPic);

 extern u8 gDecompressionBuffer[];
+u32 sub_8034974(const u8 *ptr);

 #endif // GUARD_DECOMPRESS_H