take: Decompile object.c

entriphy · Jul 18, 2024 · 31dc6f9 · 31dc6f9
1 parent 599b2db
commit 31dc6f9
Show file tree

Hide file tree

Showing 5 changed files with 596 additions and 13 deletions.
diff --git a/include/take.h b/include/take.h
@@ -18,6 +18,7 @@
 #define QWORD_SET128(x, y) { *(u128 *)&x = y; }
 #define QWORD_SET64(x, y, i) { *((u64 *)&x + i) = y; }
 #define QWORD_SET32(x, y, i) { *((u32 *)&x + i) = y; }
+#define ALIGN_BUF(x) ((void *)(((u32)x + 0xF) & ~0xF))
 
 #pragma endregion Defines
 

diff --git a/src/harada/hr_tchr.c b/src/harada/hr_tchr.c
@@ -92,10 +92,10 @@ static void hr_draw_skin(HRVU1OBJ *hrobj, s32 maxmat, sceVu0FMATRIX *LsMat, sceV
     FlushCache(0);
 }
 
-void hr_draw_tkVU1(HRVU1OBJ *hrobj, s32 maxmat, sceVu0FMATRIX *LsMat, sceVu0FMATRIX *LcLight, sceVu0FMATRIX LColor) {
+void hr_draw_tkVU1(HRVU1OBJ *hrobj, s32 maxmat, sceVu0FMATRIX *LsMat, sceVu0FMATRIX *LcLight, sceVu0FMATRIX *LColor) {
     ATR_SFXVU1 *pp;
 
-    nkMakeUnpackVif1(&p1_packet,LColor, 0x384, 4);
+    nkMakeUnpackVif1(&p1_packet, *LColor, 0x384, 4);
     if (hr_objtype != 1) {
         hr_objtype = 1;
         hrgms_old = NULL;

diff --git a/src/harada/hr_tchr.h b/src/harada/hr_tchr.h
@@ -74,6 +74,6 @@ typedef struct { // 0x80
 } ATR_SFXVU1D;
 
 extern void hr_decode_tkVU1(HRVU1OBJ *hrobj, u32 *buff, u32 *gms);
-extern void hr_draw_tkVU1(HRVU1OBJ *hrobj, s32 maxmat, sceVu0FMATRIX *LsMat, sceVu0FMATRIX *LcLight, sceVu0FMATRIX LColor);
+extern void hr_draw_tkVU1(HRVU1OBJ *hrobj, s32 maxmat, sceVu0FMATRIX *LsMat, sceVu0FMATRIX *LcLight, sceVu0FMATRIX *LColor);
 
 #endif