Effect table (#1209)

* effect_ss_table.h * monkaBSS * format * Remove InitVars extern headers * Remove `const` from InitVars * cleanup * cleanup * format * bss * bss * bss
2026-07-28 07:08:04 -04:00 · 2023-03-30 13:17:55 -03:00
parent 34f9fb9886
commit d8064bb070
78 changed files with 127 additions and 256 deletions
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"

 #define RSP_DONE_MSG 667
@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "vt.h"
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
@@ -1,4 +1,3 @@
-#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64quake.h"
 #include "z64rumble.h"
@@ -1,56 +1,34 @@
-#include "global.h"
-#include "initvars.h"
+#include "z64effect.h"
+#include "segment_symbols.h"

-#define EFFECT_SS_OVERLAY(name)                                                                \
-    {                                                                                          \
-        SEGMENT_ROM_START(ovl_##name), SEGMENT_ROM_END(ovl_##name), SEGMENT_START(ovl_##name), \
-            SEGMENT_END(ovl_##name), NULL, &name##_InitVars, 1,                                \
-    }
+// Init Vars and linker symbol declarations (used in the table below)
+#define DEFINE_EFFECT_SS(name, _enumValue) \
+    extern EffectSsInit name##_InitVars;   \
+    DECLARE_OVERLAY_SEGMENT(name)

-#define EFFECT_SS_OVERLAY_INTERNAL(name) \
-    { 0, 0, NULL, NULL, NULL, &name##_InitVars, 1 }
+#define DEFINE_EFFECT_SS_UNSET(_enumValue)

-#define EFFECT_SS_OVERLAY_UNSET \
-    { 0 }
+#include "tables/effect_ss_table.h"
+
+#undef DEFINE_EFFECT_SS
+#undef DEFINE_EFFECT_SS_UNSET
+
+#define DEFINE_EFFECT_SS(name, _enumValue) \
+    {                                      \
+        SEGMENT_ROM_START(ovl_##name),     \
+        SEGMENT_ROM_END(ovl_##name),       \
+        SEGMENT_START(ovl_##name),         \
+        SEGMENT_END(ovl_##name),           \
+        NULL,                              \
+        &name##_InitVars,                  \
+        1,                                 \
+    },
+
+#define DEFINE_EFFECT_SS_UNSET(_enumValue) { 0 },

 EffectSsOverlay gParticleOverlayTable[] = {
-    EFFECT_SS_OVERLAY(Effect_Ss_Dust),
-    EFFECT_SS_OVERLAY(Effect_Ss_Kirakira),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_Bomb2),
-    EFFECT_SS_OVERLAY(Effect_Ss_Blast),
-    EFFECT_SS_OVERLAY(Effect_Ss_G_Spk),
-    EFFECT_SS_OVERLAY(Effect_Ss_D_Fire),
-    EFFECT_SS_OVERLAY(Effect_Ss_Bubble),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_G_Ripple),
-    EFFECT_SS_OVERLAY(Effect_Ss_G_Splash),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_G_Fire),
-    EFFECT_SS_OVERLAY(Effect_Ss_Lightning),
-    EFFECT_SS_OVERLAY(Effect_Ss_Dt_Bubble),
-    EFFECT_SS_OVERLAY(Effect_Ss_Hahen),
-    EFFECT_SS_OVERLAY(Effect_Ss_Stick),
-    EFFECT_SS_OVERLAY(Effect_Ss_Sibuki),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_Stone1),
-    EFFECT_SS_OVERLAY(Effect_Ss_Hitmark),
-    EFFECT_SS_OVERLAY(Effect_Ss_Fhg_Flash),
-    EFFECT_SS_OVERLAY(Effect_Ss_K_Fire),
-    EFFECT_SS_OVERLAY(Effect_Ss_Solder_Srch_Ball),
-    EFFECT_SS_OVERLAY(Effect_Ss_Kakera),
-    EFFECT_SS_OVERLAY(Effect_Ss_Ice_Piece),
-    EFFECT_SS_OVERLAY(Effect_Ss_En_Ice),
-    EFFECT_SS_OVERLAY(Effect_Ss_Fire_Tail),
-    EFFECT_SS_OVERLAY(Effect_Ss_En_Fire),
-    EFFECT_SS_OVERLAY(Effect_Ss_Extra),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_Dead_Db),
-    EFFECT_SS_OVERLAY(Effect_Ss_Dead_Dd),
-    EFFECT_SS_OVERLAY(Effect_Ss_Dead_Ds),
-    EFFECT_SS_OVERLAY_UNSET,
-    EFFECT_SS_OVERLAY(Effect_Ss_Ice_Smoke),
-    EFFECT_SS_OVERLAY(Effect_En_Ice_Block),
-    EFFECT_SS_OVERLAY(Effect_Ss_Sbn),
+#include "tables/effect_ss_table.h"
 };
+
+#undef DEFINE_EFFECT_SS
+#undef DEFINE_EFFECT_SS_UNSET
@@ -1,3 +1,5 @@
+#include "prevent_bss_reordering.h"
+
 #include "global.h"

 #include "objects/gameplay_keep/gameplay_keep.h"
@@ -4,6 +4,7 @@
 * Description: Great Bay Temple - Waterwheels, push switches, gear shafts, and whirlpools
 */

+#include "prevent_bss_reordering.h"
 #include "z_bg_dblue_movebg.h"
 #include "objects/object_dblue_object/object_dblue_object.h"
 #include "overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h"
@@ -4,7 +4,6 @@
 * Description: Twinmold
 */

-#include "prevent_bss_reordering.h"
 #include "z_boss_02.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
@@ -4,6 +4,7 @@
 * Description: Bad Bat
 */

+#include "prevent_bss_reordering.h"
 #include "z_en_bat.h"
 #include "objects/object_bat/object_bat.h"

@@ -4,7 +4,6 @@
 * Description: Fishing Pond Elements (Owner, Fish, Props, Effects...)
 */

-#include "prevent_bss_reordering.h"
 #include "z_en_fishing.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
@@ -4,7 +4,6 @@
 * Description: Kafei
 */

-#include "prevent_bss_reordering.h"
 #include "z_en_test3.h"
 #include "objects/object_test3/object_test3.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
@@ -56,6 +56,4 @@ typedef struct ObjDriftice {
    /* 0x24C */ s32 unk_24C;
 } ObjDriftice; // size = 0x250

-extern ActorInit Obj_Driftice_InitVars;
-
 #endif // Z_OBJ_DRIFTICE_H
@@ -14,7 +14,7 @@ u32 EffectEnIceBlock_Init(PlayState* play, u32 index, EffectSs* this, void* init
 void EffectEnIceBlock_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectEnIceBlock_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_En_Ice_Block_InitVars = {
+EffectSsInit Effect_En_Ice_Block_InitVars = {
    EFFECT_EN_ICE_BLOCK,
    EffectEnIceBlock_Init,
 };
@@ -11,6 +11,4 @@ typedef struct {
    /* 0x28 */ s16 scale;
 } EffectEnIceBlockInitParams; // size = 0x2C

-extern const EffectSsInit Effect_En_Ice_Block_InitVars;
-
 #endif
@@ -26,7 +26,7 @@ u32 EffectSsBlast_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsBlast_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsBlast_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Blast_InitVars = {
+EffectSsInit Effect_Ss_Blast_InitVars = {
    EFFECT_SS_BLAST,
    EffectSsBlast_Init,
 };
@@ -15,6 +15,4 @@ typedef struct {
    /* 0x32 */ s16 life;
 } EffectSsBlastInitParams; // size = 0x34

-extern const EffectSsInit Effect_Ss_Blast_InitVars;
-
 #endif
@@ -26,7 +26,7 @@ void EffectSsBomb2_DrawFade(PlayState* play, u32 index, EffectSs* this);
 void EffectSsBomb2_DrawLayered(PlayState* play, u32 index, EffectSs* this);
 void EffectSsBomb2_Update(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Bomb2_InitVars = {
+EffectSsInit Effect_Ss_Bomb2_InitVars = {
    EFFECT_SS_BOMB2,
    EffectSsBomb2_Init,
 };
@@ -12,6 +12,4 @@ typedef struct {
    /* 0x28 */ u8 drawMode;
 } EffectSsBomb2InitParams; // size = 0x30

-extern const EffectSsInit Effect_Ss_Bomb2_InitVars;
-
 #endif
@@ -17,7 +17,7 @@ u32 EffectSsBubble_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsBubble_Update(PlayState* play2, u32 index, EffectSs* this);
 void EffectSsBubble_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Bubble_InitVars = {
+EffectSsInit Effect_Ss_Bubble_InitVars = {
    EFFECT_SS_BUBBLE,
    EffectSsBubble_Init,
 };
@@ -11,6 +11,4 @@ typedef struct {
    /* 0x18 */ f32 scale;
 } EffectSsBubbleInitParams; // size = 0x1C

-extern const EffectSsInit Effect_Ss_Bubble_InitVars;
-
 #endif
@@ -21,7 +21,7 @@ u32 EffectSsDFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsDFire_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDFire_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_D_Fire_InitVars = {
+EffectSsInit Effect_Ss_D_Fire_InitVars = {
    EFFECT_SS_D_FIRE,
    EffectSsDFire_Init,
 };
@@ -15,6 +15,4 @@ typedef struct {
    /* 0x30 */ s32 life;
 } EffectSsDFireInitParams; // size = 0x34

-extern const EffectSsInit Effect_Ss_D_Fire_InitVars;
-
 #endif
@@ -25,7 +25,7 @@ u32 EffectSsDeadDb_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsDeadDb_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDeadDb_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Dead_Db_InitVars = {
+EffectSsInit Effect_Ss_Dead_Db_InitVars = {
    EFFECT_SS_DEAD_DB,
    EffectSsDeadDb_Init,
 };
@@ -14,6 +14,4 @@ typedef struct {
    /* 0x30 */ s32 life;
 } EffectSsDeadDbInitParams; // size = 0x34

-extern const EffectSsInit Effect_Ss_Dead_Db_InitVars;
-
 #endif
@@ -25,7 +25,7 @@ u32 EffectSsDeadDd_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsDeadDd_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDeadDd_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Dead_Dd_InitVars = {
+EffectSsInit Effect_Ss_Dead_Dd_InitVars = {
    EFFECT_SS_DEAD_DD,
    EffectSsDeadDd_Init,
 };
@@ -23,6 +23,4 @@ typedef struct {
    /* 0x40 */ u8 type;
 } EffectSsDeadDdInitParams; // size = 0x44

-extern const EffectSsInit Effect_Ss_Dead_Dd_InitVars;
-
 #endif
@@ -23,7 +23,7 @@ u32 EffectSsDeadDs_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsDeadDs_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Dead_Ds_InitVars = {
+EffectSsInit Effect_Ss_Dead_Ds_InitVars = {
    EFFECT_SS_DEAD_DS,
    EffectSsDeadDs_Init,
 };
@@ -13,6 +13,4 @@ typedef struct {
    /* 0x2C */ s32 life;
 } EffectSsDeadDsInitParams; // size = 0x30

-extern const EffectSsInit Effect_Ss_Dead_Ds_InitVars;
-
 #endif
@@ -39,7 +39,7 @@ static Color_RGBA8 sEnvColors[] = {
    { 150, 150, 150, 0 },
 };

-const EffectSsInit Effect_Ss_Dt_Bubble_InitVars = {
+EffectSsInit Effect_Ss_Dt_Bubble_InitVars = {
    EFFECT_SS_DT_BUBBLE,
    EffectSsDtBubble_Init,
 };
@@ -23,6 +23,4 @@ typedef struct {
    /* 0x34 */ u8 customColor;
 } EffectSsDtBubbleInitParams; // size = 0x3C

-extern const EffectSsInit Effect_Ss_Dt_Bubble_InitVars;
-
 #endif
@@ -28,7 +28,7 @@ void EffectSsDust_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDust_UpdateFire(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Dust_InitVars = {
+EffectSsInit Effect_Ss_Dust_InitVars = {
    EFFECT_SS_DUST,
    EffectSsDust_Init,
 };
@@ -26,6 +26,4 @@ typedef struct {
    /* 0x34 */ u8 updateMode;
 } EffectSsDustInitParams; // size = 0x38

-extern const EffectSsInit Effect_Ss_Dust_InitVars;
-
 #endif
@@ -24,7 +24,7 @@ u32 EffectSsEnFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsEnFire_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_En_Fire_InitVars = {
+EffectSsInit Effect_Ss_En_Fire_InitVars = {
    EFFECT_SS_EN_FIRE,
    EffectSsEnFire_Init,
 };
@@ -15,6 +15,4 @@ typedef struct {
    /* 0x16 */ s16 bodyPart;
 } EffectSsEnFireInitParams; // size = 0x18

-extern const EffectSsInit Effect_Ss_En_Fire_InitVars;
-
 #endif
@@ -28,7 +28,7 @@ void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this);
 void EffectSsEnIce_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_En_Ice_InitVars = {
+EffectSsInit Effect_Ss_En_Ice_InitVars = {
    EFFECT_SS_EN_ICE,
    EffectSsEnIce_Init,
 };
@@ -20,6 +20,4 @@ typedef struct {
    /* 0x38 */ s16 type;
 } EffectSsEnIceInitParams; // size = 0x3C

-extern const EffectSsInit Effect_Ss_En_Ice_InitVars;
-
 #endif
@@ -16,7 +16,7 @@ void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this);

 static s16 sScores[] = { 30, 60, 100 };

-const EffectSsInit Effect_Ss_Extra_InitVars = {
+EffectSsInit Effect_Ss_Extra_InitVars = {
    EFFECT_SS_EXTRA,
    EffectSsExtra_Init,
 };
@@ -17,6 +17,4 @@ typedef struct {
    /* 0x26 */ s16 scoreIdx;
 } EffectSsExtraInitParams; // size = 0x28

-extern const EffectSsInit Effect_Ss_Extra_InitVars;
-
 #endif
@@ -19,7 +19,7 @@ u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* init
 void EffectSsFhgFlash_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsFhgFlash_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Fhg_Flash_InitVars = {
+EffectSsInit Effect_Ss_Fhg_Flash_InitVars = {
    EFFECT_SS_FHG_FLASH,
    EffectSsFhgFlash_Init,
 };
@@ -40,6 +40,4 @@ typedef struct {
    /* 0x2C */ u8 type;
 } EffectSsFhgFlashInitParams; // size = 0x30

-extern const EffectSsInit Effect_Ss_Fhg_Flash_InitVars;
-
 #endif
@@ -27,7 +27,7 @@ u32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* init
 void EffectSsFireTail_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Fire_Tail_InitVars = {
+EffectSsInit Effect_Ss_Fire_Tail_InitVars = {
    EFFECT_SS_FIRE_TAIL,
    EffectSsFireTail_Init,
 };
@@ -16,6 +16,4 @@ typedef struct {
    /* 0x30 */ s32 life;
 } EffectSsFireTailInitParams; // size = 0x34

-extern const EffectSsInit Effect_Ss_Fire_Tail_InitVars;
-
 #endif
@@ -13,7 +13,7 @@ u32 EffectSsGFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsGFire_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsGFire_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_G_Fire_InitVars = {
+EffectSsInit Effect_Ss_G_Fire_InitVars = {
    EFFECT_SS_G_FIRE,
    EffectSsGFire_Init,
 };
@@ -7,6 +7,4 @@ typedef struct {
    /* 0x00 */ Vec3f pos;
 } EffectSsGFireInitParams; // size = 0xC

-extern const EffectSsInit Effect_Ss_G_Fire_InitVars;
-
 #endif
@@ -27,7 +27,7 @@ u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initP
 void EffectSsGRipple_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsGRipple_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_G_Ripple_InitVars = {
+EffectSsInit Effect_Ss_G_Ripple_InitVars = {
    EFFECT_SS_G_RIPPLE,
    EffectSsGRipple_Init,
 };
@@ -10,6 +10,4 @@ typedef struct {
    /* 0x10 */ s16 life;
 } EffectSsGRippleInitParams; // size = 0x14

-extern const EffectSsInit Effect_Ss_G_Ripple_InitVars;
-
 #endif
@@ -26,7 +26,7 @@ void EffectSsGSpk_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsGSpk_UpdateNoAccel(PlayState* play, u32 index, EffectSs* this);
 void EffectSsGSpk_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_G_Spk_InitVars = {
+EffectSsInit Effect_Ss_G_Spk_InitVars = {
    EFFECT_SS_G_SPK,
    EffectSsGSpk_Init,
 };
@@ -20,6 +20,4 @@ typedef struct {
    /* 0x34 */ u8 updateMode;
 } EffectSsGSpkInitParams; // size = 0x38

-extern const EffectSsInit Effect_Ss_G_Spk_InitVars;
-
 #endif
@@ -17,7 +17,7 @@ u32 EffectSsGSplash_Init(PlayState* play, u32 index, EffectSs* this, void* initP
 void EffectSsGSplash_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsGSplash_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_G_Splash_InitVars = {
+EffectSsInit Effect_Ss_G_Splash_InitVars = {
    EFFECT_SS_G_SPLASH,
    EffectSsGSplash_Init,
 };
@@ -12,6 +12,4 @@ typedef struct {
    /* 0x14 */ Color_RGBA8 envColor;
 } EffectSsGSplashInitParams; // size = 0x18

-extern const EffectSsInit Effect_Ss_G_Splash_InitVars;
-
 #endif
@@ -21,7 +21,7 @@ u32 EffectSsHahen_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsHahen_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Hahen_InitVars = {
+EffectSsInit Effect_Ss_Hahen_InitVars = {
    EFFECT_SS_HAHEN,
    EffectSsHahen_Init,
 };
@@ -19,6 +19,4 @@ typedef struct {
    /* 0x2C */ s16 life;
 } EffectSsHahenInitParams; // size = 0x30

-extern const EffectSsInit Effect_Ss_Hahen_InitVars;
-
 #endif
@@ -73,7 +73,7 @@ static TexturePtr sTextures[] = {
    gEffHitmarkWhiteMetal8Tex,
 };

-const EffectSsInit Effect_Ss_Hitmark_InitVars = {
+EffectSsInit Effect_Ss_Hitmark_InitVars = {
    EFFECT_SS_HITMARK,
    EffectSsHitmark_Init,
 };
@@ -16,6 +16,4 @@ typedef struct {
    /* 0x08 */ Vec3f pos;
 } EffectSsHitmarkInitParams; // size = 0x14

-extern const EffectSsInit Effect_Ss_Hitmark_InitVars;
-
 #endif
@@ -19,7 +19,7 @@ u32 EffectSsIcePiece_Init(PlayState* play, u32 index, EffectSs* this, void* init
 void EffectSsIcePiece_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsIcePiece_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Ice_Piece_InitVars = {
+EffectSsInit Effect_Ss_Ice_Piece_InitVars = {
    EFFECT_SS_ICE_PIECE,
    EffectSsIcePiece_Init,
 };
@@ -11,6 +11,4 @@ typedef struct {
    /* 0x28 */ s32 life;
 } EffectSsIcePieceInitParams; // size = 0xC

-extern const EffectSsInit Effect_Ss_Ice_Piece_InitVars;
-
 #endif
@@ -18,7 +18,7 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init
 void EffectSsIceSmoke_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsIceSmoke_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Ice_Smoke_InitVars = {
+EffectSsInit Effect_Ss_Ice_Smoke_InitVars = {
    EFFECT_SS_ICE_SMOKE,
    EffectSsIceSmoke_Init,
 };
@@ -10,6 +10,4 @@ typedef struct {
    /* 0x24 */ s16 scale;
 } EffectSsIceSmokeInitParams; // size = 0x28

-extern const EffectSsInit Effect_Ss_Ice_Smoke_InitVars;
-
 #endif
@@ -20,7 +20,7 @@ u32 EffectSsKFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsKFire_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_K_Fire_InitVars = {
+EffectSsInit Effect_Ss_K_Fire_InitVars = {
    EFFECT_SS_K_FIRE,
    EffectSsKFire_Init,
 };
@@ -11,6 +11,4 @@ typedef struct {
    /* 0x26 */ u8 type;
 } EffectSsKFireInitParams; // size = 0x28

-extern const EffectSsInit Effect_Ss_K_Fire_InitVars;
-
 #endif
@@ -28,7 +28,7 @@ void EffectSsKakera_Draw(PlayState* play, u32 index, EffectSs* this);

 void EffectSsKakera_CheckForObject(EffectSs* this, PlayState* play);

-const EffectSsInit Effect_Ss_Kakera_InitVars = {
+EffectSsInit Effect_Ss_Kakera_InitVars = {
    EFFECT_SS_KAKERA,
    EffectSsKakera_Init,
 };
@@ -29,7 +29,7 @@ void func_80977E6C(PlayState* play, u32 index, EffectSs* this);
 void func_80977F28(PlayState* play, u32 index, EffectSs* this);
 void EffectSsKirakira_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Kirakira_InitVars = {
+EffectSsInit Effect_Ss_Kirakira_InitVars = {
    EFFECT_SS_KIRAKIRA,
    EffectSsKirakira_Init,
 };
@@ -17,6 +17,4 @@ typedef struct {
    /* 0x38 */ u8 updateMode;
 } EffectSsKirakiraInitParams; // size = 0x3C

-extern const EffectSsInit Effect_Ss_Kirakira_InitVars;
-
 #endif
@@ -31,7 +31,7 @@ TexturePtr sLightningTextures[] = {
    gEffLightning5Tex, gEffLightning6Tex, gEffLightning7Tex, gEffLightning8Tex,
 };

-const EffectSsInit Effect_Ss_Lightning_InitVars = {
+EffectSsInit Effect_Ss_Lightning_InitVars = {
    EFFECT_SS_LIGHTNING,
    EffectSsLightning_Init,
 };
@@ -13,6 +13,4 @@ typedef struct {
    /* 0x1A */ s16 numBolts;
 } EffectSsLightningInitParams; // size = 0x1C

-extern const EffectSsInit Effect_Ss_Lightning_InitVars;
-
 #endif
@@ -27,7 +27,7 @@ void EffectSsSbn_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsSbn_DrawSliding(PlayState* play, u32 index, EffectSs* this);
 void EffectSsSbn_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Sbn_InitVars = {
+EffectSsInit Effect_Ss_Sbn_InitVars = {
    EFFECT_SS_SBN,
    EffectSsSbn_Init,
 };
@@ -9,6 +9,4 @@ typedef struct {
    /* 0x10 */ f32 scale;
 } EffectSsSbnInitParams; // size = 0x14

-extern const EffectSsInit Effect_Ss_Sbn_InitVars;
-
 #endif
@@ -25,7 +25,7 @@ u32 EffectSsSibuki_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsSibuki_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsSibuki_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Sibuki_InitVars = {
+EffectSsInit Effect_Ss_Sibuki_InitVars = {
    EFFECT_SS_SIBUKI,
    EffectSsSibuki_Init,
 };
@@ -12,6 +12,4 @@ typedef struct {
    /* 0x28 */ s16 scale;
 } EffectSsSibukiInitParams; // size = 0x2C

-extern const EffectSsInit Effect_Ss_Sibuki_InitVars;
-
 #endif
@@ -15,7 +15,7 @@ u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void
 void EffectSsSolderSrchBall_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsSolderSrchBall_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars = {
+EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars = {
    EFFECT_SS_SOLDER_SRCH_BALL,
    EffectSsSolderSrchBall_Init,
 };
@@ -15,6 +15,4 @@ typedef struct {
    /* 0x2C */ s16 flags;
 } EffectSsSolderSrchBallInitParams; // size = 0x30

-extern const EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars;
-
 #endif
@@ -16,7 +16,7 @@ u32 EffectSsStick_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
 void EffectSsStick_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsStick_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Stick_InitVars = {
+EffectSsInit Effect_Ss_Stick_InitVars = {
    EFFECT_SS_STICK,
    EffectSsStick_Init,
 };
@@ -15,7 +15,7 @@ u32 EffectSsStone1_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 void EffectSsStone1_Update(PlayState* play, u32 index, EffectSs* this);
 void EffectSsStone1_Draw(PlayState* play, u32 index, EffectSs* this);

-const EffectSsInit Effect_Ss_Stone1_InitVars = {
+EffectSsInit Effect_Ss_Stone1_InitVars = {
    EFFECT_SS_STONE1,
    EffectSsStone1_Init,
 };
@@ -8,6 +8,4 @@ typedef struct {
    /* 0x0C */ s32 reg0;
 } EffectSsStone1InitParams; // size = 0x10

-extern const EffectSsInit Effect_Ss_Stone1_InitVars;
-
 #endif