mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-02 17:42:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Lots of code_80071F00 matches (#347)

Browse Source 
* Lots of code_80071F00 matches

Also removed a bunch of fake variables related to the object list.

Also gave names to some of the members of the object list type

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
2023-08-04 17:05:13 -04:00
committed by GitHub
parent 9d716d921a
commit 87297bc3b4
104 changed files with 1711 additions and 9494 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/objects.h
+37 -13
View File
@@ -9,8 +9,8 @@
typedef struct
{
/* 0x00 */ f32 unk_000;
/* 0x04 */ Vec3f unk_004;
/* 0x00 */ f32 sizeScaling;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f unk_010;
/* 0x1C */ Vec3f unk_01C;
/* 0x28 */ Vec3f unk_028;
@@ -23,13 +23,17 @@ typedef struct
/* 0x54 */ s32 unk_054;
/* 0x58 */ s32 unk_058;
/* 0x5C */ s32 unk_05C;
/* 0x60 */ u32 *unk_060;
/* 0x64 */ u8 *unk_064; // ptr to a texture
/* 0x68 */ u32 *unk_068;
/* 0x6C */ u8 *unk_06C; // ptr to a texture
/* 0x60 */ u8 *activeTLUT;
/* 0x64 */ u8 *activeTexture;
/**
* "list" is something of a misnomer for the names here
* they can be pointers to just 1 tlut/texture, but it is common for one or the other
* to be a pointer to an array of tluts/textures.
**/
/* 0x68 */ u8 *tlutList; // I feel like this should actually be `u8 (*tlutList)[512]`, but that causes mismatches
/* 0x6C */ u8 *textureList;
/* 0x70 */ Gfx *unk_070;
// For at least 1 object type this is meant to be a Vtx*. See func_800555BC
/* 0x74 */ Vtx *unk_074;
/* 0x74 */ Vtx *unk_074; // For at least 1 object type this is meant to be a Vtx*. See func_800555BC
/* 0x78 */ s8 unk_078[0x04];
/* 0x7C */ s32 unk_07C;
/* 0x80 */ u16 *unk_080; // unk_080[][4]?
@@ -41,13 +45,13 @@ typedef struct
/* 0xA0 */ s16 unk_0A0;
/* 0xA2 */ s16 unk_0A2;
/* 0xA4 */ s16 unk_0A4;
/* 0xA6 */ s16 unk_0A6;
/* 0xA6 */ s16 unk_0A6; // Usually a state tracker
/* 0xA8 */ s16 unk_0A8;
/* 0xAA */ s16 unk_0AA;
/* 0xAC */ s16 unk_0AC;
/* 0xAE */ s16 unk_0AE;
/* 0xB0 */ s16 unk_0B0;
/* 0xB2 */ Vec3su unk_0B2;
/* 0xB2 */ Vec3su unk_0B2; // rotation, I think
/* 0xB8 */ Vec3su unk_0B8;
/* 0xBE */ Vec3su unk_0BE;
/* 0xC4 */ u16 unk_0C4;
@@ -67,9 +71,9 @@ typedef struct
/* 0xD5 */ u8 unk_0D5;
/* 0xD6 */ u8 unk_0D6;
/* 0xD7 */ u8 unk_0D7;
/* 0xD8 */ s8 unk_0D8;
/* 0xD9 */ u8 unk_0D9;
/* 0xDA */ u8 unk_0DA;
/* 0xD8 */ u8 unk_0D8;
/* 0xD9 */ u8 textureWidth;
/* 0xDA */ u8 textureHeight;
/* 0xDB */ u8 unk_0DB;
/* 0xDC */ u8 unk_0DC;
/* 0xDD */ u8 unk_0DD;
@@ -90,6 +94,8 @@ extern s32 gItemWindowObjectByPlayerId[];
// Used for loop bounds when accessing D_80183EA0
extern s16 D_80165750;
extern UnkActorInner D_8018C0B0[];
/**
* D_80183EA0, D_80183F28, D_8018BFA8, and D_8018C030 are all lists of indices in D_80165C18.
* func_80070190 initializes them in such a way that the indicies in each list are not adjacent.
@@ -98,6 +104,15 @@ extern s16 D_80165750;
* The objects found at the indices in each list appears to be course dependent
**/
#define NUM_CRABS 0xA
#define NUM_NEON_SIGNS 0xA
/**
* Crabs in Koopa Troopa Beach
* Hot air balloon in Luigi Raceway?
* Neon signs in Rainbow Road?
* Thwomps in Bower's Castle?
**/
extern s32 D_80183EA0[];
/**
* Snowmen in Frappe Snowlad
@@ -159,8 +174,17 @@ extern s32 D_8018C970[];
// Next free spot in D_8018C970? Wraps back around to 0 if it gets bigger than D_8018C970_SIZE
extern s32 D_80183E7C;
#define D_8018CC80_SIZE 0x64
// List of object list indices used by the clouds and stars in some stages
// Also used for snowflakes like D_8018C1B0? Not sure what's up with that
extern s32 D_8018CC80[];
// Number of used spots in D_8018CC80?
extern s32 D_8018D1F0;
// Next free spot in D_8018CC80?
extern s32 D_8018D1F8;
// Something related to the display of the clouds/stars?
extern s8 D_8018D230;
// Some sort of limiter on how many of some object type can spawn
extern s32 D_8018D3C4;
#endif