Add a few NON_EQUIVALENT functions from scratches to keep them up to date (#602)

* WIP func_800101AC

* WIP func_800452A0

* cleanup

* Formatter and func_8004CC20 near match

* func_8004CC20 better score and documentation

* func_80049794 WIP and compilable

* Major cleanup of func_80049794

* Formatter

* Update scratch

* Add func_80019808 from scratch

* Cleanup func_80019808

* func_80019808 score improvment

* Improve func_80049794 score (Thanks Dominik!)

* func_8001C6C4 WIP

* func_8001E93C WIP

* small documenting

* Eliminate a lot of Obj64 casts.
This commit is contained in:
Ryan Myers
2025-06-03 14:47:46 -04:00
committed by GitHub
parent 4c4309665a
commit 520b3d58e3
20 changed files with 2519 additions and 224 deletions
+14 -8
View File
@@ -1537,12 +1537,17 @@ typedef struct Object_FogChanger {
typedef struct Object_NPC {
/* 0x00 */ f32 unk0;
/* 0x04 */ f32 animFrameF;
/* 0x08 */ s32 unk8;
/* 0x0C */ s8 nodeBack1; // One node backwards
/* 0x0D */ u8 nodeCurrent; // Intended target node
/* 0x0E */ u8 nodeBack2; // Two nodes backward
/* 0x0F */ u8 nodeForward1; // One node forward
/* 0x10 */ u8 nodeForward2; // Two nodes forward
/* 0x08 */ f32 unk8;
union {
/* 0x0C */ u8 nodeData[5];
struct {
/* 0x0C */ s8 nodeBack1; // One node backwards
/* 0x0D */ u8 nodeCurrent; // Intended target node
/* 0x0E */ u8 nodeBack2; // Two nodes backward
/* 0x0F */ u8 nodeForward1; // One node forward
/* 0x10 */ u8 nodeForward2; // Two nodes forward
};
};
/* 0x11 */ u8 fogR;
/* 0x12 */ u8 fogG;
/* 0x13 */ u8 fogB;
@@ -1596,7 +1601,7 @@ typedef struct Object_Log {
typedef struct Object_Fireball_Octoweapon {
u8 pad0[0x1C];
SoundHandle soundMask;
struct AudioPoint *soundMask;
} Object_Fireball_Octoweapon;
typedef struct Object_AnimatedObject {
@@ -1722,6 +1727,7 @@ typedef struct Object_68_38 {
typedef struct Object_68 {
/* 0x00 */ union {
ObjectModel *objModel;
Sprite *sprite;
TextureHeader *texHeader;
};
/* 0x04 */ Vertex *vertices[3];
@@ -1845,7 +1851,7 @@ typedef struct Object {
/* 0x0064 */ Object_64 *unk64; //player + 0x98
/* 0x0068 */ Object_68 **unk68; //player + 0x80
/* 0x006C */ struct ParticleEmitter *particleEmitter; //player + 0x370
/* 0x0070 */ Object_LightData **lightData;
/* 0x0070 */ struct ObjectLight **lightData;
/* 0x0074 */ u32 particleEmittersEnabled;
/* 0x0078 */ ObjProperties properties;
/* 0x0080 */ void *unk80;