mirror of
https://github.com/n64decomp/sm64
synced 2026-05-10 16:18:03 +00:00
68 lines
1.6 KiB
Plaintext
68 lines
1.6 KiB
Plaintext
diff a/include/types.h b/include/types.h (rejected hunks)
|
|
@@ -109,7 +109,7 @@ struct GraphNode
|
|
/*0x10*/ struct GraphNode *children;
|
|
};
|
|
|
|
-struct AnimInfo
|
|
+struct AnimInfo
|
|
{
|
|
/*0x00 0x38*/ s16 animID;
|
|
/*0x02 0x3A*/ s16 animYTrans;
|
|
@@ -154,6 +154,7 @@ struct Object
|
|
/*0x074*/ s16 activeFlags;
|
|
/*0x076*/ s16 numCollidedObjs;
|
|
/*0x078*/ struct Object *collidedObjs[4];
|
|
+ //struct Object* ReticleTarget;
|
|
/*0x088*/
|
|
union
|
|
{
|
|
@@ -284,6 +285,9 @@ struct MarioAnimation
|
|
|
|
struct MarioState
|
|
{
|
|
+
|
|
+
|
|
+
|
|
/*0x00*/ u16 unk00;
|
|
/*0x02*/ u16 input;
|
|
/*0x04*/ u32 flags;
|
|
@@ -307,6 +311,7 @@ struct MarioState
|
|
/*0x3A*/ s16 twirlYaw;
|
|
/*0x3C*/ Vec3f pos;
|
|
/*0x48*/ Vec3f vel;
|
|
+ f32 isSuper;
|
|
/*0x54*/ f32 forwardVel;
|
|
/*0x58*/ f32 slideVelX;
|
|
/*0x5C*/ f32 slideVelZ;
|
|
@@ -318,6 +323,7 @@ struct MarioState
|
|
/*0x74*/ s16 floorAngle;
|
|
/*0x76*/ s16 waterLevel;
|
|
/*0x78*/ struct Object *interactObj;
|
|
+ struct Object* homingObj;
|
|
/*0x7C*/ struct Object *heldObj;
|
|
/*0x80*/ struct Object *usedObj;
|
|
/*0x84*/ struct Object *riddenObj;
|
|
@@ -333,9 +339,14 @@ struct MarioState
|
|
/*0xAA*/ s16 numStars;
|
|
/*0xAC*/ s8 numKeys; // Unused key mechanic
|
|
/*0xAD*/ s8 numLives;
|
|
+ u8 coinstartotal;
|
|
+ s32 drownTimer;
|
|
+ s32 gasTimer;
|
|
+ s32 coinTimer;
|
|
/*0xAE*/ s16 health;
|
|
/*0xB0*/ s16 unkB0;
|
|
/*0xB2*/ u8 hurtCounter;
|
|
+ u8 hasEmerald;
|
|
/*0xB3*/ u8 healCounter;
|
|
/*0xB4*/ u8 squishTimer;
|
|
/*0xB5*/ u8 fadeWarpOpacity;
|
|
@@ -344,6 +355,7 @@ struct MarioState
|
|
/*0xBC*/ f32 peakHeight;
|
|
/*0xC0*/ f32 quicksandDepth;
|
|
/*0xC4*/ f32 unkC4;
|
|
+
|
|
};
|
|
|
|
#endif // TYPES_H
|