Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-27 14:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Effect table (#1209)

Browse Source 
* effect_ss_table.h

* monkaBSS

* format

* Remove InitVars extern headers

* Remove `const` from InitVars

* cleanup

* cleanup

* format

* bss

* bss

* bss
This commit is contained in:
Anghelo Carvajal 2023-03-30 13:17:55 -03:00 committed by GitHub
parent 34f9fb9886
commit d8064bb070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 127 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/initvars.h
View File

@ -1,39 +1,6 @@
#ifndef _INITVARS_H_
#define _INITVARS_H_
extern EffectSsInit Effect_Ss_Dust_InitVars;
extern EffectSsInit Effect_Ss_Kirakira_InitVars;
extern EffectSsInit Effect_Ss_Bomb2_InitVars;
extern EffectSsInit Effect_Ss_Blast_InitVars;
extern EffectSsInit Effect_Ss_G_Spk_InitVars;
extern EffectSsInit Effect_Ss_D_Fire_InitVars;
extern EffectSsInit Effect_Ss_Bubble_InitVars;
extern EffectSsInit Effect_Ss_G_Ripple_InitVars;
extern EffectSsInit Effect_Ss_G_Splash_InitVars;
extern EffectSsInit Effect_Ss_G_Fire_InitVars;
extern EffectSsInit Effect_Ss_Lightning_InitVars;
extern EffectSsInit Effect_Ss_Dt_Bubble_InitVars;
extern EffectSsInit Effect_Ss_Hahen_InitVars;
extern EffectSsInit Effect_Ss_Stick_InitVars;
extern EffectSsInit Effect_Ss_Sibuki_InitVars;
extern EffectSsInit Effect_Ss_Stone1_InitVars;
extern EffectSsInit Effect_Ss_Hitmark_InitVars;
extern EffectSsInit Effect_Ss_Fhg_Flash_InitVars;
extern EffectSsInit Effect_Ss_K_Fire_InitVars;
extern EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars;
extern EffectSsInit Effect_Ss_Kakera_InitVars;
extern EffectSsInit Effect_Ss_Ice_Piece_InitVars;
extern EffectSsInit Effect_Ss_En_Ice_InitVars;
extern EffectSsInit Effect_Ss_Fire_Tail_InitVars;
extern EffectSsInit Effect_Ss_En_Fire_InitVars;
extern EffectSsInit Effect_Ss_Extra_InitVars;
extern EffectSsInit Effect_Ss_Dead_Db_InitVars;
extern EffectSsInit Effect_Ss_Dead_Dd_InitVars;
extern EffectSsInit Effect_Ss_Dead_Ds_InitVars;
extern EffectSsInit Effect_Ss_Ice_Smoke_InitVars;
extern EffectSsInit Effect_En_Ice_Block_InitVars;
extern EffectSsInit Effect_Ss_Sbn_InitVars;
extern TransitionInit TransitionFade_InitVars;
extern TransitionInit TransitionTriforce_InitVars;
extern TransitionInit TransitionWipe1_InitVars;

32
include/segment_symbols.h
View File

@ -88,43 +88,11 @@ DECLARE_OVERLAY_SEGMENT(player_actor)
#undef DEFINE_ACTOR_INTERNAL
#undef DEFINE_ACTOR_UNSET
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dust)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Kirakira)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bomb2)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Blast)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Spk)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_D_Fire)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Bubble)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Ripple)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Splash)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_G_Fire)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Lightning)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dt_Bubble)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Hahen)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Stick)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sibuki)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Stone1)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Hitmark)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Fhg_Flash)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_K_Fire)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Solder_Srch_Ball)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Kakera)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Ice_Piece)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_En_Ice)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Fire_Tail)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_En_Fire)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Extra)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Db)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Dd)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Dead_Ds)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Ice_Smoke)
DECLARE_OVERLAY_SEGMENT(Effect_En_Ice_Block)
DECLARE_OVERLAY_SEGMENT(fbdemo_triforce)
DECLARE_OVERLAY_SEGMENT(fbdemo_wipe1)
DECLARE_OVERLAY_SEGMENT(fbdemo_wipe3)
DECLARE_OVERLAY_SEGMENT(fbdemo_wipe4)
DECLARE_OVERLAY_SEGMENT(fbdemo_wipe5)
DECLARE_OVERLAY_SEGMENT(Effect_Ss_Sbn)
#define DEFINE_OBJECT(name, _enumValue) DECLARE_ROM_SEGMENT(name)
#define DEFINE_OBJECT_UNSET(_enumValue)

48
include/tables/effect_ss_table.h Normal file
View File

@ -0,0 +1,48 @@
/**
* Effect Soft Sprite Table
*
* DEFINE_EFFECT_SS should be used for normal effects soft sprites
* - Argument 0: Name of the effect (without the ovl_ part)
* - Argument 1: Enum value for this effect
*
* DEFINE_EFFECT_SS_UNSET is needed to define empty entries from the original game
*/
/* 0x00 */ DEFINE_EFFECT_SS(Effect_Ss_Dust, EFFECT_SS_DUST)
/* 0x01 */ DEFINE_EFFECT_SS(Effect_Ss_Kirakira, EFFECT_SS_KIRAKIRA)
/* 0x02 */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_02)
/* 0x03 */ DEFINE_EFFECT_SS(Effect_Ss_Bomb2, EFFECT_SS_BOMB2)
/* 0x04 */ DEFINE_EFFECT_SS(Effect_Ss_Blast, EFFECT_SS_BLAST)
/* 0x05 */ DEFINE_EFFECT_SS(Effect_Ss_G_Spk, EFFECT_SS_G_SPK)
/* 0x06 */ DEFINE_EFFECT_SS(Effect_Ss_D_Fire, EFFECT_SS_D_FIRE)
/* 0x07 */ DEFINE_EFFECT_SS(Effect_Ss_Bubble, EFFECT_SS_BUBBLE)
/* 0x08 */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_08)
/* 0x09 */ DEFINE_EFFECT_SS(Effect_Ss_G_Ripple, EFFECT_SS_G_RIPPLE)
/* 0x0A */ DEFINE_EFFECT_SS(Effect_Ss_G_Splash, EFFECT_SS_G_SPLASH)
/* 0x0B */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_0B)
/* 0x0C */ DEFINE_EFFECT_SS(Effect_Ss_G_Fire, EFFECT_SS_G_FIRE)
/* 0x0D */ DEFINE_EFFECT_SS(Effect_Ss_Lightning, EFFECT_SS_LIGHTNING)
/* 0x0E */ DEFINE_EFFECT_SS(Effect_Ss_Dt_Bubble, EFFECT_SS_DT_BUBBLE)
/* 0x0F */ DEFINE_EFFECT_SS(Effect_Ss_Hahen, EFFECT_SS_HAHEN)
/* 0x10 */ DEFINE_EFFECT_SS(Effect_Ss_Stick, EFFECT_SS_STICK)
/* 0x11 */ DEFINE_EFFECT_SS(Effect_Ss_Sibuki, EFFECT_SS_SIBUKI)
/* 0x12 */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_12)
/* 0x13 */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_13)
/* 0x14 */ DEFINE_EFFECT_SS(Effect_Ss_Stone1, EFFECT_SS_STONE1)
/* 0x15 */ DEFINE_EFFECT_SS(Effect_Ss_Hitmark, EFFECT_SS_HITMARK)
/* 0x16 */ DEFINE_EFFECT_SS(Effect_Ss_Fhg_Flash, EFFECT_SS_FHG_FLASH)
/* 0x17 */ DEFINE_EFFECT_SS(Effect_Ss_K_Fire, EFFECT_SS_K_FIRE)
/* 0x18 */ DEFINE_EFFECT_SS(Effect_Ss_Solder_Srch_Ball, EFFECT_SS_SOLDER_SRCH_BALL)
/* 0x19 */ DEFINE_EFFECT_SS(Effect_Ss_Kakera, EFFECT_SS_KAKERA)
/* 0x1A */ DEFINE_EFFECT_SS(Effect_Ss_Ice_Piece, EFFECT_SS_ICE_PIECE)
/* 0x1B */ DEFINE_EFFECT_SS(Effect_Ss_En_Ice, EFFECT_SS_EN_ICE)
/* 0x1C */ DEFINE_EFFECT_SS(Effect_Ss_Fire_Tail, EFFECT_SS_FIRE_TAIL)
/* 0x1D */ DEFINE_EFFECT_SS(Effect_Ss_En_Fire, EFFECT_SS_EN_FIRE)
/* 0x1E */ DEFINE_EFFECT_SS(Effect_Ss_Extra, EFFECT_SS_EXTRA)
/* 0x1F */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_1F)
/* 0x20 */ DEFINE_EFFECT_SS(Effect_Ss_Dead_Db, EFFECT_SS_DEAD_DB)
/* 0x21 */ DEFINE_EFFECT_SS(Effect_Ss_Dead_Dd, EFFECT_SS_DEAD_DD)
/* 0x22 */ DEFINE_EFFECT_SS(Effect_Ss_Dead_Ds, EFFECT_SS_DEAD_DS)
/* 0x23 */ DEFINE_EFFECT_SS_UNSET(EFFECT_SS_UNSET_23)
/* 0x24 */ DEFINE_EFFECT_SS(Effect_Ss_Ice_Smoke, EFFECT_SS_ICE_SMOKE)
/* 0x25 */ DEFINE_EFFECT_SS(Effect_En_Ice_Block, EFFECT_EN_ICE_BLOCK)
/* 0x26 */ DEFINE_EFFECT_SS(Effect_Ss_Sbn, EFFECT_SS_SBN)

55
include/z64effect.h
View File

@ -2,6 +2,7 @@
#define Z64EFFECT_H
#include "PR/ultratypes.h"
#include "libc/stdint.h"
#include "color.h"
#include "z64light.h"
#include "z64math.h"
@ -9,6 +10,8 @@
struct GraphicsContext;
struct PlayState;
struct Actor;
struct CollisionPoly;
#define SPARK_COUNT 3
#define BLURE_COUNT 25
@ -181,7 +184,7 @@ typedef struct {
/* 0x08 */ Vec3s p2;
/* 0x0E */ s16 life;
/* 0x10 */ UNK_TYPE1 pad10[0x4];
/* 0x14 */ CollisionPoly* colPoly;
/* 0x14 */ struct CollisionPoly* colPoly;
} EffectTireMarkElement; // size = 0x18
typedef struct {
@ -265,7 +268,7 @@ typedef struct EffectSs {
/* 0x28 */ EffectSsDrawFunc draw;
/* 0x2C */ Vec3f vec;
/* 0x38 */ void* gfx;
/* 0x3C */ Actor* actor;
/* 0x3C */ struct Actor* actor;
/* 0x40 */ s16 regs[13]; // These are particle-specific
/* 0x5A */ u16 flags; // bit 0: set if this entry is not considered free on a priority tie bit 1: ? bit 2: ?
/* 0x5C */ s16 life; // -1 means this entry is free
@ -279,47 +282,15 @@ typedef struct {
/* 0x8 */ s32 size;
} EffectSsInfo; // size = 0xC
typedef enum {
/* 0x00 */ EFFECT_SS_DUST,
/* 0x01 */ EFFECT_SS_KIRAKIRA,
/* 0x02 */ EFFECT_SS_UNSET_02, // Deleted
/* 0x03 */ EFFECT_SS_BOMB2,
/* 0x04 */ EFFECT_SS_BLAST,
/* 0x05 */ EFFECT_SS_G_SPK,
/* 0x06 */ EFFECT_SS_D_FIRE,
/* 0x07 */ EFFECT_SS_BUBBLE,
/* 0x08 */ EFFECT_SS_UNSET_08, // Deleted
/* 0x09 */ EFFECT_SS_G_RIPPLE,
/* 0x0A */ EFFECT_SS_G_SPLASH,
/* 0x0B */ EFFECT_SS_UNSET_0B,
/* 0x0C */ EFFECT_SS_G_FIRE,
/* 0x0D */ EFFECT_SS_LIGHTNING,
/* 0x0E */ EFFECT_SS_DT_BUBBLE,
/* 0x0F */ EFFECT_SS_HAHEN,
/* 0x10 */ EFFECT_SS_STICK,
/* 0x11 */ EFFECT_SS_SIBUKI,
/* 0x12 */ EFFECT_SS_UNSET_12, // Deleted
/* 0x13 */ EFFECT_SS_UNSET_13, // Deleted
/* 0x14 */ EFFECT_SS_STONE1,
/* 0x15 */ EFFECT_SS_HITMARK,
/* 0x16 */ EFFECT_SS_FHG_FLASH,
/* 0x17 */ EFFECT_SS_K_FIRE,
/* 0x18 */ EFFECT_SS_SOLDER_SRCH_BALL,
/* 0x19 */ EFFECT_SS_KAKERA,
/* 0x1A */ EFFECT_SS_ICE_PIECE,
/* 0x1B */ EFFECT_SS_EN_ICE,
/* 0x1C */ EFFECT_SS_FIRE_TAIL,
/* 0x1D */ EFFECT_SS_EN_FIRE,
/* 0x1E */ EFFECT_SS_EXTRA,
/* 0x1F */ EFFECT_SS_UNSET_1F, // Deleted
/* 0x20 */ EFFECT_SS_DEAD_DB,
/* 0x21 */ EFFECT_SS_DEAD_DD,
/* 0x22 */ EFFECT_SS_DEAD_DS,
/* 0x23 */ EFFECT_SS_UNSET_23, // Deleted
/* 0x24 */ EFFECT_SS_ICE_SMOKE,
/* 0x25 */ EFFECT_EN_ICE_BLOCK,
/* 0x26 */ EFFECT_SS_SBN,
#define DEFINE_EFFECT_SS(_name, enumValue) enumValue,
#define DEFINE_EFFECT_SS_UNSET(enumValue) enumValue,
typedef enum EffectSsType {
#include "tables/effect_ss_table.h"
/* 0x27 */ EFFECT_SS_MAX
} EffectSsType;
#undef DEFINE_EFFECT_SS
#undef DEFINE_EFFECT_SS_UNSET
#endif

1
include/z64light.h
View File

@ -4,6 +4,7 @@
#include "ultra64.h"
#include "PR/gbi.h"
#include "color.h"
#include "z64math.h"
struct PlayState;

1
src/code/sched.c
View File

@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#define RSP_DONE_MSG 667

1
src/code/z_bgcheck.c
View File

@ -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
src/code/z_demo.c
View File

@ -1,4 +1,3 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "z64quake.h"
#include "z64rumble.h"

78
src/code/z_effect_soft_sprite_dlftbls.c
View File

@ -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

2
src/code/z_player_lib.c
View File

@ -1,3 +1,5 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "objects/gameplay_keep/gameplay_keep.h"

1
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
View File

@ -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"

1
src/overlays/actors/ovl_Boss_02/z_boss_02.c
View File

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

1
src/overlays/actors/ovl_En_Bat/z_en_bat.c
View File

@ -4,6 +4,7 @@
* Description: Bad Bat
*/
#include "prevent_bss_reordering.h"
#include "z_en_bat.h"
#include "objects/object_bat/object_bat.h"

1
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
View File

@ -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"

1
src/overlays/actors/ovl_En_Test3/z_en_test3.c
View File

@ -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"

2
src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.h
View File

@ -56,6 +56,4 @@ typedef struct ObjDriftice {
/* 0x24C */ s32 unk_24C;
} ObjDriftice; // size = 0x250
extern ActorInit Obj_Driftice_InitVars;
#endif // Z_OBJ_DRIFTICE_H

2
src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_En_Ice_Block/z_eff_en_ice_block.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.c
View File

@ -73,7 +73,7 @@ static TexturePtr sTextures[] = {
gEffHitmarkWhiteMetal8Tex,
};
const EffectSsInit Effect_Ss_Hitmark_InitVars = {
EffectSsInit Effect_Ss_Hitmark_InitVars = {
EFFECT_SS_HITMARK,
EffectSsHitmark_Init,
};

2
src/overlays/effects/ovl_Effect_Ss_Hitmark/z_eff_ss_hitmark.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Kirakira/z_eff_ss_kirakira.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Sbn/z_eff_ss_sbn.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
View File

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

2
src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
View File

@ -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,
};

2
src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h
View File

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