Merge pull request #1 from pret/master

Update fork to match main fork.

1 files changed, 62 insertions, 63 deletions

diff --git a/src/decompress.c b/src/decompress.c
index ebfd78ffb..d7f7087a7 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -1,14 +1,11 @@
 #include "global.h"
 #include "decompress.h"
+#include "data2.h"
 #include "species.h"
-#include "asm.h"
+#include "text.h"
 
 #define WRAM 0x02000000
 
-extern struct SpriteSheet gMonFrontPicTable[];
-extern struct SpriteSheet gMonBackPicTable[];
-extern void *gUnknown_081FAF4C[];
-
 void sub_800D238(const void *src, void *dest)
 {
     LZ77UnCompWram(src, dest);
@@ -19,92 +16,94 @@ void LZDecompressVram(const void *src, void *dest)
     LZ77UnCompVram(src, dest);
 }
 
-void LoadCompressedObjectPic(const struct SpriteSheet *a)
+void LoadCompressedObjectPic(const struct CompressedSpriteSheet *src)
 {
-    struct SpriteSheet spriteSheet;
-    
-    LZ77UnCompWram(a->data, (void *)WRAM);
-    spriteSheet.data = (void *)WRAM;
-    spriteSheet.size = a->size;
-    spriteSheet.tag = a->tag;
-    LoadSpriteSheet(&spriteSheet);
+    struct SpriteSheet dest;
+
+    LZ77UnCompWram(src->data, (void *)WRAM);
+    dest.data = (void *)WRAM;
+    dest.size = src->size;
+    dest.tag = src->tag;
+    LoadSpriteSheet(&dest);
 }
 
-void LoadCompressedObjectPicOverrideBuffer(const struct SpriteSheet *a, void *buffer)
+void LoadCompressedObjectPicOverrideBuffer(const struct CompressedSpriteSheet *src, void *buffer)
 {
-    struct SpriteSheet spriteSheet;
-    
-    LZ77UnCompWram(a->data, buffer);
-    spriteSheet.data = buffer;
-    spriteSheet.size = a->size;
-    spriteSheet.tag = a->tag;
-    LoadSpriteSheet(&spriteSheet);
+    struct SpriteSheet dest;
+
+    LZ77UnCompWram(src->data, buffer);
+    dest.data = buffer;
+    dest.size = src->size;
+    dest.tag = src->tag;
+    LoadSpriteSheet(&dest);
 }
 
-void LoadCompressedObjectPalette(const struct SpritePalette *a)
+void LoadCompressedObjectPalette(const struct CompressedSpritePalette *src)
 {
-    struct SpritePalette spritePalette;
-    
-    LZ77UnCompWram(a->data, (void *)WRAM);
-    spritePalette.data = (void *)WRAM;
-    spritePalette.tag = a->tag;
-    LoadSpritePalette(&spritePalette);
+    struct SpritePalette dest;
+
+    LZ77UnCompWram(src->data, (void *)WRAM);
+    dest.data = (void *)WRAM;
+    dest.tag = src->tag;
+    LoadSpritePalette(&dest);
 }
 
-void LoadCompressedObjectPaletteOverrideBuffer(const struct SpritePalette *a, void *buffer)
+void LoadCompressedObjectPaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer)
 {
-    struct SpritePalette spritePalette;
-    
+    struct SpritePalette dest;
+
     LZ77UnCompWram(a->data, buffer);
-    spritePalette.data = buffer;
-    spritePalette.tag = a->tag;
-    LoadSpritePalette(&spritePalette);
+    dest.data = buffer;
+    dest.tag = a->tag;
+    LoadSpritePalette(&dest);
 }
 
-void DecompressPicFromTable_2(const struct SpriteSheet *a, u8 b, u8 c, void *d, void *e, s32 f)
+void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, u8 b, u8 c, void *d, void *buffer, s32 species)
 {
-    if (f > 412)
-        LZ77UnCompWram(gMonFrontPicTable[0].data, e);
+    if (species > SPECIES_EGG)
+        LZ77UnCompWram(gMonFrontPicTable[0].data, buffer);
     else
-        LZ77UnCompWram(a->data, e);
+        LZ77UnCompWram(src->data, buffer);
 }
 
-void sub_800D334(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g)
+void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g)
 {
-    u32 unk;
-    
+    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])
-        unk = 0;
+        frontOrBack = 0; // backPic
     else
-        unk = 1;
-    sub_800D378(a, b, c, d, dest, f, g, unk);
+        frontOrBack = 1; // frontPic
+
+    LoadSpecialPokePic(src, b, c, d, dest, species, g, frontOrBack);
 }
 
-void sub_800D378(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g, u32 h)
+void LoadSpecialPokePic(const struct CompressedSpriteSheet *src, u32 b, u32 c, u32 d, void *dest, s32 species, u32 g, u32 frontOrBack)
 {
-    u8 r7 = h;
-    
-    if (f == SPECIES_UNOWN)
+    u8 frontOrBack8 = frontOrBack;
+
+    if (species == SPECIES_UNOWN)
     {
-        u16 r1 = (((g & 0x3000000) >> 18) | ((g & 0x30000) >> 12) | ((g & 0x300) >> 6) | (g & 3)) % 0x1C;
-        
-        if (r1 == 0)
-            r1 = SPECIES_UNOWN;
+        u16 i = (((g & 0x3000000) >> 18) | ((g & 0x30000) >> 12) | ((g & 0x300) >> 6) | (g & 3)) % 0x1C;
+
+        // The other Unowns are separate from Unown A.
+        if (i == 0)
+            i = SPECIES_UNOWN;
         else
-            r1 += 412;
-        if (r7 == 0)
-            LZ77UnCompWram(gMonBackPicTable[r1].data, dest);
+            i += SPECIES_UNOWN_B - 1;
+
+        if (frontOrBack8 == 0)
+            LZ77UnCompWram(gMonBackPicTable[i].data, dest);
         else
-            LZ77UnCompWram(gMonFrontPicTable[r1].data, dest);
+            LZ77UnCompWram(gMonFrontPicTable[i].data, dest);
     }
+    else if (species > SPECIES_EGG) // is species unknown? draw the ? icon
+        LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
     else
-    {
-        if (f > 412)
-            LZ77UnCompWram(gMonFrontPicTable[0].data, dest);
-        else
-            LZ77UnCompWram(a->data, dest);
-    }
-    DrawSpindaSpots(f, g, dest, r7);
+        LZ77UnCompWram(src->data, dest);
+
+    DrawSpindaSpots(species, g, dest, frontOrBack8);
 }
 
 void Unused_LZDecompressWramIndirect(const void **src, void *dest)