pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Effect Naming (#632)

Browse Source 
* name big_smoke_puff

* 0-5

* 6 -> land

* more effect stuff

* flower effects

* name fix

* cloud_puff

* flower splash

* cloud_trail

* 2 more

* more

* a bunch more

* -2F

* more

* the rest

* cleanup and the rest

* PR stuffs
This commit is contained in:
Ethan Roseman 2022-01-24 11:58:33 -05:00 committed by GitHub
parent ee0918018d
commit 9fa9639575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
983 changed files with 11495 additions and 10526 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/dead.h
View File

@ -10,7 +10,7 @@
#define evt_get_float_variable dead_evt_get_float_variable #define evt_get_float_variable dead_evt_get_float_variable
#define cos_rad dead_cos_rad #define cos_rad dead_cos_rad
#define evt_set_float_variable dead_evt_set_float_variable #define evt_set_float_variable dead_evt_set_float_variable
#define playFX_11 dead_playFX_11 #define fx_sparkles dead_fx_sparkles
#define gPlayerStatusPtr dead_gPlayerStatusPtr #define gPlayerStatusPtr dead_gPlayerStatusPtr
#define set_main_pan_u dead_set_main_pan_u #define set_main_pan_u dead_set_main_pan_u
#define set_main_pan_v dead_set_main_pan_v #define set_main_pan_v dead_set_main_pan_v
@ -46,19 +46,19 @@
#define gPartnerActionStatus dead_gPartnerActionStatus #define gPartnerActionStatus dead_gPartnerActionStatus
#define get_npc_safe dead_get_npc_safe #define get_npc_safe dead_get_npc_safe
#define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos #define sfx_adjust_env_sound_pos dead_sfx_adjust_env_sound_pos
#define playFX_83 dead_playFX_83 #define fx_star_spirits_energy dead_fx_star_spirits_energy
#define heap_malloc dead_heap_malloc #define heap_malloc dead_heap_malloc
#define update_lerp dead_update_lerp #define update_lerp dead_update_lerp
#define create_shadow_type dead_create_shadow_type #define create_shadow_type dead_create_shadow_type
#define playFX_7B dead_playFX_7B #define fx_spirit_card dead_fx_spirit_card
#define dist3D dead_dist3D #define dist3D dead_dist3D
#define subtract_hp dead_subtract_hp #define subtract_hp dead_subtract_hp
#define get_entity_by_index dead_get_entity_by_index #define get_entity_by_index dead_get_entity_by_index
#define playFX_52 dead_playFX_52 #define fx_energy_orb_wave dead_fx_energy_orb_wave
#define playFX_33 dead_playFX_33 #define fx_radial_shimmer dead_fx_radial_shimmer
#define set_screen_overlay_color dead_set_screen_overlay_color #define set_screen_overlay_color dead_set_screen_overlay_color
#define set_screen_overlay_params_front dead_set_screen_overlay_params_front #define set_screen_overlay_params_front dead_set_screen_overlay_params_front
#define playFX_82 dead_playFX_82 #define fx_sun dead_fx_sun
#define set_message_images dead_set_message_images #define set_message_images dead_set_message_images
#define general_heap_free dead_general_heap_free #define general_heap_free dead_general_heap_free
#define decode_yay0 dead_decode_yay0 #define decode_yay0 dead_decode_yay0

581
include/effects.h
View File

@ -5,132 +5,141 @@
#include "common_structs.h" #include "common_structs.h"
enum EffectID { enum EffectID {
EFFECT_ID_00 = 0x00, EFFECT_00 = 0x00,
EFFECT_ID_01, EFFECT_BIG_SMOKE_PUFF,
EFFECT_ID_06 = 0x06, EFFECT_02, // unused
EFFECT_ID_07, EFFECT_03, // unused
EFFECT_ID_08, EFFECT_04, // unused
EFFECT_ID_09, EFFECT_05, // unused
EFFECT_ID_0A, EFFECT_LANDING_DUST,
EFFECT_ID_0B, EFFECT_WALKING_DUST,
EFFECT_ID_0C, EFFECT_FLOWER_SPLASH,
EFFECT_ID_0D, EFFECT_FLOWER_TRAIL,
EFFECT_ID_0E, EFFECT_CLOUD_PUFF,
EFFECT_ID_0F, EFFECT_CLOUD_TRAIL,
EFFECT_ID_10, EFFECT_FOOTPRINT,
EFFECT_ID_11, EFFECT_FLOATING_FLOWER,
EFFECT_ID_12, EFFECT_SNOWFLAKE,
EFFECT_ID_13, EFFECT_STAR,
EFFECT_ID_14, EFFECT_EMOTE,
EFFECT_ID_15, EFFECT_SPARKLES,
EFFECT_ID_16, EFFECT_SHAPE_SPELL,
EFFECT_ID_17, EFFECT_GATHER_ENERGY_PINK,
EFFECT_ID_18, EFFECT_DROP_LEAVES,
EFFECT_ID_19, EFFECT_DUST,
EFFECT_ID_1A, EFFECT_SHATTERING_STONES,
EFFECT_ID_1B, EFFECT_SMOKE_RING,
EFFECT_ID_1C, EFFECT_DAMAGE_STARS,
EFFECT_ID_1D, EFFECT_EXPLOSION,
EFFECT_ID_1E, EFFECT_LENS_FLARE,
EFFECT_ID_1F, EFFECT_GOT_ITEM_OUTLINE,
EFFECT_ID_20, EFFECT_SPIKY_WHITE_AURA,
EFFECT_ID_21, EFFECT_SMOKE_IMPACT,
EFFECT_ID_22, EFFECT_DAMAGE_INDICATOR,
EFFECT_ID_23, EFFECT_PURPLE_RING,
EFFECT_ID_24, EFFECT_FLAME,
EFFECT_ID_25, EFFECT_STARS_BURST,
EFFECT_ID_26, EFFECT_STARS_SHIMMER,
EFFECT_ID_27, EFFECT_RISING_BUBBLE,
EFFECT_ID_28, EFFECT_RING_BLAST,
EFFECT_ID_29, EFFECT_SHOCKWAVE,
EFFECT_ID_2B = 0x2B, EFFECT_MUSIC_NOTE,
EFFECT_ID_2C, EFFECT_SMOKE_BURST,
EFFECT_ID_2D, EFFECT_SWEAT,
EFFECT_ID_2E, EFFECT_SLEEP_BUBBLE,
EFFECT_ID_2F, EFFECT_2A, // unused
EFFECT_ID_30, EFFECT_WINDY_LEAVES,
EFFECT_ID_31, EFFECT_FALLING_LEAVES,
EFFECT_ID_32, EFFECT_STARS_SPREAD,
EFFECT_ID_33, EFFECT_STEAM_BURST,
EFFECT_ID_34, EFFECT_STARS_ORBITING,
EFFECT_ID_35, EFFECT_BIG_SNOWFLAKES,
EFFECT_ID_36, EFFECT_DEBUFF,
EFFECT_ID_37, EFFECT_GREEN_IMPACT,
EFFECT_ID_38, EFFECT_RADIAL_SHIMMER,
EFFECT_ID_39, EFFECT_ENDING_DECALS,
EFFECT_ID_3A, EFFECT_LIGHT_RAYS,
EFFECT_ID_3B, EFFECT_LIGHTNING,
EFFECT_ID_3C, EFFECT_FIRE_BREATH,
EFFECT_ID_3D, EFFECT_SHIMMER_BURST,
EFFECT_ID_3E, EFFECT_ENERGY_SHOCKWAVE,
EFFECT_ID_3F, EFFECT_SHIMMER_WAVE,
EFFECT_ID_40, EFFECT_AURA,
EFFECT_ID_41, EFFECT_3C,
EFFECT_ID_42, EFFECT_3D,
EFFECT_ID_43, EFFECT_BLAST,
EFFECT_ID_44, EFFECT_FIRE_FLOWER,
EFFECT_ID_45, EFFECT_RECOVER,
EFFECT_ID_46, EFFECT_DISABLE_X,
EFFECT_ID_47, EFFECT_BOMBETTE_BREAKING,
EFFECT_ID_48, EFFECT_FIREWORK,
EFFECT_ID_49, EFFECT_CONFETTI,
EFFECT_ID_4A, EFFECT_SNOWFALL,
EFFECT_ID_4B, EFFECT_46,
EFFECT_ID_4C, EFFECT_GATHER_MAGIC,
EFFECT_ID_4D, EFFECT_ATTACK_RESULT_TEXT,
EFFECT_ID_4E, EFFECT_SMALL_GOLD_SPARKLE,
EFFECT_ID_4F, EFFECT_FLASHING_BOX_SHOCKWAVE,
EFFECT_ID_51 = 0x51, EFFECT_BALLOON,
EFFECT_ID_52, EFFECT_FLOATING_ROCK,
EFFECT_ID_53, EFFECT_CHOMP_DROP,
EFFECT_ID_55 = 0x55, EFFECT_QUIZMO_STAGE,
EFFECT_ID_56, EFFECT_RADIATING_ENERGY_ORB,
EFFECT_ID_57, EFFECT_QUIZMO_ANSWER, // unused
EFFECT_ID_58, EFFECT_MOTION_BLUR_FLAME,
EFFECT_ID_59, EFFECT_ENERGY_ORB_WAVE,
EFFECT_ID_5A, EFFECT_MERLIN_HOUSE_STARS,
EFFECT_ID_5B, EFFECT_QUIZMO_AUDIENCE, // unused
EFFECT_ID_5C, EFFECT_BUTTERFLIES,
EFFECT_ID_5D, EFFECT_STAT_CHANGE,
EFFECT_ID_5E, EFFECT_SNAKING_STATIC,
EFFECT_ID_5F, EFFECT_THUNDERBOLT_RING,
EFFECT_ID_60, EFFECT_SQUIRT,
EFFECT_ID_61, EFFECT_WATER_BLOCK,
EFFECT_ID_62, EFFECT_WATERFALL,
EFFECT_ID_63, EFFECT_WATER_FOUNTAIN,
EFFECT_ID_64, EFFECT_UNDERWATER,
EFFECT_ID_65, EFFECT_LIGHTNING_BOLT,
EFFECT_ID_66, EFFECT_WATER_SPLASH,
EFFECT_ID_67, EFFECT_SNOWMAN_DOLL,
EFFECT_ID_68, EFFECT_FRIGHT_JAR,
EFFECT_ID_69, EFFECT_STOP_WATCH,
EFFECT_ID_6B = 0x6B, EFFECT_63,
EFFECT_ID_6C, EFFECT_THROW_SPINY,
EFFECT_ID_6D, EFFECT_65,
EFFECT_ID_6E, EFFECT_TUBBA_HEART_ATTACK,
EFFECT_ID_6F, EFFECT_WHIRLWIND,
EFFECT_ID_70, EFFECT_RED_IMPACT,
EFFECT_ID_71, EFFECT_FLOATING_CLOUD_PUFF,
EFFECT_ID_72, EFFECT_6A, // unused
EFFECT_ID_73, EFFECT_ENERGY_IN_OUT,
EFFECT_ID_74, EFFECT_TATTLE_WINDOW,
EFFECT_ID_75, EFFECT_SHINY_FLARE,
EFFECT_ID_77 = 0x77, EFFECT_HUFF_PUFF_BREATH,
EFFECT_ID_78, EFFECT_COLD_BREATH,
EFFECT_ID_79, EFFECT_EMBERS,
EFFECT_ID_7A, EFFECT_HIEROGLYPHS,
EFFECT_ID_7B, EFFECT_MISC_PARTICLES,
EFFECT_ID_7C, EFFECT_STATIC_STATUS,
EFFECT_ID_7D, EFFECT_MOVING_CLOUD,
EFFECT_ID_7E, EFFECT_75,
EFFECT_ID_7F, EFFECT_76, // unused
EFFECT_ID_80, EFFECT_FIREWORK_ROCKET,
EFFECT_ID_81, EFFECT_PEACH_STAR_BEAM,
EFFECT_ID_82, EFFECT_CHAPTER_CHANGE,
EFFECT_ID_83, EFFECT_ICE_SHARD,
EFFECT_ID_84, EFFECT_SPIRIT_CARD,
EFFECT_ID_85, EFFECT_LIL_OINK,
EFFECT_ID_86, EFFECT_SOMETHING_ROTATING,
EFFECT_BREAKING_JUNK,
EFFECT_PARTNER_BUFF,
EFFECT_QUIZMO_ASSISTANT,
EFFECT_ICE_PILLAR,
EFFECT_SUN,
EFFECT_STAR_SPIRITS_ENERGY,
EFFECT_PINK_SPARKLES,
EFFECT_STAR_OUTLINE,
EFFECT_86,
}; };
typedef struct { typedef struct {
@ -194,7 +203,7 @@ typedef struct StarSpiritEffect {
/* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54; /* 0x54 */ struct StarSpiritEffectUnkStruct* unk_54;
} StarSpiritEffect; // size = 0x58 } StarSpiritEffect; // size = 0x58
typedef struct Effect1 { typedef struct BigSmokePuffFXData {
/* 0x00 */ s16 unk_00; /* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02; /* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04; /* 0x04 */ s16 unk_04;
@ -208,9 +217,9 @@ typedef struct Effect1 {
/* 0x20 */ f32 unk_20; /* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24; /* 0x24 */ f32 unk_24;
/* 0x28 */ char unk_28[0x4]; /* 0x28 */ char unk_28[0x4];
} Effect1; // size = 0x2C } BigSmokePuffFXData; // size = 0x2C
typedef struct Effect6 { typedef struct LandingDustFXData {
/* 0x00 */ u16 type; /* 0x00 */ u16 type;
/* 0x02 */ char unk_02[0x2]; /* 0x02 */ char unk_02[0x2];
/* 0x04 */ f32 x; /* 0x04 */ f32 x;
@ -229,9 +238,9 @@ typedef struct Effect6 {
/* 0x38 */ s32 unk_38; /* 0x38 */ s32 unk_38;
/* 0x3C */ s32 unk_3C; /* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40; /* 0x40 */ s32 unk_40;
} Effect6; // size = 0x44 } LandingDustFXData; // size = 0x44
typedef struct Effect7 { typedef struct WalkingDustFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ u16 unk_04; /* 0x04 */ u16 unk_04;
/* 0x08 */ f32 unk_08; /* 0x08 */ f32 unk_08;
@ -246,10 +255,10 @@ typedef struct Effect7 {
/* 0x6C */ s32 unk_6C; /* 0x6C */ s32 unk_6C;
/* 0x70 */ s32 unk_70; /* 0x70 */ s32 unk_70;
/* 0x74 */ s32 unk_74; /* 0x74 */ s32 unk_74;
} Effect7; // size = 0x78 } WalkingDustFXData; // size = 0x78
// Used by effects 8 and 9 (TODO: better name) // Used by both flower_splash and flower_trail
typedef struct Effect8 { typedef struct FlowerFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ u16 unk_04; /* 0x04 */ u16 unk_04;
/* 0x06 */ s16 unk_06; /* 0x06 */ s16 unk_06;
@ -276,9 +285,9 @@ typedef struct Effect8 {
/* 0x8C */ f32 unk_8C; /* 0x8C */ f32 unk_8C;
/* 0x90 */ f32 unk_90; /* 0x90 */ f32 unk_90;
/* 0x94 */ f32 unk_94; /* 0x94 */ f32 unk_94;
} Effect8; // size = 0x98 } FlowerFXData; // size = 0x98
typedef struct Effect10 { typedef struct CloudPuffFXData {
/* 0x00 */ s32 alive; /* 0x00 */ s32 alive;
/* 0x04 */ char unk_04[0x2]; /* 0x04 */ char unk_04[0x2];
/* 0x06 */ s16 lifetime; /* 0x06 */ s16 lifetime;
@ -300,9 +309,9 @@ typedef struct Effect10 {
/* 0x40 */ s32 unk_40; /* 0x40 */ s32 unk_40;
/* 0x44 */ f32 unk_44; /* 0x44 */ f32 unk_44;
/* 0x48 */ f32 unk_48; /* 0x48 */ f32 unk_48;
} Effect10; // size = 0x4C } CloudPuffFXData; // size = 0x4C
typedef struct Effect11 { typedef struct CloudTrailFXData {
/* 0x00 */ s32 alive; /* 0x00 */ s32 alive;
/* 0x04 */ u16 unk_04; /* 0x04 */ u16 unk_04;
/* 0x06 */ s16 lifetime; /* 0x06 */ s16 lifetime;
@ -324,9 +333,9 @@ typedef struct Effect11 {
/* 0x40 */ f32 unk_40; /* 0x40 */ f32 unk_40;
/* 0x44 */ s32 unk_44; /* 0x44 */ s32 unk_44;
/* 0x48 */ char unk_48[0x8]; /* 0x48 */ char unk_48[0x8];
} Effect11; // size = 0x50 } CloudTrailFXData; // size = 0x50
typedef struct Effect12 { typedef struct FootprintFXData {
/* 0x00 */ s32 alive; /* 0x00 */ s32 alive;
/* 0x04 */ char unk_04[0x2]; /* 0x04 */ char unk_04[0x2];
/* 0x06 */ s16 lifetime; /* 0x06 */ s16 lifetime;
@ -350,9 +359,9 @@ typedef struct Effect12 {
/* 0x88 */ char unk_88[0x8]; /* 0x88 */ char unk_88[0x8];
/* 0x90 */ f32 unk_90; /* 0x90 */ f32 unk_90;
/* 0x94 */ f32 unk_94; /* 0x94 */ f32 unk_94;
} Effect12; // size = 0x98 } FootprintFXData; // size = 0x98
typedef struct Effect13 { typedef struct FloatingFlowerFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ f32 unk_04; /* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08; /* 0x08 */ f32 unk_08;
@ -371,9 +380,9 @@ typedef struct Effect13 {
/* 0x3C */ s32 unk_3C; /* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40; /* 0x40 */ s32 unk_40;
/* 0x44 */ s32 unk_44; /* 0x44 */ s32 unk_44;
} Effect13; // size = 0x48 } FloatingFlowerFXData; // size = 0x48
typedef struct Effect14 { typedef struct SnowflakeFXData {
/* 0x00 */ f32 xPos; /* 0x00 */ f32 xPos;
/* 0x04 */ f32 yPos; /* 0x04 */ f32 yPos;
/* 0x08 */ f32 zPos; /* 0x08 */ f32 zPos;
@ -385,9 +394,9 @@ typedef struct Effect14 {
/* 0x20 */ f32 unk_20; /* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24; /* 0x24 */ f32 unk_24;
/* 0x28 */ s32 unk_28; /* 0x28 */ s32 unk_28;
} Effect14; // size = 0x2C } SnowflakeFXData; // size = 0x2C
typedef struct Effect15 { typedef struct StarFXData {
/* 0x000 */ s32 unk_00; /* 0x000 */ s32 unk_00;
/* 0x004 */ f32 unk_04; /* 0x004 */ f32 unk_04;
/* 0x008 */ f32 unk_08; /* 0x008 */ f32 unk_08;
@ -409,9 +418,9 @@ typedef struct Effect15 {
/* 0x244 */ s32 unk_244; /* 0x244 */ s32 unk_244;
/* 0x248 */ s32 unk_248; /* 0x248 */ s32 unk_248;
/* 0x24C */ s32 unk_24C; /* 0x24C */ s32 unk_24C;
} Effect15; // size = 0x250 } StarFXData; // size = 0x250
typedef struct Effect16 { typedef struct EmoteFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ f32 unk_04; /* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08; /* 0x08 */ f32 unk_08;
@ -428,9 +437,9 @@ typedef struct Effect16 {
/* 0x34 */ s32 unk_34; /* 0x34 */ s32 unk_34;
/* 0x38 */ s32 unk_38; /* 0x38 */ s32 unk_38;
/* 0x3C */ s32 unk_3C; /* 0x3C */ s32 unk_3C;
} Effect16; // size = 0x40 } EmoteFXData; // size = 0x40
typedef struct Effect73 { typedef struct SmallGoldSparkleFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04; /* 0x04 */ s32 unk_04;
/* 0x08 */ f32 unk_08; /* 0x08 */ f32 unk_08;
@ -440,9 +449,9 @@ typedef struct Effect73 {
/* 0x18 */ s32 unk_18; /* 0x18 */ s32 unk_18;
/* 0x1C */ f32 unk_1C; /* 0x1C */ f32 unk_1C;
/* 0x20 */ s32 unk_20; /* 0x20 */ s32 unk_20;
} Effect73; // size = 0x24 } SmallGoldSparkleFXData; // size = 0x24
typedef struct Effect75 { typedef struct BalloonFXData {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
/* 0x04 */ f32 unk_04; /* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08; /* 0x08 */ f32 unk_08;
@ -452,7 +461,7 @@ typedef struct Effect75 {
/* 0x18 */ f32 unk_18; /* 0x18 */ f32 unk_18;
/* 0x1C */ s32 unk_1C; /* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20; /* 0x20 */ s32 unk_20;
} Effect75; // size = 0x24 } BalloonFXData; // size = 0x24
typedef struct Effect134 { typedef struct Effect134 {
/* 0x00 */ s32 unk_00; /* 0x00 */ s32 unk_00;
@ -472,9 +481,9 @@ typedef struct Effect134 {
} Effect134; // size = 0x38 } Effect134; // size = 0x38
// TODO figure out what this actually is // TODO figure out what this actually is
// playFX_4E invokes gEffectTable[78]'s entryPoint function // fx_quizmo_stage invokes gEffectTable[78]'s entryPoint function
// playFX_6F invokes gEffectTable[111]'s entryPoint function // fx_cold_breath invokes gEffectTable[111]'s entryPoint function
// playFX_83 invokes gEffectTable[131]'s entryPoint function // fx_star_spirits_energy invokes gEffectTable[131]'s entryPoint function
// These functions are currently typed to return void // These functions are currently typed to return void
// Assume they return an Effect*, and this struct is accessed at unk_0C, // Assume they return an Effect*, and this struct is accessed at unk_0C,
// but this struct differs from EffectInstanceData // but this struct differs from EffectInstanceData
@ -607,140 +616,136 @@ EffectInstance* create_effect_instance(EffectBlueprint* effectBp);
void remove_effect(EffectInstance*); void remove_effect(EffectInstance*);
s32 load_effect(s32 effectIndex); s32 load_effect(s32 effectIndex);
void playFX_00(s32, f32, f32, f32, s32); void fx_big_dust_puff(s32, f32, f32, f32, s32);
void playFX_01(f32, f32, f32); void fx_big_smoke_puff(f32, f32, f32);
void playFX_02(s32, f32, f32, f32, s32); void fx_landing_dust(s32, f32, f32, f32, f32);
EffectInstance* playFX_03(s32, f32, f32, f32, s32); void fx_walking_dust(s32, f32, f32, f32, f32, f32);
EffectInstance* playFX_04(s32, f32, f32, f32, s32); void fx_flower_splash(f32, f32, f32, f32);
EffectInstance* playFX_05(s32, f32, f32, f32, s32); void fx_flower_trail(s32, f32, f32, f32, f32, f32);
void fx_land(s32, f32, f32, f32, f32); EffectInstance* fx_cloud_puff(f32, f32, f32, f32);
void fx_walk(s32, f32, f32, f32, f32, f32); EffectInstance* fx_cloud_trail(s32, f32, f32, f32);
void playFX_08(f32, f32, f32, f32); EffectInstance* fx_footprint(f32, f32, f32, f32, f32);
void playFX_09(s32, f32, f32, f32, f32, f32); EffectInstance* fx_floating_flower(s32, f32, f32, f32, s32);
EffectInstance* playFX_0A(f32, f32, f32, f32); EffectInstance* fx_snowflake(f32, f32, f32, s32);
EffectInstance* playFX_0B(s32, f32, f32, f32); void fx_star(s32, f32, f32, f32, f32, f32, f32, f32);
EffectInstance* playFX_0C(f32, f32, f32, f32, f32);
EffectInstance* playFX_0D(s32, f32, f32, f32, s32);
EffectInstance* playFX_0E(f32, f32, f32, s32);
void playFX_0F(s32, f32, f32, f32, f32, f32, f32, f32);
void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*); void fx_emote(s32, Npc*, f32, f32, f32, f32, f32, s32, s32*);
void playFX_11(s32, f32, f32, f32, f32); void fx_sparkles(s32, f32, f32, f32, f32);
EffectInstance* playFX_12(s32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_shape_spell(s32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_13(s32, f32, f32, f32, f32, s32); EffectInstance* fx_gather_energy_pink(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_14(s32, f32, f32, f32, s32); EffectInstance* fx_drop_leaves(s32, f32, f32, f32, s32);
EffectInstance* playFX_15(s32, f32, f32, f32, s32); EffectInstance* fx_dust(s32, f32, f32, f32, s32);
EffectInstance* playFX_16(s32, f32, f32, f32, f32); EffectInstance* fx_shattering_stones(s32, f32, f32, f32, f32);
void playFX_17(s32, f32, f32, f32); void fx_smoke_ring(s32, f32, f32, f32);
void playFX_18(s32, f32, f32, f32, f32, f32, f32, s32); void fx_damage_stars(s32, f32, f32, f32, f32, f32, f32, s32);
void playFX_19(s32, f32, f32, f32); void fx_explosion(s32, f32, f32, f32);
EffectInstance* playFX_1A(s32, f32, f32, f32, s32); EffectInstance* fx_lens_flare(s32, f32, f32, f32, s32);
EffectInstance* playFX_1B(s32, f32, f32, f32, f32, s32*); EffectInstance* fx_got_item_outline(s32, f32, f32, f32, f32, s32*);
EffectInstance* playFX_1C(s32, f32, f32, f32, s32); EffectInstance* fx_spiky_white_aura(s32, f32, f32, f32, s32);
void playFX_1D(s32, f32, f32, f32, f32, s32, f32, s32); void fx_smoke_impact(s32, f32, f32, f32, f32, s32, f32, s32);
EffectInstance* playFX_1E(s32, f32, f32, f32, f32, f32, s32, s32*); EffectInstance* fx_damage_indicator(s32, f32, f32, f32, f32, f32, s32, s32*);
EffectInstance* playFX_1F(s32, f32, f32, f32, f32, f32, f32, f32); EffectInstance* fx_purple_ring(s32, f32, f32, f32, f32, f32, f32, f32);
EffectInstance* playFX_20(s32, f32, f32, f32, f32, EffectInstance**); EffectInstance* fx_flame(s32, f32, f32, f32, f32, EffectInstance**);
EffectInstance* playFX_21(s32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_stars_burst(s32, f32, f32, f32, f32, f32, s32);
void playFX_22(s32, f32, f32, f32, f32, f32, s32, s32); void fx_stars_shimmer(s32, f32, f32, f32, f32, f32, s32, s32);
EffectInstance* playFX_23(u32, f32, f32, f32, f32); EffectInstance* fx_rising_bubble(u32, f32, f32, f32, f32);
EffectInstance* playFX_24(s32, f32, f32, f32, f32, s32); EffectInstance* fx_ring_blast(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_25(s32, f32, f32, f32); EffectInstance* fx_shockwave(s32, f32, f32, f32);
void playFX_26(s32, f32, f32, f32); void fx_music_note(s32, f32, f32, f32);
EffectInstance* playFX_27(s32, f32, f32, f32, f32, s32); EffectInstance* fx_smoke_burst(s32, f32, f32, f32, f32, s32);
void fx_sweat(s32, f32 x, f32 y, f32 z, f32, f32, s32); void fx_sweat(s32, f32 x, f32 y, f32 z, f32, f32, s32);
void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32*); void fx_sleep_bubble(s32, f32, f32, f32, f32, f32, s32*);
EffectInstance* playFX_2A(s32, f32, f32, f32); EffectInstance* fx_2A(s32, f32, f32, f32);
EffectInstance* playFX_2B(s32, f32, f32, f32); EffectInstance* fx_windy_leaves(s32, f32, f32, f32);
EffectInstance* playFX_2C(s32, f32, f32, f32); EffectInstance* fx_falling_leaves(s32, f32, f32, f32);
void playFX_2D(s32, f32, f32, f32, s32, s32); void fx_stars_spread(s32, f32, f32, f32, s32, s32);
void playFX_2E(s32, f32, f32, f32, f32, s32); void fx_steam_burst(s32, f32, f32, f32, f32, s32);
void playFX_2F(s32, f32, f32, f32, f32, s32, s32*); void fx_stars_orbiting(s32, f32, f32, f32, f32, s32, s32*);
void playFX_30(s32, f32, f32, f32); void fx_big_snowflakes(s32, f32, f32, f32);
void playFX_31(s32, f32, f32, f32); void fx_debuff(s32, f32, f32, f32);
void playFX_32(s32, f32, f32, f32, f32); void fx_green_impact(s32, f32, f32, f32, f32);
EffectInstance* playFX_33(s32, f32, f32, f32, f32, s32); EffectInstance* fx_radial_shimmer(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_34(s32, f32, f32, f32, f32, s32*); EffectInstance* fx_ending_decals(s32, f32, f32, f32, f32, s32*);
EffectInstance* playFX_35(s32, f32, f32, f32, f32, s32*); EffectInstance* fx_light_rays(s32, f32, f32, f32, f32, s32*);
EffectInstance* playFX_36(s32, f32, f32, f32, f32, f32); EffectInstance* fx_lightning(s32, f32, f32, f32, f32, f32);
EffectInstance* playFX_37(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32); EffectInstance* fx_fire_breath(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32);
EffectInstance* playFX_38(s32, f32, f32, f32, f32, s32); EffectInstance* fx_shimmer_burst(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_39(s32, f32, f32, f32, f32, s32); EffectInstance* fx_energy_shockwave(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_3A(s32, f32, f32, f32, f32, f32, s32, s32); EffectInstance* fx_shimmer_wave(s32, f32, f32, f32, f32, f32, s32, s32);
void playFX_3B(s32, f32, f32, f32, f32, s32*); void fx_aura(s32, f32, f32, f32, f32, s32*);
EffectInstance* playFX_3C(s32, f32, f32, f32, f32, s32*); EffectInstance* fx_3C(s32, f32, f32, f32, f32, s32*);
void playFX_3D(s32, f32, f32, f32, f32, f32, f32, s32, s32*); void fx_3D(s32, f32, f32, f32, f32, f32, f32, s32, s32*);
EffectInstance* playFX_3E(s32, f32, f32, f32, f32, s32); EffectInstance* fx_blast(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_3F(s32, f32, f32, f32, s32); EffectInstance* fx_fire_flower(s32, f32, f32, f32, s32);
EffectInstance* playFX_40(s32, f32, f32, f32, s32); EffectInstance* fx_recover(s32, f32, f32, f32, s32);
EffectInstance* playFX_41(s32, f32, f32, f32, s32); EffectInstance* fx_disable_x(s32, f32, f32, f32, s32);
EffectInstance* playFX_42(s32, s32, s32, f32, s32, s32); EffectInstance* fx_bombette_breaking(s32, s32, s32, f32, s32, s32);
EffectInstance* playFX_43(s32, f32, f32, f32, f32, s32); EffectInstance* fx_firework(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_44(s32, f32, f32, f32, f32, s32); EffectInstance* fx_confetti(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_45(s32, s32); EffectInstance* fx_snowfall(s32, s32);
EffectInstance* playFX_46_whirlwind(s32, EffectWhirlwind*, f32, s32); EffectInstance* fx_46(s32, EffectWhirlwind*, f32, s32);
EffectInstance* playFX_47(s32, f32, f32, f32, f32, s32); EffectInstance* fx_gather_magic(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_48(s32, f32, f32, f32, f32, s32); EffectInstance* fx_attack_result_text(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_49(s32, f32, f32, f32, f32, s32); EffectInstance* fx_small_gold_sparkle(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_4A(s32, f32, f32, f32, f32, f32); EffectInstance* fx_flashing_box_shockwave(s32, f32, f32, f32, f32, f32);
EffectInstance* playFX_4B(s32, f32, f32, f32, f32, s32); EffectInstance* fx_balloon(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_4C(s32, f32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_floating_rock(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_4D(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32); EffectInstance* fx_chomp_drop(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32);
EffectInstance* playFX_4E(s32, f32, f32, f32); EffectInstance* fx_quizmo_stage(s32, f32, f32, f32);
EffectInstance* playFX_4F(s32, f32, f32, f32, f32, s32); EffectInstance* fx_radiating_energy_orb(s32, f32, f32, f32, f32, s32);
void playFX_50(s32, f32, f32, f32); void fx_quizmo_answer(s32, f32, f32, f32);
EffectInstance* playFX_51(s32, f32, f32, f32, f32, s32); EffectInstance* fx_motion_blur_flame(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_52(s32, f32, f32, f32, f32, s32); EffectInstance* fx_energy_orb_wave(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_53(s32, f32, f32, f32); EffectInstance* fx_merlin_house_stars(s32, f32, f32, f32);
EffectInstance* playFX_54(s32, f32, f32, f32); EffectInstance* fx_quizmo_audience(s32, f32, f32, f32);
EffectInstance* playFX_55(s32, f32, f32, f32); EffectInstance* fx_butterflies(s32, f32, f32, f32);
EffectInstance* playFX_56(s32, f32, f32, f32, f32, s32); EffectInstance* fx_stat_change(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_57(s32, f32, f32, f32, f32, s32); EffectInstance* fx_snaking_static(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_58(s32, f32, f32, f32, f32, s32); EffectInstance* fx_thunderbolt_ring(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_59(s32, f32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_squirt(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_5A(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); EffectInstance* fx_water_block(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
EffectInstance* playFX_5B(s32, f32, f32, f32, f32, s32); EffectInstance* fx_waterfall(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_5C(s32, f32, f32, f32, f32, s32); EffectInstance* fx_water_fountain(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_5D(s32, f32, f32, f32, f32, s32); EffectInstance* fx_underwater(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_5E(s32, f32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_lightning_bolt(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_5F(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32); EffectInstance* fx_water_splash(s32, f32 x, f32 y, f32 z, f32 scale /* maybe */, s32);
EffectInstance* playFX_60(s32, f32, f32, f32, f32, s32); EffectInstance* fx_snowman_doll(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_61(s32, f32, f32, f32, f32, s32); EffectInstance* fx_fright_jar(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_62(s32, f32, f32, f32, f32, s32); EffectInstance* fx_stop_watch(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_63(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32); EffectInstance* fx_63(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
EffectInstance* playFX_64(s32, f32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_throw_spiny(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_65(s32, f32, f32, f32, f32, s32); EffectInstance* fx_65(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_66(s32, f32, f32, f32, f32, s32); EffectInstance* fx_tubba_heart_attack(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_67(s32, f32, f32, f32, f32, s32); EffectInstance* fx_whirlwind(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_68(s32, f32, f32, f32, f32, s32); EffectInstance* fx_red_impact(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_69(s32, f32, f32, f32, f32, s32); EffectInstance* fx_floating_cloud_puff(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6A(s32, f32, f32, f32, f32, s32); EffectInstance* fx_6A(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6B(s32, f32, f32, f32, f32, s32); EffectInstance* fx_energy_in_out(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6C(s32, f32, f32, f32, f32, s32); EffectInstance* fx_tattle_window(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6D(s32, f32, f32, f32, f32, s32); EffectInstance* fx_shiny_flare(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6E(s32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_huff_puff_breath(s32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_6F(s32, f32, f32, f32, f32, s32); EffectInstance* fx_cold_breath(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_70(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32); EffectInstance* fx_embers(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32);
EffectInstance* playFX_71(s32, f32, f32, f32, f32, s32); EffectInstance* fx_hieroglyphs(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_72(s32, f32, f32, f32, f32, f32, f32, s32, s32); EffectInstance* fx_misc_particles(s32, f32, f32, f32, f32, f32, f32, s32, s32);
EffectInstance* playFX_73(s32, f32, f32, f32, f32, s32, s32); //returns ptr to struct unk_802BE310* in watt.c EffectInstance* fx_static_status(s32, f32, f32, f32, f32, s32, s32); //returns ptr to struct unk_802BE310* in watt.c
EffectInstance* playFX_74(s32, f32, f32, f32, f32, f32, f32, f32, f32); EffectInstance* fx_moving_cloud(s32, f32, f32, f32, f32, f32, f32, f32, f32);
EffectInstance* playFX_75(s32, f32, f32, f32, f32, s32); EffectInstance* fx_75(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_76(s32, f32, f32, f32, f32, s32); EffectInstance* fx_76(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_77(s32, f32, f32, f32, f32, f32, f32, f32, s32); EffectInstance* fx_firework_rocket(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* playFX_78(s32, f32, f32, f32, f32, s32); EffectInstance* fx_peach_star_beam(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_79(s32, f32, f32, f32, f32, s32); EffectInstance* fx_chapter_change(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7A(s32, f32, f32, f32, f32, s32); EffectInstance* fx_ice_shard(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7B(s32, f32, f32, f32, f32, s32); EffectInstance* fx_spirit_card(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7C(s32, f32, f32, f32, f32, s32); EffectInstance* fx_lil_oink(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7D(s32, f32, f32, f32, f32, s32); EffectInstance* fx_something_rotating(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7E(s32, f32, f32, f32, f32, s32); EffectInstance* fx_breaking_junk(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_7F(s32, f32, f32, f32, f32, s32); EffectInstance* fx_partner_buff(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_80(s32, f32, f32, f32, f32, s32); EffectInstance* fx_quizmo_assistant(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_81(s32, f32 x, f32 y, f32 z, f32, s32); EffectInstance* fx_ice_pillar(s32, f32 x, f32 y, f32 z, f32, s32);
EffectInstance* playFX_82(s32, f32, f32, f32, f32, s32 time); EffectInstance* fx_sun(s32, f32, f32, f32, f32, s32 time);
EffectInstance* playFX_83(s32, f32, f32, f32, f32, s32); EffectInstance* fx_star_spirits_energy(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_84(s32, f32, f32, f32, f32, f32); EffectInstance* fx_pink_sparkles(s32, f32, f32, f32, f32, f32);
EffectInstance* playFX_85(s32, f32, f32, f32, f32, s32); EffectInstance* fx_star_outline(s32, f32, f32, f32, f32, s32);
EffectInstance* playFX_86(s32, f32, f32, f32, f32, s32); EffectInstance* fx_86(s32, f32, f32, f32, f32, s32);
#endif #endif

136
include/effects_internal.h
View File

@ -6,6 +6,7 @@
s32 func_E0200000(s32); s32 func_E0200000(s32);
EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp); EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp);
s32 shim_load_effect(s32 effectIndex);
void shim_remove_effect(EffectInstance*); void shim_remove_effect(EffectInstance*);
s32 shim_rand_int(s32); s32 shim_rand_int(s32);
void* shim_general_heap_malloc(s32 size); void* shim_general_heap_malloc(s32 size);
@ -25,12 +26,139 @@ void shim_guTranslateF(float mf[4][4], float x, float y, float z);
void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z); void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z);
void shim_mem_clear(void* data, s32 numBytes); void shim_mem_clear(void* data, s32 numBytes);
void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS); void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
s32 shim_load_effect(s32 effectIndex);
s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*); s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*);
void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
void fx_6_main(s32 type, f32 x, f32 y, f32 z, f32 arg4); // the actual signature is going to be wrong, but it doesn't matter
// TODO remove when every effect's main is sorted out
#define FX_MAIN(name) void name(void);
void big_smoke_puff_main(f32 x, f32 y, f32 z);
void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32);
void walking_dust_main(s32, f32, f32, f32, f32, f32);
void flower_splash_main(f32, f32, f32, f32);
void flower_trail_main(s32, f32, f32, f32, f32, f32);
void cloud_puff_main(f32, f32, f32, f32);
void cloud_trail_main(s32, f32, f32, f32);
void footprint_main(f32, f32, f32, f32, f32, f32, f32, f32);
void floating_flower_main(s32, f32, f32, f32, s32);
void snowflake_main(f32, f32, f32, s32, s32);
EffectInstance* star_main(s32, f32, f32, f32, f32, f32, f32, f32);
void emote_main(s32, s32, f32, f32, f32, f32, f32, s32, EffectInstance**);
FX_MAIN(sparkles_main);
FX_MAIN(shape_spell_main);
FX_MAIN(gather_energy_pink_main);
FX_MAIN(drop_leaves_main);
FX_MAIN(dust_main);
FX_MAIN(shattering_stones_main);
FX_MAIN(smoke_ring_main);
FX_MAIN(damage_stars_main);
FX_MAIN(explosion_main);
FX_MAIN(lens_flare_main);
FX_MAIN(got_item_outline_main);
FX_MAIN(spiky_white_aura_main);
FX_MAIN(smoke_impact_main);
FX_MAIN(damage_indicator_main);
FX_MAIN(purple_ring_main);
FX_MAIN(flame_main);
FX_MAIN(stars_burst_main);
FX_MAIN(stars_shimmer_main);
FX_MAIN(rising_bubble_main);
FX_MAIN(ring_blast_main);
FX_MAIN(shockwave_main);
FX_MAIN(music_note_main);
FX_MAIN(smoke_burst_main);
FX_MAIN(sweat_main);
FX_MAIN(sleep_bubble_main);
FX_MAIN(windy_leaves_main);
FX_MAIN(falling_leaves_main);
FX_MAIN(stars_spread_main);
FX_MAIN(steam_burst_main);
FX_MAIN(stars_orbiting_main);
FX_MAIN(big_snowflakes_main);
FX_MAIN(debuff_main);
FX_MAIN(green_impact_main);
FX_MAIN(radial_shimmer_main);
FX_MAIN(ending_decals_main);
FX_MAIN(light_rays_main);
FX_MAIN(lightning_main);
FX_MAIN(fire_breath_main);
FX_MAIN(shimmer_burst_main);
FX_MAIN(energy_shockwave_main);
FX_MAIN(shimmer_wave_main);
FX_MAIN(aura_main);
FX_MAIN(fx_3C_main);
FX_MAIN(fx_3D_main);
FX_MAIN(blast_main);
FX_MAIN(fire_flower_main);
FX_MAIN(recover_main);
FX_MAIN(disable_x_main);
FX_MAIN(bombette_breaking_main);
FX_MAIN(firework_main);
FX_MAIN(confetti_main);
FX_MAIN(snowfall_main);
FX_MAIN(fx_46_main);
FX_MAIN(gather_magic_main);
EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32);
EffectInstance* small_gold_sparkle_main(EffectInstanceDataThing*, f32, f32, f32, f32);
FX_MAIN(flashing_box_shockwave_main);
EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32);
FX_MAIN(floating_rock_main);
FX_MAIN(chomp_drop_main);
FX_MAIN(quizmo_stage_main);
FX_MAIN(radiating_energy_orb_main);
FX_MAIN(quizmo_answer_main);
FX_MAIN(motion_blur_flame_main);
FX_MAIN(energy_orb_wave_main);
FX_MAIN(merlin_house_stars_main);
FX_MAIN(quizmo_audience_main);
FX_MAIN(butterflies_main);
FX_MAIN(stat_change_main);
FX_MAIN(snaking_static_main);
FX_MAIN(thunderbolt_ring_main);
FX_MAIN(squirt_main);
FX_MAIN(water_block_main);
FX_MAIN(waterfall_main);
FX_MAIN(water_fountain_main);
FX_MAIN(underwater_main);
FX_MAIN(lightning_bolt_main);
FX_MAIN(water_splash_main);
FX_MAIN(snowman_doll_main);
FX_MAIN(fright_jar_main);
FX_MAIN(stop_watch_main);
FX_MAIN(fx_63_main);
FX_MAIN(throw_spiny_main);
FX_MAIN(fx_65_main);
FX_MAIN(tubba_heart_attack_main);
FX_MAIN(whirlwind_main);
FX_MAIN(red_impact_main);
FX_MAIN(floating_cloud_puff_main);
FX_MAIN(energy_in_out_main);
FX_MAIN(tattle_window_main);
FX_MAIN(shiny_flare_main);
FX_MAIN(huff_puff_breath_main);
FX_MAIN(cold_breath_main);
FX_MAIN(embers_main);
FX_MAIN(hieroglyphs_main);
FX_MAIN(misc_particles_main);
FX_MAIN(static_status_main);
FX_MAIN(moving_cloud_main);
FX_MAIN(fx_75_main);
FX_MAIN(firework_rocket_main);
FX_MAIN(peach_star_beam_main);
FX_MAIN(chapter_change_main);
FX_MAIN(ice_shard_main);
FX_MAIN(spirit_card_main);
FX_MAIN(lil_oink_main);
FX_MAIN(something_rotating_main);
FX_MAIN(breaking_junk_main);
FX_MAIN(partner_buff_main);
FX_MAIN(quizmo_assistant_main);
FX_MAIN(ice_pillar_main);
FX_MAIN(sun_main);
FX_MAIN(star_spirits_energy_main);
FX_MAIN(pink_sparkles_main);
FX_MAIN(star_outline_main);
EffectInstance* fx_86_main(s32, f32, f32, f32, f32, s32);
#endif #endif

6
src/17FEB0.c
View File

@ -91,7 +91,7 @@ s32 calc_item_damage_enemy(void) {
} }
phi_a0_2 = 0; phi_a0_2 = 0;
if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
playFX_24(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18); fx_ring_blast(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
isFireDamage = TRUE; isFireDamage = TRUE;
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) {
@ -99,10 +99,10 @@ s32 calc_item_damage_enemy(void) {
isElectricDamage = TRUE; isElectricDamage = TRUE;
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {
playFX_5F(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18); fx_water_splash(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f, 1.0f, 0x18);
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) {
playFX_30(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f); fx_big_snowflakes(0, actorState->goalPos.x, actorState->goalPos.y, actorState->goalPos.z + 5.0f);
isIceDamage = TRUE; isIceDamage = TRUE;
} }
if ((battleStatus->currentAttackElement & DAMAGE_TYPE_REMOVE_BUFFS) == 0) { if ((battleStatus->currentAttackElement & DAMAGE_TYPE_REMOVE_BUFFS) == 0) {

2
src/18C790.c
View File

@ -46,7 +46,7 @@ ApiStatus func_8025E108(Evt* script, s32 isInitialCall) {
} }
ApiStatus func_8025E14C(Evt* script, s32 isInitialCall) { ApiStatus func_8025E14C(Evt* script, s32 isInitialCall) {
playFX_44(3, 0.0f, 100.0f, 0.0f, 1.0f, 0x78); fx_confetti(3, 0.0f, 100.0f, 0.0f, 1.0f, 0x78);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

12
src/18F340.c
View File

@ -250,7 +250,7 @@ ApiStatus func_802613BC(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
playFX_6B(6, var1, var2 + 15, var3, 1.2f, 30); fx_energy_in_out(6, var1, var2 + 15, var3, 1.2f, 30);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -260,7 +260,7 @@ ApiStatus func_80261478(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
playFX_52(9, var1, var2 + 15, var3, 5.0f, 15); fx_energy_orb_wave(9, var1, var2 + 15, var3, 5.0f, 15);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -331,8 +331,8 @@ ApiStatus func_802616F4(Evt* script, s32 isInitialCall) {
if (isInitialCall) { if (isInitialCall) {
script->functionTemp[1] = 0; script->functionTemp[1] = 0;
D_8029FB94 = merlee->pos.y; D_8029FB94 = merlee->pos.y;
D_8029FB98 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0); D_8029FB98 = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
D_8029FB9C = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); D_8029FB9C = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
D_8029FBA4 = 0; D_8029FBA4 = 0;
D_8029FB90 = 12; D_8029FB90 = 12;
sfx_play_sound(0x2074); sfx_play_sound(0x2074);
@ -439,7 +439,7 @@ ApiStatus FXRecoverHP(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32 var4 = evt_get_variable(script, *args++); s32 var4 = evt_get_variable(script, *args++);
playFX_40(0, var1, var2, var3, var4); fx_recover(0, var1, var2, var3, var4);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -450,7 +450,7 @@ ApiStatus FXRecoverFP(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32 var4 = evt_get_variable(script, *args++); s32 var4 = evt_get_variable(script, *args++);
playFX_40(1, var1, var2, var3, var4); fx_recover(1, var1, var2, var3, var4);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

24
src/190B20.c
View File

@ -1825,7 +1825,7 @@ void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angl
f32 temp_f20_2; f32 temp_f20_2;
if (var0 == 2) { if (var0 == 2) {
fx_land(0, xPos, yPos + 0.0f, zPos, D_802938A4); fx_landing_dust(0, xPos, yPos + 0.0f, zPos, D_802938A4);
} else if (var0 == 1) { } else if (var0 == 1) {
D_802938A8 = 4; D_802938A8 = 4;
} else if (D_802938A8++ >= 4) { } else if (D_802938A8++ >= 4) {
@ -1833,7 +1833,7 @@ void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angl
temp_f20 = (clamp_angle(-angleDeg) * TAU) / 360.0f; temp_f20 = (clamp_angle(-angleDeg) * TAU) / 360.0f;
temp_f20_2 = sin_rad(temp_f20); temp_f20_2 = sin_rad(temp_f20);
temp_f0 = cos_rad(temp_f20); temp_f0 = cos_rad(temp_f20);
fx_walk(0, xPos + (temp_f20_2 * 24.0f * 0.2f), yPos + 1.5f, zPos + (temp_f0 * 24.0f * 0.2f), temp_f20_2, temp_f0); fx_walking_dust(0, xPos + (temp_f20_2 * 24.0f * 0.2f), yPos + 1.5f, zPos + (temp_f0 * 24.0f * 0.2f), temp_f20_2, temp_f0);
} }
} }
#else #else
@ -2064,7 +2064,7 @@ void load_player_actor(void) {
player->shadow.id = create_shadow_type(0, player->currentPos.x, player->currentPos.y, player->currentPos.z); player->shadow.id = create_shadow_type(0, player->currentPos.x, player->currentPos.y, player->currentPos.z);
player->shadowScale = player->size.x / 24.0; player->shadowScale = player->size.x / 24.0;
player->hudElementDataIndex = create_status_icon_set(); player->hudElementDataIndex = create_status_icon_set();
player->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); player->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
player->unk_228 = NULL; player->unk_228 = NULL;
if (is_ability_active(ABILITY_ZAP_TAP)) { if (is_ability_active(ABILITY_ZAP_TAP)) {
@ -2318,7 +2318,7 @@ void load_partner_actor(void) {
partnerActor->shadow.id = create_shadow_type(0, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z); partnerActor->shadow.id = create_shadow_type(0, partnerActor->currentPos.x, partnerActor->currentPos.y, partnerActor->currentPos.z);
partnerActor->shadowScale = partnerActor->size.x / 24.0; partnerActor->shadowScale = partnerActor->size.x / 24.0;
partnerActor->hudElementDataIndex = create_status_icon_set(); partnerActor->hudElementDataIndex = create_status_icon_set();
partnerActor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); partnerActor->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
partnerActor->unk_228 = NULL; partnerActor->unk_228 = NULL;
takeTurnScript = start_script(partnerActor->takeTurnScriptSource, 10, 0); takeTurnScript = start_script(partnerActor->takeTurnScriptSource, 10, 0);
@ -2589,7 +2589,7 @@ Actor* create_actor(Formation formation) {
takeTurnScript->owner1.enemyID = actor->enemyIndex | 0x200; takeTurnScript->owner1.enemyID = actor->enemyIndex | 0x200;
actor->shadow.id = create_shadow_type(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z); actor->shadow.id = create_shadow_type(0, actor->currentPos.x, actor->currentPos.y, actor->currentPos.z);
actor->shadowScale = actor->size.x / 24.0; actor->shadowScale = actor->size.x / 24.0;
actor->ptrDefuffIcon = playFX_41(0, -142.0f, 34.0f, 1.0f, 0); actor->ptrDefuffIcon = fx_disable_x(0, -142.0f, 34.0f, 1.0f, 0);
actor->unk_228 = NULL; actor->unk_228 = NULL;
actor->hudElementDataIndex = create_status_icon_set(); actor->hudElementDataIndex = create_status_icon_set();
return actor; return actor;
@ -2768,7 +2768,7 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) {
if (effect != NULL) { if (effect != NULL) {
effect->flags |= EFFECT_INSTANCE_FLAGS_10; effect->flags |= EFFECT_INSTANCE_FLAGS_10;
} }
target->unk_228 = playFX_81(0, target->currentPos.x, target->currentPos.y, target->unk_228 = fx_ice_pillar(0, target->currentPos.x, target->currentPos.y,
target->currentPos.z, 1.0f, 0); target->currentPos.z, 1.0f, 0);
create_status_debuff(target->hudElementDataIndex, STATUS_FROZEN); create_status_debuff(target->hudElementDataIndex, STATUS_FROZEN);
} }
@ -2985,7 +2985,7 @@ void func_802664DC(f32 x, f32 y, f32 z, s32 attack, s32 a) {
a = 55; a = 55;
} }
playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]); fx_damage_indicator(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
gDamageCountTimers[i] = 40; gDamageCountTimers[i] = 40;
} }
@ -3011,7 +3011,7 @@ void show_damage_popup(f32 x, f32 y, f32 z, s32 attack, s32 a) {
a = 55; a = 55;
} }
playFX_1E(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]); fx_damage_indicator(0, x, y, z, 10.0f, a, attack, &gDamageCountEffects[i]);
gDamageCountTimers[i] = 40; gDamageCountTimers[i] = 40;
} }
@ -3472,10 +3472,10 @@ void remove_player_buffs(s32 buffs) {
battleStatus->unk_43C->unk_0C->unk_10 = 0; battleStatus->unk_43C->unk_0C->unk_10 = 0;
battleStatus->waterBlockEffect->flags |= 0x10; battleStatus->waterBlockEffect->flags |= 0x10;
playFX_5A(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 0xA); fx_water_block(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 0xA);
playFX_5F(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 0x18); fx_water_splash(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
playFX_5F(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 0x18); fx_water_splash(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
playFX_5F(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18); fx_water_splash(1, player->currentPos.x + 15.0f, player->currentPos.y + 22.0f, player->currentPos.z + 5.0f, 1.0f, 0x18);
battleStatus->waterBlockEffect = NULL; battleStatus->waterBlockEffect = NULL;
sfx_play_sound(SOUND_299); sfx_play_sound(SOUND_299);

6
src/19FAF0.c
View File

@ -4,12 +4,12 @@
#include "script_api/battle.h" #include "script_api/battle.h"
ApiStatus func_80271210(Evt* script, s32 isInitialCall) { ApiStatus func_80271210(Evt* script, s32 isInitialCall) {
playFX_31(0, script->varTable[0], script->varTable[1], script->varTable[2]); fx_debuff(0, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
ApiStatus func_80271258(Evt* script, s32 isInitialCall) { ApiStatus func_80271258(Evt* script, s32 isInitialCall) {
playFX_31(1, script->varTable[0], script->varTable[1], script->varTable[2]); fx_debuff(1, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -23,7 +23,7 @@ ApiStatus func_802713B0(Evt* script, s32 isInitialCall);
INCLUDE_ASM(ApiStatus, "19FAF0", func_802713B0, Evt* script, s32 isInitialCall); INCLUDE_ASM(ApiStatus, "19FAF0", func_802713B0, Evt* script, s32 isInitialCall);
ApiStatus func_8027143C(Evt* script, s32 isInitialCall) { ApiStatus func_8027143C(Evt* script, s32 isInitialCall) {
playFX_30(0, script->varTable[0], script->varTable[1], script->varTable[2]); fx_big_snowflakes(0, script->varTable[0], script->varTable[1], script->varTable[2]);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

6
src/1A5830.c
View File

@ -313,7 +313,7 @@ s32 calc_enemy_damage_target(Actor* attacker) {
return HIT_RESULT_QUAKE_IMMUNE; return HIT_RESULT_QUAKE_IMMUNE;
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_FIRE) {
playFX_24(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18); fx_ring_blast(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
isFire = TRUE; isFire = TRUE;
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_ELECTRIC) {
@ -321,10 +321,10 @@ s32 calc_enemy_damage_target(Actor* attacker) {
isElectric = TRUE; isElectric = TRUE;
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_WATER) {
playFX_5F(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18); fx_water_splash(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f, 1.0f, 0x18);
} }
if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) { if (battleStatus->currentAttackElement & DAMAGE_TYPE_ICE) {
playFX_30(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f); fx_big_snowflakes(0, state->goalPos.x, state->goalPos.y, state->goalPos.z + 5.0f);
} }
if (!(attacker->staticStatus == STATUS_STATIC)) { if (!(attacker->staticStatus == STATUS_STATIC)) {

16
src/1AF120.c
View File

@ -393,7 +393,7 @@ EvtScript D_80296014 = {
EVT_WAIT_FRAMES(8) EVT_WAIT_FRAMES(8)
EVT_LABEL(10) EVT_LABEL(10)
EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_PARTNER, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_06, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
@ -405,11 +405,11 @@ EvtScript D_8029621C = {
EVT_ADD(LW(5), -5) EVT_ADD(LW(5), -5)
EVT_ADD(LW(6), 18) EVT_ADD(LW(6), 18)
EVT_ADD(LW(7), 5) EVT_ADD(LW(7), 5)
EVT_CALL(PlayEffect, EFFECT_ID_24, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_ADD(LW(5), 10) EVT_ADD(LW(5), 10)
EVT_ADD(LW(6), -14) EVT_ADD(LW(6), -14)
EVT_CALL(PlayEffect, EFFECT_ID_24, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LW(5), LW(6), LW(7), EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0)
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
EVT_CALL(GetDamageIntensity) EVT_CALL(GetDamageIntensity)
EVT_SWITCH(LW(0)) EVT_SWITCH(LW(0))
@ -1138,7 +1138,7 @@ EvtScript D_80298E20 = {
EVT_SUB(LW(1), LW(7)) EVT_SUB(LW(1), LW(7))
EVT_END_IF EVT_END_IF
EVT_SUB(LW(1), 3) EVT_SUB(LW(1), 3)
EVT_CALL(PlayEffect, EFFECT_ID_67, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WHIRLWIND, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(func_80269E80, LW(0)) EVT_CALL(func_80269E80, LW(0))
EVT_SWITCH(LW(0)) EVT_SWITCH(LW(0))
EVT_CASE_OR_EQ(14) EVT_CASE_OR_EQ(14)
@ -1511,7 +1511,7 @@ EvtScript DoBurnHit = {
EVT_SETF(LW(3), EVT_FLOAT(1.0)) EVT_SETF(LW(3), EVT_FLOAT(1.0))
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_END_SWITCH EVT_END_SWITCH
@ -1535,7 +1535,7 @@ EvtScript D_8029A76C = {
EVT_SETF(LW(5), LW(3)) EVT_SETF(LW(5), LW(3))
EVT_DIVF(LW(5), EVT_FLOAT(20.0)) EVT_DIVF(LW(5), EVT_FLOAT(20.0))
EVT_ADDF(LW(1), LW(5)) EVT_ADDF(LW(1), LW(5))
EVT_CALL(PlayEffect, EFFECT_ID_4A, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(func_8027D32C, ACTOR_SELF)
EVT_CALL(HPBarToCurrent, ACTOR_SELF) EVT_CALL(HPBarToCurrent, ACTOR_SELF)
@ -1678,7 +1678,7 @@ EvtScript D_8029AF08 = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_ADD(LW(2), 10) EVT_ADD(LW(2), 10)
EVT_CALL(PlayEffect, EFFECT_ID_01, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_DEATH)
EVT_CALL(DropStarPoints, -127) EVT_CALL(DropStarPoints, -127)
EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0)
@ -1989,7 +1989,7 @@ EvtScript DoAirLift = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
EVT_CALL(GetActorSize, ACTOR_SELF, LW(6), LW(7)) EVT_CALL(GetActorSize, ACTOR_SELF, LW(6), LW(7))
EVT_ADD(LW(4), LW(6)) EVT_ADD(LW(4), LW(6))
EVT_CALL(PlayEffect, EFFECT_ID_28, 0, LW(3), LW(4), LW(5), 5, -45, 20, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SWEAT, 0, LW(3), LW(4), LW(5), 5, -45, 20, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_END_LOOP EVT_END_LOOP
EVT_CALL(SetAnimationRate, ACTOR_SELF, LW(0), EVT_FLOAT(1.0)) EVT_CALL(SetAnimationRate, ACTOR_SELF, LW(0), EVT_FLOAT(1.0))

12
src/1a1f0_len_5390.c
View File

@ -125,8 +125,8 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) {
if (isInitialCall) { if (isInitialCall) {
script->functionTemp[1] = 0; script->functionTemp[1] = 0;
D_800A0BA4 = merlee->pos.y; D_800A0BA4 = merlee->pos.y;
D_800A0BA8 = playFX_52(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0); D_800A0BA8 = fx_energy_orb_wave(0, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.4f, 0);
D_800A0BAC = playFX_52(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0); D_800A0BAC = fx_energy_orb_wave(3, merlee->pos.x, merlee->pos.y, merlee->pos.z, 0.00001f, 0);
D_800A0BB8 = 0; D_800A0BB8 = 0;
D_800A0BA0 = 12; D_800A0BA0 = 12;
sfx_play_sound(0x2074); sfx_play_sound(0x2074);
@ -203,7 +203,7 @@ ApiStatus PlayMerleeGatherFX(Evt* script, s32 isInitialCall) {
s32 var1 = evt_get_variable(script, *args++); s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
playFX_6B(6, var0, var1, var2, 1.2f, 30); fx_energy_in_out(6, var0, var1, var2, 1.2f, 30);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -213,7 +213,7 @@ ApiStatus PlayMerleeOrbFX(Evt* script, s32 isInitialCall) {
s32 var1 = evt_get_variable(script, *args++); s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
playFX_52(9, var0, var1, var2, 5.0f, 15); fx_energy_orb_wave(9, var0, var1, var2, 5.0f, 15);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -235,12 +235,12 @@ ApiStatus OnDefeatEnemy(Evt* script, s32 isInitialCall) {
if (script->functionTemp[1] == 15) { if (script->functionTemp[1] == 15) {
sfx_play_sound(SOUND_DEATH); sfx_play_sound(SOUND_DEATH);
playFX_18(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10); fx_damage_stars(1, npc->pos.x, npc->pos.y + (npc->collisionHeight / 2), npc->pos.z, 0, -1.0f, 0, 10);
} }
temp1 = script->functionTemp[1]; temp1 = script->functionTemp[1];
if (script->functionTemp[1] == 10) { if (script->functionTemp[1] == 10) {
playFX_01(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f); fx_big_smoke_puff(npc->pos.x, npc->pos.y + 10.0f, npc->pos.z + 10.0f);
if (script->functionTemp[1] == temp1) { // what? (never can be false, seemingly) if (script->functionTemp[1] == temp1) { // what? (never can be false, seemingly)
spawn_drops(enemy); spawn_drops(enemy);
} }

6
src/3251D0.c
View File

@ -8,7 +8,7 @@ ApiStatus func_802C0000(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_11(0, a, b, c, 60.0f); fx_sparkles(0, a, b, c, 60.0f);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -19,7 +19,7 @@ ApiStatus func_802C00AC(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -30,7 +30,7 @@ ApiStatus func_802C016C(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/EB8E50.c
View File

@ -16,6 +16,6 @@ const char ascii_EC2030[] = "flo_08";
static const f64 rodata_alignment = 0.0; static const f64 rodata_alignment = 0.0;
ApiStatus func_80240000_EB8E50(void) { ApiStatus func_80240000_EB8E50(void) {
dead_playFX_82(0, 0, 0, 0, 0, 0); dead_fx_sun(0, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/ED8E20.c
View File

@ -54,6 +54,6 @@ ApiStatus N(DeadGetEntryPos)(Evt* script, s32 isInitialCall) {
#include "world/common/SomeXYZFunc2.inc.c" #include "world/common/SomeXYZFunc2.inc.c"
ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) { ApiStatus func_80240318_ED9138(Evt* script, s32 isInitialCall) {
dead_playFX_82(0, 0, 0, 0, 0, 0); dead_fx_sun(0, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/EDBFE0.c
View File

@ -4,6 +4,6 @@
#define NAMESPACE ED8FE0 #define NAMESPACE ED8FE0
ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) { ApiStatus func_80240000_EDBFE0(Evt *script, s32 isInitialCall) {
dead_playFX_82(0, 0, 0, 0, 0, 0); dead_fx_sun(0, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/EDE9C0.c
View File

@ -4,6 +4,6 @@
#define NAMESPACE EDE9C0 #define NAMESPACE EDE9C0
ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) { ApiStatus func_80240000_EDE9C0(Evt *script, s32 isInitialCall) {
dead_playFX_82(0, 0, 0, 0, 0, 0); dead_fx_sun(0, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/EE65B0.c
View File

@ -10,7 +10,7 @@
#include "world/common/UnkTexturePanFunc2.inc.c" #include "world/common/UnkTexturePanFunc2.inc.c"
ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) { ApiStatus func_8024030C_EE68BC(Evt *script, s32 isInitialCall) {
dead_playFX_82(0, 0, 0, 0, 0, 0); dead_fx_sun(0, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

14
src/actor_api.c
View File

@ -3209,7 +3209,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
switch (script->functionTemp[0]) { switch (script->functionTemp[0]) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
playFX_33(2, x1, y1, z1, 1.0f, 30); fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30);
func_8024E3D8(0x13); func_8024E3D8(0x13);
script->functionTemp[3] = 30; script->functionTemp[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
@ -3228,7 +3228,7 @@ ApiStatus BoostAttack(Evt* script, s32 isInitialCall) {
if (actor->attackBoost > 20) { if (actor->attackBoost > 20) {
actor->attackBoost = 20; actor->attackBoost = 20;
} }
playFX_56(attackBoost - 1, x2, y2, z2, 1.0f, 60); fx_stat_change(attackBoost - 1, x2, y2, z2, 1.0f, 60);
script->functionTemp[3] = 15; script->functionTemp[3] = 15;
script->functionTemp[0] = 3; script->functionTemp[0] = 3;
} else { } else {
@ -3333,7 +3333,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
switch (script->functionTemp[0]) { switch (script->functionTemp[0]) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
playFX_33(2, x1, y1, z1, 1.0f, 30); fx_radial_shimmer(2, x1, y1, z1, 1.0f, 30);
func_8024E3D8(0x13); func_8024E3D8(0x13);
script->functionTemp[3] = 30; script->functionTemp[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
@ -3352,7 +3352,7 @@ ApiStatus BoostDefense(Evt* script, s32 isInitialCall) {
if (actor->defenseBoost > 20) { if (actor->defenseBoost > 20) {
actor->defenseBoost = 20; actor->defenseBoost = 20;
} }
playFX_56(defenseBoost + 5, x2, y2, z2, 1.0f, 60); fx_stat_change(defenseBoost + 5, x2, y2, z2, 1.0f, 60);
script->functionTemp[3] = 15; script->functionTemp[3] = 15;
script->functionTemp[0] = 3; script->functionTemp[0] = 3;
} else { } else {
@ -3444,7 +3444,7 @@ ApiStatus VanishActor(Evt* script, s32 isInitialCall) {
switch (script->functionTemp[0]) { switch (script->functionTemp[0]) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
playFX_33(3, x, y, z, 1.0f, 30); fx_radial_shimmer(3, x, y, z, 1.0f, 30);
func_8024E3D8(0x13); func_8024E3D8(0x13);
script->functionTemp[3] = 0x1E; script->functionTemp[3] = 0x1E;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
@ -3550,7 +3550,7 @@ ApiStatus ElectrifyActor(Evt* script, s32 isInitialCall) {
switch (script->functionTemp[0]) { switch (script->functionTemp[0]) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
playFX_57(8, x, y, z, 1.0f, 30); fx_snaking_static(8, x, y, z, 1.0f, 30);
func_8024E3D8(0x13); func_8024E3D8(0x13);
script->functionTemp[3] = 0x1E; script->functionTemp[3] = 0x1E;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;
@ -3668,7 +3668,7 @@ ApiStatus HealActor(Evt* script, s32 isInitialCall) {
case 1: case 1:
if (script->functionTemp[3] == 0) { if (script->functionTemp[3] == 0) {
dispatch_event_actor(actor, EVENT_SWAP_PARTNER); dispatch_event_actor(actor, EVENT_SWAP_PARTNER);
playFX_40(0, x2, y2, z2, hpBoost); fx_recover(0, x2, y2, z2, hpBoost);
func_802D7460(x1, y1, z1, hpBoost); func_802D7460(x1, y1, z1, hpBoost);
script->functionTemp[3] = 30; script->functionTemp[3] = 30;
script->functionTemp[0] = 2; script->functionTemp[0] = 2;

18
src/battle/area_arn/actor/hyper_cleft.c
View File

@ -143,7 +143,7 @@ EvtScript N(80220DC0) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_Anim_4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_Anim_4)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@ -157,7 +157,7 @@ EvtScript N(80220DC0) = {
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.5))
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2D9) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2D9)
EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_THREAD EVT_END_THREAD
@ -207,7 +207,7 @@ EvtScript N(80220DC0) = {
EVT_THREAD EVT_THREAD
EVT_LOOP(30) EVT_LOOP(30)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(1) EVT_WAIT_FRAMES(1)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -239,7 +239,7 @@ EvtScript N(80220DC0) = {
EVT_THREAD EVT_THREAD
EVT_LOOP(25) EVT_LOOP(25)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(1) EVT_WAIT_FRAMES(1)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -413,7 +413,7 @@ EvtScript N(80221DE0) = {
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2)) EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2))
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
@ -589,7 +589,7 @@ EvtScript N(handleEvent_80222140) = {
EVT_ADD(LW(0), -8) EVT_ADD(LW(0), -8)
EVT_ADD(LW(1), 27) EVT_ADD(LW(1), 27)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER)
EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -731,11 +731,11 @@ EvtScript N(80223310) = {
EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(MoveBattleCamOver, 30)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_charge_still) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_hyper_charge_still)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)

6
src/battle/area_arn/actor/hyper_paragoomba.c
View File

@ -210,7 +210,7 @@ EvtScript N(8021B678) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_paragoomba_hyper_aim) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_paragoomba_hyper_aim)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@ -797,7 +797,7 @@ EvtScript N(8021D9F4) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
EVT_ADD(LW(4), 10) EVT_ADD(LW(4), 10)
EVT_ADD(LW(5), 5) EVT_ADD(LW(5), 5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -901,7 +901,7 @@ EvtScript N(8021E218) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)

2
src/battle/area_arn/actor/hypergoomba.c
View File

@ -135,7 +135,7 @@ EvtScript N(802189D4) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_POWER_UP)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_goomba_hyper_run)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)

22
src/battle/area_arn/actor/tubba_blubba.c
View File

@ -291,7 +291,7 @@ EvtScript N(80226558) = {
EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SET(LW(1), 0) EVT_SET(LW(1), 0)
EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0))
@ -303,7 +303,7 @@ EvtScript N(80226558) = {
EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_MISS)
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_SET(LW(1), 7012353) EVT_SET(LW(1), 7012353)
EVT_EXEC_WAIT(N(80225F8C)) EVT_EXEC_WAIT(N(80225F8C))
@ -321,7 +321,7 @@ EvtScript N(80226558) = {
EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -386,11 +386,11 @@ EvtScript N(80226B88) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20EA) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20EA)
EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
@ -407,7 +407,7 @@ EvtScript N(80226B88) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY) EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
@ -461,11 +461,11 @@ EvtScript N(80226B88) = {
EVT_END_IF EVT_END_IF
EVT_LABEL(0) EVT_LABEL(0)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
@ -482,14 +482,14 @@ EvtScript N(80226B88) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_GOTO(2) EVT_GOTO(2)
EVT_LABEL(1) EVT_LABEL(1)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_END_IF EVT_END_IF
@ -507,7 +507,7 @@ EvtScript N(80226B88) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(8) EVT_WAIT_FRAMES(8)
EVT_END_IF EVT_END_IF
EVT_LABEL(2) EVT_LABEL(2)

12
src/battle/area_arn/actor/tubbas_heart.c
View File

@ -500,8 +500,8 @@ EvtScript N(80225258) = {
EVT_ADD(LW(1), 6) EVT_ADD(LW(1), 6)
EVT_SETF(LW(3), EVT_FLOAT(0.4)) EVT_SETF(LW(3), EVT_FLOAT(0.4))
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_47, 1, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 1, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlayEffect, EFFECT_ID_6B, 6, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 6, LW(0), LW(1), LW(2), LW(3), 60, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F7) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F7)
EVT_WAIT_FRAMES(60) EVT_WAIT_FRAMES(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
@ -520,7 +520,7 @@ EvtScript N(80225258) = {
EVT_ADD(LW(1), 6) EVT_ADD(LW(1), 6)
EVT_SETF(LW(3), EVT_FLOAT(0.4)) EVT_SETF(LW(3), EVT_FLOAT(0.4))
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_6B, 3, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_ENERGY_IN_OUT, 3, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 4, LW(15)) EVT_CALL(SetActorVar, ACTOR_SELF, 4, LW(15))
EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80223C1C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_80223C1C)))
@ -545,7 +545,7 @@ EvtScript N(802255D8) = {
EVT_ELSE EVT_ELSE
EVT_ADD(LW(1), 6) EVT_ADD(LW(1), 6)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_13, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(60) EVT_WAIT_FRAMES(60)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(MoveBattleCamOver, 20)
@ -574,7 +574,7 @@ EvtScript N(802255D8) = {
EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 5) EVT_ADD(LW(1), 5)
EVT_CALL(PlayEffect, EFFECT_ID_66, 1, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 1, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(145) EVT_WAIT_FRAMES(145)
EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY) EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
@ -585,7 +585,7 @@ EvtScript N(802255D8) = {
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 5) EVT_ADD(LW(1), 5)
EVT_CALL(PlayEffect, EFFECT_ID_66, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_TUBBA_HEART_ATTACK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 200, 0, 0, 0, 0, 0, 0, 0)
EVT_THREAD EVT_THREAD
EVT_WAIT_FRAMES(160) EVT_WAIT_FRAMES(160)
EVT_CALL(PlaySound, 0x20FC) EVT_CALL(PlaySound, 0x20FC)

22
src/battle/area_dgb/actor/tubba_blubba.c
View File

@ -323,7 +323,7 @@ EvtScript N(takeTurn_80219750) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_2)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SET(LW(1), 80) EVT_SET(LW(1), 80)
EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 30, 315, 30, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 30, 315, 30, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(40) EVT_WAIT_FRAMES(40)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_1)
EVT_SET(LW(0), 0) EVT_SET(LW(0), 0)
@ -411,8 +411,8 @@ EvtScript N(80219D88) = {
EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SHRINK)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SET(LW(1), 0) EVT_SET(LW(1), 0)
EVT_CALL(PlayEffect, EFFECT_ID_06, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(15.0))
@ -439,7 +439,7 @@ EvtScript N(80219D88) = {
EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
@ -507,7 +507,7 @@ EvtScript N(8021A36C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_12) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_12)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
@ -524,7 +524,7 @@ EvtScript N(8021A36C) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY) EVT_IF_EQ(LW(10), HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF EVT_END_IF
@ -581,11 +581,11 @@ EvtScript N(8021A36C) = {
EVT_END_IF EVT_END_IF
EVT_LABEL(0) EVT_LABEL(0)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 0, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_battle_tubba_Palette_00_Anim_D)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_THREAD EVT_THREAD
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
@ -602,14 +602,14 @@ EvtScript N(8021A36C) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_GOTO(2) EVT_GOTO(2)
EVT_LABEL(1) EVT_LABEL(1)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5)) EVT_CALL(GetStatusFlags, ACTOR_SELF, LW(5))
EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK) EVT_IF_NOT_FLAG(LW(5), STATUS_FLAG_SHRINK)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_25, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 1, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_END_IF EVT_END_IF
@ -627,7 +627,7 @@ EvtScript N(8021A36C) = {
EVT_CALL(StartRumble, 1) EVT_CALL(StartRumble, 1)
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 60, 8, 10, 20, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(8) EVT_WAIT_FRAMES(8)
EVT_END_IF EVT_END_IF
EVT_LABEL(2) EVT_LABEL(2)

20
src/battle/area_flo/5B28D0.c
View File

@ -25,7 +25,7 @@ ApiStatus func_80219420_5B28D0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -41,7 +41,7 @@ ApiStatus func_802194E0_5B2990(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -57,7 +57,7 @@ ApiStatus func_802195A0_5B2A50(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -73,7 +73,7 @@ ApiStatus func_80219660_5B2B10(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -89,7 +89,7 @@ ApiStatus func_80219720_5B2BD0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -105,7 +105,7 @@ ApiStatus func_802197E0_5B2C90(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -121,7 +121,7 @@ ApiStatus func_802198A0_5B2D50(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -145,7 +145,7 @@ ApiStatus func_80219C80_5B3130(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -161,7 +161,7 @@ ApiStatus func_80219D40_5B31F0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -177,7 +177,7 @@ ApiStatus func_80219E00_5B32B0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/area_flo2/5CE690.c
View File

@ -98,7 +98,7 @@ ApiStatus func_80218774_5CEE04(Evt* script, s32 isInitialCall) {
f32 var6 = evt_get_float_variable(script, *args++); f32 var6 = evt_get_float_variable(script, *args++);
f32 var7 = evt_get_float_variable(script, *args++); f32 var7 = evt_get_float_variable(script, *args++);
s32 var8 = evt_get_variable(script, *args++); s32 var8 = evt_get_variable(script, *args++);
EffectInstance* effect = playFX_6E(var1, var2, var3, var4, var5, var6, var7, var8); EffectInstance* effect = fx_huff_puff_breath(var1, var2, var3, var4, var5, var6, var7, var8);
evt_set_variable(script, *args++, effect); evt_set_variable(script, *args++, effect);
return ApiStatus_DONE2; return ApiStatus_DONE2;
@ -115,7 +115,7 @@ ApiStatus func_80218924_5CEFB4(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
f32 var4 = evt_get_float_variable(script, *args++); f32 var4 = evt_get_float_variable(script, *args++);
script->varTable[0] = playFX_57(0, var1, var2, var3, var4 * 2.5f, 0); script->varTable[0] = fx_snaking_static(0, var1, var2, var3, var4 * 2.5f, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

20
src/battle/area_flo2/5CF2D0.c
View File

@ -29,7 +29,7 @@ ApiStatus func_80218DD0_5CF460(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -45,7 +45,7 @@ ApiStatus func_80218E90_5CF520(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -61,7 +61,7 @@ ApiStatus func_80218F50_5CF5E0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -77,7 +77,7 @@ ApiStatus func_80219010_5CF6A0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -93,7 +93,7 @@ ApiStatus func_802190D0_5CF760(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -109,7 +109,7 @@ ApiStatus func_80219190_5CF820(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -125,7 +125,7 @@ ApiStatus func_80219250_5CF8E0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -149,7 +149,7 @@ ApiStatus func_80219630_5CFCC0(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -165,7 +165,7 @@ ApiStatus func_802196F0_5CFD80(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -181,7 +181,7 @@ ApiStatus func_802197B0_5CFE40(Evt* script, s32 isInitialCall) {
} }
} }
playFX_82(var1, 0, 0, 0, 0, 0); fx_sun(var1, 0, 0, 0, 0, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

8
src/battle/area_isk_part_1/actor/buzzy_beetle.c
View File

@ -456,7 +456,7 @@ EvtScript N(handleEvent_8021F228) = {
EVT_ELSE EVT_ELSE
EVT_ADD(LW(1), 24) EVT_ADD(LW(1), 24)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_EQ(EVENT_DEATH) EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LW(0), 1) EVT_SET_CONST(LW(0), 1)
@ -729,11 +729,11 @@ EvtScript N(takeTurn_80220A44) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_6)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_buzzy_beetle_Palette_00_Anim_5)

4
src/battle/area_isk_part_1/actor/pokey_mummy.c
View File

@ -439,7 +439,7 @@ EvtScript N(handleEvent_80219050) = {
EVT_END_IF EVT_END_IF
EVT_ADDF(LW(3), LW(0)) EVT_ADDF(LW(3), LW(0))
EVT_ADDF(LW(4), LW(1)) EVT_ADDF(LW(4), LW(1))
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LW(0), 1) EVT_SET_CONST(LW(0), 1)
@ -964,7 +964,7 @@ EvtScript N(8021BDE4) = {
EVT_ADD(LW(1), LW(3)) EVT_ADD(LW(1), LW(3))
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1)) EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1))

4
src/battle/area_isk_part_1/stage/isk_04.c
View File

@ -9,8 +9,8 @@ BSS EffectInstance* N(D_80224D60);
BSS EffectInstance* N(D_80224D64); BSS EffectInstance* N(D_80224D64);
ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) { ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) {
playFX_20(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D60)); fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D60));
playFX_20(1, 129.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D64)); fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &N(D_80224D64));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/area_isk_part_1/stage/isk_05.c
View File

@ -9,8 +9,8 @@ BSS EffectInstance* N(D_80224D70);
BSS EffectInstance* N(D_80224D74); BSS EffectInstance* N(D_80224D74);
ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) { ApiStatus N(CreateTorchFX)(Evt* script, s32 isInitialCall) {
playFX_20(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D70)); fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D70));
playFX_20(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D74)); fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &N(D_80224D74));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_1/stage/isk_06.c
View File

@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
BSS EffectInstance* N(D_80224D80); BSS EffectInstance* N(D_80224D80);
ApiStatus func_80218A50_4E3190(Evt* script, s32 isInitialCall) { ApiStatus func_80218A50_4E3190(Evt* script, s32 isInitialCall) {
playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80)); fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D80));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_1/stage/isk_06b.c
View File

@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
BSS EffectInstance* N(D_80224DA0); BSS EffectInstance* N(D_80224DA0);
ApiStatus func_80218B30_4E3270(Evt* script, s32 isInitialCall) { ApiStatus func_80218B30_4E3270(Evt* script, s32 isInitialCall) {
playFX_20(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0)); fx_flame(1, -110.0f, 80.0f, -146.0, 0.3f, &N(D_80224DA0));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_1/stage/isk_07.c
View File

@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
BSS EffectInstance* N(D_80224D90); BSS EffectInstance* N(D_80224D90);
ApiStatus func_80218AC0_4E3200(Evt* script, s32 isInitialCall) { ApiStatus func_80218AC0_4E3200(Evt* script, s32 isInitialCall) {
playFX_20(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90)); fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &N(D_80224D90));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_1/stage/isk_08.c
View File

@ -8,7 +8,7 @@ BSS char N(pad)[8]; // BSS has bad alignment. Should be 0x10 aligned.
BSS EffectInstance* N(D_80224DB0); BSS EffectInstance* N(D_80224DB0);
ApiStatus func_80218BA0_4E32E0(Evt* script, s32 isInitialCall) { ApiStatus func_80218BA0_4E32E0(Evt* script, s32 isInitialCall) {
playFX_20(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0)); fx_flame(1, 0, 72.0f, -146.0, 0.3f, &N(D_80224DB0));
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

14
src/battle/area_isk_part_2/actor/tutankoopa.c
View File

@ -227,7 +227,7 @@ ApiStatus func_8021875C_4EFBFC(Evt* script, s32 isInitialCall) {
s32 var1 = evt_get_variable(script, *args++); s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
EffectInstance* effect = playFX_4C(2, var1, 150.0f, var3, var2, -0.5f, -0.9f, 0.5f, 60); EffectInstance* effect = fx_floating_rock(2, var1, 150.0f, var3, var2, -0.5f, -0.9f, 0.5f, 60);
((EffectInstanceData*)effect->data)->unk_30 = 0; ((EffectInstanceData*)effect->data)->unk_30 = 0;
((EffectInstanceData*)effect->data)->unk_38 = 0; ((EffectInstanceData*)effect->data)->unk_38 = 0;
@ -472,7 +472,7 @@ EvtScript N(8021C974) = {
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(3.0))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 40) EVT_ADD(LW(1), 40)
EVT_CALL(PlayEffect, EFFECT_ID_2F, 0, LW(0), LW(1), LW(2), 20, 4, LW(15), 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_STARS_ORBITING, 0, LW(0), LW(1), LW(2), 20, 4, LW(15), 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_A) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_A)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20E5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20E5)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
@ -672,12 +672,12 @@ EvtScript N(8021D81C) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_3)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_71, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(MoveBattleCamOver, 70) EVT_CALL(MoveBattleCamOver, 70)
EVT_CALL(PlaySound, 0x20E7) EVT_CALL(PlaySound, 0x20E7)
EVT_CALL(PlayEffect, EFFECT_ID_4D, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_CHOMP_DROP, 0, 0, 60, 0, EVT_FLOAT(0.2), 0, EVT_FLOAT(1.4), 255, EVT_FLOAT(0.1), 150, 0, 0, 0)
EVT_WAIT_FRAMES(15) EVT_WAIT_FRAMES(15)
EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LW(0)) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LW(0))
EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP | STATUS_FLAG_TRANSPARENT) EVT_IF_NOT_FLAG(LW(0), STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP | STATUS_FLAG_TRANSPARENT)
@ -697,7 +697,7 @@ EvtScript N(8021D81C) = {
EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_QUESTION) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_QUESTION)
EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 20, 315, 30, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 20, 315, 30, 0, 0, 0, 0, 0)
EVT_CALL(PlaySound, 0x20E8) EVT_CALL(PlaySound, 0x20E8)
EVT_ELSE EVT_ELSE
EVT_WAIT_FRAMES(50) EVT_WAIT_FRAMES(50)
@ -1102,7 +1102,7 @@ EvtScript N(8021F5E8) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_8) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_tutankoopa_Palette_00_Anim_8)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_71, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_HIEROGLYPHS, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 45, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(45) EVT_WAIT_FRAMES(45)
EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C)
EVT_CALL(MoveBattleCamOver, 60) EVT_CALL(MoveBattleCamOver, 60)
@ -1185,7 +1185,7 @@ EvtScript N(8021FA54) = {
EVT_CALL(SetActorYaw, ACTOR_ENEMY1, 0) EVT_CALL(SetActorYaw, ACTOR_ENEMY1, 0)
EVT_CALL(GetActorPos, ACTOR_ENEMY1, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_ENEMY1, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_01, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, SOUND_DEATH)
EVT_SET(LW(3), 0) EVT_SET(LW(3), 0)
EVT_LOOP(12) EVT_LOOP(12)

4
src/battle/area_isk_part_2/stage/isk_04.c
View File

@ -8,8 +8,8 @@ BSS EffectInstance* D_80220740;
BSS EffectInstance* D_80220744; BSS EffectInstance* D_80220744;
ApiStatus func_80218850_4EFCF0(Evt* script, s32 isInitialCall) { ApiStatus func_80218850_4EFCF0(Evt* script, s32 isInitialCall) {
playFX_20(1, -133.0f, 72.0f, -143.0f, 0.3f, &D_80220740); fx_flame(1, -133.0f, 72.0f, -143.0f, 0.3f, &D_80220740);
playFX_20(1, 129.0f, 72.0f, -143.0f, 0.3f, &D_80220744); fx_flame(1, 129.0f, 72.0f, -143.0f, 0.3f, &D_80220744);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/area_isk_part_2/stage/isk_05.c
View File

@ -8,8 +8,8 @@ BSS EffectInstance* D_80220750;
BSS EffectInstance* D_80220754; BSS EffectInstance* D_80220754;
ApiStatus func_80218920_4EFDC0(Evt* script, s32 isInitialCall) { ApiStatus func_80218920_4EFDC0(Evt* script, s32 isInitialCall) {
playFX_20(1, -90.0f, 45.0f, -146.0f, 0.25f, &D_80220750); fx_flame(1, -90.0f, 45.0f, -146.0f, 0.25f, &D_80220750);
playFX_20(1, 80.0f, 45.0f, -146.0f, 0.25f, &D_80220754); fx_flame(1, 80.0f, 45.0f, -146.0f, 0.25f, &D_80220754);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_2/stage/isk_06.c
View File

@ -7,7 +7,7 @@
BSS EffectInstance* D_80220760; BSS EffectInstance* D_80220760;
ApiStatus func_802189F0_4EFE90(Evt* script, s32 isInitialCall) { ApiStatus func_802189F0_4EFE90(Evt* script, s32 isInitialCall) {
playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760); fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220760);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_2/stage/isk_06b.c
View File

@ -7,7 +7,7 @@
BSS EffectInstance* D_80220770; BSS EffectInstance* D_80220770;
ApiStatus func_80218A60_4EFF00(Evt* script, s32 isInitialCall) { ApiStatus func_80218A60_4EFF00(Evt* script, s32 isInitialCall) {
playFX_20(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770); fx_flame(1, -110.0f, 80.0f, -146.0f, 0.3f, &D_80220770);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/area_isk_part_2/stage/isk_07.c
View File

@ -7,7 +7,7 @@
BSS EffectInstance* D_80220780; BSS EffectInstance* D_80220780;
ApiStatus func_80218AD0_4EFF70(Evt* script, s32 isInitialCall) { ApiStatus func_80218AD0_4EFF70(Evt* script, s32 isInitialCall) {
playFX_20(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780); fx_flame(1, 110.0f, 80.0f, -146.0f, 0.3f, &D_80220780);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

8
src/battle/area_iwa/actor/buzzar.c
View File

@ -345,7 +345,7 @@ EvtScript N(8021BEBC) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), 10) EVT_ADD(LW(0), 10)
EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -383,7 +383,7 @@ EvtScript N(8021BEBC) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), 10) EVT_ADD(LW(0), 10)
EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -448,7 +448,7 @@ EvtScript N(8021BEBC) = {
EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), 10) EVT_ADD(LW(0), 10)
EVT_CALL(PlayEffect, EFFECT_ID_2B, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WINDY_LEAVES, 2, LW(0), 10, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD
@ -558,7 +558,7 @@ EvtScript N(8021CCE8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), 24) EVT_ADD(LW(0), 24)
EVT_ADD(LW(1), 24) EVT_ADD(LW(1), 24)
EVT_CALL(PlayEffect, EFFECT_ID_6D, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.6), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHINY_FLARE, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.6), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F3) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20F3)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0) EVT_CALL(SetPartSounds, ACTOR_SELF, 3, 1, 0, 0)

10
src/battle/area_iwa/actor/cleft.c
View File

@ -154,7 +154,7 @@ EvtScript N(80218944) = {
EVT_THREAD EVT_THREAD
EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0))
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlayEffect, EFFECT_ID_1D, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LW(0), LW(1), LW(2), 40, 8, EVT_FLOAT(0.0), 20, 0, 0, 0, 0, 0)
EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2)) EVT_CALL(SetActorPos, ACTOR_SELF, LW(0), 0, LW(2))
EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0)
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
@ -297,7 +297,7 @@ EvtScript N(handleEvent_80218C3C) = {
EVT_ADD(LW(0), -8) EVT_ADD(LW(0), -8)
EVT_ADD(LW(1), 27) EVT_ADD(LW(1), 27)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER)
EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_IMMUNE)
@ -439,11 +439,11 @@ EvtScript N(80219BA0) = {
EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(MoveBattleCamOver, 30)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_default_charge_still) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_cleft_default_charge_still)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)

2
src/battle/area_jan/actor/jungle_fuzzy.c
View File

@ -570,7 +570,7 @@ EvtScript N(leechAttack) = {
EVT_END_THREAD EVT_END_THREAD
EVT_ADD(LW(0), 20) EVT_ADD(LW(0), 20)
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_40, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(GetActorHP, ACTOR_SELF, LW(0)) EVT_CALL(GetActorHP, ACTOR_SELF, LW(0))
EVT_ADD(LW(0), LW(3)) EVT_ADD(LW(0), LW(3))
EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0)) EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0))

8
src/battle/area_jan/actor/spear_guy.c
View File

@ -499,7 +499,7 @@ EvtScript N(handleEvent_80218E3C) = {
EVT_ADD(LW(1), 38) EVT_ADD(LW(1), 38)
EVT_END_IF EVT_END_IF
EVT_END_SWITCH EVT_END_SWITCH
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
@ -631,7 +631,7 @@ EvtScript N(summonBackup) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 15) EVT_ADD(LW(1), 15)
EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
@ -700,7 +700,7 @@ EvtScript N(summonBackup) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 15) EVT_ADD(LW(1), 15)
EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, LW(11), 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E) EVT_CALL(SetAnimation, LW(11), 2, NPC_ANIM_jungle_guy_Palette_00_Anim_E)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_IF_EQ(LF(0), 0) EVT_IF_EQ(LF(0), 0)
@ -764,7 +764,7 @@ EvtScript N(becomeShyGuy) = {
EVT_THREAD EVT_THREAD
EVT_LOOP(10) EVT_LOOP(10)
EVT_CALL(GetPartOffset, ACTOR_SELF, 4, LW(0), LW(1), LW(2)) EVT_CALL(GetPartOffset, ACTOR_SELF, 4, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_11, 3, LW(0), LW(1), LW(2), 5, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LW(0), LW(1), LW(2), 5, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_END_LOOP EVT_END_LOOP
EVT_END_THREAD EVT_END_THREAD

2
src/battle/area_jan/stage/jan_00.c
View File

@ -110,7 +110,7 @@ EvtScript N(beforeBattle_802271C4) = {
EVT_EXEC(N(80226B00)) EVT_EXEC(N(80226B00))
EVT_SET(LW(0), 53) EVT_SET(LW(0), 53)
EVT_EXEC(N(80226C18)) EVT_EXEC(N(80226C18))
EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

2
src/battle/area_jan2/stage/jan_00.c
View File

@ -110,7 +110,7 @@ EvtScript N(beforeBattle_8021E1F4) = {
EVT_EXEC(N(8021DB30)) EVT_EXEC(N(8021DB30))
EVT_SET(LW(0), 53) EVT_SET(LW(0), 53)
EVT_EXEC(N(8021DC48)) EVT_EXEC(N(8021DC48))
EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

2
src/battle/area_kgr/actor/fuzzipede.c
View File

@ -875,7 +875,7 @@ EvtScript N(8021B22C) = {
EVT_END_LOOP EVT_END_LOOP
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2)
EVT_CALL(PlayEffect, EFFECT_ID_43, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(N(StartRumbleWithParams), 200, 10) EVT_CALL(N(StartRumbleWithParams), 200, 10)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20DC) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x20DC)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_fuzzipede_Palette_00_Anim_13) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_fuzzipede_Palette_00_Anim_13)

2
src/battle/area_kmr_part_2/actor/goomba_king.c
View File

@ -150,7 +150,7 @@ ApiStatus func_80218A60_43A4F0(Evt* script, s32 isInitialCall) {
s32 var1 = evt_get_variable(script, *args++); s32 var1 = evt_get_variable(script, *args++);
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
fx_land(2, var1, var2, evt_get_variable(script, *args++), 0); fx_landing_dust(2, var1, var2, evt_get_variable(script, *args++), 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

12
src/battle/area_kzn/actor/red_magikoopa.c
View File

@ -382,7 +382,7 @@ EvtScript N(80221788) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
EVT_ADD(LW(4), 10) EVT_ADD(LW(4), 10)
EVT_ADD(LW(5), 5) EVT_ADD(LW(5), 5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -550,7 +550,7 @@ EvtScript N(rMagikoopa_ShapeSpell) = {
EVT_SUB(LW(0), 30) EVT_SUB(LW(0), 30)
EVT_ADD(LW(1), 36) EVT_ADD(LW(1), 36)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_47, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_01_Anim_2) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_01_Anim_2)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10)
@ -850,12 +850,12 @@ EvtScript N(takeTurn_802233E0) = {
EVT_SUB(LW(0), 6) EVT_SUB(LW(0), 6)
EVT_ADD(LW(1), 12) EVT_ADD(LW(1), 12)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 16) EVT_SUB(LW(0), 16)
EVT_ADD(LW(1), 31) EVT_ADD(LW(1), 31)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_ELSE EVT_ELSE
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@ -864,12 +864,12 @@ EvtScript N(takeTurn_802233E0) = {
EVT_SUB(LW(0), 12) EVT_SUB(LW(0), 12)
EVT_ADD(LW(1), 14) EVT_ADD(LW(1), 14)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 30) EVT_SUB(LW(0), 30)
EVT_ADD(LW(1), 36) EVT_ADD(LW(1), 36)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 5, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)

2
src/battle/area_mim/actor/forest_fuzzy.c
View File

@ -434,7 +434,7 @@ EvtScript N(80219054) = {
EVT_END_THREAD EVT_END_THREAD
EVT_ADD(LW(0), 20) EVT_ADD(LW(0), 20)
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_40, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RECOVER, 0, LW(0), LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(GetActorHP, ACTOR_SELF, LW(0)) EVT_CALL(GetActorHP, ACTOR_SELF, LW(0))
EVT_ADD(LW(0), LW(3)) EVT_ADD(LW(0), LW(3))
EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0)) EVT_CALL(SetEnemyHP, ACTOR_SELF, LW(0))

2
src/battle/area_mim/actor/piranha_plant.c
View File

@ -203,7 +203,7 @@ EvtScript N(handleEvent_8021D60C) = {
EVT_ADD(LW(0), 0) EVT_ADD(LW(0), 0)
EVT_ADD(LW(1), 35) EVT_ADD(LW(1), 35)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_END_THREAD EVT_END_THREAD
EVT_LOOP(40) EVT_LOOP(40)

6
src/battle/area_omo/actor/groove_guy.c
View File

@ -612,7 +612,7 @@ s32 func_8021878C_512D5C(Evt* script, s32 isInitialCall) {
D_802310D0.unk_28 = x; D_802310D0.unk_28 = x;
D_802310D0.unk_2C = y; D_802310D0.unk_2C = y;
D_802310D0.unk_30 = z; D_802310D0.unk_30 = z;
playFX_46_whirlwind(6, &D_802310D0, temp_f20, temp_v0); fx_46(6, &D_802310D0, temp_f20, temp_v0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -692,7 +692,7 @@ EvtScript N(8022671C) = {
EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 30) EVT_ADD(LW(1), 30)
EVT_CALL(PlayEffect, EFFECT_ID_11, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x206D)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_groove_guy_Palette_00_Anim_A) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_groove_guy_Palette_00_Anim_A)
EVT_WAIT_FRAMES(8) EVT_WAIT_FRAMES(8)
@ -764,7 +764,7 @@ EvtScript N(80226DEC) = {
EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_groove_guy_Palette_00_Anim_A) EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_groove_guy_Palette_00_Anim_A)
EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
EVT_CALL(ForceHomePos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(ForceHomePos, LW(11), LW(0), LW(1), LW(2))
EVT_WAIT_FRAMES(25) EVT_WAIT_FRAMES(25)

10
src/battle/area_omo/actor/sky_guy.c
View File

@ -273,12 +273,12 @@ EvtScript N(80229A34) = {
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(7), LW(8), LW(9)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(7), LW(8), LW(9))
EVT_ADD(LW(8), 20) EVT_ADD(LW(8), 20)
EVT_CALL(PlayEffect, EFFECT_ID_4B, 2, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BALLOON, 2, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
EVT_SUB(LW(7), 14) EVT_SUB(LW(7), 14)
EVT_SUB(LW(8), 4) EVT_SUB(LW(8), 4)
EVT_CALL(PlayEffect, EFFECT_ID_4B, 0, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BALLOON, 0, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
EVT_ADD(LW(7), 28) EVT_ADD(LW(7), 28)
EVT_CALL(PlayEffect, EFFECT_ID_4B, 1, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BALLOON, 1, LW(7), LW(8), LW(9), EVT_FLOAT(1.0), 150, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 2)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1)
EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, 1)
@ -355,7 +355,7 @@ EvtScript N(80229F08) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_0) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x263) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x263)
EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 24, 0, 25, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 24, 0, 25, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(25) EVT_WAIT_FRAMES(25)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_6) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_sky_guy_Palette_00_Anim_6)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
@ -376,7 +376,7 @@ EvtScript N(80229F08) = {
EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_NO_TARGET)
EVT_CALL(SetPartFlags, ACTOR_SELF, 1, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET) EVT_CALL(SetPartFlags, ACTOR_SELF, 1, ACTOR_PART_FLAG_4 | ACTOR_PART_FLAG_MULTI_TARGET)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_shy_guy_Palette_00_Anim_12) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_shy_guy_Palette_00_Anim_12)
EVT_CALL(PlayEffect, EFFECT_ID_06, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(40) EVT_WAIT_FRAMES(40)
EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0)
EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022CA9C))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_ADDR(N(takeTurn_8022CA9C)))

4
src/battle/area_omo/actor/spy_guy.c
View File

@ -571,7 +571,7 @@ EvtScript N(hammerAttack) = {
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2)
EVT_SUB(LW(1), 7) EVT_SUB(LW(1), 7)
EVT_CALL(PlayEffect, EFFECT_ID_43, 0, LW(1), LW(2), LW(3), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_FIREWORK, 0, LW(1), LW(2), LW(3), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(40) EVT_WAIT_FRAMES(40)
EVT_ELSE EVT_ELSE
EVT_WAIT_FRAMES(8) EVT_WAIT_FRAMES(8)
@ -585,7 +585,7 @@ EvtScript N(hammerAttack) = {
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 10) EVT_ADD(LW(1), 10)
EVT_CALL(PlayEffect, EFFECT_ID_10, 2, 0, LW(0), LW(1), LW(2), 25, -45, 20, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_EMOTE, 2, 0, LW(0), LW(1), LW(2), 25, -45, 20, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_END_IF EVT_END_IF
EVT_LABEL(100) EVT_LABEL(100)

2
src/battle/area_sbk/actor/bandit.c
View File

@ -286,7 +286,7 @@ EvtScript N(8021D820) = {
EVT_CALL(SetGoalToTarget, LW(10)) EVT_CALL(SetGoalToTarget, LW(10))
EVT_CALL(JumpToGoal, LW(10), 15, FALSE, FALSE, FALSE) EVT_CALL(JumpToGoal, LW(10), 15, FALSE, FALSE, FALSE)
EVT_CALL(GetGoalPos, LW(10), LW(0), LW(1), LW(2)) EVT_CALL(GetGoalPos, LW(10), LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_49, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMALL_GOLD_SPARKLE, 0, LW(0), LW(1), LW(2), EVT_FLOAT(1.0), 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, LW(10), 0x211) EVT_CALL(PlaySoundAtActor, LW(10), 0x211)
EVT_CALL(GetActorVar, LW(10), 1, LW(0)) EVT_CALL(GetActorVar, LW(10), 1, LW(0))
EVT_CALL(AddCoin, LW(0)) EVT_CALL(AddCoin, LW(0))

8
src/battle/area_sbk/actor/pokey.c
View File

@ -435,7 +435,7 @@ EvtScript N(handleEvent_802186C0) = {
EVT_END_IF EVT_END_IF
EVT_ADDF(LW(3), LW(0)) EVT_ADDF(LW(3), LW(0))
EVT_ADDF(LW(4), LW(1)) EVT_ADDF(LW(4), LW(1))
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(3), LW(4), LW(5), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LW(0), 1) EVT_SET_CONST(LW(0), 1)
@ -934,7 +934,7 @@ EvtScript N(8021AE2C) = {
EVT_SUB(LW(1), 80) EVT_SUB(LW(1), 80)
EVT_CALL(SetActorPos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(SetActorPos, LW(11), LW(0), LW(1), LW(2))
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(PlayEffect, EFFECT_ID_25, 2, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LW(0), 0, LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(UseIdleAnimation, LW(11), FALSE) EVT_CALL(UseIdleAnimation, LW(11), FALSE)
EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_pokey_Palette_00_Anim_C) EVT_CALL(SetAnimation, LW(11), 1, NPC_ANIM_pokey_Palette_00_Anim_C)
EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(11), LW(0), LW(1), LW(2))
@ -1367,7 +1367,7 @@ EvtScript N(8021CCAC) = {
EVT_ADD(LW(1), LW(3)) EVT_ADD(LW(1), LW(3))
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1)) EVT_CALL(GetActorVar, ACTOR_SELF, 7, LW(1))
EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, LW(1))
@ -1414,7 +1414,7 @@ EvtScript N(8021D184) = {
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(10), LW(11), LW(12)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(10), LW(11), LW(12))
EVT_LOOP(LW(6)) EVT_LOOP(LW(6))
EVT_CALL(PlayEffect, EFFECT_ID_25, 2, LW(10), 0, LW(12), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SHOCKWAVE, 2, LW(10), 0, LW(12), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_END_LOOP EVT_END_LOOP
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD

2
src/battle/area_sbk/stage/sbk_02.c
View File

@ -38,7 +38,7 @@ EvtScript N(beforeBattle_8021F800) = {
EVT_SET(LW(0), 5) EVT_SET(LW(0), 5)
EVT_SET(LW(1), 240) EVT_SET(LW(1), 240)
EVT_EXEC(N(8021F720)) EVT_EXEC(N(8021F720))
EVT_CALL(PlayEffect, EFFECT_ID_82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };

4
src/battle/area_trd_part_1/actor/bill_blaster.c
View File

@ -220,8 +220,8 @@ EvtScript N(8021A2BC) = {
EVT_SUB(LW(0), 33) EVT_SUB(LW(0), 33)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_ADD(LW(2), 3) EVT_ADD(LW(2), 3)
EVT_CALL(PlayEffect, EFFECT_ID_00, LW(0), LW(1), LW(2), 2, 5, 0, 2, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_00, LW(0), LW(1), LW(2), 2, 5, 0, 2, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlayEffect, EFFECT_ID_00, LW(0), LW(1), LW(2), 2, 5, 2, 2, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_00, LW(0), LW(1), LW(2), 2, 5, 2, 2, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_CALL(func_80218000_4A10A0) EVT_CALL(func_80218000_4A10A0)
EVT_CALL(SummonEnemy, EVT_ADDR(N(specialFormation_8021A4E8)), 0) EVT_CALL(SummonEnemy, EVT_ADDR(N(specialFormation_8021A4E8)), 0)

8
src/battle/area_trd_part_1/actor/bob_omb.c
View File

@ -182,7 +182,7 @@ EvtScript N(8021A9C8) = {
EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_ADDR(N(statusTable_8021A5B4))) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_ADDR(N(statusTable_8021A5B4)))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(2), 2) EVT_ADD(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_06, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 3, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(StopLoopingSoundAtActor, ACTOR_SELF, 0) EVT_CALL(StopLoopingSoundAtActor, ACTOR_SELF, 0)
EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0)
EVT_RETURN EVT_RETURN
@ -210,10 +210,10 @@ EvtScript N(8021AB54) = {
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(2), 2) EVT_ADD(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_17, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_ADD(LW(1), 20) EVT_ADD(LW(1), 20)
EVT_ADD(LW(2), 2) EVT_ADD(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_19, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMB_BLAST) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BOMB_BLAST)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
@ -567,7 +567,7 @@ EvtScript N(tackleAttack) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_bob_omb_Palette_00_Anim_14) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_bob_omb_Palette_00_Anim_14)
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(GetActorSize, ACTOR_SELF, LW(3), LW(4)) EVT_CALL(GetActorSize, ACTOR_SELF, LW(3), LW(4))
EVT_CALL(PlayEffect, EFFECT_ID_4A, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_FLASHING_BOX_SHOCKWAVE, 0, LW(0), LW(1), LW(2), LW(4), LW(3), 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HIT_SHOCK)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_EXEC_WAIT(N(8021AB54)) EVT_EXEC_WAIT(N(8021AB54))

4
src/battle/area_trd_part_1/actor/bullet_bill.c
View File

@ -291,10 +291,10 @@ EvtScript N(takeTurn_802197C0) = {
EvtScript N(80219BE0) = { EvtScript N(80219BE0) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(2), 2) EVT_ADD(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_17, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LW(0), LW(1), LW(2), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_ADD(LW(1), 16) EVT_ADD(LW(1), 16)
EVT_ADD(LW(2), 2) EVT_ADD(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_3E, 0, LW(0), LW(1), LW(2), EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_BLAST, 0, LW(0), LW(1), LW(2), EVT_FLOAT(3.0), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2078) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2078)
EVT_CALL(StartRumble, 11) EVT_CALL(StartRumble, 11)
EVT_THREAD EVT_THREAD

6
src/battle/area_trd_part_2/actor/blue_ninja_koopa.c
View File

@ -322,7 +322,7 @@ EvtScript N(8022B6E8) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_C) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_C)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022B6DC))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022B6DC)))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -500,7 +500,7 @@ EvtScript N(8022B6E8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_4)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
@ -659,7 +659,7 @@ EvtScript N(8022B6E8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_3)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)

30
src/battle/area_trd_part_2/actor/fake_bowser.c
View File

@ -1303,31 +1303,31 @@ EvtScript N(8021E3A0) = {
EVT_WAIT_FRAMES(LW(3)) EVT_WAIT_FRAMES(LW(3))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), -8) EVT_ADD(LW(0), -8)
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(RandInt, LW(10), LW(3)) EVT_CALL(RandInt, LW(10), LW(3))
EVT_ADD(LW(3), 1) EVT_ADD(LW(3), 1)
EVT_WAIT_FRAMES(LW(3)) EVT_WAIT_FRAMES(LW(3))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), -12) EVT_ADD(LW(0), -12)
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(RandInt, LW(10), LW(3)) EVT_CALL(RandInt, LW(10), LW(3))
EVT_ADD(LW(3), 1) EVT_ADD(LW(3), 1)
EVT_WAIT_FRAMES(LW(3)) EVT_WAIT_FRAMES(LW(3))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), -47) EVT_ADD(LW(0), -47)
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(RandInt, LW(10), LW(3)) EVT_CALL(RandInt, LW(10), LW(3))
EVT_ADD(LW(3), 1) EVT_ADD(LW(3), 1)
EVT_WAIT_FRAMES(LW(3)) EVT_WAIT_FRAMES(LW(3))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), 40) EVT_ADD(LW(0), 40)
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(RandInt, LW(10), LW(3)) EVT_CALL(RandInt, LW(10), LW(3))
EVT_ADD(LW(3), 1) EVT_ADD(LW(3), 1)
EVT_WAIT_FRAMES(LW(3)) EVT_WAIT_FRAMES(LW(3))
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(0), -19) EVT_ADD(LW(0), -19)
EVT_CALL(PlayEffect, EFFECT_ID_07, 2, LW(0), 59, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 2, LW(0), 59, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_RETURN EVT_RETURN
EVT_END EVT_END
}; };
@ -1368,9 +1368,9 @@ EvtScript N(handleEvent_8021E6F0) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(ActorSpeak, MESSAGE_ID(0x0C, 0x0106), ACTOR_SELF, 1, -00001, -00001) EVT_CALL(ActorSpeak, MESSAGE_ID(0x0C, 0x0106), ACTOR_SELF, 1, -00001, -00001)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
@ -1401,9 +1401,9 @@ EvtScript N(handleEvent_8021E6F0) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_CASE_GROUP EVT_END_CASE_GROUP
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH
@ -1701,7 +1701,7 @@ EvtScript N(8021F630) = {
EVT_ADD(LW(0), 7) EVT_ADD(LW(0), 7)
EVT_ADD(LW(1), 28) EVT_ADD(LW(1), 28)
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x20F3) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY0, 0x20F3)
EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_1A) EVT_CALL(SetAnimation, ACTOR_ENEMY1, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_1A)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
@ -1709,7 +1709,7 @@ EvtScript N(8021F630) = {
EVT_ADD(LW(0), 7) EVT_ADD(LW(0), 7)
EVT_ADD(LW(1), 28) EVT_ADD(LW(1), 28)
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x20F3) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY1, 0x20F3)
EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_1A) EVT_CALL(SetAnimation, ACTOR_ENEMY2, 1, NPC_ANIM_koopa_bros_Palette_00_Anim_1A)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
@ -1717,7 +1717,7 @@ EvtScript N(8021F630) = {
EVT_ADD(LW(0), 7) EVT_ADD(LW(0), 7)
EVT_ADD(LW(1), 28) EVT_ADD(LW(1), 28)
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x20F3) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY2, 0x20F3)
EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_1A) EVT_CALL(SetAnimation, ACTOR_ENEMY3, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_1A)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
@ -1725,7 +1725,7 @@ EvtScript N(8021F630) = {
EVT_ADD(LW(0), 7) EVT_ADD(LW(0), 7)
EVT_ADD(LW(1), 28) EVT_ADD(LW(1), 28)
EVT_ADD(LW(2), 5) EVT_ADD(LW(2), 5)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x20F3) EVT_CALL(PlaySoundAtActor, ACTOR_ENEMY3, 0x20F3)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(func_80218350_4B1540) EVT_CALL(func_80218350_4B1540)
@ -1913,7 +1913,7 @@ EvtScript N(80220588) = {
EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LW(0)) EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LW(0))
EVT_IF_NOT_FLAG(LW(0), 2) EVT_IF_NOT_FLAG(LW(0), 2)
@ -2255,7 +2255,7 @@ EvtScript N(80221DB4) = {
EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, LW(10), LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetActorFlagBits, LW(10), ACTOR_FLAG_40000, 1) EVT_CALL(SetActorFlagBits, LW(10), ACTOR_FLAG_40000, 1)
EVT_CALL(SetPartFlagBits, LW(10), 1, ACTOR_PART_FLAG_NO_TARGET, 1) EVT_CALL(SetPartFlagBits, LW(10), 1, ACTOR_PART_FLAG_NO_TARGET, 1)

6
src/battle/area_trd_part_2/actor/green_ninja_koopa.c
View File

@ -322,7 +322,7 @@ EvtScript N(802257A8) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_C) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_C)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022579C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022579C)))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -500,7 +500,7 @@ EvtScript N(802257A8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_4)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
@ -659,7 +659,7 @@ EvtScript N(802257A8) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_03_Anim_3)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)

6
src/battle/area_trd_part_2/actor/red_ninja_koopa.c
View File

@ -322,7 +322,7 @@ EvtScript N(80228748) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_C) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_C)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022873C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022873C)))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -500,7 +500,7 @@ EvtScript N(80228748) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_4)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
@ -659,7 +659,7 @@ EvtScript N(80228748) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_01_Anim_3)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)

6
src/battle/area_trd_part_2/actor/yellow_ninja_koopa.c
View File

@ -322,7 +322,7 @@ EvtScript N(8022E688) = {
EVT_ADDF(LW(1), LW(3)) EVT_ADDF(LW(1), LW(3))
EVT_ADDF(LW(2), EVT_FLOAT(5.0)) EVT_ADDF(LW(2), EVT_FLOAT(5.0))
EVT_DIVF(LW(3), EVT_FLOAT(10.0)) EVT_DIVF(LW(3), EVT_FLOAT(10.0))
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(0), LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_C) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_C)
EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022E67C))) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_ADDR(N(idleAnimations_8022E67C)))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -500,7 +500,7 @@ EvtScript N(8022E688) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_4) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_4)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
@ -659,7 +659,7 @@ EvtScript N(8022E688) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_SUB(LW(0), 22) EVT_SUB(LW(0), 22)
EVT_ADD(LW(1), 19) EVT_ADD(LW(1), 19)
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 30, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_3) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_bros_Palette_02_Anim_3)
EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetGoalToHome, ACTOR_SELF)

6
src/battle/common/actor/koopa_troopa.inc.c
View File

@ -504,11 +504,11 @@ EvtScript N(takeTurn_8021DD9C) = {
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 4) EVT_ADD(LW(1), 4)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6)

4
src/battle/common/actor/medi_guy.inc.c
View File

@ -368,8 +368,8 @@ EvtScript N(healOneAlly) = {
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_5)
EVT_ADD(LW(2), 50) EVT_ADD(LW(2), 50)
EVT_CALL(PlayEffect, EFFECT_ID_11, 1, LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LW(1), LW(2), LW(3), 10, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(PlayEffect, EFFECT_ID_40, 2, LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RECOVER, 2, LW(1), LW(2), LW(3), 0, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_1) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_medi_guy_Palette_00_Anim_1)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)

2
src/battle/common/actor/paragoomba.inc.c
View File

@ -515,7 +515,7 @@ EvtScript N(8021C574) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
EVT_ADD(LW(4), 10) EVT_ADD(LW(4), 10)
EVT_ADD(LW(5), 5) EVT_ADD(LW(5), 5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)

6
src/battle/common/actor/paratroopa.inc.c
View File

@ -1058,11 +1058,11 @@ EvtScript N(takeTurn_80221DAC) = {
EVT_CHILD_THREAD EVT_CHILD_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_ADD(LW(1), 4) EVT_ADD(LW(1), 4)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(3) EVT_WAIT_FRAMES(3)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(2) EVT_WAIT_FRAMES(2)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_CHILD_THREAD EVT_END_CHILD_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_koopa_troopa_Palette_01_Anim_6)

8
src/battle/common/actor/spike_top.inc.c
View File

@ -455,7 +455,7 @@ EvtScript N(spikeTop_HandleEvent_Floor) = {
EVT_ELSE EVT_ELSE
EVT_ADD(LW(1), 24) EVT_ADD(LW(1), 24)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_EQ(EVENT_DEATH) EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LW(0), 1) EVT_SET_CONST(LW(0), 1)
@ -730,11 +730,11 @@ EvtScript N(spikeTop_TakeTurn_Floor) = {
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_F) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_F)
EVT_THREAD EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(10) EVT_WAIT_FRAMES(10)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(5) EVT_WAIT_FRAMES(5)
EVT_CALL(PlayEffect, EFFECT_ID_1D, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LW(0), LW(1), LW(2), 32, 4, 0, 10, 0, 0, 0, 0, 0)
EVT_END_THREAD EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, 0x2021)
EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_A) EVT_CALL(SetAnimation, ACTOR_SELF, 1, NPC_ANIM_spike_top_Palette_00_Anim_A)

2
src/battle/common/actor/spiked_goomba.inc.c
View File

@ -284,7 +284,7 @@ EvtScript N(handleEvent_8021E874) = {
EVT_ELSE EVT_ELSE
EVT_ADD(LW(1), 26) EVT_ADD(LW(1), 26)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_1A, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LW(0), LW(1), LW(2), 20, 0, 0, 0, 0, 0, 0, 0, 0)
EVT_WAIT_FRAMES(20) EVT_WAIT_FRAMES(20)
EVT_CASE_DEFAULT EVT_CASE_DEFAULT
EVT_END_SWITCH EVT_END_SWITCH

20
src/battle/common/actor/white_magikoopa.inc.c
View File

@ -383,7 +383,7 @@ EvtScript N(80224448) = {
EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(3), LW(4), LW(5))
EVT_ADD(LW(4), 10) EVT_ADD(LW(4), 10)
EVT_ADD(LW(5), 5) EVT_ADD(LW(5), 5)
EVT_CALL(PlayEffect, EFFECT_ID_27, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LW(3), LW(4), LW(5), EVT_FLOAT(1.0), 10, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(SetGoalPos, ACTOR_SELF, LW(0), LW(1), LW(2))
EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
@ -551,7 +551,7 @@ EvtScript N(wMagikoopa_ShapeSpell) = {
EVT_SUB(LW(0), 30) EVT_SUB(LW(0), 30)
EVT_ADD(LW(1), 36) EVT_ADD(LW(1), 36)
EVT_END_IF EVT_END_IF
EVT_CALL(PlayEffect, EFFECT_ID_47, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_GATHER_MAGIC, 0, LW(0), LW(1), LW(2), EVT_FLOAT(0.5), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_03_Anim_2) EVT_CALL(SetAnimation, ACTOR_SELF, 2, NPC_ANIM_flying_magikoopa_Palette_03_Anim_2)
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LW(0), 0, 0, 1, BS_FLAGS1_10)
@ -958,12 +958,12 @@ EvtScript N(healOne) = {
EVT_SUB(LW(0), 6) EVT_SUB(LW(0), 6)
EVT_ADD(LW(1), 12) EVT_ADD(LW(1), 12)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 16) EVT_SUB(LW(0), 16)
EVT_ADD(LW(1), 31) EVT_ADD(LW(1), 31)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_ELSE EVT_ELSE
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@ -972,12 +972,12 @@ EvtScript N(healOne) = {
EVT_SUB(LW(0), 12) EVT_SUB(LW(0), 12)
EVT_ADD(LW(1), 14) EVT_ADD(LW(1), 14)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 30) EVT_SUB(LW(0), 30)
EVT_ADD(LW(1), 36) EVT_ADD(LW(1), 36)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)
@ -1044,12 +1044,12 @@ EvtScript N(healAll) = {
EVT_SUB(LW(0), 6) EVT_SUB(LW(0), 6)
EVT_ADD(LW(1), 12) EVT_ADD(LW(1), 12)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 16) EVT_SUB(LW(0), 16)
EVT_ADD(LW(1), 31) EVT_ADD(LW(1), 31)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_ELSE EVT_ELSE
EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2)) EVT_CALL(GetActorPos, ACTOR_SELF, LW(0), LW(1), LW(2))
@ -1058,12 +1058,12 @@ EvtScript N(healAll) = {
EVT_SUB(LW(0), 12) EVT_SUB(LW(0), 12)
EVT_ADD(LW(1), 14) EVT_ADD(LW(1), 14)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.12), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_ELSE EVT_ELSE
EVT_SUB(LW(0), 30) EVT_SUB(LW(0), 30)
EVT_ADD(LW(1), 36) EVT_ADD(LW(1), 36)
EVT_SUB(LW(2), 2) EVT_SUB(LW(2), 2)
EVT_CALL(PlayEffect, EFFECT_ID_33, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlayEffect, EFFECT_RADIAL_SHIMMER, 7, LW(0), LW(1), LW(2), EVT_FLOAT(0.3), 30, 0, 0, 0, 0, 0, 0, 0)
EVT_END_IF EVT_END_IF
EVT_END_IF EVT_END_IF
EVT_WAIT_FRAMES(30) EVT_WAIT_FRAMES(30)

2
src/battle/item/dried_shroom.c
View File

@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/egg_missile.c
View File

@ -14,8 +14,8 @@ ApiStatus N(func_802A123C_71CF1C)(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_17(0, a, b, c); fx_smoke_ring(0, a, b, c);
playFX_19(0, a, b + 20, c); fx_explosion(0, a, b + 20, c);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/electro_pop.c
View File

@ -19,7 +19,7 @@ ApiStatus N(func_802A127C_73081C)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -31,7 +31,7 @@ ApiStatus N(func_802A133C_7308DC)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/fire_flower.c
View File

@ -9,7 +9,7 @@ ApiStatus N(func_802A123C_716E9C)(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_3F(0, a, b, c, 0); fx_fire_flower(0, a, b, c, 0);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/food.c
View File

@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_733448)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -60,7 +60,7 @@ ApiStatus N(func_802A1438_733508)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/insecticide_herb.c
View File

@ -41,7 +41,7 @@ ApiStatus N(func_802A12E0_72AA30)(Evt* script, s32 isInitialCall) {
a += rand_int(20) - 10; a += rand_int(20) - 10;
b += rand_int(10) - 5; b += rand_int(10) - 5;
effect = (struct N(temp)*)playFX_6F(0, a, b, c, 1.0f, 30); effect = (struct N(temp)*)fx_cold_breath(0, a, b, c, 1.0f, 30);
effect->unk_0C->unk_18 = 0xF4; effect->unk_0C->unk_18 = 0xF4;
effect->unk_0C->unk_1C = 0xF4; effect->unk_0C->unk_1C = 0xF4;

2
src/battle/item/life_shroom.c
View File

@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_72E8A8)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/mushroom.c
View File

@ -48,7 +48,7 @@ ApiStatus N(func_802A1378_715BC8)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -60,7 +60,7 @@ ApiStatus N(func_802A1438_715C88)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/mystery.c
View File

@ -218,7 +218,7 @@ ApiStatus N(func_802A188C_72CE3C)(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_18(2, a, b, c, 0, -1.0f, 0, 5); fx_damage_stars(2, a, b, c, 0, -1.0f, 0, 5);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/shooting_star.c
View File

@ -36,7 +36,7 @@ ApiStatus N(func_802A123C_71D9AC)(Evt* script, s32 isInitialCall) {
} }
do { do {
playFX_0F(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7); fx_star(phi_a0, temp_s1, c8, temp_s0, temp_f22, 0, temp_f20, phi_v0 + 7);
if (temp_f20) { if (temp_f20) {
temp_f20 -= rand; temp_f20 -= rand;
} }
@ -55,7 +55,7 @@ ApiStatus N(func_802A1388_71DAF8)(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_18(2, a, b, c, 0, -1.0f, 0, 5); fx_damage_stars(2, a, b, c, 0, -1.0f, 0, 5);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/item/sleepy_sheep.c
View File

@ -129,7 +129,7 @@ ApiStatus func_802A123C_71E88C(Evt* script, s32 isInitialCall) {
if (x > 40.0f) { if (x > 40.0f) {
x2 = -(x - 40.0f); x2 = -(x - 40.0f);
} }
fx_land(3, x2, y2, z, 0); fx_landing_dust(3, x2, y2, z, 0);
flag = 1; flag = 1;
} }
} }
@ -139,7 +139,7 @@ ApiStatus func_802A123C_71E88C(Evt* script, s32 isInitialCall) {
} }
if (gGameStatusPtr->frameCounter & 1) { if (gGameStatusPtr->frameCounter & 1) {
s32 randIdx = rand_int(9); s32 randIdx = rand_int(9);
fx_land(2, N(D_802A3E88_7214D8)[randIdx * 3 + 0] + D_802A3F88_ptr->x, fx_landing_dust(2, N(D_802A3E88_7214D8)[randIdx * 3 + 0] + D_802A3F88_ptr->x,
N(D_802A3E88_7214D8)[randIdx * 3 + 1], N(D_802A3E88_7214D8)[randIdx * 3 + 1],
N(D_802A3E88_7214D8)[randIdx * 3 + 2] + D_802A3F88_ptr->z, 0); N(D_802A3E88_7214D8)[randIdx * 3 + 2] + D_802A3F88_ptr->z, 0);
} }

4
src/battle/item/snowman_doll.c
View File

@ -9,8 +9,8 @@ ApiStatus N(func_802A123C_71C06C)(Evt* script, s32 isInitialCall) {
s32 b = evt_get_variable(script, *args++); s32 b = evt_get_variable(script, *args++);
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
playFX_11(2, a, b, c, 30.0f); fx_sparkles(2, a, b, c, 30.0f);
playFX_11(2, a, b, c, 30.0f); fx_sparkles(2, a, b, c, 30.0f);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/stone_cap.c
View File

@ -25,7 +25,7 @@ ApiStatus N(func_802A123C_7217DC)(Evt* script, s32 isInitialCall) {
f32 x = player->currentPos.x + ((rand_int(20) - 10) * player->scalingFactor); f32 x = player->currentPos.x + ((rand_int(20) - 10) * player->scalingFactor);
f32 y = player->currentPos.y + ((rand_int(20) + 10) * player->scalingFactor); f32 y = player->currentPos.y + ((rand_int(20) + 10) * player->scalingFactor);
f32 z = player->currentPos.z + 5.0f; f32 z = player->currentPos.z + 5.0f;
playFX_69(0, x, y, z, 1.0f, 25); fx_floating_cloud_puff(0, x, y, z, 1.0f, 25);
} }
if (script->functionTemp[1] == 0) { if (script->functionTemp[1] == 0) {

4
src/battle/item/strange_cake.c
View File

@ -212,7 +212,7 @@ ApiStatus N(func_802A1818_731B18)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
@ -223,7 +223,7 @@ ApiStatus N(func_802A18D8_731BD8)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/super_soda.c
View File

@ -79,7 +79,7 @@ ApiStatus N(func_802A1418_7250F8)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(1, a, b, c, d); fx_recover(1, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/thunder_bolt.c
View File

@ -23,7 +23,7 @@ ApiStatus N(func_802A123C_722D7C)(Evt* script, s32 isInitialCall) {
posY -= actor->size.y / 2; posY -= actor->size.y / 2;
} }
playFX_36(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY); fx_lightning(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/thunder_rage.c
View File

@ -41,7 +41,7 @@ ApiStatus N(func_802A1354_71B4F4)(Evt* script, s32 isInitialCall) {
posY -= actor->size.y / 2; posY -= actor->size.y / 2;
} }
playFX_36(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY); fx_lightning(rand_int(2) + 3, posX, posY, posZ, scaleX, scaleY);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/ultra_shroom.c
View File

@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_7239BC)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/item/unknown_item.c
View File

@ -10,7 +10,7 @@ ApiStatus N(func_802A123C_72447C)(Evt* script, s32 isInitialCall) {
s32 c = evt_get_variable(script, *args++); s32 c = evt_get_variable(script, *args++);
s32 d = evt_get_variable(script, *args++); s32 d = evt_get_variable(script, *args++);
playFX_40(0, a, b, c, d); fx_recover(0, a, b, c, d);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

4
src/battle/move/d_down_jump/781920.c
View File

@ -12,9 +12,9 @@ ApiStatus func_802A10E4_781A04(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
if (script->varTable[10] == 0) { if (script->varTable[10] == 0) {
playFX_32(TRUE, var0, var1, var2, 0.0f); fx_green_impact(TRUE, var0, var1, var2, 0.0f);
} else { } else {
playFX_32(FALSE, var0, var1, var2, 0.0f); fx_green_impact(FALSE, var0, var1, var2, 0.0f);
} }
return ApiStatus_DONE2; return ApiStatus_DONE2;

4
src/battle/move/d_down_pound/74AD90.c
View File

@ -14,9 +14,9 @@ ApiStatus func_802A10A4_74AE34(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
if (script->varTable[10] == 0) { if (script->varTable[10] == 0) {
playFX_32(TRUE, var0 + 30, var1 + 25, var2, 45.0f); fx_green_impact(TRUE, var0 + 30, var1 + 25, var2, 45.0f);
} else { } else {
playFX_32(FALSE, var0 + 30, var1 + 25, var2, 45.0f); fx_green_impact(FALSE, var0 + 30, var1 + 25, var2, 45.0f);
} }
return ApiStatus_DONE2; return ApiStatus_DONE2;

4
src/battle/move/hammer_charge_0/74F130.c
View File

@ -16,7 +16,7 @@ ApiStatus func_802A10C8_74F1F8(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
playFX_56(0, var1, var2, var3, 1.0f, 60); fx_stat_change(0, var1, var2, var3, 1.0f, 60);
battleStatus->hammerCharge++; battleStatus->hammerCharge++;
if (battleStatus->hammerCharge > 99) { if (battleStatus->hammerCharge > 99) {
@ -37,7 +37,7 @@ ApiStatus func_802A11CC_74F2FC(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
f32 var3 = evt_get_float_variable(script, *args++); f32 var3 = evt_get_float_variable(script, *args++);
playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45); fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/move/hammer_charge_1/7595B0.c
View File

@ -19,7 +19,7 @@ ApiStatus func_802A10C8_759678(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32* var4; s32* var4;
playFX_56(1, var1, var2, var3, 1.0f, 60); fx_stat_change(1, var1, var2, var3, 1.0f, 60);
var4 = &D_802A43D0; var4 = &D_802A43D0;
*var4 = 0; *var4 = 0;
if (battleStatus->hammerCharge > 0) { if (battleStatus->hammerCharge > 0) {

2
src/battle/move/hammer_charge_2/75E5D0.c
View File

@ -19,7 +19,7 @@ ApiStatus func_802A10C8_75E698(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32* var4; s32* var4;
playFX_56(2, var1, var2, var3, 1.0f, 60); fx_stat_change(2, var1, var2, var3, 1.0f, 60);
var4 = &D_802A4350; var4 = &D_802A4350;
*var4 = 0; *var4 = 0;
if (battleStatus->hammerCharge > 0) { if (battleStatus->hammerCharge > 0) {

4
src/battle/move/jump_charge_0/74D570.c
View File

@ -14,7 +14,7 @@ ApiStatus func_802A1108_74D678(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
playFX_56(0, var1, var2, var3, 1.0f, 60); fx_stat_change(0, var1, var2, var3, 1.0f, 60);
battleStatus->jumpCharge++; battleStatus->jumpCharge++;
if (battleStatus->jumpCharge > 99) { if (battleStatus->jumpCharge > 99) {
@ -35,7 +35,7 @@ ApiStatus func_802A120C_74D77C(Evt* script, s32 isInitialCall) {
s32 var2 = evt_get_variable(script, *args++); s32 var2 = evt_get_variable(script, *args++);
f32 var3 = evt_get_float_variable(script, *args++); f32 var3 = evt_get_float_variable(script, *args++);
playFX_6B(6, var0 + 10, var1 + 18, var2, var3, 45); fx_energy_in_out(6, var0 + 10, var1 + 18, var2, var3, 45);
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }

2
src/battle/move/jump_charge_1/75C980.c
View File

@ -17,7 +17,7 @@ ApiStatus func_802A1108_75CA88(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32* var4; s32* var4;
playFX_56(1, var1, var2, var3, 1.0f, 60); fx_stat_change(1, var1, var2, var3, 1.0f, 60);
var4 = &D_802A2C50; var4 = &D_802A2C50;
*var4 = 0; *var4 = 0;
if (battleStatus->jumpCharge > 0) { if (battleStatus->jumpCharge > 0) {

2
src/battle/move/jump_charge_2/761920.c
View File

@ -17,7 +17,7 @@ ApiStatus func_802A1108_761A28(Evt* script, s32 isInitialCall) {
s32 var3 = evt_get_variable(script, *args++); s32 var3 = evt_get_variable(script, *args++);
s32* var4; s32* var4;
playFX_56(2, var1, var2, var3, 1.0f, 60); fx_stat_change(2, var1, var2, var3, 1.0f, 60);
var4 = &D_802A2C20; var4 = &D_802A2C20;
*var4 = 0; *var4 = 0;
if (battleStatus->jumpCharge > 0) { if (battleStatus->jumpCharge > 0) {

Some files were not shown because too many files have changed in this diff Show More