Refresh 16

This commit is contained in:
n64
2023-08-17 08:56:02 -04:00
parent 66018e9f3c
commit ae770e0df5
1326 changed files with 73566 additions and 26397 deletions

View File

@@ -48,11 +48,14 @@ typedef uintptr_t GeoLayout;
typedef uintptr_t LevelScript;
typedef s16 Movtex;
typedef s16 MacroObject;
typedef s16 Collision;
typedef s16 Collision; // Collision data is limited to -32768 to 32767. Change this if you want to increase it.
typedef s16 Trajectory;
typedef s16 PaintingData;
typedef uintptr_t BehaviorScript;
typedef u8 Texture;
typedef s8 RoomData; // Rooms are limited to -128 to 127. Change the type if you wish to have more rooms.
typedef Collision TerrainData;
typedef TerrainData Vec3Terrain[3];
enum SpTaskState {
SPTASK_STATE_NOT_STARTED,
@@ -75,7 +78,7 @@ struct VblankHandler {
};
#define ANIM_FLAG_NOLOOP (1 << 0) // 0x01
#define ANIM_FLAG_FORWARD (1 << 1) // 0x02
#define ANIM_FLAG_BACKWARD (1 << 1) // 0x02
#define ANIM_FLAG_2 (1 << 2) // 0x04
#define ANIM_FLAG_HOR_TRANS (1 << 3) // 0x08
#define ANIM_FLAG_VERT_TRANS (1 << 4) // 0x10
@@ -216,15 +219,15 @@ struct Waypoint {
};
struct Surface {
/*0x00*/ s16 type;
/*0x02*/ s16 force;
/*0x00*/ TerrainData type;
/*0x02*/ TerrainData force;
/*0x04*/ s8 flags;
/*0x05*/ s8 room;
/*0x06*/ s16 lowerY;
/*0x08*/ s16 upperY;
/*0x0A*/ Vec3s vertex1;
/*0x10*/ Vec3s vertex2;
/*0x16*/ Vec3s vertex3;
/*0x05*/ RoomData room;
/*0x06*/ TerrainData lowerY;
/*0x08*/ TerrainData upperY;
/*0x0A*/ Vec3Terrain vertex1;
/*0x10*/ Vec3Terrain vertex2;
/*0x16*/ Vec3Terrain vertex3;
/*0x1C*/ struct {
f32 x;
f32 y;
@@ -309,7 +312,7 @@ struct MarioState {
/*0xB8*/ s16 prevNumStarsForDialog;
/*0xBC*/ f32 peakHeight;
/*0xC0*/ f32 quicksandDepth;
/*0xC4*/ f32 unkC4;
/*0xC4*/ f32 gettingBlownGravity;
};
#endif // TYPES_H