Merrp's follower merge (11th of July) (#4944)

rh-hideout · Jul 11, 2024 · 9e0af6c · 9e0af6c
2 parents e953a80 + b695ddf
commit 9e0af6c
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/gflib/sprite.c b/gflib/sprite.c
@@ -1443,7 +1443,7 @@ void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotat
     CopyOamMatrix(matrixNum, &matrix);
 }
 
-u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
+static u16 LoadSpriteSheetWithOffset(const struct SpriteSheet *sheet, u32 offset)
 {
     s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP);
 
@@ -1454,11 +1454,16 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
     else
     {
         AllocSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP);
-        CpuSmartCopy16(sheet->data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size);
+        CpuSmartCopy16(sheet->data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart + offset, sheet->size - offset);
         return (u16)tileStart;
     }
 }
 
+u16 LoadSpriteSheet(const struct SpriteSheet *sheet)
+{
+    return LoadSpriteSheetWithOffset(sheet, 0);
+}
+
 // Like LoadSpriteSheet, but checks if already loaded, and uses template image frames
 u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame, s32 offset)
 {
@@ -1469,10 +1474,10 @@ u16 LoadSpriteSheetByTemplate(const struct SpriteTemplate *template, u32 frame,
         return TAG_NONE;
     if ((tileStart = GetSpriteTileStartByTag(template->tileTag)) != TAG_NONE) // return if already loaded
         return tileStart;
-    sheet.data = template->images[frame].data - offset;
+    sheet.data = template->images[frame].data;
     sheet.size = template->images[frame].size;
     sheet.tag = template->tileTag;
-    return LoadSpriteSheet(&sheet);
+    return LoadSpriteSheetWithOffset(&sheet, offset);
 }
 
 void LoadSpriteSheets(const struct SpriteSheet *sheets)