Add names to all typedef'd structs, unions, and enums (#2028)

* Add names to all typedef'd structs, unions, and enums * wtf vs code * Use a better regex
2025-08-12 01:40:47 +00:00 · 2024-08-12 00:07:48 -07:00 · 2024-08-12 00:07:48 -07:00 · e6bc4bd8cb
commit e6bc4bd8cb
parent 672728455d
426 changed files with 1417 additions and 1417 deletions
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsBlastParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsBombInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsBomb2InitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsBubbleInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ f32 yPosOffset;
    /* 0x10 */ f32 yPosRandScale;
--- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDFireInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDeadDbInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDeadDdInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDeadDsInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDeadSoundInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDtBubbleInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsDustInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
@ -103,12 +103,12 @@ void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this) {
    CLOSE_DISPS(gfxCtx, "../z_eff_en_fire.c", 213);
 }

-typedef struct {
+typedef struct FireActorF {
    /* 0x000 */ Actor actor;
    /* 0x14C */ Vec3f firePos[10];
 } FireActorF;

-typedef struct {
+typedef struct FireActorS {
    /* 0x000 */ Actor actor;
    /* 0x14C */ Vec3s firePos[10];
 } FireActorS;
--- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsEnFireInitParams {
    /* 0x00 */ Actor* actor;
    /* 0x04 */ Vec3f pos;
    /* 0x10 */ s16 scale;
--- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
+++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsEnIceInitParams {
    /* 0x00 */ Actor* actor;
    /* 0x04 */ Vec3f pos;
    /* 0x10 */ f32 scale;
--- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsExtraInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
@ -12,7 +12,7 @@ typedef struct {
    /* 0x26 */ s16 scoreIdx;
 } EffectSsExtraInitParams; // size = 0x28

-typedef enum {
+typedef enum ExtraScoreIdx {
    /* 0 */ EXTRA_SCORE_30,
    /* 1 */ EXTRA_SCORE_60,
    /* 2 */ EXTRA_SCORE_100
--- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsFcircleInitParams {
    /* 0x00 */ Actor* actor;
    /* 0x04 */ Vec3f pos;
    /* 0x10 */ s16 radius;
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsFhgFlashInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
@ -14,12 +14,12 @@ typedef struct {
    /* 0x2C */ u8 type;
 } EffectSsFhgFlashInitParams; // size = 0x30

-typedef enum {
+typedef enum FhgFlashType {
    /* 0x00 */ FHGFLASH_LIGHTBALL,
    /* 0x01 */ FHGFLASH_SHOCK
 } FhgFlashType;

-typedef enum {
+typedef enum FhgFlashLightBallParam {
    /* 0x00 */ FHGFLASH_LIGHTBALL_GREEN,
    /* 0x01 */ FHGFLASH_LIGHTBALL_LIGHTBLUE,
    /* 0x02 */ FHGFLASH_LIGHTBALL_RED,
@ -31,7 +31,7 @@ typedef enum {
    /* 0x08 */ FHGFLASH_LIGHTBALL_WHITE2
 } FhgFlashLightBallParam;

-typedef enum {
+typedef enum FhgFlashLightningParam {
    /* 0x00 */ FHGFLASH_SHOCK_NO_ACTOR, // Don't attach to any actor. Stays at a fixed position.
    /* 0x01 */ FHGFLASH_SHOCK_PLAYER,   // Move to a random Player body part every frame.
    /* 0x02 */ FHGFLASH_SHOCK_PG        // Move to a random Phantom Ganon body part every frame.
--- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsFireTailInitParams {
    /* 0x00 */ Actor* actor;
    /* 0x04 */ Vec3f pos;
    /* 0x10 */ f32 scale;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGFireInitParams {
    /* 0x00 */ Vec3f pos;
 } EffectSsGFireInitParams; // size = 0xC

--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGMagmaInitParams {
    /* 0x00 */ Vec3f pos;
 } EffectSsGMagmaInitParams; // size = 0xC

--- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGMagma2InitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Color_RGBA8 primColor;
    /* 0x10 */ Color_RGBA8 envColor;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGRippleInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ s16 radius;
    /* 0x0E */ s16 radiusMax;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGSpkInitParams {
    /* 0x00 */ Actor* actor;
    /* 0x04 */ Vec3f pos;
    /* 0x10 */ Vec3f velocity;
--- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsGSplashInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ u8 type;
    /* 0x0D */ u8 customColor;
--- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsHahenInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
+++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h
@ -4,13 +4,13 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsHitMarkInitParams {
    /* 0x00 */ s32 type;
    /* 0x04 */ s16 scale;
    /* 0x08 */ Vec3f pos;
 } EffectSsHitMarkInitParams; // size = 0x14

-typedef enum {
+typedef enum EffectSsHitmarkType {
    EFFECT_HITMARK_WHITE,
    EFFECT_HITMARK_DUST,
    EFFECT_HITMARK_RED,
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsIcePieceInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ f32 scale;
    /* 0x10 */ Vec3f velocity;
--- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsIceSmokeInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
+++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsKFireInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsKakeraInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f unk_18;
@ -24,7 +24,7 @@ typedef struct {

 #define KAKERA_OBJECT_DEFAULT -1

-typedef enum {
+typedef enum KakeraColorIndex {
    /* -1 */ KAKERA_COLOR_NONE = -1,
    /*  0 */ KAKERA_COLOR_WHITE,
    /*  1 */ KAKERA_COLOR_BROWN
--- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
+++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsKiraKiraInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsLightningInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Color_RGBA8 primColor;
    /* 0x10 */ Color_RGBA8 envColor;
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsSibukiInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsSibuki2InitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsSolderSrchBallInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ Vec3f velocity;
    /* 0x18 */ Vec3f accel;
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
@ -20,7 +20,7 @@ EffectSsProfile Effect_Ss_Stick_Profile = {
    EffectSsStick_Init,
 };

-typedef struct {
+typedef struct StickDrawInfo {
    /* 0x00 */ s16 objectId;
    /* 0x04 */ Gfx* displayList;
 } StickDrawInfo;
--- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsStickInitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x0C */ s16 yaw;
 } EffectSsStickInitParams; // size = 0x10
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
@ -18,7 +18,7 @@ EffectSsProfile Effect_Ss_Stone1_Profile = {
    EffectSsStone1_Init,
 };

-typedef struct {
+typedef struct EffStoneDrawInfo {
    /* 0x00 */ void* texture;
    /* 0x04 */ Color_RGBA8 primColor;
    /* 0x08 */ Color_RGBA8 envColor;
--- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "global.h"

-typedef struct {
+typedef struct EffectSsStone1InitParams {
    /* 0x00 */ Vec3f pos;
    /* 0x00 */ s32 unk_C;
 } EffectSsStone1InitParams; // size = 0x