Refresh 2

include/types.h

@@ -136,21 +136,19 @@ struct Object
         s32 asS32[0x50];
         s16 asS16[0x50][2];
         f32 asF32[0x50];
-        void *asVoidP[0x50];
         s16 *asS16P[0x50];
         s32 *asS32P[0x50];
-        u32 *asAnims[0x50];
+        struct Animation **asAnims[0x50];
         struct Waypoint *asWaypoint[0x50];
         struct ChainSegment *asChainSegment[0x50];
         struct Object *asObject[0x50];
         struct Surface *asSurface[0x50];
         void *asVoidPtr[0x50];
-        struct Object *asObjPtr[0x50];
     } rawData;
-    /*0x1C8*/ u32 unk1C8;
-    /*0x1CC*/ u32 *behScript;
+    /*0x1C8*/ u32 unused1;
+    /*0x1CC*/ uintptr_t *behScript;
     /*0x1D0*/ u32 stackIndex;
-    /*0x1D4*/ u32 stack[8];
+    /*0x1D4*/ uintptr_t stack[8];
     /*0x1F4*/ s16 unk1F4;
     /*0x1F6*/ s16 respawnInfoType;
     /*0x1F8*/ f32 hitboxRadius;
@@ -159,7 +157,7 @@ struct Object
     /*0x204*/ f32 hurtboxHeight;
     /*0x208*/ f32 hitboxDownOffset;
     /*0x20C*/ void *behavior;
-    /*0x210*/ u32 unk210;
+    /*0x210*/ u32 unused2;
     /*0x214*/ struct Object *platform;
     /*0x218*/ void *collisionData;
     /*0x21C*/ Mat4 transform;
@@ -218,19 +216,26 @@ struct MarioBodyState
     /*0x0C*/ Vec3s unkC;
     /*0x12*/ Vec3s unk12;
     /*0x18*/ Vec3f unk18;
-    u8 padding[4]; // what is this?
+    u8 padding[4];
+};
+
+struct MarioAnimSub
+{
+    u32 offset;
+    u32 size;
 };
 
 struct MarioAnimDmaRelatedThing
 {
-    u32 unk0;
-    u32 unk4;
+    u32 count;
+    u8 *srcAddr;
+    struct MarioAnimSub anim[1]; // dynamic size
 };
 
 struct MarioAnimation
 {
     struct MarioAnimDmaRelatedThing *animDmaTable;
-    u32 currentDma;
+    u8 *currentAnimAddr;
     struct Animation *targetAnim;
     u8 padding[4];
 };
@@ -243,7 +248,7 @@ struct MarioState
     /*0x08*/ u32 particleFlags;
     /*0x0C*/ u32 action;
     /*0x10*/ u32 prevAction;
-    /*0x14*/ u32 stepSound;
+    /*0x14*/ u32 terrainSoundAddend;
     /*0x18*/ u16 actionState;
     /*0x1A*/ u16 actionTimer;
     /*0x1C*/ u32 actionArg;