From ee0bd3c30481d1fef630708a89fd85cc1fc9181f Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Mon, 8 May 2023 23:46:47 -0400 Subject: [PATCH] effect flags (#1052) * damage intensity * standardized battle script names * few more * effect flags * slight name change * renderUI = NULL * rm space --------- Co-authored-by: HailSanta --- include/dead.h | 2 +- include/effects.h | 44 +++--- include/enums.h | 76 ++--------- include/functions.h | 2 +- include/npc.h | 2 +- include/script_api/common.h | 4 +- src/16F740.c | 6 +- src/182B30.c | 4 +- src/18F340.c | 4 +- src/190B20.c | 6 +- src/5B320.c | 80 +++++------ src/77480.c | 4 +- src/C50A0.c | 10 +- src/battle/area/mac/actor/lee.c | 18 +-- src/battle/btl_evt_library.c | 2 +- src/battle/common/actor/ghost_goombario.inc.c | 2 +- src/battle/common/actor/ghost_watt.inc.c | 16 +-- src/battle/common/move/StarBeamSupport.inc.c | 4 +- src/battle/partner/goombario.c | 2 +- src/battle/partner/parakarry.c | 2 +- src/battle/partner/sushie.c | 2 +- src/battle/partner/watt.c | 12 +- src/effects.c | 126 ++++++++++-------- src/effects/attack_result_text.c | 2 +- src/effects/aura.c | 6 +- src/effects/balloon.c | 2 +- src/effects/big_smoke_puff.c | 2 +- src/effects/big_snowflakes.c | 2 +- src/effects/blast.c | 2 +- src/effects/bombette_breaking.c | 2 +- src/effects/breaking_junk.c | 6 +- src/effects/bulb_glow.c | 6 +- src/effects/butterflies.c | 6 +- src/effects/chapter_change.c | 6 +- src/effects/chomp_drop.c | 2 +- src/effects/cloud_puff.c | 2 +- src/effects/cloud_trail.c | 2 +- src/effects/cold_breath.c | 6 +- src/effects/confetti.c | 2 +- src/effects/damage_indicator.c | 2 +- src/effects/damage_stars.c | 2 +- src/effects/debuff.c | 2 +- src/effects/disable_x.c | 6 +- src/effects/drop_leaves.c | 2 +- src/effects/dust.c | 2 +- src/effects/effect_3D.c | 2 +- src/effects/effect_46.c | 2 +- src/effects/effect_63.c | 6 +- src/effects/effect_65.c | 6 +- src/effects/effect_75.c | 6 +- src/effects/effect_86.c | 6 +- src/effects/embers.c | 6 +- src/effects/emote.c | 2 +- src/effects/ending_decals.c | 6 +- src/effects/energy_in_out.c | 6 +- src/effects/energy_orb_wave.c | 6 +- src/effects/energy_shockwave.c | 4 +- src/effects/explosion.c | 2 +- src/effects/falling_leaves.c | 2 +- src/effects/fire_breath.c | 2 +- src/effects/fire_flower.c | 4 +- src/effects/firework.c | 2 +- src/effects/firework_rocket.c | 6 +- src/effects/flame.c | 2 +- src/effects/flashing_box_shockwave.c | 2 +- src/effects/floating_cloud_puff.c | 6 +- src/effects/floating_flower.c | 2 +- src/effects/floating_rock.c | 2 +- src/effects/flower_splash.c | 2 +- src/effects/flower_trail.c | 2 +- src/effects/footprint.c | 2 +- src/effects/fright_jar.c | 6 +- src/effects/gather_energy_pink.c | 2 +- src/effects/gather_magic.c | 2 +- src/effects/got_item_outline.c | 104 +++++++-------- src/effects/green_impact.c | 2 +- src/effects/hieroglyphs.c | 6 +- src/effects/huff_puff_breath.c | 6 +- src/effects/ice_pillar.c | 6 +- src/effects/ice_shard.c | 6 +- src/effects/landing_dust.c | 2 +- src/effects/lens_flare.c | 122 +++++++++-------- src/effects/light_rays.c | 6 +- src/effects/lightning.c | 6 +- src/effects/lightning_bolt.c | 6 +- src/effects/lil_oink.c | 2 +- src/effects/merlin_house_stars.c | 6 +- src/effects/misc_particles.c | 6 +- src/effects/motion_blur_flame.c | 6 +- src/effects/moving_cloud.c | 6 +- src/effects/music_note.c | 2 +- src/effects/partner_buff.c | 6 +- src/effects/peach_star_beam.c | 6 +- src/effects/pink_sparkles.c | 2 +- src/effects/purple_ring.c | 2 +- src/effects/quizmo_answer.c | 2 +- src/effects/quizmo_assistant.c | 6 +- src/effects/quizmo_audience.c | 6 +- src/effects/quizmo_stage.c | 6 +- src/effects/radial_shimmer.c | 6 +- src/effects/radiating_energy_orb.c | 6 +- src/effects/recover.c | 2 +- src/effects/red_impact.c | 2 +- src/effects/ring_blast.c | 2 +- src/effects/rising_bubble.c | 2 +- src/effects/shape_spell.c | 6 +- src/effects/shattering_stones.c | 2 +- src/effects/shimmer_burst.c | 6 +- src/effects/shimmer_wave.c | 6 +- src/effects/shiny_flare.c | 6 +- src/effects/shockwave.c | 2 +- src/effects/sleep_bubble.c | 2 +- src/effects/small_gold_sparkle.c | 2 +- src/effects/smoke_burst.c | 2 +- src/effects/smoke_impact.c | 2 +- src/effects/smoke_ring.c | 2 +- src/effects/snaking_static.c | 6 +- src/effects/snowfall.c | 2 +- src/effects/snowflake.c | 2 +- src/effects/snowman_doll.c | 6 +- src/effects/something_rotating.c | 6 +- src/effects/sparkles.c | 2 +- src/effects/spiky_white_aura.c | 2 +- src/effects/spirit_card.c | 26 ++-- src/effects/squirt.c | 6 +- src/effects/star.c | 2 +- src/effects/star_outline.c | 6 +- src/effects/star_spirits_energy.c | 6 +- src/effects/stars_burst.c | 2 +- src/effects/stars_orbiting.c | 2 +- src/effects/stars_shimmer.c | 2 +- src/effects/stars_spread.c | 2 +- src/effects/stat_change.c | 2 +- src/effects/static_status.c | 6 +- src/effects/steam_burst.c | 2 +- src/effects/stop_watch.c | 6 +- src/effects/sun.c | 6 +- src/effects/sweat.c | 2 +- src/effects/tattle_window.c | 6 +- src/effects/throw_spiny.c | 6 +- src/effects/thunderbolt_ring.c | 6 +- src/effects/tubba_heart_attack.c | 6 +- src/effects/underwater.c | 6 +- src/effects/walking_dust.c | 2 +- src/effects/water_block.c | 8 +- src/effects/water_fountain.c | 6 +- src/effects/water_splash.c | 6 +- src/effects/waterfall.c | 6 +- src/effects/whirlwind.c | 6 +- src/effects/windy_leaves.c | 2 +- src/encounter.c | 4 +- src/entity/Chest.c | 2 +- src/evt/fx_api.c | 8 +- src/msg_data_2.c | 64 ++++----- src/npc.c | 8 +- src/world/area_dro/dro_02/npc_merlee.c | 4 +- src/world/area_hos/hos_05/hos_05_5_intro.c | 36 ++--- src/world/area_hos/hos_05/hos_05_7_model_fx.c | 2 +- .../area_hos/hos_06/hos_06_5_merluvlee.c | 4 +- src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c | 2 +- src/world/area_kmr/kmr_04/kmr_04_5_foliage.c | 2 +- src/world/area_kmr/kmr_23/kmr_23_2_npc.c | 2 +- src/world/area_kzn/kzn_23/kzn_23_3_npc.c | 2 +- .../area_mac/mac_01/npc/flower_gate.inc.c | 2 +- .../area_mac/mac_01/npc/read_fortune.inc.c | 4 +- src/world/area_obk/obk_04/obk_04_6_game.c | 2 +- src/world/common/complete/Quizmo.inc.c | 4 +- src/world/common/entity/SuperBlock.inc.c | 4 +- src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 2 +- tools/ignored_funcs.txt | 2 +- ver/ique/undefined_syms.txt | 66 ++++----- ver/jp/undefined_syms.txt | 64 ++++----- ver/pal/undefined_syms.txt | 4 +- ver/us/splat.yaml | 64 ++++----- ver/us/symbol_addrs.txt | 72 +++++----- ver/us/undefined_syms.txt | 2 +- 176 files changed, 777 insertions(+), 827 deletions(-) diff --git a/include/dead.h b/include/dead.h index 7192b5e1bf..2046c40980 100644 --- a/include/dead.h +++ b/include/dead.h @@ -307,7 +307,7 @@ #define GetNpcYaw dead_GetNpcYaw #define PlayAmbientSounds dead_PlayAmbientSounds #define SetTexPanner dead_SetTexPanner -#define func_802D7B10 dead_func_802D7B10 +#define DismissEffect dead_DismissEffect #define Entity_Chest dead_Entity_Chest #define snd_ambient_mute dead_snd_ambient_mute #define GetPlayerAnimation dead_GetPlayerAnimation diff --git a/include/effects.h b/include/effects.h index 330437e614..c077659c8e 100644 --- a/include/effects.h +++ b/include/effects.h @@ -384,7 +384,7 @@ enum SparkesFXTypes { }; typedef struct ShapeSpellFXData { - /* 0x00 */ s32 isChild; + /* 0x00 */ b32 isChild; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 unk_10; /* 0x14 */ f32 unk_14; @@ -526,30 +526,26 @@ typedef struct ExplosionFXData { } ExplosionFXData; // size = 0x3C typedef struct LensFlareFXData { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ s32 unk_24; - /* 0x28 */ s32 unk_28; - /* 0x2C */ s32 unk_2C; - /* 0x30 */ s32 unk_30; + /* 0x00 */ s32 type; + /* 0x04 */ Vec3f pos; + /* 0x10 */ f32 largeFlareRot; + /* 0x14 */ f32 largeFlareRotVel; + /* 0x18 */ f32 largeFlareScale; + /* 0x1C */ f32 largeFlareScaleVel; + /* 0x20 */ f32 smallFlareScale; + /* 0x24 */ s32 largeFlareAlpha; + /* 0x28 */ s32 smallFlareAlpha; + /* 0x2C */ s32 timeLeft; + /* 0x30 */ s32 lifetime; } LensFlareFXData; // size = 0x34 typedef struct GotItemOutlineFXData { - /* 0x00 */ s32 unk_00; - /* 0x04 */ f32 unk_04; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ s32 unk_1C; + /* 0x00 */ s32 type; + /* 0x04 */ Vec3f pos; + /* 0x10 */ s32 lifetime; + /* 0x14 */ s32 timeLeft; + /* 0x18 */ f32 scale; + /* 0x1C */ s32 alpha; } GotItemOutlineFXData; // size = 0x20 typedef struct SpikyWhiteAuraFXData { @@ -2380,7 +2376,7 @@ typedef struct SpiritCardFXData { /* 0x10 */ s32 unk_10; /* 0x14 */ s32 unk_14; /* 0x18 */ f32 unk_18; - /* 0x1C */ struct EffectInstance* unk_1C; + /* 0x1C */ struct EffectInstance* child; /* 0x20 */ f32 unk_20; /* 0x24 */ f32 yaw; /* 0x28 */ char unk_28[0xC]; @@ -2805,7 +2801,7 @@ typedef struct EffectBlueprint { /* 0x08 */ void (*init)(EffectInstance* effectInst); /* 0x0C */ void (*update)(EffectInstance* effectInst); /* 0x10 */ void (*renderWorld)(EffectInstance* effectInst); - /* 0x14 */ void (*unk_14)(EffectInstance* effectInst); + /* 0x14 */ void (*renderUI)(EffectInstance* effectInst); } EffectBlueprint; // size = 0x18 typedef struct EffectGraphics { diff --git a/include/enums.h b/include/enums.h index 50df8c04b6..3ae80f9a5c 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4136,40 +4136,17 @@ enum DamageIntensityRange { DAMAGE_INTENSITY_UNUSED = 4, // unused }; +enum EffectInstanceFlags { + FX_INSTANCE_FLAG_ENABLED = 0x00000001, + FX_INSTANCE_FLAG_BATTLE = 0x00000004, // effect was created during battle + FX_INSTANCE_FLAG_HAS_UPDATED = 0x00000008, // has run update at least once + FX_INSTANCE_FLAG_DISMISS = 0x00000010, // effect should perform cleanup and self-delete +}; + enum EffectGfxDataFlags { FX_GRAPHICS_DISABLED = 0x00000000, - FX_GRAPHICS_ENABLED = 0x00000001, - FX_GRAPHICS_FLAG_2 = 0x00000002, - FX_GRAPHICS_FLAG_4 = 0x00000004, - FX_GRAPHICS_FLAG_8 = 0x00000008, - FX_GRAPHICS_FLAG_10 = 0x00000010, - FX_GRAPHICS_FLAG_20 = 0x00000020, - FX_GRAPHICS_FLAG_40 = 0x00000040, - FX_GRAPHICS_FLAG_80 = 0x00000080, - FX_GRAPHICS_FLAG_100 = 0x00000100, - FX_GRAPHICS_FLAG_200 = 0x00000200, - FX_GRAPHICS_FLAG_400 = 0x00000400, - FX_GRAPHICS_FLAG_800 = 0x00000800, - FX_GRAPHICS_FLAG_1000 = 0x00001000, - FX_GRAPHICS_FLAG_2000 = 0x00002000, - FX_GRAPHICS_FLAG_4000 = 0x00004000, - FX_GRAPHICS_FLAG_8000 = 0x00008000, - FX_GRAPHICS_FLAG_10000 = 0x00010000, - FX_GRAPHICS_FLAG_20000 = 0x00020000, - FX_GRAPHICS_FLAG_40000 = 0x00040000, - FX_GRAPHICS_FLAG_80000 = 0x00080000, - FX_GRAPHICS_FLAG_100000 = 0x00100000, - FX_GRAPHICS_FLAG_200000 = 0x00200000, - FX_GRAPHICS_FLAG_400000 = 0x00400000, - FX_GRAPHICS_FLAG_800000 = 0x00800000, - FX_GRAPHICS_FLAG_1000000 = 0x01000000, - FX_GRAPHICS_FLAG_2000000 = 0x02000000, - FX_GRAPHICS_FLAG_4000000 = 0x04000000, - FX_GRAPHICS_FLAG_8000000 = 0x08000000, - FX_GRAPHICS_FLAG_10000000 = 0x10000000, - FX_GRAPHICS_FLAG_20000000 = 0x20000000, - FX_GRAPHICS_FLAG_40000000 = 0x40000000, - FX_GRAPHICS_FLAG_80000000 = 0x80000000, + FX_GRAPHICS_LOADED = 0x00000001, + FX_GRAPHICS_CAN_FREE = 0x00000002, }; enum MoveIDs { @@ -5957,41 +5934,6 @@ enum TempSetZoneEnabledFlags { TEMP_SET_ZONE_ENABLED_FLAG_80000000 = 0x80000000, }; -enum EffectInstanceFlags { - EFFECT_INSTANCE_FLAG_1 = 0x00000001, - EFFECT_INSTANCE_FLAG_2 = 0x00000002, - EFFECT_INSTANCE_FLAG_4 = 0x00000004, - EFFECT_INSTANCE_FLAG_8 = 0x00000008, - EFFECT_INSTANCE_FLAG_10 = 0x00000010, // mark ready for cleanup - EFFECT_INSTANCE_FLAG_20 = 0x00000020, - EFFECT_INSTANCE_FLAG_40 = 0x00000040, - EFFECT_INSTANCE_FLAG_80 = 0x00000080, - EFFECT_INSTANCE_FLAG_100 = 0x00000100, - EFFECT_INSTANCE_FLAG_200 = 0x00000200, - EFFECT_INSTANCE_FLAG_400 = 0x00000400, - EFFECT_INSTANCE_FLAG_800 = 0x00000800, - EFFECT_INSTANCE_FLAG_1000 = 0x00001000, - EFFECT_INSTANCE_FLAG_2000 = 0x00002000, - EFFECT_INSTANCE_FLAG_4000 = 0x00004000, - EFFECT_INSTANCE_FLAG_8000 = 0x00008000, - EFFECT_INSTANCE_FLAG_10000 = 0x00010000, - EFFECT_INSTANCE_FLAG_20000 = 0x00020000, - EFFECT_INSTANCE_FLAG_40000 = 0x00040000, - EFFECT_INSTANCE_FLAG_80000 = 0x00080000, - EFFECT_INSTANCE_FLAG_100000 = 0x00100000, - EFFECT_INSTANCE_FLAG_200000 = 0x00200000, - EFFECT_INSTANCE_FLAG_400000 = 0x00400000, - EFFECT_INSTANCE_FLAG_800000 = 0x00800000, - EFFECT_INSTANCE_FLAG_1000000 = 0x01000000, - EFFECT_INSTANCE_FLAG_2000000 = 0x02000000, - EFFECT_INSTANCE_FLAG_4000000 = 0x04000000, - EFFECT_INSTANCE_FLAG_8000000 = 0x08000000, - EFFECT_INSTANCE_FLAG_10000000 = 0x10000000, - EFFECT_INSTANCE_FLAG_20000000 = 0x20000000, - EFFECT_INSTANCE_FLAG_40000000 = 0x40000000, - EFFECT_INSTANCE_FLAG_80000000 = 0x80000000, -}; - enum ModelTransformGroupFlags { MODEL_TRANSFORM_GROUP_FLAG_1 = 0x00000001, MODEL_TRANSFORM_GROUP_FLAG_2 = 0x00000002, diff --git a/include/functions.h b/include/functions.h index f2dbf2b3ac..bd792e1d42 100644 --- a/include/functions.h +++ b/include/functions.h @@ -844,7 +844,7 @@ void partner_init_after_battle(s32 arg0); void load_map_script_lib(void); void remove_item_entity_by_index(s32 index); void set_entity_commandlist(Entity* entity, s32* entityScript); -s32 func_800DFCF4(void); +s32 is_player_dismounted(void); void func_800EF300(void); void func_800EF314(void); void func_800EF43C(void); diff --git a/include/npc.h b/include/npc.h index b542baf903..045a629465 100644 --- a/include/npc.h +++ b/include/npc.h @@ -592,7 +592,7 @@ Npc* npc_find_closest_simple(f32 x, f32 y, f32 z, f32 radius); s32 npc_get_collider_below(Npc* npc); -void func_8003D3BC(Npc* npc); +void npc_imgfx_update(Npc* npc); void npc_set_imgfx_params(Npc* npc, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); diff --git a/include/script_api/common.h b/include/script_api/common.h index 059ad8c7f5..3ad89dc008 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -276,8 +276,8 @@ ApiStatus ShowGotItem(Evt* script, s32 isInitialCall); ApiStatus ShowEmote(Evt* script, s32 isInitialCall); ApiStatus ShowSleepBubble(Evt* script, s32 isInitialCall); ApiStatus RemoveEffect(Evt* script, s32 isInitialCall); -ApiStatus func_802D7B10(Evt* script, s32 isInitialCall); -ApiStatus func_802D7B44(Evt* script, s32 isInitialCall); +ApiStatus DismissEffect(Evt* script, s32 isInitialCall); +ApiStatus DismissItemOutline(Evt* script, s32 isInitialCall); ApiStatus PlayEffect(Evt* script, s32 isInitialCall); ApiStatus SetSpriteShading(Evt* script, s32 isInitialCall); ApiStatus EnableSpriteShading(Evt* script, s32 isInitialCall); diff --git a/src/16F740.c b/src/16F740.c index a1e1384dc6..107f2ba1da 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -759,7 +759,7 @@ void btl_state_update_begin_player_turn(void) { battleStatus->waterBlockTurnsLeft--; battleStatus->buffEffect->data.partnerBuff->unk_0C[FX_BUFF_DATA_WATER_BLOCK].turnsLeft = battleStatus->waterBlockTurnsLeft; if (battleStatus->waterBlockTurnsLeft <= 0) { - battleStatus->waterBlockEffect->flags |= EFFECT_INSTANCE_FLAG_10; + battleStatus->waterBlockEffect->flags |= FX_INSTANCE_FLAG_DISMISS; fx_water_block(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 10); fx_water_splash(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 24); fx_water_splash(0, player->currentPos.x - 15.0f, player->currentPos.y + 32.0f, player->currentPos.z + 5.0f, 1.0f, 24); @@ -926,7 +926,7 @@ back: if (player->debuffDuration <= 0) { if (player->debuff == STATUS_FROZEN) { sfx_play_sound(SOUND_FROZEN_SHATTER); - player->icePillarEffect->flags |= 0x10; + player->icePillarEffect->flags |= FX_INSTANCE_FLAG_DISMISS; player->icePillarEffect = NULL; dispatch_event_player(EVENT_32); } else { @@ -2365,7 +2365,7 @@ void btl_state_update_defeat(void) { if (player->debuff != 0) { if (player->debuff == STATUS_FROZEN) { sfx_play_sound(SOUND_FROZEN_SHATTER); - player->icePillarEffect->flags |= EFFECT_INSTANCE_FLAG_10; + player->icePillarEffect->flags |= FX_INSTANCE_FLAG_DISMISS; player->icePillarEffect = NULL; } player->debuff = 0; diff --git a/src/182B30.c b/src/182B30.c index 19a926bc76..8fc9373f3d 100644 --- a/src/182B30.c +++ b/src/182B30.c @@ -788,7 +788,7 @@ void appendGfx_npc_actor(s32 isPartner, s32 actorIndex) { } else { effect = actor->icePillarEffect; if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; actor->icePillarEffect = NULL; } } @@ -3696,7 +3696,7 @@ void func_8025D830(ActorPart* part, s32 decorationIndex) { } void func_8025D8EC(ActorPart* part, s32 decorationIndex) { - part->decorationTable->effect[decorationIndex]->flags |= EFFECT_INSTANCE_FLAG_10; + part->decorationTable->effect[decorationIndex]->flags |= FX_INSTANCE_FLAG_DISMISS; } void func_8025D90C(ActorPart* part, s32 decorationIndex) { diff --git a/src/18F340.c b/src/18F340.c index a068360d51..7c44f77a46 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -419,8 +419,8 @@ API_CALLABLE(BattleMerleeUpdateFX) { if (D_8029FBA4 == 2) { BattleMerleeOrbEffect->data.energyOrbWave->scale = 0.00001f; BattleMerleeWaveEffect->data.energyOrbWave->scale = 0.00001f; - BattleMerleeOrbEffect->flags |= 0x10; - BattleMerleeWaveEffect->flags |= 0x10; + BattleMerleeOrbEffect->flags |= FX_INSTANCE_FLAG_DISMISS; + BattleMerleeWaveEffect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE1; } diff --git a/src/190B20.c b/src/190B20.c index ff6872d3d1..55f7451a80 100644 --- a/src/190B20.c +++ b/src/190B20.c @@ -2098,7 +2098,7 @@ s32 inflict_status(Actor* target, s32 statusTypeKey, s32 duration) { if (target->actorID != ACTOR_PARTNER) { effect = target->icePillarEffect; if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; } target->icePillarEffect = fx_ice_pillar(0, target->currentPos.x, target->currentPos.y, target->currentPos.z, 1.0f, 0); @@ -2849,13 +2849,13 @@ void remove_player_buffs(s32 buffs) { if (buffs & PLAYER_BUFF_TRANSPARENT && (player->transparentStatus != 0)) { player->transparentDuration = 0; player->transparentStatus = 0; - playerPartsTable->flags &= ~0x100; + playerPartsTable->flags &= ~ACTOR_PART_FLAG_100; remove_status_transparent(player->hudElementDataIndex); } if (buffs & PLAYER_BUFF_WATER_BLOCK && (battleStatus->waterBlockTurnsLeft != 0)) { battleStatus->waterBlockTurnsLeft = 0; battleStatus->buffEffect->data.partnerBuff->unk_0C[FX_BUFF_DATA_WATER_BLOCK].turnsLeft = 0; - battleStatus->waterBlockEffect->flags |= 0x10; + battleStatus->waterBlockEffect->flags |= FX_INSTANCE_FLAG_DISMISS; fx_water_block(1, player->currentPos.x, player->currentPos.y + 18.0f, player->currentPos.z + 5.0f, 1.5f, 0xA); fx_water_splash(0, player->currentPos.x - 10.0f, player->currentPos.y + 5.0f, player->currentPos.z + 5.0f, 1.0f, 0x18); diff --git a/src/5B320.c b/src/5B320.c index 8e7db8c6b8..c28ba8b2b1 100644 --- a/src/5B320.c +++ b/src/5B320.c @@ -454,50 +454,50 @@ s32 pad_after_move_table[] = { 0x00000000, 0x00000000, 0x00000000 }; -extern IMG_BIN ui_msg_frame_part_0_png[]; -extern IMG_BIN ui_msg_frame_part_1_png[]; -extern IMG_BIN ui_msg_frame_part_2_png[]; -extern IMG_BIN ui_msg_frame_part_3_png[]; -extern IMG_BIN ui_msg_frame_part_4_png[]; -extern IMG_BIN ui_msg_frame_part_5_png[]; -extern IMG_BIN ui_msg_frame_part_6_png[]; -extern IMG_BIN ui_msg_frame_part_7_png[]; -extern IMG_BIN ui_msg_frame_part_8_png[]; -extern IMG_BIN ui_msg_frame_part_9_png[]; -extern IMG_BIN ui_msg_frame_part_A_png[]; -extern IMG_BIN ui_msg_frame_part_B_png[]; -extern IMG_BIN ui_msg_frame_part_C_png[]; -extern IMG_BIN ui_msg_frame_part_D_png[]; -extern IMG_BIN ui_msg_frame_part_E_png[]; -extern IMG_BIN ui_msg_frame_part_F_png[]; -extern IMG_BIN ui_msg_frame_part_10_png[]; -extern IMG_BIN ui_msg_frame_part_11_png[]; -extern IMG_BIN ui_msg_frame_part_12_png[]; -extern IMG_BIN ui_msg_frame_part_13_png[]; -extern IMG_BIN ui_msg_frame_part_14_png[]; -extern IMG_BIN ui_msg_frame_part_15_png[]; -extern IMG_BIN ui_msg_frame_part_16_png[]; -extern IMG_BIN ui_msg_frame_part_17_png[]; -extern IMG_BIN ui_msg_frame_part_18_png[]; -extern IMG_BIN ui_msg_frame_part_19_png[]; -extern IMG_BIN ui_msg_frame_part_1A_png[]; -extern IMG_BIN ui_msg_frame_part_1B_png[]; -extern IMG_BIN ui_msg_frame_part_1C_png[]; -extern IMG_BIN ui_msg_frame_part_1D_png[]; -extern IMG_BIN ui_msg_frame_part_1E_png[]; -extern IMG_BIN ui_msg_frame_part_1F_png[]; +extern IMG_BIN ui_msg_frame_a_1_1_png[]; +extern IMG_BIN ui_msg_frame_a_1_2_png[]; +extern IMG_BIN ui_msg_frame_a_1_3_png[]; +extern IMG_BIN ui_msg_frame_a_1_4_png[]; +extern IMG_BIN ui_msg_frame_a_1_5_png[]; +extern IMG_BIN ui_msg_frame_a_2_1_png[]; +extern IMG_BIN ui_msg_frame_a_2_5_png[]; +extern IMG_BIN ui_msg_frame_a_3_1_png[]; +extern IMG_BIN ui_msg_frame_a_3_5_png[]; +extern IMG_BIN ui_msg_frame_a_4_1_png[]; +extern IMG_BIN ui_msg_frame_a_4_5_png[]; +extern IMG_BIN ui_msg_frame_a_5_1_png[]; +extern IMG_BIN ui_msg_frame_a_5_2_png[]; +extern IMG_BIN ui_msg_frame_a_5_3_png[]; +extern IMG_BIN ui_msg_frame_a_5_4_png[]; +extern IMG_BIN ui_msg_frame_a_5_5_png[]; +extern IMG_BIN ui_msg_frame_b_1_1_png[]; +extern IMG_BIN ui_msg_frame_b_1_2_png[]; +extern IMG_BIN ui_msg_frame_b_1_3_png[]; +extern IMG_BIN ui_msg_frame_b_1_4_png[]; +extern IMG_BIN ui_msg_frame_b_1_5_png[]; +extern IMG_BIN ui_msg_frame_b_2_1_png[]; +extern IMG_BIN ui_msg_frame_b_2_5_png[]; +extern IMG_BIN ui_msg_frame_b_3_1_png[]; +extern IMG_BIN ui_msg_frame_b_3_5_png[]; +extern IMG_BIN ui_msg_frame_b_4_1_png[]; +extern IMG_BIN ui_msg_frame_b_4_5_png[]; +extern IMG_BIN ui_msg_frame_b_5_1_png[]; +extern IMG_BIN ui_msg_frame_b_5_2_png[]; +extern IMG_BIN ui_msg_frame_b_5_3_png[]; +extern IMG_BIN ui_msg_frame_b_5_4_png[]; +extern IMG_BIN ui_msg_frame_b_5_5_png[]; IMG_BIN* gMessageBoxFrameParts[2][16] = { { - ui_msg_frame_part_0_png, ui_msg_frame_part_1_png, ui_msg_frame_part_2_png, ui_msg_frame_part_3_png, - ui_msg_frame_part_4_png, ui_msg_frame_part_5_png, ui_msg_frame_part_6_png, ui_msg_frame_part_7_png, - ui_msg_frame_part_8_png, ui_msg_frame_part_9_png, ui_msg_frame_part_A_png, ui_msg_frame_part_B_png, - ui_msg_frame_part_C_png, ui_msg_frame_part_D_png, ui_msg_frame_part_E_png, ui_msg_frame_part_F_png, + ui_msg_frame_a_1_1_png, ui_msg_frame_a_1_2_png, ui_msg_frame_a_1_3_png, ui_msg_frame_a_1_4_png, + ui_msg_frame_a_1_5_png, ui_msg_frame_a_2_1_png, ui_msg_frame_a_2_5_png, ui_msg_frame_a_3_1_png, + ui_msg_frame_a_3_5_png, ui_msg_frame_a_4_1_png, ui_msg_frame_a_4_5_png, ui_msg_frame_a_5_1_png, + ui_msg_frame_a_5_2_png, ui_msg_frame_a_5_3_png, ui_msg_frame_a_5_4_png, ui_msg_frame_a_5_5_png, }, { - ui_msg_frame_part_10_png, ui_msg_frame_part_11_png, ui_msg_frame_part_12_png, ui_msg_frame_part_13_png, - ui_msg_frame_part_14_png, ui_msg_frame_part_15_png, ui_msg_frame_part_16_png, ui_msg_frame_part_17_png, - ui_msg_frame_part_18_png, ui_msg_frame_part_19_png, ui_msg_frame_part_1A_png, ui_msg_frame_part_1B_png, - ui_msg_frame_part_1C_png, ui_msg_frame_part_1D_png, ui_msg_frame_part_1E_png, ui_msg_frame_part_1F_png, + ui_msg_frame_b_1_1_png, ui_msg_frame_b_1_2_png, ui_msg_frame_b_1_3_png, ui_msg_frame_b_1_4_png, + ui_msg_frame_b_1_5_png, ui_msg_frame_b_2_1_png, ui_msg_frame_b_2_5_png, ui_msg_frame_b_3_1_png, + ui_msg_frame_b_3_5_png, ui_msg_frame_b_4_1_png, ui_msg_frame_b_4_5_png, ui_msg_frame_b_5_1_png, + ui_msg_frame_b_5_2_png, ui_msg_frame_b_5_3_png, ui_msg_frame_b_5_4_png, ui_msg_frame_b_5_5_png, } }; diff --git a/src/77480.c b/src/77480.c index fdf7497711..8047b9a20f 100644 --- a/src/77480.c +++ b/src/77480.c @@ -781,7 +781,7 @@ void player_reset_data(void) { func_800E5520(); } -s32 func_800DFCF4(void) { +b32 is_player_dismounted(void) { if (gPartnerStatus.partnerActionState == PARTNER_ACTION_USE && (gPartnerStatus.actingPartner == PARTNER_WATT || gPartnerStatus.actingPartner == PARTNER_BOW @@ -824,7 +824,7 @@ s32 get_overriding_player_anim(s32 anim) { if (anim == ANIM_MarioW1_Lift || anim == ANIM_Peach2_SpreadArms || anim == ANIM_Mario1_Idle) { if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { - if (!func_800DFCF4()) { + if (!is_player_dismounted()) { return -1; } } else if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { diff --git a/src/C50A0.c b/src/C50A0.c index 30c13921fb..6e416ce2cd 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -2722,15 +2722,15 @@ block_47: // TODO required to match (BUTTON_STICK_RIGHT | BUTTON_STICK_LEFT | BUTTON_STICK_DOWN | BUTTON_STICK_UP | BUTTON_A | BUTTON_B)) { hide_item_entity(itemEntity); - if (func_800DFCF4() && - playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER && - !(playerStatus->animFlags & PA_FLAG_NO_OOB_RESPAWN)) - { + if (is_player_dismounted() + && playerStatus->actionState != ACTION_STATE_USE_SPINNING_FLOWER + && !(playerStatus->animFlags & PA_FLAG_NO_OOB_RESPAWN) + ) { set_action_state(ACTION_STATE_IDLE); } if (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_GEAR) { - D_801568F0->data.gotItemOutline->unk_14 = 0xA; + D_801568F0->data.gotItemOutline->timeLeft = 10; } set_window_update(WINDOW_ID_12, (s32) basic_hidden_window_update); set_window_update(WINDOW_ID_19, (s32) basic_hidden_window_update); diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index dc76eb9378..076bbb958b 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -986,7 +986,7 @@ API_CALLABLE(func_80218E2C_4652BC) { EffectInstance* tattleEffect = (EffectInstance*) evt_get_variable(script, *script->ptrReadPos); tattleEffect->data.tattleWindow->pos.y = 144.0f; - tattleEffect->flags |= EFFECT_INSTANCE_FLAG_10; + tattleEffect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } @@ -2911,7 +2911,7 @@ API_CALLABLE(func_80219188_465618) { } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } wattEffectData->effect1->data.staticStatus->pos.x = x; @@ -2920,7 +2920,7 @@ API_CALLABLE(func_80219188_465618) { break; case 1: if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 == NULL) { @@ -2934,21 +2934,21 @@ API_CALLABLE(func_80219188_465618) { } } else { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } } if (wattEffectData->debuff != actor->debuff && wattEffectData->unk_0C) { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } } @@ -2964,11 +2964,11 @@ API_CALLABLE(func_80219604_465A94) { wattEffectData->flags = 0; if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; } return ApiStatus_DONE2; diff --git a/src/battle/btl_evt_library.c b/src/battle/btl_evt_library.c index 756339511c..4579cde050 100644 --- a/src/battle/btl_evt_library.c +++ b/src/battle/btl_evt_library.c @@ -1211,7 +1211,7 @@ EvtScript EVS_Enemy_FanSmack_Impl = { EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_LEFT) EVT_CASE_OR_EQ(DMG_SRC_LAST_FAN_SMACK_RIGHT) EVT_WAIT(40) - EVT_CALL(func_802D7B10, LVarF) + EVT_CALL(DismissEffect, LVarF) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2023) EVT_END_CASE_GROUP EVT_END_SWITCH diff --git a/src/battle/common/actor/ghost_goombario.inc.c b/src/battle/common/actor/ghost_goombario.inc.c index 2c4849ebe5..cd962eb92c 100644 --- a/src/battle/common/actor/ghost_goombario.inc.c +++ b/src/battle/common/actor/ghost_goombario.inc.c @@ -23,7 +23,7 @@ API_CALLABLE(N(UnkTattleEffectFunc2)) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); effect->data.tattleWindow->pos.y = 144.0f; - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } diff --git a/src/battle/common/actor/ghost_watt.inc.c b/src/battle/common/actor/ghost_watt.inc.c index 078739ff11..dff8b6c027 100644 --- a/src/battle/common/actor/ghost_watt.inc.c +++ b/src/battle/common/actor/ghost_watt.inc.c @@ -42,7 +42,7 @@ API_CALLABLE(N(UnkWattEffectFunc1)) { } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } wattEffectData->effect1->data.staticStatus->pos.x = x; @@ -51,7 +51,7 @@ API_CALLABLE(N(UnkWattEffectFunc1)) { break; case 1: if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 == NULL) { @@ -65,21 +65,21 @@ API_CALLABLE(N(UnkWattEffectFunc1)) { } } else { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } } if (wattEffectData->debuff != actor->debuff && wattEffectData->unk_0C) { if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect1 = NULL; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; wattEffectData->effect2 = NULL; } } @@ -97,11 +97,11 @@ API_CALLABLE(N(UnkWattEffectFunc2)) { wattEffectData->flags = FALSE; if (wattEffectData->effect1 != NULL) { - wattEffectData->effect1->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect1->flags |= FX_INSTANCE_FLAG_DISMISS; } if (wattEffectData->effect2 != NULL) { - wattEffectData->effect2->flags |= EFFECT_INSTANCE_FLAG_10; + wattEffectData->effect2->flags |= FX_INSTANCE_FLAG_DISMISS; } return ApiStatus_DONE2; diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 447610fd8c..1a316f5751 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -668,7 +668,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { if (!cond) { N(starBeamStage) = 2; - N(effect)->flags |= EFFECT_INSTANCE_FLAG_10; + N(effect)->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } break; @@ -738,7 +738,7 @@ API_CALLABLE(N(ProcessPeachStarBeam)) { if (!cond) { N(starBeamStage) = 2; - N(effect)->flags |= EFFECT_INSTANCE_FLAG_10; + N(effect)->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } break; diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 06a2002128..32493aac92 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -346,7 +346,7 @@ API_CALLABLE(N(CloseTattleWindow)) { EffectInstance* effect = N(tattleEffect); effect->data.tattleWindow->pos.y = 144.0f; - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 1ca5d668b5..3428bcbc7f 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -589,7 +589,7 @@ API_CALLABLE(N(FlyAround)) { case 2: state->moveTime = 5; script->functionTemp[0] = 3; - airRaidEffect->flags |= 0x10; + airRaidEffect->flags |= FX_INSTANCE_FLAG_DISMISS; // fallthrough case 3: add_vec2D_polar(&state->currentPos.x, &state->currentPos.y, state->speed, state->angle); diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 0a1194bfad..25dd796ba5 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -354,7 +354,7 @@ API_CALLABLE(N(ProcessTidalWave)) { sEffect->data.waterFountain->unk_40 = partner->scale.x; if (state->moveTime == 0) { partner->rotation.z = 0.0f; - sEffect->flags |= EFFECT_INSTANCE_FLAG_10; + sEffect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } state->moveTime--; diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 4cebc978c6..064438f54d 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -77,7 +77,7 @@ API_CALLABLE(N(WattFXUpdate)) { sWattEffectData_effect1 = fx_static_status(0, x, y, z, 1.0f, 5, 0); } if (sWattEffectData_effect2 != NULL) { - sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAG_10; + sWattEffectData_effect2->flags |= FX_INSTANCE_FLAG_DISMISS; sWattEffectData_effect2 = NULL; } sWattEffectData_effect1->data.staticStatus->pos.x = x; @@ -86,7 +86,7 @@ API_CALLABLE(N(WattFXUpdate)) { break; case 1: if (sWattEffectData_effect1 != NULL) { - sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAG_10; + sWattEffectData_effect1->flags |= FX_INSTANCE_FLAG_DISMISS; sWattEffectData_effect1 = NULL; } if (sWattEffectData_effect2 == NULL) { @@ -99,11 +99,11 @@ API_CALLABLE(N(WattFXUpdate)) { } } else { if (sWattEffectData_effect1 != NULL) { - sWattEffectData_effect1->flags |= EFFECT_INSTANCE_FLAG_10; + sWattEffectData_effect1->flags |= FX_INSTANCE_FLAG_DISMISS; sWattEffectData_effect1 = NULL; } if (sWattEffectData_effect2 != NULL) { - sWattEffectData_effect2->flags |= EFFECT_INSTANCE_FLAG_10; + sWattEffectData_effect2->flags |= FX_INSTANCE_FLAG_DISMISS; sWattEffectData_effect2 = NULL; } } @@ -167,7 +167,7 @@ API_CALLABLE(N(ElectroDashFXDisable)) { EffectInstance* effect = N(radialShimmer); if (effect != NULL) { - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; } N(radialShimmer) = NULL; @@ -392,7 +392,7 @@ API_CALLABLE(N(MegaShockFX)) { script->functionTemp[3]--; } if (script->functionTemp[2] == 0) { - N(thunderboltRing)->flags |= EFFECT_INSTANCE_FLAG_10; + N(thunderboltRing)->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } script->functionTemp[2]--; diff --git a/src/effects.c b/src/effects.c index 32a201dcb8..dc8e4de443 100644 --- a/src/effects.c +++ b/src/effects.c @@ -6,8 +6,6 @@ typedef s32 TlbEntry[0x1000 / 4]; typedef TlbEntry TlbMappablePage[15]; -#define EFFECT_LOADED 1 - extern EffectGraphics gEffectGraphicsData[15]; extern EffectInstance* gEffectInstances[96]; @@ -202,38 +200,41 @@ void update_effects(void) { EffectGraphics* effectGraphics; s32 i; + // reset free delay for each EffectGraphics touched in previous update for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { - if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (!(effectGraphics->flags & FX_GRAPHICS_FLAG_2)) { - effectGraphics->flags |= FX_GRAPHICS_FLAG_2; + if (effectGraphics->flags & FX_GRAPHICS_LOADED) { + if (!(effectGraphics->flags & FX_GRAPHICS_CAN_FREE)) { + effectGraphics->flags |= FX_GRAPHICS_CAN_FREE; effectGraphics->freeDelay = 3; } } } + // update each EffectInstances for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) { EffectInstance* effectInstance = gEffectInstances[i]; - if (effectInstance != NULL && (effectInstance->flags & EFFECT_INSTANCE_FLAG_1)) { - effectInstance->graphics->flags &= ~FX_GRAPHICS_FLAG_2; + if (effectInstance != NULL && (effectInstance->flags & FX_INSTANCE_FLAG_ENABLED)) { + effectInstance->graphics->flags &= ~FX_GRAPHICS_CAN_FREE; if (gGameStatusPtr->isBattle) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAG_4) { + if (effectInstance->flags & FX_INSTANCE_FLAG_BATTLE) { effectInstance->graphics->update(effectInstance); - effectInstance->flags |= EFFECT_INSTANCE_FLAG_8; + effectInstance->flags |= FX_INSTANCE_FLAG_HAS_UPDATED; } } else { - if (!(effectInstance->flags & EFFECT_INSTANCE_FLAG_4)) { + if (!(effectInstance->flags & FX_INSTANCE_FLAG_BATTLE)) { effectInstance->graphics->update(effectInstance); - effectInstance->flags |= EFFECT_INSTANCE_FLAG_8; + effectInstance->flags |= FX_INSTANCE_FLAG_HAS_UPDATED; } } } } + // free any EffectGraphics which haven't been used recently for (i = 0, effectGraphics = gEffectGraphicsData; i < ARRAY_COUNT(gEffectGraphicsData); i++, effectGraphics++) { - if (effectGraphics->flags & FX_GRAPHICS_ENABLED) { - if (effectGraphics->flags & FX_GRAPHICS_FLAG_2) { + if (effectGraphics->flags & FX_GRAPHICS_LOADED) { + if (effectGraphics->flags & FX_GRAPHICS_CAN_FREE) { if (effectGraphics->freeDelay != 0) { effectGraphics->freeDelay--; } else { @@ -254,14 +255,20 @@ void render_effects_world(void) { s32 i; for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) { - if (gEffectInstances[i] != NULL && gEffectInstances[i]->flags & 1 && gEffectInstances[i]->flags & 8) { - if (gGameStatusPtr->isBattle) { - if (gEffectInstances[i]->flags & 4) { - gEffectInstances[i]->graphics->renderWorld(gEffectInstances[i]); - } - } else { - if (!(gEffectInstances[i]->flags & 4)) { - gEffectInstances[i]->graphics->renderWorld(gEffectInstances[i]); + EffectInstance* effectInstance = gEffectInstances[i]; + + if (effectInstance != NULL) { + if (effectInstance->flags & FX_INSTANCE_FLAG_ENABLED) { + if (effectInstance->flags & FX_INSTANCE_FLAG_HAS_UPDATED) { + if (gGameStatusPtr->isBattle) { + if (effectInstance->flags & FX_INSTANCE_FLAG_BATTLE) { + effectInstance->graphics->renderWorld(effectInstance); + } + } else { + if (!(effectInstance->flags & FX_INSTANCE_FLAG_BATTLE)) { + effectInstance->graphics->renderWorld(effectInstance); + } + } } } } @@ -276,15 +283,15 @@ void render_effects_UI(void) { EffectInstance* effectInstance = gEffectInstances[i]; if (effectInstance != NULL) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAG_1) { - if (effectInstance->flags & EFFECT_INSTANCE_FLAG_8) { + if (effectInstance->flags & FX_INSTANCE_FLAG_ENABLED) { + if (effectInstance->flags & FX_INSTANCE_FLAG_HAS_UPDATED) { void (*renderUI)(EffectInstance* effect); - if (gGameStatusPtr->isBattle && !(effectInstance->flags & EFFECT_INSTANCE_FLAG_4)) { + if (gGameStatusPtr->isBattle && !(effectInstance->flags & FX_INSTANCE_FLAG_BATTLE)) { continue; } - if (!gGameStatusPtr->isBattle && effectInstance->flags & EFFECT_INSTANCE_FLAG_4) { + if (!gGameStatusPtr->isBattle && effectInstance->flags & FX_INSTANCE_FLAG_BATTLE) { continue; } @@ -324,7 +331,7 @@ void render_effects_UI(void) { EffectInstance* create_effect_instance(EffectBlueprint* effectBp) { EffectInstance* newEffectInst; - EffectGraphics* curEffect; + EffectGraphics* effectGraphics; s32 i; // Search for an unused instance @@ -340,47 +347,48 @@ EffectInstance* create_effect_instance(EffectBlueprint* effectBp) { gEffectInstances[i] = newEffectInst = general_heap_malloc(sizeof(*newEffectInst)); ASSERT(newEffectInst != NULL); - curEffect = &gEffectGraphicsData[0]; + effectGraphics = &gEffectGraphicsData[0]; newEffectInst->effectIndex = effectBp->effectID; - newEffectInst->flags = 1; + newEffectInst->flags = FX_INSTANCE_FLAG_ENABLED; // Look for a loaded effect of the proper index for (i = 0; i < ARRAY_COUNT(gEffectGraphicsData); i++) { - if ((curEffect->flags & EFFECT_LOADED) && (curEffect->effectIndex == effectBp->effectID)) { + if ((effectGraphics->flags & FX_GRAPHICS_LOADED) && (effectGraphics->effectIndex == effectBp->effectID)) { break; } - curEffect++; + effectGraphics++; } ASSERT(i < ARRAY_COUNT(gEffectGraphicsData)); // If this is the first new instance of the effect, initialize the function pointers - if (curEffect->instanceCounter == 0) { - curEffect->update = effectBp->update; - if (curEffect->update == NULL) { - curEffect->renderWorld = stub_effect_delegate; + if (effectGraphics->instanceCounter == 0) { + effectGraphics->update = effectBp->update; + if (effectGraphics->update == NULL) { + effectGraphics->renderWorld = stub_effect_delegate; } - curEffect->renderWorld = effectBp->renderWorld; - if (curEffect->renderUI == NULL) { - curEffect->renderUI = stub_effect_delegate; + effectGraphics->renderWorld = effectBp->renderWorld; + // @bug? null check for renderUI instead of renderWorld + if (effectGraphics->renderUI == NULL) { + effectGraphics->renderUI = stub_effect_delegate; } - curEffect->renderUI = effectBp->unk_14; - if (curEffect->renderUI == NULL) { - curEffect->renderUI = stub_effect_delegate; + effectGraphics->renderUI = effectBp->renderUI; + if (effectGraphics->renderUI == NULL) { + effectGraphics->renderUI = stub_effect_delegate; } } - curEffect->instanceCounter++; - newEffectInst->graphics = curEffect; + effectGraphics->instanceCounter++; + newEffectInst->graphics = effectGraphics; if (effectBp->init != NULL) { effectBp->init(newEffectInst); } if (gGameStatusPtr->isBattle) { - newEffectInst->flags |= 4; + newEffectInst->flags |= FX_INSTANCE_FLAG_BATTLE; } return newEffectInst; } @@ -412,7 +420,7 @@ void remove_all_effects(void) { for (i = 0; i < ARRAY_COUNT(gEffectInstances); i++) { EffectInstance* effect = gEffectInstances[i]; - if (effect != NULL && effect->flags & 4) { + if (effect != NULL && effect->flags & FX_INSTANCE_FLAG_BATTLE) { if (effect->data.any != NULL) { general_heap_free(effect->data.any); } @@ -424,32 +432,32 @@ void remove_all_effects(void) { s32 load_effect(s32 effectIndex) { EffectTableEntry* effectEntry = &gEffectTable[effectIndex]; - EffectGraphics* curEffect; + EffectGraphics* effectGraphics; TlbMappablePage* tlbMappablePages; s32 i; // Look for a loaded effect matching the desired index - for (i = 0, curEffect = &gEffectGraphicsData[0]; i < ARRAY_COUNT(gEffectGraphicsData); i++) { - if (curEffect->flags & EFFECT_LOADED && curEffect->effectIndex == effectIndex) { + for (i = 0, effectGraphics = &gEffectGraphicsData[0]; i < ARRAY_COUNT(gEffectGraphicsData); i++) { + if (effectGraphics->flags & FX_GRAPHICS_LOADED && effectGraphics->effectIndex == effectIndex) { break; } - curEffect++; + effectGraphics++; } // If an effect was found within the table, initialize it and return if (i < ARRAY_COUNT(gEffectGraphicsData)) { - curEffect->effectIndex = effectIndex; - curEffect->instanceCounter = 0; - curEffect->flags = EFFECT_LOADED; + effectGraphics->effectIndex = effectIndex; + effectGraphics->instanceCounter = 0; + effectGraphics->flags = FX_GRAPHICS_LOADED; return 1; } // If a loaded effect wasn't found, look for the first empty space - for (i = 0, curEffect = &gEffectGraphicsData[0]; i < ARRAY_COUNT(gEffectGraphicsData); i++) { - if (!(curEffect->flags & EFFECT_LOADED)) { + for (i = 0, effectGraphics = &gEffectGraphicsData[0]; i < ARRAY_COUNT(gEffectGraphicsData); i++) { + if (!(effectGraphics->flags & FX_GRAPHICS_LOADED)) { break; } - curEffect++; + effectGraphics++; } // If no empty space was found, panic @@ -465,14 +473,14 @@ s32 load_effect(s32 effectIndex) { // If there's extra data the effect normally loads, allocate space and copy into the new space if (effectEntry->graphicsDmaStart != NULL) { void* effectDataBuf = general_heap_malloc(effectEntry->graphicsDmaEnd - effectEntry->graphicsDmaStart); - curEffect->data = effectDataBuf; + effectGraphics->data = effectDataBuf; ASSERT(effectDataBuf != NULL); - dma_copy(effectEntry->graphicsDmaStart, effectEntry->graphicsDmaEnd, curEffect->data); + dma_copy(effectEntry->graphicsDmaStart, effectEntry->graphicsDmaEnd, effectGraphics->data); } // Initialize the newly loaded effect data - curEffect->effectIndex = effectIndex; - curEffect->instanceCounter = 0; - curEffect->flags = EFFECT_LOADED; + effectGraphics->effectIndex = effectIndex; + effectGraphics->instanceCounter = 0; + effectGraphics->flags = FX_GRAPHICS_LOADED; return 1; } diff --git a/src/effects/attack_result_text.c b/src/effects/attack_result_text.c index c6c697c614..db2a18bd14 100644 --- a/src/effects/attack_result_text.c +++ b/src/effects/attack_result_text.c @@ -44,7 +44,7 @@ EffectInstance* attack_result_text_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, bp.init = attack_result_text_init; bp.update = attack_result_text_update; bp.renderWorld = attack_result_text_render; - bp.unk_14 = func_E0090428; + bp.renderUI = func_E0090428; bp.effectID = EFFECT_ATTACK_RESULT_TEXT; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/aura.c b/src/effects/aura.c index ba6d621e83..f960b56233 100644 --- a/src/effects/aura.c +++ b/src/effects/aura.c @@ -36,7 +36,7 @@ void aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInstance* bp.update = aura_update; bp.renderWorld = aura_render; bp.unk_00 = 0; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_AURA; effect = shim_create_effect_instance(bpPtr); @@ -162,8 +162,8 @@ void aura_update(EffectInstance* effect) { s32 lifeTime; data = effect->data.aura; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->fadeTime = 5; } diff --git a/src/effects/balloon.c b/src/effects/balloon.c index 1f5f2cf440..dac4782c86 100644 --- a/src/effects/balloon.c +++ b/src/effects/balloon.c @@ -24,7 +24,7 @@ EffectInstance* balloon_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s bp.update = balloon_update; bp.renderWorld = balloon_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_BALLOON; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/big_smoke_puff.c b/src/effects/big_smoke_puff.c index ceacbb78d7..aa9ea9cf8b 100644 --- a/src/effects/big_smoke_puff.c +++ b/src/effects/big_smoke_puff.c @@ -39,7 +39,7 @@ void big_smoke_puff_main(f32 x, f32 y, f32 z) { bp.init = big_smoke_puff_init; bp.update = big_smoke_puff_update; bp.renderWorld = big_smoke_puff_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_BIG_SMOKE_PUFF; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/big_snowflakes.c b/src/effects/big_snowflakes.c index 75ba73ad6a..cfa2eb08f8 100644 --- a/src/effects/big_snowflakes.c +++ b/src/effects/big_snowflakes.c @@ -24,7 +24,7 @@ void big_snowflakes_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = big_snowflakes_init; bp.update = big_snowflakes_update; bp.renderWorld = big_snowflakes_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_BIG_SNOWFLAKES; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/blast.c b/src/effects/blast.c index f5c544d8e3..26162cf843 100644 --- a/src/effects/blast.c +++ b/src/effects/blast.c @@ -36,7 +36,7 @@ void blast_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { bp.update = blast_update; bp.renderWorld = blast_render; bp.unk_00 = 0; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_BLAST; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/bombette_breaking.c b/src/effects/bombette_breaking.c index 2cc92af122..b6d9531c92 100644 --- a/src/effects/bombette_breaking.c +++ b/src/effects/bombette_breaking.c @@ -62,7 +62,7 @@ EffectInstance* bombette_breaking_main(s32 type, s32 modelID, s32 treeIndex, f32 bp.init = bombette_breaking_init; bp.update = bombette_breaking_update; bp.renderWorld = bombette_breaking_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_BOMBETTE_BREAKING; f20 *= 0.5; diff --git a/src/effects/breaking_junk.c b/src/effects/breaking_junk.c index 047de86f70..fd582453fb 100644 --- a/src/effects/breaking_junk.c +++ b/src/effects/breaking_junk.c @@ -29,7 +29,7 @@ EffectInstance* breaking_junk_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 bp.init = breaking_junk_init; bp.update = breaking_junk_update; bp.renderWorld = breaking_junk_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_BREAKING_JUNK; effect = shim_create_effect_instance(bpPtr); @@ -87,8 +87,8 @@ void breaking_junk_update(EffectInstance* effect) { BreakingJunkFXData* data = effect->data.breakingJunk; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/bulb_glow.c b/src/effects/bulb_glow.c index 1a19f6f494..28d7d4bf8b 100644 --- a/src/effects/bulb_glow.c +++ b/src/effects/bulb_glow.c @@ -57,7 +57,7 @@ void bulb_glow_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, EffectInst bp.update = bulb_glow_update; bp.renderWorld = bulb_glow_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_BULB_GLOW; effect = shim_create_effect_instance(&bp); @@ -94,8 +94,8 @@ void bulb_glow_update(EffectInstance* effect) { BulbGlowFXData* data = effect->data.bulbGlow; s32 unk18; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_14 = 10; } diff --git a/src/effects/butterflies.c b/src/effects/butterflies.c index a0dfa7f51c..1a666dfa88 100644 --- a/src/effects/butterflies.c +++ b/src/effects/butterflies.c @@ -40,7 +40,7 @@ EffectInstance* butterflies_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = butterflies_init; bp.update = butterflies_update; bp.renderWorld = butterflies_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_BUTTERFLIES; effect = shim_create_effect_instance(&bp); @@ -83,8 +83,8 @@ void butterflies_update(EffectInstance* effect) { f32 var_f24; temp_s0 = effect->data.butterflies; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; temp_s0->unk_04 = 900; } diff --git a/src/effects/chapter_change.c b/src/effects/chapter_change.c index 428529cfea..54d3557066 100644 --- a/src/effects/chapter_change.c +++ b/src/effects/chapter_change.c @@ -179,7 +179,7 @@ EffectInstance* chapter_change_main(s32 arg0, f32 posX, f32 posY, f32 arg3, f32 bp.update = chapter_change_update; bp.renderWorld = chapter_change_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_CHAPTER_CHANGE; effect = shim_create_effect_instance(&bp); @@ -227,8 +227,8 @@ void chapter_change_init(EffectInstance* effect) { void chapter_change_update(EffectInstance* effect) { ChapterChangeFXData* data = effect->data.chapterChange; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/chomp_drop.c b/src/effects/chomp_drop.c index edae697557..8ed7982988 100644 --- a/src/effects/chomp_drop.c +++ b/src/effects/chomp_drop.c @@ -22,7 +22,7 @@ EffectInstance* chomp_drop_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bp.update = chomp_drop_update; bp.renderWorld = chomp_drop_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_CHOMP_DROP; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/cloud_puff.c b/src/effects/cloud_puff.c index 82ead0e23b..da5f27cda6 100644 --- a/src/effects/cloud_puff.c +++ b/src/effects/cloud_puff.c @@ -21,7 +21,7 @@ void cloud_puff_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = cloud_puff_init; bp.update = cloud_puff_update; bp.renderWorld = cloud_puff_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_CLOUD_PUFF; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/cloud_trail.c b/src/effects/cloud_trail.c index f9d8758119..8c090015f3 100644 --- a/src/effects/cloud_trail.c +++ b/src/effects/cloud_trail.c @@ -20,7 +20,7 @@ void cloud_trail_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = cloud_trail_init; bp.update = cloud_trail_update; bp.renderWorld = cloud_trail_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_CLOUD_TRAIL; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/cold_breath.c b/src/effects/cold_breath.c index 842b04850d..997d2eb13f 100644 --- a/src/effects/cold_breath.c +++ b/src/effects/cold_breath.c @@ -86,7 +86,7 @@ EffectInstance* cold_breath_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg bp.update = cold_breath_update; bp.renderWorld = cold_breath_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_COLD_BREATH; effect = shim_create_effect_instance(&bp); @@ -126,8 +126,8 @@ void cold_breath_update(EffectInstance* effect) { ColdBreathFXData* data = effect->data.coldBreath; s32 unk00 = data->unk_00; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 0x10; } diff --git a/src/effects/confetti.c b/src/effects/confetti.c index 4607132332..1e64e7817d 100644 --- a/src/effects/confetti.c +++ b/src/effects/confetti.c @@ -105,7 +105,7 @@ EffectInstance* confetti_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bpPtr->update = confetti_update; bpPtr->renderWorld = confetti_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_CONFETTI; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/damage_indicator.c b/src/effects/damage_indicator.c index 66a3ae7c88..e17082d197 100644 --- a/src/effects/damage_indicator.c +++ b/src/effects/damage_indicator.c @@ -89,7 +89,7 @@ void damage_indicator_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 bp.init = damage_indicator_init; bp.update = damage_indicator_update; bp.renderWorld = damage_indicator_render; - bp.unk_14 = func_E003C47C; + bp.renderUI = func_E003C47C; bp.unk_00 = 0; bp.effectID = EFFECT_DAMAGE_INDICATOR; diff --git a/src/effects/damage_stars.c b/src/effects/damage_stars.c index 265052bd70..9af223b5e2 100644 --- a/src/effects/damage_stars.c +++ b/src/effects/damage_stars.c @@ -91,7 +91,7 @@ void damage_stars_main( bpPtr->init = damage_stars_init; bpPtr->update = damage_stars_update; bpPtr->renderWorld = damage_stars_render; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_DAMAGE_STARS; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/debuff.c b/src/effects/debuff.c index ea86113c6f..1f73ace4f6 100644 --- a/src/effects/debuff.c +++ b/src/effects/debuff.c @@ -23,7 +23,7 @@ EffectInstance* debuff_main(s32 type, f32 x, f32 y, f32 z) { bp.init = debuff_init; bp.update = debuff_update; bp.renderWorld = debuff_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_DEBUFF; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/disable_x.c b/src/effects/disable_x.c index f289084662..fce0a2b090 100644 --- a/src/effects/disable_x.c +++ b/src/effects/disable_x.c @@ -44,7 +44,7 @@ EffectInstance* disable_x_main(s32 type, f32 x, f32 y, f32 z, s32 arg4) { bp.init = disable_x_init; bp.update = disable_x_update; bp.renderWorld = disable_x_render; - bp.unk_14 = func_E0082528; + bp.renderUI = func_E0082528; bp.effectID = EFFECT_DISABLE_X; effect = shim_create_effect_instance(&bp); @@ -111,8 +111,8 @@ void disable_x_update(EffectInstance* effect) { u32 type; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_28 = 21; } diff --git a/src/effects/drop_leaves.c b/src/effects/drop_leaves.c index 84fca1b7bc..aa70bd245f 100644 --- a/src/effects/drop_leaves.c +++ b/src/effects/drop_leaves.c @@ -20,7 +20,7 @@ void drop_leaves_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.update = drop_leaves_update; bp.renderWorld = drop_leaves_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_DROP_LEAVES; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/dust.c b/src/effects/dust.c index c338f3a8ce..cded1c78d9 100644 --- a/src/effects/dust.c +++ b/src/effects/dust.c @@ -30,7 +30,7 @@ EffectInstance* dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.update = dust_update; bp.renderWorld = dust_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_DUST; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/effect_3D.c b/src/effects/effect_3D.c index 5ff2c063b6..d3ff4c1a54 100644 --- a/src/effects/effect_3D.c +++ b/src/effects/effect_3D.c @@ -65,7 +65,7 @@ void effect_3D_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, bpPtr->init = effect_3D_init; bpPtr->update = effect_3D_update; bpPtr->renderWorld = effect_3D_render; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_3D; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/effect_46.c b/src/effects/effect_46.c index 617b36d3d0..efafc7496e 100644 --- a/src/effects/effect_46.c +++ b/src/effects/effect_46.c @@ -30,7 +30,7 @@ EffectInstance* effect_46_main(s32 arg0, PlayerStatus* arg1, f32 arg2, s32 arg3) bp.update = effect_46_update; bp.renderWorld = effect_46_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_46; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/effect_63.c b/src/effects/effect_63.c index e4cfd1b3f8..59ae981d7a 100644 --- a/src/effects/effect_63.c +++ b/src/effects/effect_63.c @@ -47,7 +47,7 @@ EffectInstance* effect_63_main( bpPtr->update = effect_63_update; bpPtr->renderWorld = effect_63_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_63; effect = shim_create_effect_instance(bpPtr); @@ -134,8 +134,8 @@ void effect_63_update(EffectInstance* effect) { s32 unk_24; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_20 = 0x10; } diff --git a/src/effects/effect_65.c b/src/effects/effect_65.c index 2452cb3ee0..d3f724ea59 100644 --- a/src/effects/effect_65.c +++ b/src/effects/effect_65.c @@ -30,7 +30,7 @@ EffectInstance* effect_65_main( bp.update = effect_65_update; bp.renderWorld = effect_65_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_65; effect = shim_create_effect_instance(&bp); @@ -128,8 +128,8 @@ void effect_65_update(EffectInstance* effect) { f32 dist; s32 idx; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/effect_75.c b/src/effects/effect_75.c index 8d279b555b..b1708e49f7 100644 --- a/src/effects/effect_75.c +++ b/src/effects/effect_75.c @@ -24,7 +24,7 @@ EffectInstance* effect_75_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 scale bp.update = effect_75_update; bp.renderWorld = effect_75_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_75; effect = shim_create_effect_instance(&bp); @@ -79,8 +79,8 @@ void effect_75_update(EffectInstance* effect) { Effect75FXData* data = effect->data.unk_75; s32 unk_14; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 0x10; } diff --git a/src/effects/effect_86.c b/src/effects/effect_86.c index 916d8476bf..7290ead8af 100644 --- a/src/effects/effect_86.c +++ b/src/effects/effect_86.c @@ -39,7 +39,7 @@ EffectInstance* effect_86_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bp.update = effect_86_update; bp.renderWorld = effect_86_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_86; effect = shim_create_effect_instance(&bp); @@ -79,8 +79,8 @@ void effect_86_init(EffectInstance* effect) { void effect_86_update(EffectInstance* effect) { Effect86FXData* data = effect->data.unk_86; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 0x10; } diff --git a/src/effects/embers.c b/src/effects/embers.c index ca702bafb1..1411be9d8c 100644 --- a/src/effects/embers.c +++ b/src/effects/embers.c @@ -45,7 +45,7 @@ EffectInstance* embers_main( bp.update = embers_update; bp.renderWorld = embers_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_EMBERS; effect = shim_create_effect_instance(&bp); @@ -101,8 +101,8 @@ void embers_update(EffectInstance* effect) { f32 unk_6C; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_18 = 0x10; } diff --git a/src/effects/emote.c b/src/effects/emote.c index e9fc225eca..807ed79909 100644 --- a/src/effects/emote.c +++ b/src/effects/emote.c @@ -102,7 +102,7 @@ void emote_main(s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 bp.init = emote_init; bp.update = emote_update; bp.renderWorld = emote_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_EMOTE; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/ending_decals.c b/src/effects/ending_decals.c index 1ca8ef82c5..7099005cd5 100644 --- a/src/effects/ending_decals.c +++ b/src/effects/ending_decals.c @@ -38,7 +38,7 @@ void ending_decals_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 arg4, Effect bp.update = ending_decals_update; bp.renderWorld = ending_decals_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_ENDING_DECALS; effect = shim_create_effect_instance(&bp); @@ -86,8 +86,8 @@ void ending_decals_init(EffectInstance* effect) { void ending_decals_update(EffectInstance* effect) { EndingDecalsFXData* data = effect->data.endingDecals; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_1C = 10; } diff --git a/src/effects/energy_in_out.c b/src/effects/energy_in_out.c index cc5b23b475..18a1020f7e 100644 --- a/src/effects/energy_in_out.c +++ b/src/effects/energy_in_out.c @@ -45,7 +45,7 @@ EffectInstance* energy_in_out_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.update = energy_in_out_update; bp.renderWorld = energy_in_out_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_IN_OUT; effect = shim_create_effect_instance(&bp); @@ -173,8 +173,8 @@ void energy_in_out_update(EffectInstance* effect) { f32 angle; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_10 = 16; } diff --git a/src/effects/energy_orb_wave.c b/src/effects/energy_orb_wave.c index 62342a3fd8..401059b49b 100644 --- a/src/effects/energy_orb_wave.c +++ b/src/effects/energy_orb_wave.c @@ -22,7 +22,7 @@ EffectInstance* energy_orb_wave_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 bp.update = energy_orb_wave_update; bp.renderWorld = energy_orb_wave_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_ORB_WAVE; effect = shim_create_effect_instance(&bp); @@ -88,8 +88,8 @@ void energy_orb_wave_update(EffectInstance* effect) { u16 var_4; s32 var_3; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 30; } diff --git a/src/effects/energy_shockwave.c b/src/effects/energy_shockwave.c index ff471dbde5..a3ba8e680b 100644 --- a/src/effects/energy_shockwave.c +++ b/src/effects/energy_shockwave.c @@ -26,7 +26,7 @@ void energy_shockwave_main( bp.update = energy_shockwave_update; bp.renderWorld = energy_shockwave_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_ENERGY_SHOCKWAVE; effect = shim_create_effect_instance(&bp); @@ -80,7 +80,7 @@ void energy_shockwave_update(EffectInstance* effect) { angle = func_E0200044(360, unk_2C); shim_sin_deg(angle); shim_cos_deg(angle); - shim_load_effect(58); + shim_load_effect(EFFECT_SHIMMER_WAVE); shimmer_wave_main(0, data->unk_04, data->unk_08, data->unk_0C, unk_2C * 8, 10.0f, 10, 20); } diff --git a/src/effects/explosion.c b/src/effects/explosion.c index e24b30698e..8fe46237f3 100644 --- a/src/effects/explosion.c +++ b/src/effects/explosion.c @@ -36,7 +36,7 @@ void explosion_main(s32 type, f32 x, f32 y, f32 z) { bpPtr->init = explosion_init; bpPtr->update = explosion_update; bpPtr->renderWorld = explosion_render; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_EXPLOSION; diff --git a/src/effects/falling_leaves.c b/src/effects/falling_leaves.c index 40e86c58f2..ab29a6a90f 100644 --- a/src/effects/falling_leaves.c +++ b/src/effects/falling_leaves.c @@ -20,7 +20,7 @@ void falling_leaves_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.update = falling_leaves_update; bp.renderWorld = falling_leaves_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FALLING_LEAVES; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/fire_breath.c b/src/effects/fire_breath.c index 665efe544c..045963be56 100644 --- a/src/effects/fire_breath.c +++ b/src/effects/fire_breath.c @@ -31,7 +31,7 @@ EffectInstance* fire_breath_main( bp.init = fire_breath_init; bp.update = fire_breath_update; bp.renderWorld = fire_breath_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_FIRE_BREATH; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/fire_flower.c b/src/effects/fire_flower.c index f48074c16b..bfdb6d9262 100644 --- a/src/effects/fire_flower.c +++ b/src/effects/fire_flower.c @@ -28,7 +28,7 @@ EffectInstance* fire_flower_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg bp.init = fire_flower_init; bp.update = fire_flower_update; bp.renderWorld = fire_flower_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FIRE_FLOWER; effect = shim_create_effect_instance(&bp); @@ -96,7 +96,7 @@ void fire_flower_update(EffectInstance* effect) { switch (unk_04) { case 0: - shim_load_effect(45); + shim_load_effect(EFFECT_STARS_SPREAD); stars_spread_main(0, part->pos.x - 10.0f, part->pos.y, part->pos.z, 7, 20); part->unk_34 = 0; part->unk_38 = 0; diff --git a/src/effects/firework.c b/src/effects/firework.c index 267593a971..2d5ea059a4 100644 --- a/src/effects/firework.c +++ b/src/effects/firework.c @@ -58,7 +58,7 @@ EffectInstance* firework_main( bp.init = firework_init; bp.update = firework_update; bp.renderWorld = firework_render; - bp.unk_14 = func_E0086398; + bp.renderUI = func_E0086398; bp.effectID = EFFECT_FIREWORK; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/firework_rocket.c b/src/effects/firework_rocket.c index 6c442a6769..b21186d537 100644 --- a/src/effects/firework_rocket.c +++ b/src/effects/firework_rocket.c @@ -93,7 +93,7 @@ EffectInstance* firework_rocket_main(s32 variation, f32 centerX, f32 centerY, f3 bp.update = firework_rocket_update; bp.renderWorld = firework_rocket_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FIREWORK_ROCKET; effect = shim_create_effect_instance(&bp); @@ -147,8 +147,8 @@ void firework_rocket_update(EffectInstance* effect) { s32 lifeTime; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/flame.c b/src/effects/flame.c index 2e526d71c0..5817b2b316 100644 --- a/src/effects/flame.c +++ b/src/effects/flame.c @@ -57,7 +57,7 @@ void flame_main( bpPtr->update = flame_update; bpPtr->renderWorld = flame_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_FLAME; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/flashing_box_shockwave.c b/src/effects/flashing_box_shockwave.c index 10e09cfd5c..cb4c530d6d 100644 --- a/src/effects/flashing_box_shockwave.c +++ b/src/effects/flashing_box_shockwave.c @@ -28,7 +28,7 @@ EffectInstance* flashing_box_shockwave_main( bp.update = flashing_box_shockwave_update; bp.renderWorld = flashing_box_shockwave_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FLASHING_BOX_SHOCKWAVE; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/floating_cloud_puff.c b/src/effects/floating_cloud_puff.c index 16e6ef92d9..504c8ced75 100644 --- a/src/effects/floating_cloud_puff.c +++ b/src/effects/floating_cloud_puff.c @@ -29,7 +29,7 @@ EffectInstance* floating_cloud_puff_main( bp.update = floating_cloud_puff_update; bp.renderWorld = floating_cloud_puff_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_CLOUD_PUFF; effect = shim_create_effect_instance(&bp); @@ -66,8 +66,8 @@ void floating_cloud_puff_update(EffectInstance* effect) { FloatingCloudPuffFXData* data = effect->data.floatingCloudPuff; s32 unk_14; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } diff --git a/src/effects/floating_flower.c b/src/effects/floating_flower.c index 5e0ea2f3e4..1ca473ef91 100644 --- a/src/effects/floating_flower.c +++ b/src/effects/floating_flower.c @@ -21,7 +21,7 @@ void floating_flower_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) bp.init = floating_flower_init; bp.update = floating_flower_update; bp.renderWorld = floating_flower_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_FLOWER; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/floating_rock.c b/src/effects/floating_rock.c index f2ba37d77d..fa5e4f209e 100644 --- a/src/effects/floating_rock.c +++ b/src/effects/floating_rock.c @@ -26,7 +26,7 @@ EffectInstance* floating_rock_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.update = floating_rock_update; bp.renderWorld = floating_rock_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FLOATING_ROCK; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/flower_splash.c b/src/effects/flower_splash.c index 4a20c9669b..b1e28f97b6 100644 --- a/src/effects/flower_splash.c +++ b/src/effects/flower_splash.c @@ -55,7 +55,7 @@ void flower_splash_main(f32 posX, f32 posY, f32 posZ, f32 angle) { bp.update = flower_splash_update; bp.renderWorld = flower_splash_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FLOWER_SPLASH; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/flower_trail.c b/src/effects/flower_trail.c index 057998aaf0..fd958b2b92 100644 --- a/src/effects/flower_trail.c +++ b/src/effects/flower_trail.c @@ -57,7 +57,7 @@ void flower_trail_main(s32 triggeredByNpc, f32 posX, f32 posY, f32 posZ, f32 ang bp.update = flower_trail_update; bp.renderWorld = flower_trail_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FLOWER_TRAIL; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/footprint.c b/src/effects/footprint.c index 7ef4c9bb29..072a5292ba 100644 --- a/src/effects/footprint.c +++ b/src/effects/footprint.c @@ -32,7 +32,7 @@ void footprint_main(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, bp.init = footprint_init; bp.update = footprint_update; bp.renderWorld = footprint_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_FOOTPRINT; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/fright_jar.c b/src/effects/fright_jar.c index 2c755824aa..c45efe5408 100644 --- a/src/effects/fright_jar.c +++ b/src/effects/fright_jar.c @@ -33,7 +33,7 @@ EffectInstance* fright_jar_main( bp.update = fright_jar_update; bp.renderWorld = fright_jar_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_FRIGHT_JAR; effect = shim_create_effect_instance(&bp); @@ -67,8 +67,8 @@ void fright_jar_update(EffectInstance* effect) { FrightJarFXData* data = effect->data.frightJar; s32 unk_10; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } diff --git a/src/effects/gather_energy_pink.c b/src/effects/gather_energy_pink.c index ee152b9743..f0f2418010 100644 --- a/src/effects/gather_energy_pink.c +++ b/src/effects/gather_energy_pink.c @@ -29,7 +29,7 @@ void gather_energy_pink_main(s32 type, f32 posX, f32 posY, f32 posZ, f32 scale, bp.init = gather_energy_pink_init; bp.update = gather_energy_pink_update; bp.renderWorld = gather_energy_pink_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_GATHER_ENERGY_PINK; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/gather_magic.c b/src/effects/gather_magic.c index 2e0c98e30e..87bd962824 100644 --- a/src/effects/gather_magic.c +++ b/src/effects/gather_magic.c @@ -23,7 +23,7 @@ EffectInstance* gather_magic_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bp.init = gather_magic_init; bp.update = gather_magic_update; bp.renderWorld = gather_magic_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_GATHER_MAGIC; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/got_item_outline.c b/src/effects/got_item_outline.c index 29f8ab260f..c9101c9dda 100644 --- a/src/effects/got_item_outline.c +++ b/src/effects/got_item_outline.c @@ -1,8 +1,8 @@ #include "common.h" #include "effects_internal.h" -extern char D_09000000_345B40[][0x1000]; -extern char D_09004000_349B40[][0x1000]; +extern IMG_BIN D_09000000_345B40[][0x1000]; +extern IMG_BIN D_09004000_349B40[][0x1000]; extern Gfx D_09008100_34DC40[]; extern Gfx D_09008170_34DCB0[]; extern Gfx D_09008190_34DCD0[]; @@ -13,8 +13,8 @@ Gfx* D_E0036630[] = { D_09008170_34DCB0, D_09008190_34DCD0, D_090081A8_34DCE8, D_090081C0_34DD00 }; -u8 D_E0036640[] = { 0x3C, 0x78, 0x8C, 0x93, 0x95, 0x96, 0x00, 0x00 }; -u8 D_E0036648[] = { 0x96, 0x96, 0x96, 0x96, 0x96, 0x96, 0x00, 0x00 }; +u8 AnimScaleIn[] = { 60, 120, 140, 147, 149, 150 }; +u8 AnimScaleOut[] = { 150, 150, 150, 150, 150, 150 }; void got_item_outline_init(EffectInstance* effect); void got_item_outline_update(EffectInstance* effect); @@ -22,10 +22,10 @@ void got_item_outline_render(EffectInstance* effect); void got_item_outline_appendGfx(void* effect); void got_item_outline_main( - s32 arg0, - f32 arg1, - f32 arg2, - f32 arg3, + s32 type, + f32 posX, + f32 posY, + f32 posZ, f32 arg4, EffectInstance** outEffect ) { @@ -38,7 +38,7 @@ void got_item_outline_main( bp.update = got_item_outline_update; bp.renderWorld = got_item_outline_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_GOT_ITEM_OUTLINE; effect = shim_create_effect_instance(&bp); @@ -46,13 +46,13 @@ void got_item_outline_main( data = effect->data.gotItemOutline = shim_general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.gotItemOutline != NULL); - data->unk_14 = 100; - data->unk_00 = arg0; - data->unk_10 = 0; - data->unk_04 = arg1; - data->unk_08 = arg2; - data->unk_0C = arg3; - data->unk_1C = 255; + data->timeLeft = 100; + data->type = type; + data->lifetime = 0; + data->pos.x = posX; + data->pos.y = posY; + data->pos.z = posZ; + data->alpha = 255; *outEffect = effect; } @@ -62,31 +62,31 @@ void got_item_outline_init(EffectInstance* effect) { void got_item_outline_update(EffectInstance* effect) { GotItemOutlineFXData* data = effect->data.gotItemOutline; - s32 unk_10; + s32 time; - if (data->unk_14 < 100) { - data->unk_14--; - if (data->unk_14 < 0) { + if (data->timeLeft < 100) { + data->timeLeft--; + if (data->timeLeft < 0) { shim_remove_effect(effect); return; } } - data->unk_10++; - unk_10 = data->unk_10; + data->lifetime++; + time = data->lifetime; - if (data->unk_14 < 6) { - data->unk_18 = D_E0036648[5 - data->unk_14] / 150.0f; - data->unk_1C /= 2; + if (data->timeLeft < 6) { + data->scale = AnimScaleOut[5 - data->timeLeft] / 150.0f; + data->alpha /= 2; } else { - if (unk_10 < 7) { - data->unk_18 = D_E0036640[unk_10 - 1] / 150.0f; + if (time < 7) { + data->scale = AnimScaleIn[time - 1] / 150.0f; } else { - data->unk_18 = 1.0f; + data->scale = 1.0f; } - if (unk_10 >= 7) { - data->unk_10 = 7; + if (time >= 7) { + data->lifetime = 7; } } } @@ -109,49 +109,49 @@ void func_E003621C(void) { void got_item_outline_appendGfx(void* effect) { GotItemOutlineFXData* data = ((EffectInstance*)effect)->data.gotItemOutline; - s32 unk_00 = data->unk_00; - f32 unk_18 = data->unk_18; - Matrix4f sp18; - Matrix4f sp58; + s32 type = data->type; + f32 scale = data->scale; + Matrix4f mtxTransform; + Matrix4f mtxTemp; s32 i; - if (unk_18 != 0.0f) { + if (scale != 0.0f) { gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); gSPDisplayList(gMainGfxPos++, D_09008100_34DC40); - if (unk_00 == 0) { - gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); + if (type == 0) { + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->alpha); gDPSetEnvColor(gMainGfxPos++, 0, 0, 0, 255); } else { - gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->unk_1C); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, data->alpha); gDPSetEnvColor(gMainGfxPos++, 255, 255, 0, 255); } - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guTranslateF(sp58, 0.0f, 0.0f, -2.0f); - shim_guMtxCatF(sp58, sp18, sp18); + shim_guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + shim_guTranslateF(mtxTemp, 0.0f, 0.0f, -2.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); - unk_18 *= 0.6; + scale *= 0.6; - shim_guScaleF(sp58, unk_18, unk_18, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guScaleF(mtxTemp, scale, scale, 1.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < 4; i++) { - char* temp; + IMG_PTR img; - if (unk_00 == 0) { - temp = D_09000000_345B40[i]; + if (type == 0) { + img = D_09000000_345B40[i]; } else { - temp = D_09004000_349B40[i]; + img = D_09004000_349B40[i]; } - gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 128, temp); + gDPSetTextureImage(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 128, img); gDPSetTile(gMainGfxPos++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); diff --git a/src/effects/green_impact.c b/src/effects/green_impact.c index e782781357..1bf4128de5 100644 --- a/src/effects/green_impact.c +++ b/src/effects/green_impact.c @@ -32,7 +32,7 @@ EffectInstance* green_impact_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bpPtr->init = green_impact_init; bpPtr->update = green_impact_update; bpPtr->renderWorld = green_impact_render; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_GREEN_IMPACT; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/hieroglyphs.c b/src/effects/hieroglyphs.c index 1a6ac48dd4..f79bb66b56 100644 --- a/src/effects/hieroglyphs.c +++ b/src/effects/hieroglyphs.c @@ -36,7 +36,7 @@ EffectInstance* hieroglyphs_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg effectBp.update = hieroglyphs_update; effectBp.renderWorld = hieroglyphs_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_HIEROGLYPHS; effect = shim_create_effect_instance(&effectBp); @@ -75,8 +75,8 @@ void hieroglyphs_update(EffectInstance* effect) { HieroglyphsFXData* data = effect->data.hieroglyphs; s32 temp_a2; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/huff_puff_breath.c b/src/effects/huff_puff_breath.c index 293cd0febd..c0beebb512 100644 --- a/src/effects/huff_puff_breath.c +++ b/src/effects/huff_puff_breath.c @@ -23,7 +23,7 @@ EffectInstance* huff_puff_breath_main(s32 type, f32 posX, f32 posY, f32 posZ, f3 effectBp.update = huff_puff_breath_update; effectBp.renderWorld = huff_puff_breath_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_HUFF_PUFF_BREATH; effect = shim_create_effect_instance(&effectBp); @@ -74,8 +74,8 @@ void huff_puff_breath_update(EffectInstance* effect) { HuffPuffBreathFXData* data = effect->data.huffPuffBreath; s32 temp_a2; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/ice_pillar.c b/src/effects/ice_pillar.c index 27f7ccbad7..4d7745fcda 100644 --- a/src/effects/ice_pillar.c +++ b/src/effects/ice_pillar.c @@ -25,7 +25,7 @@ EffectInstance* ice_pillar_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 ar effectBp.update = ice_pillar_update; effectBp.renderWorld = ice_pillar_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_ICE_PILLAR; effect = shim_create_effect_instance(&effectBp); @@ -72,8 +72,8 @@ void ice_pillar_update(EffectInstance* effect) { s32 lifeTime; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/ice_shard.c b/src/effects/ice_shard.c index 3702aed7f3..f8116bf45e 100644 --- a/src/effects/ice_shard.c +++ b/src/effects/ice_shard.c @@ -30,7 +30,7 @@ EffectInstance* ice_shard_main( bp.update = ice_shard_update; bp.renderWorld = ice_shard_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_ICE_SHARD; effect = shim_create_effect_instance(&bp); @@ -76,8 +76,8 @@ void ice_shard_update(EffectInstance* effect) { IceShardFXData* data = effect->data.iceShard; s32 unk_00 = data->type; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/landing_dust.c b/src/effects/landing_dust.c index 88e5ea463a..a1aeb90b8d 100644 --- a/src/effects/landing_dust.c +++ b/src/effects/landing_dust.c @@ -98,7 +98,7 @@ void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32 arg4) { bpPtr->update = landing_dust_update; bpPtr->renderWorld = landing_dust_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_LANDING_DUST; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/lens_flare.c b/src/effects/lens_flare.c index f7bdd9bfa1..07a05b3f5a 100644 --- a/src/effects/lens_flare.c +++ b/src/effects/lens_flare.c @@ -23,7 +23,7 @@ void lens_flare_update(EffectInstance* effect); void lens_flare_render(EffectInstance* effect); void lens_flare_appendGfx(void* effect); -void lens_flare_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { +void lens_flare_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duration) { EffectBlueprint bp; EffectInstance* effect; LensFlareFXData* data; @@ -33,7 +33,7 @@ void lens_flare_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.update = lens_flare_update; bp.renderWorld = lens_flare_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_LENS_FLARE; effect = shim_create_effect_instance(&bp); @@ -41,23 +41,25 @@ void lens_flare_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { data = effect->data.lensFlare = shim_general_heap_malloc(numParts * sizeof(*data)); ASSERT(effect->data.lensFlare != NULL); - data->unk_00 = arg0; - data->unk_04 = arg1; - data->unk_08 = arg2; - data->unk_0C = arg3; - data->unk_2C = arg4; - data->unk_30 = 0; - data->unk_24 = 0; - data->unk_10 = 0; - if (arg0 == 0) { - data->unk_14 = 30.0f; + data->type = type; + data->pos.x = posX; + data->pos.y = posY; + data->pos.z = posZ; + data->timeLeft = duration; + data->lifetime = 0; + + data->largeFlareAlpha = 0; + data->largeFlareRot = 0; + if (type == 0) { + data->largeFlareRotVel = 30.0f; } else { - data->unk_14 = 0; + data->largeFlareRotVel = 0; } - data->unk_18 = 0; - data->unk_28 = 0; - data->unk_20 = 0; - data->unk_1C = 0.8f; + data->largeFlareScale = 0; + data->largeFlareScaleVel = 0.8f; + + data->smallFlareAlpha = 0; + data->smallFlareScale = 0; } void lens_flare_init(EffectInstance* effect) { @@ -65,30 +67,30 @@ void lens_flare_init(EffectInstance* effect) { void lens_flare_update(EffectInstance* effect) { LensFlareFXData* data = effect->data.lensFlare; - s32 unk_2C; + s32 time; - data->unk_2C--; - data->unk_30++; + data->timeLeft--; + data->lifetime++; - if (data->unk_2C < 0) { + if (data->timeLeft < 0) { shim_remove_effect(effect); return; } - unk_2C = data->unk_2C; + time = data->timeLeft; - if (data->unk_30 < 7) { - data->unk_24 += (218 - data->unk_24) * 0.5; + if (data->lifetime < 7) { + data->largeFlareAlpha += (218 - data->largeFlareAlpha) * 0.5; } else { - data->unk_24 *= 0.78; + data->largeFlareAlpha *= 0.78; } - data->unk_18 += data->unk_1C; - data->unk_1C += 0.29; - data->unk_10 += data->unk_14; - data->unk_14 *= 0.93; - data->unk_20 = shim_sin_deg(unk_2C * 50) * 0.5 + 0.9; - data->unk_28 = shim_sin_deg(unk_2C * 40) * 64.0f + 144.0f; + data->largeFlareScale += data->largeFlareScaleVel; + data->largeFlareScaleVel += 0.29; + data->largeFlareRot += data->largeFlareRotVel; + data->largeFlareRotVel *= 0.93; + data->smallFlareScale = shim_sin_deg(time * 50) * 0.5 + 0.9; + data->smallFlareAlpha = shim_sin_deg(time * 40) * 64.0f + 144.0f; } void lens_flare_render(EffectInstance* effect) { @@ -106,53 +108,55 @@ void lens_flare_render(EffectInstance* effect) { void lens_flare_appendGfx(void* effect) { LensFlareFXData* data = ((EffectInstance*)effect)->data.lensFlare; - s32 unk_00 = data->unk_00; - s32 primA; + s32 type = data->type; + s32 alpha; s32 idx; - Matrix4f sp18; - Matrix4f sp58; - Matrix4f sp98; + Matrix4f mtxTransform; + Matrix4f mtxTemp; + Matrix4f mtxShared; gDPPipeSync(gMainGfxPos++); gSPSegment(gMainGfxPos++, 0x09, VIRTUAL_TO_PHYSICAL(((EffectInstance*)effect)->graphics->data)); - gSPDisplayList(gMainGfxPos++, D_E0034788[unk_00]); + gSPDisplayList(gMainGfxPos++, D_E0034788[type]); - shim_guTranslateF(sp18, data->unk_04, data->unk_08, data->unk_0C); - shim_guRotateF(sp58, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); - shim_guMtxCatF(sp58, sp18, sp98); + shim_guTranslateF(mtxTransform, data->pos.x, data->pos.y, data->pos.z); + shim_guRotateF(mtxTemp, -gCameras[gCurrentCameraID].currentYaw, 0.0f, 1.0f, 0.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxShared); - primA = data->unk_28; - idx = data->unk_30 * 3; + alpha = data->smallFlareAlpha; + idx = data->lifetime * 3; - if (unk_00 == 0) { - shim_guScaleF(sp58, data->unk_20, data->unk_20, data->unk_20); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + // small twinkling shine which changes color + if (type == 0) { + shim_guScaleF(mtxTemp, data->smallFlareScale, data->smallFlareScale, data->smallFlareScale); + shim_guMtxCatF(mtxTemp, mtxShared, mtxTransform); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); idx %= ARRAY_COUNT(D_E0034790); - gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], alpha); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(gMainGfxPos++, D_E0034780[0]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } - primA = data->unk_24; - if (primA > 255) { - primA = 255; + alpha = data->largeFlareAlpha; + if (alpha > 255) { + alpha = 255; } - if (primA > 0) { - shim_guScaleF(sp58, data->unk_18, data->unk_18, data->unk_18); - shim_guMtxCatF(sp58, sp98, sp18); - shim_guRotateF(sp58, data->unk_10, 0.0f, 0.0f, 1.0f); - shim_guMtxCatF(sp58, sp18, sp18); - shim_guMtxF2L(sp18, &gDisplayContext->matrixStack[gMatrixListPos]); + // large growing white shine + if (alpha > 0) { + shim_guScaleF(mtxTemp, data->largeFlareScale, data->largeFlareScale, data->largeFlareScale); + shim_guMtxCatF(mtxTemp, mtxShared, mtxTransform); + shim_guRotateF(mtxTemp, data->largeFlareRot, 0.0f, 0.0f, 1.0f); + shim_guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); - gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], primA); - gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, primA); + gDPSetPrimColor(gMainGfxPos++, 0, 0, D_E0034790[idx], D_E0034790[idx + 1], D_E0034790[idx + 2], alpha); + gDPSetPrimColor(gMainGfxPos++, 0, 0, 255, 255, 255, alpha); gSPMatrix(gMainGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW); - gSPDisplayList(gMainGfxPos++, D_E0034780[unk_00]); + gSPDisplayList(gMainGfxPos++, D_E0034780[type]); gSPPopMatrix(gMainGfxPos++, G_MTX_MODELVIEW); } diff --git a/src/effects/light_rays.c b/src/effects/light_rays.c index 39d5deee4d..df2549f31b 100644 --- a/src/effects/light_rays.c +++ b/src/effects/light_rays.c @@ -104,7 +104,7 @@ void light_rays_main( bpPtr->update = light_rays_update; bpPtr->renderWorld = light_rays_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_LIGHT_RAYS; effect = shim_create_effect_instance(bpPtr); @@ -195,8 +195,8 @@ void light_rays_update(EffectInstance* effect) { part->lifetime++; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->timeLeft = 10; } diff --git a/src/effects/lightning.c b/src/effects/lightning.c index 91ec30fee8..d3ebbae5cc 100644 --- a/src/effects/lightning.c +++ b/src/effects/lightning.c @@ -42,7 +42,7 @@ EffectInstance* lightning_main( bp.update = lightning_update; bp.renderWorld = lightning_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_LIGHTNING; effect = shim_create_effect_instance(&bp); @@ -114,8 +114,8 @@ void lightning_update(EffectInstance* effect) { LightningFXData* data = effect->data.lightning; s32 unk_00; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_14 = 0; } diff --git a/src/effects/lightning_bolt.c b/src/effects/lightning_bolt.c index 29a5771df3..ffe28234b2 100644 --- a/src/effects/lightning_bolt.c +++ b/src/effects/lightning_bolt.c @@ -64,7 +64,7 @@ EffectInstance* lightning_bolt_main( bp.update = lightning_bolt_update; bp.renderWorld = lightning_bolt_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_LIGHTNING_BOLT; effect = shim_create_effect_instance(&bp); @@ -120,8 +120,8 @@ void lightning_bolt_update(EffectInstance* effect) { LightningBoltFXData* data = effect->data.lightningBolt; s32 type = data->type; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 589b104b7a..66a3f7bfe7 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -60,7 +60,7 @@ EffectInstance* lil_oink_main(void) { bp.init = lil_oink_init; bp.update = lil_oink_update; bp.renderWorld = lil_oink_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_LIL_OINK; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/merlin_house_stars.c b/src/effects/merlin_house_stars.c index b2d41f4dfb..e7dc284aa1 100644 --- a/src/effects/merlin_house_stars.c +++ b/src/effects/merlin_house_stars.c @@ -19,7 +19,7 @@ EffectInstance* merlin_house_stars_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) bp.update = merlin_house_stars_update; bp.renderWorld = merlin_house_stars_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_MERLIN_HOUSE_STARS; effect = shim_create_effect_instance(&bp); @@ -51,8 +51,8 @@ void merlin_house_stars_update(EffectInstance* effect) { MerlinHouseStarsFXData* data = effect->data.merlinHouseStars; s32 unk_04; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_04 = 30; } diff --git a/src/effects/misc_particles.c b/src/effects/misc_particles.c index 047085cc8a..bfe5c97c19 100644 --- a/src/effects/misc_particles.c +++ b/src/effects/misc_particles.c @@ -66,7 +66,7 @@ EffectInstance* misc_particles_main( bp.update = misc_particles_update; bp.renderWorld = misc_particles_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_MISC_PARTICLES; effect = shim_create_effect_instance(&bp); @@ -160,8 +160,8 @@ void misc_particles_update(EffectInstance* effect) { f32 temp_cos; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; particle->timeLeft = 16; } diff --git a/src/effects/motion_blur_flame.c b/src/effects/motion_blur_flame.c index 0db56625bf..9732d30492 100644 --- a/src/effects/motion_blur_flame.c +++ b/src/effects/motion_blur_flame.c @@ -41,7 +41,7 @@ EffectInstance* motion_blur_flame_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f bp.update = motion_blur_flame_update; bp.renderWorld = motion_blur_flame_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_MOTION_BLUR_FLAME; effect = shim_create_effect_instance(&bp); @@ -80,8 +80,8 @@ void motion_blur_flame_update(EffectInstance* effect) { MotionBlurFlameFXData* data = effect->data.motionBlurFlame; s32 temp; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_50 = 30; } data->unk_54++; diff --git a/src/effects/moving_cloud.c b/src/effects/moving_cloud.c index a85be959d9..3f16c75f39 100644 --- a/src/effects/moving_cloud.c +++ b/src/effects/moving_cloud.c @@ -37,7 +37,7 @@ EffectInstance* moving_cloud_main( bp.update = moving_cloud_update; bp.renderWorld = moving_cloud_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_MOVING_CLOUD; effect = shim_create_effect_instance(&bp); @@ -120,8 +120,8 @@ void moving_cloud_update(EffectInstance* effect) { s32 unk_00 = data->unk_00; s32 unk_1C; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_1C = 16; } diff --git a/src/effects/music_note.c b/src/effects/music_note.c index c682d4e884..92829bf236 100644 --- a/src/effects/music_note.c +++ b/src/effects/music_note.c @@ -45,7 +45,7 @@ void music_note_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = music_note_init; bp.update = music_note_update; bp.renderWorld = music_note_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_MUSIC_NOTE; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/partner_buff.c b/src/effects/partner_buff.c index 91bb64c6f8..3fa2f27e75 100644 --- a/src/effects/partner_buff.c +++ b/src/effects/partner_buff.c @@ -46,7 +46,7 @@ EffectInstance* partner_buff_main(s32 useRandomValues, f32 arg1, f32 arg2, f32 a bp.init = partner_buff_init; bp.update = partner_buff_update; bp.renderWorld = partner_buff_render; - bp.unk_14 = func_E011A3A0; + bp.renderUI = func_E011A3A0; bp.effectID = EFFECT_PARTNER_BUFF; effect = shim_create_effect_instance(&bp); @@ -87,8 +87,8 @@ void partner_buff_update(EffectInstance* effect) { s32 time; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/peach_star_beam.c b/src/effects/peach_star_beam.c index 0f5aa79540..7e4bcd42f5 100644 --- a/src/effects/peach_star_beam.c +++ b/src/effects/peach_star_beam.c @@ -45,7 +45,7 @@ EffectInstance* peach_star_beam_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, s3 bp.init = peach_star_beam_init; bp.update = peach_star_beam_update; bp.renderWorld = peach_star_beam_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_PEACH_STAR_BEAM; effect = shim_create_effect_instance(&bp); @@ -106,8 +106,8 @@ void peach_star_beam_update(EffectInstance* effect) { f32 spiritAngle; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/pink_sparkles.c b/src/effects/pink_sparkles.c index 3dad00df48..d8c05bc3bb 100644 --- a/src/effects/pink_sparkles.c +++ b/src/effects/pink_sparkles.c @@ -110,7 +110,7 @@ EffectInstance* pink_sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.update = pink_sparkles_update; bp.renderWorld = pink_sparkles_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_PINK_SPARKLES; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/purple_ring.c b/src/effects/purple_ring.c index f4150e1f68..ee7a23b34d 100644 --- a/src/effects/purple_ring.c +++ b/src/effects/purple_ring.c @@ -89,7 +89,7 @@ EffectInstance* purple_ring_main( bpPtr->update = purple_ring_update; bpPtr->renderWorld = purple_ring_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_PURPLE_RING; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/quizmo_answer.c b/src/effects/quizmo_answer.c index 1af98abcd2..8249a99fa8 100644 --- a/src/effects/quizmo_answer.c +++ b/src/effects/quizmo_answer.c @@ -12,7 +12,7 @@ EffectInstance* quizmo_answer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bp.init = NULL; bp.update = NULL; bp.renderWorld = NULL; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_QUIZMO_ANSWER; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/quizmo_assistant.c b/src/effects/quizmo_assistant.c index fe6c83590f..578718fcb4 100644 --- a/src/effects/quizmo_assistant.c +++ b/src/effects/quizmo_assistant.c @@ -33,7 +33,7 @@ EffectInstance* quizmo_assistant_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f3 bp.update = quizmo_assistant_update; bp.renderWorld = quizmo_assistant_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_QUIZMO_ASSISTANT; effect = shim_create_effect_instance(&bp); @@ -63,8 +63,8 @@ void quizmo_assistant_init(EffectInstance* effect) { void quizmo_assistant_update(EffectInstance* effect) { QuizmoAssistantFXData* data = effect->data.quizmoAssistant; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->vanishTimer = 16; } diff --git a/src/effects/quizmo_audience.c b/src/effects/quizmo_audience.c index e2a9e2ea6b..45e6e964bb 100644 --- a/src/effects/quizmo_audience.c +++ b/src/effects/quizmo_audience.c @@ -86,7 +86,7 @@ EffectInstance* quizmo_audience_main(s32 arg0, f32 posX, f32 posY, f32 posZ) { effectBp.update = quizmo_audience_update; effectBp.renderWorld = quizmo_audience_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_QUIZMO_AUDIENCE; effect = shim_create_effect_instance(&effectBp); @@ -120,8 +120,8 @@ void quizmo_audience_update(EffectInstance* effect) { s32 posIdx; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 30; } diff --git a/src/effects/quizmo_stage.c b/src/effects/quizmo_stage.c index 11140fd27b..73535b105f 100644 --- a/src/effects/quizmo_stage.c +++ b/src/effects/quizmo_stage.c @@ -30,7 +30,7 @@ EffectInstance* quizmo_stage_main(s32 arg0, f32 posX, f32 posY, f32 posZ) { effectBp.update = quizmo_stage_update; effectBp.renderWorld = quizmo_stage_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_QUIZMO_STAGE; effect = shim_create_effect_instance(&effectBp); @@ -65,8 +65,8 @@ void quizmo_stage_update(EffectInstance *effect) { QuizmoStageFXData *data = effect->data.quizmoStage; s32 lifeTime; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->vanishTimer = 30; } diff --git a/src/effects/radial_shimmer.c b/src/effects/radial_shimmer.c index 43a28631f7..ec66a6ca60 100644 --- a/src/effects/radial_shimmer.c +++ b/src/effects/radial_shimmer.c @@ -43,7 +43,7 @@ EffectInstance* radial_shimmer_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 bp.update = radial_shimmer_update; bp.renderWorld = radial_shimmer_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_RADIAL_SHIMMER; effect = shim_create_effect_instance(&bp); @@ -215,8 +215,8 @@ void radial_shimmer_update(EffectInstance* effect) { part->timeLeft--; part->lifeTime++; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->timeLeft = 16; } diff --git a/src/effects/radiating_energy_orb.c b/src/effects/radiating_energy_orb.c index 931ae808f8..310697bc97 100644 --- a/src/effects/radiating_energy_orb.c +++ b/src/effects/radiating_energy_orb.c @@ -37,7 +37,7 @@ EffectInstance* radiating_energy_orb_main( bp.init = radiating_energy_orb_init; bp.update = radiating_energy_orb_update; bp.renderWorld = radiating_energy_orb_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_RADIATING_ENERGY_ORB; effect = shim_create_effect_instance(&bp); @@ -77,8 +77,8 @@ void radiating_energy_orb_update(EffectInstance* effect) { s32 unk_1C; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_18 = 30; } diff --git a/src/effects/recover.c b/src/effects/recover.c index 48a18bdc6d..d12fbf7d34 100644 --- a/src/effects/recover.c +++ b/src/effects/recover.c @@ -51,7 +51,7 @@ EffectInstance* recover_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bp.init = recover_init; bp.update = recover_update; bp.renderWorld = recover_render; - bp.unk_14 = func_E008042C; + bp.renderUI = func_E008042C; bp.unk_00 = 0; bp.effectID = EFFECT_RECOVER; diff --git a/src/effects/red_impact.c b/src/effects/red_impact.c index e74cde997e..3dc799e8fe 100644 --- a/src/effects/red_impact.c +++ b/src/effects/red_impact.c @@ -33,7 +33,7 @@ EffectInstance* red_impact_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bpPtr->init = red_impact_init; bpPtr->update = red_impact_update; bpPtr->renderWorld = red_impact_render; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_RED_IMPACT; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/ring_blast.c b/src/effects/ring_blast.c index 65ed36adfa..5ef377de0c 100644 --- a/src/effects/ring_blast.c +++ b/src/effects/ring_blast.c @@ -22,7 +22,7 @@ void ring_blast_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 arg5) effectBp.update = ring_blast_update; effectBp.renderWorld = ring_blast_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_RING_BLAST; effect = shim_create_effect_instance(&effectBp); diff --git a/src/effects/rising_bubble.c b/src/effects/rising_bubble.c index b1225f9d19..6ff16ae30d 100644 --- a/src/effects/rising_bubble.c +++ b/src/effects/rising_bubble.c @@ -32,7 +32,7 @@ void rising_bubble_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) { effectBp.init = rising_bubble_init; effectBp.update = rising_bubble_update; effectBp.renderWorld = rising_bubble_render; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_RISING_BUBBLE; effect = shim_create_effect_instance(&effectBp); diff --git a/src/effects/shape_spell.c b/src/effects/shape_spell.c index f171ad8c73..bb6f3b1818 100644 --- a/src/effects/shape_spell.c +++ b/src/effects/shape_spell.c @@ -40,7 +40,7 @@ EffectInstance* shape_spell_main(s32 isChild, f32 x, f32 y, f32 z, f32 arg4, f32 bp.update = shape_spell_update; bp.renderWorld = shape_spell_render; bp.unk_00 = 0; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_SHAPE_SPELL; effect = shim_create_effect_instance(bpPtr); @@ -85,8 +85,8 @@ void shape_spell_update(EffectInstance* effect) { ShapeSpellFXData* part = effect->data.shapeSpell; s32 isChild; - if (flags & 0x10) { - effect->flags = flags & ~0x10; + if (flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags = flags & ~FX_INSTANCE_FLAG_DISMISS; part->timeLeft = 0; } diff --git a/src/effects/shattering_stones.c b/src/effects/shattering_stones.c index 1b34cd3c87..02ef16c4a1 100644 --- a/src/effects/shattering_stones.c +++ b/src/effects/shattering_stones.c @@ -49,7 +49,7 @@ void shattering_stones_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { bp.update = shattering_stones_update; bp.renderWorld = shattering_stones_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SHATTERING_STONES; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/shimmer_burst.c b/src/effects/shimmer_burst.c index f64d318c6d..45b49c4f05 100644 --- a/src/effects/shimmer_burst.c +++ b/src/effects/shimmer_burst.c @@ -43,7 +43,7 @@ EffectInstance* shimmer_burst_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 a bp.update = shimmer_burst_update; bp.renderWorld = shimmer_burst_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SHIMMER_BURST; effect = shim_create_effect_instance(&bp); @@ -106,8 +106,8 @@ void shimmer_burst_update(EffectInstance* effect) { f32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_38 = 16; } diff --git a/src/effects/shimmer_wave.c b/src/effects/shimmer_wave.c index 51f0b1c09a..41ad158d44 100644 --- a/src/effects/shimmer_wave.c +++ b/src/effects/shimmer_wave.c @@ -53,7 +53,7 @@ EffectInstance* shimmer_wave_main( bp.update = shimmer_wave_update; bp.renderWorld = shimmer_wave_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SHIMMER_WAVE; effect = shim_create_effect_instance(&bp); @@ -107,8 +107,8 @@ void shimmer_wave_update(EffectInstance* effect) { f32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_38 = 16; } diff --git a/src/effects/shiny_flare.c b/src/effects/shiny_flare.c index 6a8a5692b8..d11a47e15f 100644 --- a/src/effects/shiny_flare.c +++ b/src/effects/shiny_flare.c @@ -30,7 +30,7 @@ EffectInstance* shiny_flare_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg effectBp.update = shiny_flare_update; effectBp.renderWorld = shiny_flare_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SHINY_FLARE; effect = shim_create_effect_instance(&effectBp); effect->numParts = numParts; @@ -60,8 +60,8 @@ void shiny_flare_init(EffectInstance* effect) { void shiny_flare_update(EffectInstance *effect) { ShinyFlareFXData *data = effect->data.shinyFlare; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 10; } if (data->timeLeft < 1000) { diff --git a/src/effects/shockwave.c b/src/effects/shockwave.c index e4eaa028ab..239dda67fa 100644 --- a/src/effects/shockwave.c +++ b/src/effects/shockwave.c @@ -59,7 +59,7 @@ void shockwave_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bpPtr->update = shockwave_update; bpPtr->renderWorld = shockwave_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SHOCKWAVE; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/sleep_bubble.c b/src/effects/sleep_bubble.c index 435ca65bb1..808abf19de 100644 --- a/src/effects/sleep_bubble.c +++ b/src/effects/sleep_bubble.c @@ -29,7 +29,7 @@ void sleep_bubble_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg bp.init = sleep_bubble_init; bp.update = sleep_bubble_update; bp.renderWorld = sleep_bubble_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_SLEEP_BUBBLE; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/small_gold_sparkle.c b/src/effects/small_gold_sparkle.c index e79be843a4..035e6fbd18 100644 --- a/src/effects/small_gold_sparkle.c +++ b/src/effects/small_gold_sparkle.c @@ -35,7 +35,7 @@ EffectInstance* small_gold_sparkle_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, bp.update = small_gold_sparkle_update; bp.renderWorld = small_gold_sparkle_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SMALL_GOLD_SPARKLE; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/smoke_burst.c b/src/effects/smoke_burst.c index 943f51c784..fd1df2e71c 100644 --- a/src/effects/smoke_burst.c +++ b/src/effects/smoke_burst.c @@ -28,7 +28,7 @@ void smoke_burst_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, s32 time effectBp.update = smoke_burst_update; effectBp.renderWorld = smoke_burst_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SMOKE_BURST; effect = shim_create_effect_instance(&effectBp); diff --git a/src/effects/smoke_impact.c b/src/effects/smoke_impact.c index 03f1814901..6bc1be8a4b 100644 --- a/src/effects/smoke_impact.c +++ b/src/effects/smoke_impact.c @@ -39,7 +39,7 @@ void smoke_impact_main( bp.update = smoke_impact_update; bp.renderWorld = smoke_impact_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SMOKE_IMPACT; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/smoke_ring.c b/src/effects/smoke_ring.c index 1431e20499..264d9ff419 100644 --- a/src/effects/smoke_ring.c +++ b/src/effects/smoke_ring.c @@ -45,7 +45,7 @@ void smoke_ring_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { bpPtr->update = smoke_ring_update; bpPtr->renderWorld = smoke_ring_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = 0; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SMOKE_RING; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/snaking_static.c b/src/effects/snaking_static.c index 3989cc0ba0..8dcd8069f3 100644 --- a/src/effects/snaking_static.c +++ b/src/effects/snaking_static.c @@ -20,7 +20,7 @@ EffectInstance* snaking_static_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 effectBp.update = snaking_static_update; effectBp.renderWorld = snaking_static_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SNAKING_STATIC; effect = shim_create_effect_instance(&effectBp); @@ -80,8 +80,8 @@ void snaking_static_update(EffectInstance* effect) { s32 timeLeft; s32 i; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } diff --git a/src/effects/snowfall.c b/src/effects/snowfall.c index 7f0eb5d5ff..ef1bb1ef39 100644 --- a/src/effects/snowfall.c +++ b/src/effects/snowfall.c @@ -34,7 +34,7 @@ EffectInstance* snowfall_main(s32 arg0, s32 arg1) { effectBp.update = snowfall_update; effectBp.renderWorld = snowfall_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SNOWFALL; effect = shim_create_effect_instance(&effectBp); diff --git a/src/effects/snowflake.c b/src/effects/snowflake.c index 1a821c497b..9978515cac 100644 --- a/src/effects/snowflake.c +++ b/src/effects/snowflake.c @@ -22,7 +22,7 @@ void snowflake_main(f32 x, f32 y, f32 z, s32 arg3, s32 arg4) { bp.init = snowflake_init; bp.update = snowflake_update; bp.renderWorld = snowflake_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_SNOWFLAKE; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/snowman_doll.c b/src/effects/snowman_doll.c index 7b0caab8ba..0992e99c7d 100644 --- a/src/effects/snowman_doll.c +++ b/src/effects/snowman_doll.c @@ -78,7 +78,7 @@ EffectInstance* snowman_doll_main( bp.update = snowman_doll_update; bp.renderWorld = snowman_doll_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SNOWMAN_DOLL; effect = shim_create_effect_instance(&bp); @@ -125,8 +125,8 @@ void snowman_doll_update(EffectInstance* effect) { s32 unk_14; s32 unk_58; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } diff --git a/src/effects/something_rotating.c b/src/effects/something_rotating.c index 5fb6ddee01..039351766a 100644 --- a/src/effects/something_rotating.c +++ b/src/effects/something_rotating.c @@ -91,7 +91,7 @@ EffectInstance* something_rotating_main( bp.update = something_rotating_update; bp.renderWorld = something_rotating_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SOMETHING_ROTATING; effect = shim_create_effect_instance(&bp); @@ -144,8 +144,8 @@ void something_rotating_update(EffectInstance* effect) { f32 angle1; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_10 = 32; } diff --git a/src/effects/sparkles.c b/src/effects/sparkles.c index bfb454dd63..8f2c115fc5 100644 --- a/src/effects/sparkles.c +++ b/src/effects/sparkles.c @@ -80,7 +80,7 @@ void sparkles_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { bpPtr->update = sparkles_update; bpPtr->renderWorld = sparkles_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SPARKLES; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/spiky_white_aura.c b/src/effects/spiky_white_aura.c index 839e48c7ba..01d9c88658 100644 --- a/src/effects/spiky_white_aura.c +++ b/src/effects/spiky_white_aura.c @@ -78,7 +78,7 @@ void spiky_white_aura_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4) { bpPtr->update = spiky_white_aura_update; bpPtr->renderWorld = spiky_white_aura_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_SPIKY_WHITE_AURA; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/spirit_card.c b/src/effects/spirit_card.c index a702a82060..cef673d934 100644 --- a/src/effects/spirit_card.c +++ b/src/effects/spirit_card.c @@ -43,7 +43,7 @@ EffectInstance* spirit_card_main( bp.update = spirit_card_update; bp.renderWorld = spirit_card_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SPIRIT_CARD; effect = shim_create_effect_instance(&bp); @@ -73,9 +73,9 @@ EffectInstance* spirit_card_main( if (arg0 < 2) { shim_load_effect(EFFECT_MISC_PARTICLES); - data->unk_1C = misc_particles_main(3, arg1, arg2 - arg4 * 30.0f, arg3, arg4 * 30.0f, arg4 * 50.0f, 1.0f, 16, 0); + data->child = misc_particles_main(3, arg1, arg2 - arg4 * 30.0f, arg3, arg4 * 30.0f, arg4 * 50.0f, 1.0f, 16, 0); } else { - data->unk_1C = NULL; + data->child = NULL; } return effect; @@ -87,8 +87,8 @@ void spirit_card_init(EffectInstance* effect) { void spirit_card_update(EffectInstance* effect) { SpiritCardFXData* data = effect->data.spiritCard; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } @@ -100,15 +100,15 @@ void spirit_card_update(EffectInstance* effect) { if (data->unk_10 < 0) { shim_remove_effect(effect); - if (data->unk_1C != NULL) { - data->unk_1C->flags |= 0x10; + if (data->child != NULL) { + data->child->flags |= FX_INSTANCE_FLAG_DISMISS; } - } else if (data->unk_10 >= 16 && data->unk_1C != NULL) { - data->unk_1C->data.miscParticles->scaleX = data->unk_18 * 30.0f; - data->unk_1C->data.miscParticles->scaleY = data->unk_18 * 50.0f; - data->unk_1C->data.miscParticles->pos.x = data->pos.x; - data->unk_1C->data.miscParticles->pos.y = data->pos.y - data->unk_18 * 30.0f; - data->unk_1C->data.miscParticles->pos.z = data->pos.z; + } else if (data->unk_10 >= 16 && data->child != NULL) { + data->child->data.miscParticles->scaleX = data->unk_18 * 30.0f; + data->child->data.miscParticles->scaleY = data->unk_18 * 50.0f; + data->child->data.miscParticles->pos.x = data->pos.x; + data->child->data.miscParticles->pos.y = data->pos.y - data->unk_18 * 30.0f; + data->child->data.miscParticles->pos.z = data->pos.z; } } diff --git a/src/effects/squirt.c b/src/effects/squirt.c index 743c156a0d..dbc9d9883d 100644 --- a/src/effects/squirt.c +++ b/src/effects/squirt.c @@ -22,7 +22,7 @@ EffectInstance* squirt_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f3 bp.update = squirt_update; bp.renderWorld = squirt_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SQUIRT; effect = shim_create_effect_instance(&bp); @@ -92,8 +92,8 @@ void squirt_update(EffectInstance* effect) { f32 factor; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_2C = 16; } diff --git a/src/effects/star.c b/src/effects/star.c index 9bb0b54c63..d2a58da1b8 100644 --- a/src/effects/star.c +++ b/src/effects/star.c @@ -36,7 +36,7 @@ EffectInstance* star_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 bp.init = star_init; bp.update = star_update; bp.renderWorld = star_render; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_STAR; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/star_outline.c b/src/effects/star_outline.c index 1706631d96..5fa3f57bec 100644 --- a/src/effects/star_outline.c +++ b/src/effects/star_outline.c @@ -24,7 +24,7 @@ EffectInstance* star_outline_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 ar effectBp.update = star_outline_update; effectBp.renderWorld = star_outline_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_STAR_OUTLINE; effect = shim_create_effect_instance(&effectBp); @@ -70,8 +70,8 @@ void star_outline_update(EffectInstance* effect) { s32 temp; s32 temp2; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/star_spirits_energy.c b/src/effects/star_spirits_energy.c index 1be72b312e..b9b0e78867 100644 --- a/src/effects/star_spirits_energy.c +++ b/src/effects/star_spirits_energy.c @@ -102,7 +102,7 @@ EffectInstance* star_spirits_energy_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, bp.update = star_spirits_energy_update; bp.renderWorld = star_spirits_energy_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_STAR_SPIRITS_ENERGY; effect = shim_create_effect_instance(&bp); @@ -168,8 +168,8 @@ void star_spirits_energy_update(EffectInstance* effect) { u8 var_int_2; u8 var_int_3; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_14 = 16; } diff --git a/src/effects/stars_burst.c b/src/effects/stars_burst.c index 056a9b4774..988f2b5bde 100644 --- a/src/effects/stars_burst.c +++ b/src/effects/stars_burst.c @@ -49,7 +49,7 @@ void stars_burst_main( bpPtr->update = stars_burst_update; bpPtr->renderWorld = stars_burst_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_STARS_BURST; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/stars_orbiting.c b/src/effects/stars_orbiting.c index bcfafd3c97..41a12dfc17 100644 --- a/src/effects/stars_orbiting.c +++ b/src/effects/stars_orbiting.c @@ -33,7 +33,7 @@ void stars_orbiting_main( bp.update = stars_orbiting_update; bp.renderWorld = stars_orbiting_render; bp.unk_00 = 0; - bp.unk_14 = func_E005E318; + bp.renderUI = func_E005E318; bp.effectID = EFFECT_STARS_ORBITING; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/stars_shimmer.c b/src/effects/stars_shimmer.c index 0fa60fbb72..bfed3f54ae 100644 --- a/src/effects/stars_shimmer.c +++ b/src/effects/stars_shimmer.c @@ -66,7 +66,7 @@ void stars_shimmer_main(s32 type, f32 x, f32 y, f32 z, f32 arg4, f32 arg5, s32 n bpPtr->update = stars_shimmer_update; bpPtr->renderWorld = stars_shimmer_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_STARS_SHIMMER; effect = shim_create_effect_instance(bpPtr); diff --git a/src/effects/stars_spread.c b/src/effects/stars_spread.c index 4aecbaff4a..9578511616 100644 --- a/src/effects/stars_spread.c +++ b/src/effects/stars_spread.c @@ -28,7 +28,7 @@ void stars_spread_main( bp.update = stars_spread_update; bp.renderWorld = stars_spread_render; bp.unk_00 = 0; - bp.unk_14 = 0; + bp.renderUI = NULL; bp.effectID = EFFECT_STARS_SPREAD; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/stat_change.c b/src/effects/stat_change.c index a6c68427d2..6793ed4618 100644 --- a/src/effects/stat_change.c +++ b/src/effects/stat_change.c @@ -148,7 +148,7 @@ EffectInstance* stat_change_main(s32 arg0, f32 x, f32 y, f32 z, f32 scale, s32 t bp.init = stat_change_init; bp.update = stat_change_update; bp.renderWorld = stat_change_render; - bp.unk_14 = func_E00AC288; + bp.renderUI = func_E00AC288; bp.unk_00 = 0; bp.effectID = EFFECT_STAT_CHANGE; diff --git a/src/effects/static_status.c b/src/effects/static_status.c index a3c2545a97..7876a0a9cf 100644 --- a/src/effects/static_status.c +++ b/src/effects/static_status.c @@ -56,7 +56,7 @@ EffectInstance* static_status_main( bp.update = static_status_update; bp.renderWorld = static_status_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_STATIC_STATUS; effect = shim_create_effect_instance(&bp); @@ -100,8 +100,8 @@ void static_status_update(EffectInstance* effect) { f32 angle; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->timeLeft = 16; } diff --git a/src/effects/steam_burst.c b/src/effects/steam_burst.c index ae34694792..a575892697 100644 --- a/src/effects/steam_burst.c +++ b/src/effects/steam_burst.c @@ -30,7 +30,7 @@ void steam_burst_main( bp.update = steam_burst_update; bp.renderWorld = steam_burst_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_STEAM_BURST; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/stop_watch.c b/src/effects/stop_watch.c index 8b64dc4a56..0d50e0810a 100644 --- a/src/effects/stop_watch.c +++ b/src/effects/stop_watch.c @@ -62,7 +62,7 @@ EffectInstance* stop_watch_main( bp.update = stop_watch_update; bp.renderWorld = stop_watch_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_STOP_WATCH; effect = shim_create_effect_instance(&bp); @@ -111,8 +111,8 @@ void stop_watch_update(EffectInstance* effect) { s32 unk_14; s32 i; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 64; } diff --git a/src/effects/sun.c b/src/effects/sun.c index caab0b8454..c002e7bff8 100644 --- a/src/effects/sun.c +++ b/src/effects/sun.c @@ -31,7 +31,7 @@ EffectInstance* sun_main(s32 shineFromRight, f32 offsetX, f32 offsetY, f32 offse bp.update = sun_update; bp.renderWorld = sun_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_SUN; effect = shim_create_effect_instance(&bp); @@ -76,8 +76,8 @@ void sun_update(EffectInstance* effect) { s32 time; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/sweat.c b/src/effects/sweat.c index c3b906e513..cf36273173 100644 --- a/src/effects/sweat.c +++ b/src/effects/sweat.c @@ -23,7 +23,7 @@ void sweat_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 effectBp.update = sweat_update; effectBp.renderWorld = sweat_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_SWEAT; effect = shim_create_effect_instance(&effectBp); diff --git a/src/effects/tattle_window.c b/src/effects/tattle_window.c index 9c69b9b277..d0f9e43917 100644 --- a/src/effects/tattle_window.c +++ b/src/effects/tattle_window.c @@ -68,7 +68,7 @@ EffectInstance* tattle_window_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 bp.init = tattle_window_init; bp.update = tattle_window_update; bp.renderWorld = tattle_window_render; - bp.unk_14 = func_E00D8264; + bp.renderUI = func_E00D8264; bp.unk_00 = 0; bp.effectID = EFFECT_TATTLE_WINDOW; @@ -108,8 +108,8 @@ void tattle_window_update(EffectInstance* effect) { s32 old_unk_14; TattleWindowFXData* part = effect->data.tattleWindow; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_10 = 23; } diff --git a/src/effects/throw_spiny.c b/src/effects/throw_spiny.c index 0b9083c887..f0363a9766 100644 --- a/src/effects/throw_spiny.c +++ b/src/effects/throw_spiny.c @@ -30,7 +30,7 @@ EffectInstance* throw_spiny_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg bp.update = throw_spiny_update; bp.renderWorld = throw_spiny_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_THROW_SPINY; effect = (EffectInstance*)shim_create_effect_instance(bpPtr); @@ -91,8 +91,8 @@ void throw_spiny_update(EffectInstance* effectInstance) { f32 gravity; s32 lifeDuration; - if (effectInstance->flags & EFFECT_INSTANCE_FLAG_10) { - effectInstance->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effectInstance->flags & FX_INSTANCE_FLAG_DISMISS) { + effectInstance->flags &= ~FX_INSTANCE_FLAG_DISMISS; spinyObject->life = 16; } diff --git a/src/effects/thunderbolt_ring.c b/src/effects/thunderbolt_ring.c index 0e95b422ab..4c8dd880de 100644 --- a/src/effects/thunderbolt_ring.c +++ b/src/effects/thunderbolt_ring.c @@ -19,7 +19,7 @@ EffectInstance* thunderbolt_ring_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f3 effectBp.update = thunderbolt_ring_update; effectBp.renderWorld = thunderbolt_ring_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_THUNDERBOLT_RING; effect = shim_create_effect_instance(&effectBp); @@ -57,8 +57,8 @@ void thunderbolt_ring_update(EffectInstance *effect) { s32 lifeTime; s32 timeLeft; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/tubba_heart_attack.c b/src/effects/tubba_heart_attack.c index 68317f2696..ea0b03e877 100644 --- a/src/effects/tubba_heart_attack.c +++ b/src/effects/tubba_heart_attack.c @@ -57,7 +57,7 @@ EffectInstance* tubba_heart_attack_main( bp.update = tubba_heart_attack_update; bp.renderWorld = tubba_heart_attack_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_TUBBA_HEART_ATTACK; effect = shim_create_effect_instance(&bp); @@ -119,8 +119,8 @@ void tubba_heart_attack_update(EffectInstance* effect) { s32 i; s32 j; - if (effect->flags & 0x10) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 64; } diff --git a/src/effects/underwater.c b/src/effects/underwater.c index 9ef01b3067..e6190fc4ba 100644 --- a/src/effects/underwater.c +++ b/src/effects/underwater.c @@ -23,7 +23,7 @@ EffectInstance* underwater_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4 bp.update = underwater_update; bp.renderWorld = underwater_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_UNDERWATER; effect = shim_create_effect_instance(&bp); @@ -72,8 +72,8 @@ void underwater_update(EffectInstance* effect) { s32 i; s32 j; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 32; } diff --git a/src/effects/walking_dust.c b/src/effects/walking_dust.c index 300d6701c8..7b164d0503 100644 --- a/src/effects/walking_dust.c +++ b/src/effects/walking_dust.c @@ -29,7 +29,7 @@ void walking_dust_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg bp.init = walking_dust_init; bp.update = walking_dust_update; bp.renderWorld = walking_dust_render; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_WALKING_DUST; effect = shim_create_effect_instance(&bp); diff --git a/src/effects/water_block.c b/src/effects/water_block.c index 31ea2bb044..d18b1addcd 100644 --- a/src/effects/water_block.c +++ b/src/effects/water_block.c @@ -79,7 +79,7 @@ EffectInstance* water_block_main(s32 arg0, f32 x, f32 y, f32 z, f32 arg4, s32 ar bpPtr->update = &water_block_update; bpPtr->renderWorld = water_block_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_WATER_BLOCK; effect = shim_create_effect_instance(bpPtr); @@ -125,12 +125,12 @@ void water_block_update(EffectInstance* effect) { data = effect->data.waterBlock; temp_a0 = data->unk_00; - if (effect->flags & 0x10) { + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { if (temp_a0 == 1) { - effect->flags = effect->flags & ~0x10; + effect->flags = effect->flags & ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 4; } else { - effect->flags = effect->flags & ~0x10; + effect->flags = effect->flags & ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } } diff --git a/src/effects/water_fountain.c b/src/effects/water_fountain.c index 3f0eec7c17..35941ed9e4 100644 --- a/src/effects/water_fountain.c +++ b/src/effects/water_fountain.c @@ -131,7 +131,7 @@ EffectInstance* water_fountain_main(s32 arg0, f32 posX, f32 posY, f32 posZ, f32 effectBp.update = water_fountain_update; effectBp.renderWorld = water_fountain_render; effectBp.unk_00 = 0; - effectBp.unk_14 = 0; + effectBp.renderUI = NULL; effectBp.effectID = EFFECT_WATER_FOUNTAIN; effect = shim_create_effect_instance(&effectBp); @@ -171,8 +171,8 @@ void water_fountain_init(EffectInstance* effect) { void water_fountain_update(EffectInstance* effect) { WaterFountainFXData* data = effect->data.waterFountain; - if (effect->flags & 16) { - effect->flags &= ~16; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->timeLeft = 16; } if (data->timeLeft < 1000) { diff --git a/src/effects/water_splash.c b/src/effects/water_splash.c index d6201a2882..2d1dd1ebfd 100644 --- a/src/effects/water_splash.c +++ b/src/effects/water_splash.c @@ -41,7 +41,7 @@ EffectInstance* water_splash_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 ar bpPtr->update = water_splash_update; bpPtr->renderWorld = water_splash_render; bpPtr->unk_00 = 0; - bpPtr->unk_14 = NULL; + bpPtr->renderUI = NULL; bpPtr->effectID = EFFECT_WATER_SPLASH; effect = shim_create_effect_instance(bpPtr); effect->numParts = numParts; @@ -110,8 +110,8 @@ void water_splash_update(EffectInstance *effect) { part = effect->data.waterSplash; temp_a2 = part->unk_00; - if ((effect->flags & 0x10) != 0) { - effect->flags &= ~0x10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_1C = 0x10; } diff --git a/src/effects/waterfall.c b/src/effects/waterfall.c index 2542ed711a..ac23f336db 100644 --- a/src/effects/waterfall.c +++ b/src/effects/waterfall.c @@ -26,7 +26,7 @@ EffectInstance* waterfall_main( bp.update = waterfall_update; bp.renderWorld = waterfall_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_WATERFALL; effect = shim_create_effect_instance(&bp); @@ -66,8 +66,8 @@ void waterfall_update(EffectInstance* effect) { s32 unk_14; s32 i; - if (effect->flags & EFFECT_INSTANCE_FLAG_10) { - effect->flags &= ~EFFECT_INSTANCE_FLAG_10; + if (effect->flags & FX_INSTANCE_FLAG_DISMISS) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; data->unk_10 = 16; } diff --git a/src/effects/whirlwind.c b/src/effects/whirlwind.c index fab9a86324..b03ff7122f 100644 --- a/src/effects/whirlwind.c +++ b/src/effects/whirlwind.c @@ -20,7 +20,7 @@ EffectInstance* whirlwind_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, bp.update = whirlwind_update; bp.renderWorld = whirlwind_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_WHIRLWIND; numParts = 1; @@ -78,8 +78,8 @@ void whirlwind_update(EffectInstance* effect) { f32 temp; part = effect->data.whirlwind; - if ((effect->flags & 0x10)) { - effect->flags &= ~0x10; + if ((effect->flags & FX_INSTANCE_FLAG_DISMISS)) { + effect->flags &= ~FX_INSTANCE_FLAG_DISMISS; part->unk_10 = 16; } if (part->unk_10 < 1000) { diff --git a/src/effects/windy_leaves.c b/src/effects/windy_leaves.c index 7ca1eeddf0..dec0f71845 100644 --- a/src/effects/windy_leaves.c +++ b/src/effects/windy_leaves.c @@ -22,7 +22,7 @@ void windy_leaves_main(s32 type, f32 arg1, f32 arg2, f32 arg3) { bp.update = windy_leaves_update; bp.renderWorld = windy_leaves_render; bp.unk_00 = 0; - bp.unk_14 = NULL; + bp.renderUI = NULL; bp.effectID = EFFECT_WINDY_LEAVES; numParts = 5; diff --git a/src/encounter.c b/src/encounter.c index e5efa232b6..91bb7ac636 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -339,8 +339,8 @@ ApiStatus MerleeUpdateFX(Evt* script, s32 isInitialCall) { if (D_800A0BB8 == 2) { WorldMerleeOrbEffect->data.energyOrbWave->scale = 0.00001f; WorldMerleeWaveEffect->data.energyOrbWave->scale = 0.00001f; - WorldMerleeOrbEffect->flags |= EFFECT_INSTANCE_FLAG_10; - WorldMerleeWaveEffect->flags |= EFFECT_INSTANCE_FLAG_10; + WorldMerleeOrbEffect->flags |= FX_INSTANCE_FLAG_DISMISS; + WorldMerleeWaveEffect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE1; } diff --git a/src/entity/Chest.c b/src/entity/Chest.c index d4412457ca..ce33301e91 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -255,7 +255,7 @@ void entity_GiantChest_hide_effect(Entity* entity) { EffectInstance* effect = chest->gotItemEffect; if (effect != NULL) { - effect->data.gotItemOutline->unk_14 = 10; + effect->data.gotItemOutline->timeLeft = 10; } } diff --git a/src/evt/fx_api.c b/src/evt/fx_api.c index 601582290f..b0aced6d29 100644 --- a/src/evt/fx_api.c +++ b/src/evt/fx_api.c @@ -123,19 +123,19 @@ ApiStatus RemoveEffect(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D7B10(Evt* script, s32 isInitialCall) { +ApiStatus DismissEffect(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } -ApiStatus func_802D7B44(Evt* script, s32 isInitialCall) { +ApiStatus DismissItemOutline(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *args++); - effect->data.gotItemOutline->unk_14 = 10; + effect->data.gotItemOutline->timeLeft = 10; return ApiStatus_DONE2; } diff --git a/src/msg_data_2.c b/src/msg_data_2.c index 6503cb7319..a7a0e9d73d 100644 --- a/src/msg_data_2.c +++ b/src/msg_data_2.c @@ -39,38 +39,38 @@ s16 D_802EB644[] = { #include "ui/msg/bubble_mid.png.inc.c" #include "ui/msg/bubble_right.png.inc.c" #include "ui/msg/arrow.png.inc.c" -#include "ui/msg/frame_part_0.png.inc.c" -#include "ui/msg/frame_part_1.png.inc.c" -#include "ui/msg/frame_part_2.png.inc.c" -#include "ui/msg/frame_part_3.png.inc.c" -#include "ui/msg/frame_part_4.png.inc.c" -#include "ui/msg/frame_part_5.png.inc.c" -#include "ui/msg/frame_part_6.png.inc.c" -#include "ui/msg/frame_part_7.png.inc.c" -#include "ui/msg/frame_part_8.png.inc.c" -#include "ui/msg/frame_part_9.png.inc.c" -#include "ui/msg/frame_part_A.png.inc.c" -#include "ui/msg/frame_part_B.png.inc.c" -#include "ui/msg/frame_part_C.png.inc.c" -#include "ui/msg/frame_part_D.png.inc.c" -#include "ui/msg/frame_part_E.png.inc.c" -#include "ui/msg/frame_part_F.png.inc.c" -#include "ui/msg/frame_part_10.png.inc.c" -#include "ui/msg/frame_part_11.png.inc.c" -#include "ui/msg/frame_part_12.png.inc.c" -#include "ui/msg/frame_part_13.png.inc.c" -#include "ui/msg/frame_part_14.png.inc.c" -#include "ui/msg/frame_part_15.png.inc.c" -#include "ui/msg/frame_part_16.png.inc.c" -#include "ui/msg/frame_part_17.png.inc.c" -#include "ui/msg/frame_part_18.png.inc.c" -#include "ui/msg/frame_part_19.png.inc.c" -#include "ui/msg/frame_part_1A.png.inc.c" -#include "ui/msg/frame_part_1B.png.inc.c" -#include "ui/msg/frame_part_1C.png.inc.c" -#include "ui/msg/frame_part_1D.png.inc.c" -#include "ui/msg/frame_part_1E.png.inc.c" -#include "ui/msg/frame_part_1F.png.inc.c" +#include "ui/msg/frame_a_1_1.png.inc.c" +#include "ui/msg/frame_a_1_2.png.inc.c" +#include "ui/msg/frame_a_1_3.png.inc.c" +#include "ui/msg/frame_a_1_4.png.inc.c" +#include "ui/msg/frame_a_1_5.png.inc.c" +#include "ui/msg/frame_a_2_1.png.inc.c" +#include "ui/msg/frame_a_2_5.png.inc.c" +#include "ui/msg/frame_a_3_1.png.inc.c" +#include "ui/msg/frame_a_3_5.png.inc.c" +#include "ui/msg/frame_a_4_1.png.inc.c" +#include "ui/msg/frame_a_4_5.png.inc.c" +#include "ui/msg/frame_a_5_1.png.inc.c" +#include "ui/msg/frame_a_5_2.png.inc.c" +#include "ui/msg/frame_a_5_3.png.inc.c" +#include "ui/msg/frame_a_5_4.png.inc.c" +#include "ui/msg/frame_a_5_5.png.inc.c" +#include "ui/msg/frame_b_1_1.png.inc.c" +#include "ui/msg/frame_b_1_2.png.inc.c" +#include "ui/msg/frame_b_1_3.png.inc.c" +#include "ui/msg/frame_b_1_4.png.inc.c" +#include "ui/msg/frame_b_1_5.png.inc.c" +#include "ui/msg/frame_b_2_1.png.inc.c" +#include "ui/msg/frame_b_2_5.png.inc.c" +#include "ui/msg/frame_b_3_1.png.inc.c" +#include "ui/msg/frame_b_3_5.png.inc.c" +#include "ui/msg/frame_b_4_1.png.inc.c" +#include "ui/msg/frame_b_4_5.png.inc.c" +#include "ui/msg/frame_b_5_1.png.inc.c" +#include "ui/msg/frame_b_5_2.png.inc.c" +#include "ui/msg/frame_b_5_3.png.inc.c" +#include "ui/msg/frame_b_5_4.png.inc.c" +#include "ui/msg/frame_b_5_5.png.inc.c" // TODO: make assets unsigned char ui_msg_palettes[16][32] = { diff --git a/src/npc.c b/src/npc.c index 466bcde1b7..f6ef1e7422 100644 --- a/src/npc.c +++ b/src/npc.c @@ -1187,7 +1187,7 @@ void appendGfx_npc_blur(void* data) { } } } - func_8003D3BC(npc); + npc_imgfx_update(npc); } void npc_enable_collisions(void) { @@ -1230,7 +1230,7 @@ void npc_reload_all(void) { for (j = 0; j < 2; j++) { npc_reset_current_decoration(npc, j); } - func_8003D3BC(npc); + npc_imgfx_update(npc); } } } @@ -2079,7 +2079,7 @@ s32 npc_get_collider_below(Npc* npc) { return 0; } -void func_8003D3BC(Npc* npc) { +void npc_imgfx_update(Npc* npc) { s32 imgfxType = npc->imgfxType; s32 imgfxArg1 = npc->imgfxArg1; s32 imgfxArg2 = npc->imgfxArg2; @@ -2155,7 +2155,7 @@ void npc_set_imgfx_params(Npc* npc, s32 imgfxType, s32 arg2, s32 arg3, s32 arg4, npc->imgfxArg3 = arg4; npc->imgfxArg4 = arg5; npc->imgfxFlags = arg6; - func_8003D3BC(npc); + npc_imgfx_update(npc); } //TODO begin split for npc_surfaces diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index fdea29ee93..95de45e83b 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -553,7 +553,7 @@ void N(card_worker_update)(void) { sfx_play_sound(SOUND_206); for (j = 0; j < ARRAY_COUNT(N(D_8024EF90)); j++) { - N(D_8024EF90)[j]->flags |= EFFECT_INSTANCE_FLAG_10; + N(D_8024EF90)[j]->flags |= FX_INSTANCE_FLAG_DISMISS; } } break; @@ -646,7 +646,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_SET(RITUAL_VAR_ORB_EFFECT, LVarF) EVT_THREAD EVT_WAIT(30) - EVT_CALL(func_802D7B10, RITUAL_VAR_ORB_EFFECT) + EVT_CALL(DismissEffect, RITUAL_VAR_ORB_EFFECT) EVT_END_THREAD EVT_CALL(N(DarkenWorld)) EVT_CALL(DisablePlayerPhysics, TRUE) diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/hos_05_5_intro.c index fdc752741b..9fbcbe429b 100644 --- a/src/world/area_hos/hos_05/hos_05_5_intro.c +++ b/src/world/area_hos/hos_05/hos_05_5_intro.c @@ -1085,7 +1085,7 @@ EvtScript N(EVS_UpdateWorldFogParams) = { }; EvtScript N(EVS_CaptureSpirits) = { - EVT_CALL(func_802D7B10, ArrayVar(6)) + EVT_CALL(DismissEffect, ArrayVar(6)) EVT_CALL(GetNpcPos, NPC_Klevar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1110,10 +1110,10 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Klevar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Klevar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(13)) + EVT_CALL(DismissEffect, ArrayVar(13)) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(func_802D7B10, ArrayVar(3)) + EVT_CALL(DismissEffect, ArrayVar(3)) EVT_CALL(GetNpcPos, NPC_Skolar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1138,10 +1138,10 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_IdleSad) EVT_CALL(SetNpcImgFXParams, NPC_Skolar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Skolar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(10)) + EVT_CALL(DismissEffect, ArrayVar(10)) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(func_802D7B10, ArrayVar(4)) + EVT_CALL(DismissEffect, ArrayVar(4)) EVT_CALL(GetNpcPos, NPC_Muskular, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1166,10 +1166,10 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Muskular, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Muskular, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(11)) + EVT_CALL(DismissEffect, ArrayVar(11)) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(func_802D7B10, ArrayVar(7)) + EVT_CALL(DismissEffect, ArrayVar(7)) EVT_CALL(GetNpcPos, NPC_Kalmar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1194,10 +1194,10 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Kalmar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Kalmar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(14)) + EVT_CALL(DismissEffect, ArrayVar(14)) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(func_802D7B10, ArrayVar(5)) + EVT_CALL(DismissEffect, ArrayVar(5)) EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1222,10 +1222,10 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Misstar, ANIM_WorldMisstar_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Misstar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Misstar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(12)) + EVT_CALL(DismissEffect, ArrayVar(12)) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(func_802D7B10, ArrayVar(2)) + EVT_CALL(DismissEffect, ArrayVar(2)) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -1250,7 +1250,7 @@ EvtScript N(EVS_CaptureSpirits) = { EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Mamar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(9)) + EVT_CALL(DismissEffect, ArrayVar(9)) EVT_END_THREAD EVT_WAIT(20 * DT) EVT_RETURN @@ -2099,7 +2099,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(func_802D7B10, ArrayVar(17)) + EVT_CALL(DismissEffect, ArrayVar(17)) EVT_THREAD EVT_CALL(EnableTexPanning, MODEL_o33, TRUE) EVT_CALL(EnableTexPanning, MODEL_o34, TRUE) @@ -2209,7 +2209,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_WAIT(5) EVT_END_LOOP EVT_WAIT(27 * DT) - EVT_CALL(func_802D7B10, ArrayVar(17)) + EVT_CALL(DismissEffect, ArrayVar(17)) EVT_CALL(N(SetWorldFogParams), 0, 0, 0, 0, 0, 0, 0, 995, 1000) EVT_CALL(N(AdjustCamVfov), 0, 25) EVT_CALL(SetPanTarget, CAM_DEFAULT, -38, 210, 85) @@ -2375,8 +2375,8 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Panic) EVT_THREAD EVT_WAIT(5) - EVT_CALL(func_802D7B10, ArrayVar(18)) - EVT_CALL(func_802D7B10, ArrayVar(19)) + EVT_CALL(DismissEffect, ArrayVar(18)) + EVT_CALL(DismissEffect, ArrayVar(19)) EVT_END_THREAD EVT_PLAY_EFFECT(EFFECT_ENERGY_SHOCKWAVE, 0, 18, 256, -21, EVT_FLOAT(0.40625), 60) EVT_SET(LVar0, 120) @@ -2439,7 +2439,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_ADDF(LVar1, EVT_FLOAT(-30.0)) EVT_CALL(SetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) EVT_EXEC(N(EVS_UpdateWorldFogParams)) - EVT_CALL(func_802D7B10, ArrayVar(1)) + EVT_CALL(DismissEffect, ArrayVar(1)) EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 1, LVar0, LVar1, LVar2, 4, 20) EVT_THREAD @@ -2464,7 +2464,7 @@ EvtScript N(EVS_Scene_IntroStory) = { EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Panic) EVT_CALL(SetNpcImgFXParams, NPC_Eldstar, IMGFX_CLEAR, 0, 0, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_INVISIBLE, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(8)) + EVT_CALL(DismissEffect, ArrayVar(8)) EVT_END_THREAD EVT_WAIT(15 * DT) EVT_CALL(N(AdjustCamVfov), 0, 50) diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/hos_05_7_model_fx.c index f39ec36faf..57490c28f4 100644 --- a/src/world/area_hos/hos_05/hos_05_7_model_fx.c +++ b/src/world/area_hos/hos_05/hos_05_7_model_fx.c @@ -233,7 +233,7 @@ EvtScript N(EVS_Starship_Summon) = { EVT_END_LOOP EVT_WAIT(40) EVT_CALL(PlaySoundAt, SOUND_A3 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, 0, 250, 0) - EVT_CALL(func_802D7B10, LVar9) + EVT_CALL(DismissEffect, LVar9) EVT_CALL(EnableGroup, MODEL_g277, TRUE) EVT_CALL(MakeLerp, 200, 0, 45, EASING_QUADRATIC_OUT) EVT_LOOP(0) diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c index 2a53979f38..2ae653660d 100644 --- a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c +++ b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c @@ -627,14 +627,14 @@ EvtScript N(EVS_PerformHintRitual) = { EVT_CALL(PlaySoundAt, SOUND_208, 0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(70) - EVT_CALL(func_802D7B10, ArrayVar(2)) + EVT_CALL(DismissEffect, ArrayVar(2)) EVT_WAIT(40) EVT_CALL(PlaySoundAt, SOUND_207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) EVT_CALL(N(func_80241F98_A3B478), ArrayVar(1)) EVT_WAIT(15) EVT_CALL(EnableModel, MODEL_o185, TRUE) EVT_CALL(EnableModel, MODEL_o186, TRUE) - EVT_CALL(func_802D7B10, ArrayVar(1)) + EVT_CALL(DismissEffect, ArrayVar(1)) EVT_THREAD EVT_CALL(N(func_80241B74_A3B054)) EVT_END_THREAD diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index 7f2fda4054..671d37d2b5 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -314,7 +314,7 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_01, MSG_Peach_CH1_KoopaBros_000F) EVT_WAIT(20 * DT) EVT_KILL_THREAD(LVarB) - EVT_CALL(func_802D7B10, LVarA) + EVT_CALL(DismissEffect, LVarA) EVT_CALL(EnableSpriteShading, FALSE) EVT_WAIT(30 * DT) EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index 59085ef498..134c30cbde 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -63,7 +63,7 @@ EvtScript N(EVS_GotHammer) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(func_802D7B44, LVar8) + EVT_CALL(DismissItemOutline, LVar8) EVT_CALL(RemoveItemEntity, LVarC) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c index cd49b1ba2a..6acbc6377a 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c +++ b/src/world/area_kmr/kmr_23/kmr_23_2_npc.c @@ -230,7 +230,7 @@ API_CALLABLE(N(FlashScreenWhite)) { set_screen_overlay_color(SCREEN_LAYER_FRONT, 208, 208, 208); set_screen_overlay_params_front(OVERLAY_VIEWPORT_COLOR, data->screenWhiteness); if (data->screenWhiteness == 255) { - data->spiritCardEffect->flags |= EFFECT_INSTANCE_FLAG_10; + data->spiritCardEffect->flags |= FX_INSTANCE_FLAG_DISMISS; data->spiritCardEffect = NULL; gCameras->bgColor[0] = 208; gCameras->bgColor[1] = 208; diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index 4e45ec5c45..5174138764 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -190,7 +190,7 @@ EvtScript N(EVS_SpawnPyroclasts) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(func_802D7B10, LVarE) + EVT_CALL(DismissEffect, LVarE) EVT_END_THREAD EVT_WAIT(8) EVT_END_LOOP diff --git a/src/world/area_mac/mac_01/npc/flower_gate.inc.c b/src/world/area_mac/mac_01/npc/flower_gate.inc.c index c542712eff..fa3ec15011 100644 --- a/src/world/area_mac/mac_01/npc/flower_gate.inc.c +++ b/src/world/area_mac/mac_01/npc/flower_gate.inc.c @@ -299,7 +299,7 @@ EvtScript N(EVS_Scene_FlowerGateAppears) = { EVT_END_LOOP EVT_CALL(EnableModel, MODEL_r_door, FALSE) EVT_CALL(EnableGroup, MODEL_to_flo, TRUE) - EVT_CALL(func_802D7B10, LVar9) + EVT_CALL(DismissEffect, LVar9) EVT_CALL(PlaySoundAt, SOUND_2A4, SOUND_SPACE_MODE_0, 266, 50, 338) EVT_LOOP(3) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 5, 266, 50, 338, 1, 20) diff --git a/src/world/area_mac/mac_01/npc/read_fortune.inc.c b/src/world/area_mac/mac_01/npc/read_fortune.inc.c index 4df605dab3..4738d45745 100644 --- a/src/world/area_mac/mac_01/npc/read_fortune.inc.c +++ b/src/world/area_mac/mac_01/npc/read_fortune.inc.c @@ -260,12 +260,12 @@ EvtScript N(EVS_Merlon_ReadFortuneFX) = { EVT_CALL(PlaySoundAt, SOUND_208, SOUND_SPACE_MODE_0, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, EVT_FLOAT(0.5), 20) EVT_WAIT(70) - EVT_CALL(func_802D7B10, ArrayVar(2)) + EVT_CALL(DismissEffect, ArrayVar(2)) EVT_WAIT(40) EVT_CALL(PlaySoundAt, SOUND_207 | SOUND_ID_TRIGGER_CHANGE_SOUND, 0, LVar0, LVar1, LVar2) EVT_CALL(N(func_802446AC_804F2C), ArrayVar(1)) EVT_WAIT(15) - EVT_CALL(func_802D7B10, ArrayVar(1)) + EVT_CALL(DismissEffect, ArrayVar(1)) EVT_THREAD EVT_CALL(N(func_80244308_804B88)) EVT_END_THREAD diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index 7fc3d16881..d028414b89 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -259,7 +259,7 @@ EvtScript N(EVS_ShowGotSuperBootsFX) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(func_802D7B44, LVar8) + EVT_CALL(DismissItemOutline, LVar8) EVT_CALL(RemoveItemEntity, LVarC) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 7b1b5c0519..2a9ac6af1a 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -374,8 +374,8 @@ API_CALLABLE(N(Quizmo_DestroyEffects)) { QuizmoStageFXData* stageData; if (isInitialCall) { - N(Quizmo_AudienceEffect)->flags |= EFFECT_INSTANCE_FLAG_10; - N(Quizmo_VannaTEffect)->flags |= EFFECT_INSTANCE_FLAG_10; + N(Quizmo_AudienceEffect)->flags |= FX_INSTANCE_FLAG_DISMISS; + N(Quizmo_VannaTEffect)->flags |= FX_INSTANCE_FLAG_DISMISS; } stageData = N(Quizmo_StageEffect)->data.quizmoStage; diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 5c4714a8ce..790a2a94a6 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -214,7 +214,7 @@ API_CALLABLE(N(SuperBlock_StartGlowEffect)) { API_CALLABLE(N(SuperBlock_EndGlowEffect)) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, *script->ptrReadPos); - effect->flags |= EFFECT_INSTANCE_FLAG_10; + effect->flags |= FX_INSTANCE_FLAG_DISMISS; return ApiStatus_DONE2; } @@ -329,7 +329,7 @@ API_CALLABLE(N(SuperBlock_AnimateEnergyOrbs)) { userData->scatterStateTime++; if (userData->scatterStateTime > (s32)(30 * DT)) { for (i = 0; i < SUPER_BLOCK_NUM_ORBS; i++) { - userData->orbEffects[i]->flags |= EFFECT_INSTANCE_FLAG_10; + userData->orbEffects[i]->flags |= FX_INSTANCE_FLAG_DISMISS; } return ApiStatus_DONE2; } diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index 4e45ec5c45..5174138764 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -190,7 +190,7 @@ EvtScript N(EVS_SpawnPyroclasts) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(func_802D7B10, LVarE) + EVT_CALL(DismissEffect, LVarE) EVT_END_THREAD EVT_WAIT(8) EVT_END_LOOP diff --git a/tools/ignored_funcs.txt b/tools/ignored_funcs.txt index a0c5268672..0fc8023f45 100644 --- a/tools/ignored_funcs.txt +++ b/tools/ignored_funcs.txt @@ -234,7 +234,7 @@ dead_SetNpcRotationPivot = 0x802DB3C8; dead_GetNpcYaw = 0x802DBF70; dead_PlayAmbientSounds = 0x802E376C; dead_SetTexPanner = 0x802D6480; -dead_func_802D7B10 = 0x802E5160; +dead_DismissEffect = 0x802E5160; dead_Entity_Chest = 0x802F92E0; dead_snd_ambient_mute = 0x80059AC8; dead_GetPlayerAnimation = 0x802DF4B4; diff --git a/ver/ique/undefined_syms.txt b/ver/ique/undefined_syms.txt index 87895633be..a9e8fedb23 100644 --- a/ver/ique/undefined_syms.txt +++ b/ver/ique/undefined_syms.txt @@ -734,38 +734,38 @@ btl_restore_world_cameras = 0x80240aa8; filemenu_ROM_START = 0x001ac100; filemenu_VRAM = 0x80242ba0; -ui_msg_frame_part_0_png = 0x802ebff0; -ui_msg_frame_part_1_png = 0x802ec010; -ui_msg_frame_part_2_png = 0x802ec030; -ui_msg_frame_part_3_png = 0x802ec050; -ui_msg_frame_part_4_png = 0x802ec070; -ui_msg_frame_part_5_png = 0x802ec090; -ui_msg_frame_part_6_png = 0x802ec0b0; -ui_msg_frame_part_7_png = 0x802ec0d0; -ui_msg_frame_part_8_png = 0x802ec0f0; -ui_msg_frame_part_9_png = 0x802ec110; -ui_msg_frame_part_A_png = 0x802ec130; -ui_msg_frame_part_B_png = 0x802ec150; -ui_msg_frame_part_C_png = 0x802ec170; -ui_msg_frame_part_D_png = 0x802ec190; -ui_msg_frame_part_E_png = 0x802ec1b0; -ui_msg_frame_part_F_png = 0x802ec1d0; -ui_msg_frame_part_10_png = 0x802ec1f0; -ui_msg_frame_part_11_png = 0x802ec210; -ui_msg_frame_part_12_png = 0x802ec230; -ui_msg_frame_part_13_png = 0x802ec250; -ui_msg_frame_part_14_png = 0x802ec270; -ui_msg_frame_part_15_png = 0x802ec290; -ui_msg_frame_part_16_png = 0x802ec2b0; -ui_msg_frame_part_17_png = 0x802ec2d0; -ui_msg_frame_part_18_png = 0x802ec2f0; -ui_msg_frame_part_19_png = 0x802ec310; -ui_msg_frame_part_1A_png = 0x802ec330; -ui_msg_frame_part_1B_png = 0x802ec350; -ui_msg_frame_part_1C_png = 0x802ec370; -ui_msg_frame_part_1D_png = 0x802ec390; -ui_msg_frame_part_1E_png = 0x802ec3b0; -ui_msg_frame_part_1F_png = 0x802ec3d0; +ui_msg_frame_a_1_1_png = 0x802ebff0; +ui_msg_frame_a_1_2_png = 0x802ec010; +ui_msg_frame_a_1_3_png = 0x802ec030; +ui_msg_frame_a_1_4_png = 0x802ec050; +ui_msg_frame_a_1_5_png = 0x802ec070; +ui_msg_frame_a_2_1_png = 0x802ec090; +ui_msg_frame_a_2_5_png = 0x802ec0b0; +ui_msg_frame_a_3_1_png = 0x802ec0d0; +ui_msg_frame_a_3_5_png = 0x802ec0f0; +ui_msg_frame_a_4_1_png = 0x802ec110; +ui_msg_frame_a_4_5_png = 0x802ec130; +ui_msg_frame_a_5_1_png = 0x802ec150; +ui_msg_frame_a_5_2_png = 0x802ec170; +ui_msg_frame_a_5_3_png = 0x802ec190; +ui_msg_frame_a_5_4_png = 0x802ec1b0; +ui_msg_frame_a_5_5_png = 0x802ec1d0; +ui_msg_frame_b_1_1_png = 0x802ec1f0; +ui_msg_frame_b_1_2_png = 0x802ec210; +ui_msg_frame_b_1_3_png = 0x802ec230; +ui_msg_frame_b_1_4_png = 0x802ec250; +ui_msg_frame_b_1_5_png = 0x802ec270; +ui_msg_frame_b_2_1_png = 0x802ec290; +ui_msg_frame_b_2_5_png = 0x802ec2b0; +ui_msg_frame_b_3_1_png = 0x802ec2d0; +ui_msg_frame_b_3_5_png = 0x802ec2f0; +ui_msg_frame_b_4_1_png = 0x802ec310; +ui_msg_frame_b_4_5_png = 0x802ec330; +ui_msg_frame_b_5_1_png = 0x802ec350; +ui_msg_frame_b_5_2_png = 0x802ec370; +ui_msg_frame_b_5_3_png = 0x802ec390; +ui_msg_frame_b_5_4_png = 0x802ec3b0; +ui_msg_frame_b_5_5_png = 0x802ec3d0; HES_Bow = 0x80106218; HES_BowDisabled = 0x80106240; HES_Watt = 0x80106268; @@ -1168,7 +1168,7 @@ sort_items = 0x800e5aac; suggest_player_anim_always_forward = 0x800de358; add_item = 0x800e5954; destroy_popup_menu = 0x800ef918; -func_800DFCF4 = 0x800de0d4; +is_player_dismounted = 0x800de0d4; increment_status_menu_disabled = 0x800e7f34; npc_raycast_up = 0x800db250; SparkleScript_Coin = 0x80102ea0; diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index a0b6ae33d7..e91560f129 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -351,38 +351,38 @@ GetPlayerPos = 0x802D1DFC; PlaySound = 0x802D6150; D_802D9D70 = 0x802D9D70; D_802D9D71 = 0x802D9D71; -ui_msg_frame_part_0_png = 0x802E7110; -ui_msg_frame_part_1_png = 0x802E7130; -ui_msg_frame_part_2_png = 0x802E7150; -ui_msg_frame_part_3_png = 0x802E7170; -ui_msg_frame_part_4_png = 0x802E7190; -ui_msg_frame_part_5_png = 0x802E71B0; -ui_msg_frame_part_6_png = 0x802E71D0; -ui_msg_frame_part_7_png = 0x802E71F0; -ui_msg_frame_part_8_png = 0x802E7210; -ui_msg_frame_part_9_png = 0x802E7230; -ui_msg_frame_part_A_png = 0x802E7250; -ui_msg_frame_part_B_png = 0x802E7270; -ui_msg_frame_part_C_png = 0x802E7290; -ui_msg_frame_part_D_png = 0x802E72B0; -ui_msg_frame_part_E_png = 0x802E72D0; -ui_msg_frame_part_F_png = 0x802E72F0; -ui_msg_frame_part_10_png = 0x802E7310; -ui_msg_frame_part_11_png = 0x802E7330; -ui_msg_frame_part_12_png = 0x802E7350; -ui_msg_frame_part_13_png = 0x802E7370; -ui_msg_frame_part_14_png = 0x802E7390; -ui_msg_frame_part_15_png = 0x802E73B0; -ui_msg_frame_part_16_png = 0x802E73D0; -ui_msg_frame_part_17_png = 0x802E73F0; -ui_msg_frame_part_18_png = 0x802E7410; -ui_msg_frame_part_19_png = 0x802E7430; -ui_msg_frame_part_1A_png = 0x802E7450; -ui_msg_frame_part_1B_png = 0x802E7470; -ui_msg_frame_part_1C_png = 0x802E7490; -ui_msg_frame_part_1D_png = 0x802E74B0; -ui_msg_frame_part_1E_png = 0x802E74D0; -ui_msg_frame_part_1F_png = 0x802E74F0; +ui_msg_frame_a_1_1_png = 0x802E7110; +ui_msg_frame_a_1_2_png = 0x802E7130; +ui_msg_frame_a_1_3_png = 0x802E7150; +ui_msg_frame_a_1_4_png = 0x802E7170; +ui_msg_frame_a_1_5_png = 0x802E7190; +ui_msg_frame_a_2_1_png = 0x802E71B0; +ui_msg_frame_a_2_5_png = 0x802E71D0; +ui_msg_frame_a_3_1_png = 0x802E71F0; +ui_msg_frame_a_3_5_png = 0x802E7210; +ui_msg_frame_a_4_1_png = 0x802E7230; +ui_msg_frame_a_4_5_png = 0x802E7250; +ui_msg_frame_a_5_1_png = 0x802E7270; +ui_msg_frame_a_5_2_png = 0x802E7290; +ui_msg_frame_a_5_3_png = 0x802E72B0; +ui_msg_frame_a_5_4_png = 0x802E72D0; +ui_msg_frame_a_5_5_png = 0x802E72F0; +ui_msg_frame_b_1_1_png = 0x802E7310; +ui_msg_frame_b_1_2_png = 0x802E7330; +ui_msg_frame_b_1_3_png = 0x802E7350; +ui_msg_frame_b_1_4_png = 0x802E7370; +ui_msg_frame_b_1_5_png = 0x802E7390; +ui_msg_frame_b_2_1_png = 0x802E73B0; +ui_msg_frame_b_2_5_png = 0x802E73D0; +ui_msg_frame_b_3_1_png = 0x802E73F0; +ui_msg_frame_b_3_5_png = 0x802E7410; +ui_msg_frame_b_4_1_png = 0x802E7430; +ui_msg_frame_b_4_5_png = 0x802E7450; +ui_msg_frame_b_5_1_png = 0x802E7470; +ui_msg_frame_b_5_2_png = 0x802E7490; +ui_msg_frame_b_5_3_png = 0x802E74B0; +ui_msg_frame_b_5_4_png = 0x802E74D0; +ui_msg_frame_b_5_5_png = 0x802E74F0; heap_generalHead = 0x802FB800; gFrameBuf0 = 0x8038F800; gFrameBuf1 = 0x803B5000; diff --git a/ver/pal/undefined_syms.txt b/ver/pal/undefined_syms.txt index fad4382702..403c678a77 100644 --- a/ver/pal/undefined_syms.txt +++ b/ver/pal/undefined_syms.txt @@ -1233,8 +1233,8 @@ ShowStartRecoveryShimmer = 0x802DA540; ShowRecoveryShimmer = 0x802DA5F8; ShowEmote = 0x802DA8C0; RemoveEffect = 0x802DAB04; -func_802D7B10 = 0x802DAB30; -func_802D7B44 = 0x802DAB64; +DismissEffect = 0x802DAB30; +DismissItemOutline = 0x802DAB64; SetMotionBlurParams = 0x802DAD18; ShowSweat = 0x802DAE28; ShowSleepBubble = 0x802DB048; diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index e698cfbaee..51cc642edd 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -972,38 +972,38 @@ segments: - [0x10D2B0, ci4, ui/msg/bubble_mid, 8, 64, ui/msg/bubble_left] - [0x10D3B0, ci4, ui/msg/bubble_right, 32, 64, ui/msg/bubble_left] - [0x10D7B0, ci4, ui/msg/arrow, 16, 16, ui/msg/bubble_left] - - [0x10D830, ci4, ui/msg/frame_part_0, 8, 8, ui/msg/bubble_left] - - [0x10D850, ci4, ui/msg/frame_part_1, 8, 8, ui/msg/bubble_left] - - [0x10D870, ci4, ui/msg/frame_part_2, 8, 8, ui/msg/bubble_left] - - [0x10D890, ci4, ui/msg/frame_part_3, 8, 8, ui/msg/bubble_left] - - [0x10D8B0, ci4, ui/msg/frame_part_4, 8, 8, ui/msg/bubble_left] - - [0x10D8D0, ci4, ui/msg/frame_part_5, 8, 8, ui/msg/bubble_left] - - [0x10D8F0, ci4, ui/msg/frame_part_6, 8, 8, ui/msg/bubble_left] - - [0x10D910, ci4, ui/msg/frame_part_7, 8, 8, ui/msg/bubble_left] - - [0x10D930, ci4, ui/msg/frame_part_8, 8, 8, ui/msg/bubble_left] - - [0x10D950, ci4, ui/msg/frame_part_9, 8, 8, ui/msg/bubble_left] - - [0x10D970, ci4, ui/msg/frame_part_A, 8, 8, ui/msg/bubble_left] - - [0x10D990, ci4, ui/msg/frame_part_B, 8, 8, ui/msg/bubble_left] - - [0x10D9B0, ci4, ui/msg/frame_part_C, 8, 8, ui/msg/bubble_left] - - [0x10D9D0, ci4, ui/msg/frame_part_D, 8, 8, ui/msg/bubble_left] - - [0x10D9F0, ci4, ui/msg/frame_part_E, 8, 8, ui/msg/bubble_left] - - [0x10DA10, ci4, ui/msg/frame_part_F, 8, 8, ui/msg/bubble_left] - - [0x10DA30, ci4, ui/msg/frame_part_10, 8, 8, ui/msg/bubble_left] - - [0x10DA50, ci4, ui/msg/frame_part_11, 8, 8, ui/msg/bubble_left] - - [0x10DA70, ci4, ui/msg/frame_part_12, 8, 8, ui/msg/bubble_left] - - [0x10DA90, ci4, ui/msg/frame_part_13, 8, 8, ui/msg/bubble_left] - - [0x10DAB0, ci4, ui/msg/frame_part_14, 8, 8, ui/msg/bubble_left] - - [0x10DAD0, ci4, ui/msg/frame_part_15, 8, 8, ui/msg/bubble_left] - - [0x10DAF0, ci4, ui/msg/frame_part_16, 8, 8, ui/msg/bubble_left] - - [0x10DB10, ci4, ui/msg/frame_part_17, 8, 8, ui/msg/bubble_left] - - [0x10DB30, ci4, ui/msg/frame_part_18, 8, 8, ui/msg/bubble_left] - - [0x10DB50, ci4, ui/msg/frame_part_19, 8, 8, ui/msg/bubble_left] - - [0x10DB70, ci4, ui/msg/frame_part_1A, 8, 8, ui/msg/bubble_left] - - [0x10DB90, ci4, ui/msg/frame_part_1B, 8, 8, ui/msg/bubble_left] - - [0x10DBB0, ci4, ui/msg/frame_part_1C, 8, 8, ui/msg/bubble_left] - - [0x10DBD0, ci4, ui/msg/frame_part_1D, 8, 8, ui/msg/bubble_left] - - [0x10DBF0, ci4, ui/msg/frame_part_1E, 8, 8, ui/msg/bubble_left] - - [0x10DC10, ci4, ui/msg/frame_part_1F, 8, 8, ui/msg/bubble_left] + - [0x10D830, ci4, ui/msg/frame_a_1_1, 8, 8, ui/msg/bubble_left] + - [0x10D850, ci4, ui/msg/frame_a_1_2, 8, 8, ui/msg/bubble_left] + - [0x10D870, ci4, ui/msg/frame_a_1_3, 8, 8, ui/msg/bubble_left] + - [0x10D890, ci4, ui/msg/frame_a_1_4, 8, 8, ui/msg/bubble_left] + - [0x10D8B0, ci4, ui/msg/frame_a_1_5, 8, 8, ui/msg/bubble_left] + - [0x10D8D0, ci4, ui/msg/frame_a_2_1, 8, 8, ui/msg/bubble_left] + - [0x10D8F0, ci4, ui/msg/frame_a_2_5, 8, 8, ui/msg/bubble_left] + - [0x10D910, ci4, ui/msg/frame_a_3_1, 8, 8, ui/msg/bubble_left] + - [0x10D930, ci4, ui/msg/frame_a_3_5, 8, 8, ui/msg/bubble_left] + - [0x10D950, ci4, ui/msg/frame_a_4_1, 8, 8, ui/msg/bubble_left] + - [0x10D970, ci4, ui/msg/frame_a_4_5, 8, 8, ui/msg/bubble_left] + - [0x10D990, ci4, ui/msg/frame_a_5_1, 8, 8, ui/msg/bubble_left] + - [0x10D9B0, ci4, ui/msg/frame_a_5_2, 8, 8, ui/msg/bubble_left] + - [0x10D9D0, ci4, ui/msg/frame_a_5_3, 8, 8, ui/msg/bubble_left] + - [0x10D9F0, ci4, ui/msg/frame_a_5_4, 8, 8, ui/msg/bubble_left] + - [0x10DA10, ci4, ui/msg/frame_a_5_5, 8, 8, ui/msg/bubble_left] + - [0x10DA30, ci4, ui/msg/frame_b_1_1, 8, 8, ui/msg/bubble_left] + - [0x10DA50, ci4, ui/msg/frame_b_1_2, 8, 8, ui/msg/bubble_left] + - [0x10DA70, ci4, ui/msg/frame_b_1_3, 8, 8, ui/msg/bubble_left] + - [0x10DA90, ci4, ui/msg/frame_b_1_4, 8, 8, ui/msg/bubble_left] + - [0x10DAB0, ci4, ui/msg/frame_b_1_5, 8, 8, ui/msg/bubble_left] + - [0x10DAD0, ci4, ui/msg/frame_b_2_1, 8, 8, ui/msg/bubble_left] + - [0x10DAF0, ci4, ui/msg/frame_b_2_5, 8, 8, ui/msg/bubble_left] + - [0x10DB10, ci4, ui/msg/frame_b_3_1, 8, 8, ui/msg/bubble_left] + - [0x10DB30, ci4, ui/msg/frame_b_3_5, 8, 8, ui/msg/bubble_left] + - [0x10DB50, ci4, ui/msg/frame_b_4_1, 8, 8, ui/msg/bubble_left] + - [0x10DB70, ci4, ui/msg/frame_b_4_5, 8, 8, ui/msg/bubble_left] + - [0x10DB90, ci4, ui/msg/frame_b_5_1, 8, 8, ui/msg/bubble_left] + - [0x10DBB0, ci4, ui/msg/frame_b_5_2, 8, 8, ui/msg/bubble_left] + - [0x10DBD0, ci4, ui/msg/frame_b_5_3, 8, 8, ui/msg/bubble_left] + - [0x10DBF0, ci4, ui/msg/frame_b_5_4, 8, 8, ui/msg/bubble_left] + - [0x10DC10, ci4, ui/msg/frame_b_5_5, 8, 8, ui/msg/bubble_left] # all 16 following palettes can be applied to all images above - [0x10DC30, palette, ui/msg/bubble_left] #- [0x10DC30, palette, ui/msg/palette_0] diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 8148403e91..b544b9df65 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -309,7 +309,7 @@ npc_find_closest = 0x8003CFB4; // type:func rom:0x183B4 npc_find_closest_simple = 0x8003D0C4; // type:func rom:0x184C4 npc_find_standing_on_entity = 0x8003D1D4; // type:func rom:0x185D4 npc_get_collider_below = 0x8003D2F8; // type:func rom:0x186F8 -func_8003D3BC = 0x8003D3BC; // type:func rom:0x187BC +npc_imgfx_update = 0x8003D3BC; // type:func rom:0x187BC npc_set_imgfx_params = 0x8003D624; // type:func rom:0x18A24 spawn_surface_effects = 0x8003D660; // type:func rom:0x18A60 spawn_default_surface_effects = 0x8003D788; // type:func rom:0x18B88 @@ -2653,7 +2653,7 @@ phys_update_standard = 0x800DFAAC; // type:func rom:0x78F5C phys_update_lava_reset = 0x800DFBE8; // type:func rom:0x79098 clear_player_status = 0x800DFC50; // type:func rom:0x79100 player_reset_data = 0x800DFC74; // type:func rom:0x79124 -func_800DFCF4 = 0x800DFCF4; // type:func rom:0x791A4 +is_player_dismounted = 0x800DFCF4; // type:func rom:0x791A4 get_overriding_player_anim = 0x800DFD48; // type:func rom:0x791F8 suggest_player_anim_allow_backward = 0x800DFEFC; // type:func rom:0x793AC force_player_anim = 0x800DFF50; // type:func rom:0x79400 @@ -5563,8 +5563,8 @@ ShowRecoveryShimmer = 0x802D75D8; // type:func rom:0xFBF88 func_802D7690 = 0x802D7690; // type:func rom:0xFC040 ShowEmote = 0x802D78A0; // type:func rom:0xFC250 RemoveEffect = 0x802D7AE4; // type:func rom:0xFC494 -func_802D7B10 = 0x802D7B10; // type:func rom:0xFC4C0 -func_802D7B44 = 0x802D7B44; // type:func rom:0xFC4F4 +DismissEffect = 0x802D7B10; // type:func rom:0xFC4C0 +DismissItemOutline = 0x802D7B44; // type:func rom:0xFC4F4 func_802D7B74 = 0x802D7B74; // type:func rom:0xFC524 InterpMotionBlurParams = 0x802D7BA4; // type:func rom:0xFC554 SetMotionBlurParams = 0x802D7CF8; // type:func rom:0xFC6A8 @@ -5920,38 +5920,38 @@ ui_msg_bubble_left_png = 0x802EB670; ui_msg_bubble_mid_png = 0x802EBA70; ui_msg_bubble_right_png = 0x802EBB70; ui_msg_arrow_png = 0x802EBF70; -ui_msg_frame_part_0_png = 0x802EBFF0; -ui_msg_frame_part_1_png = 0x802EC010; -ui_msg_frame_part_2_png = 0x802EC030; -ui_msg_frame_part_3_png = 0x802EC050; -ui_msg_frame_part_4_png = 0x802EC070; -ui_msg_frame_part_5_png = 0x802EC090; -ui_msg_frame_part_6_png = 0x802EC0B0; -ui_msg_frame_part_7_png = 0x802EC0D0; -ui_msg_frame_part_8_png = 0x802EC0F0; -ui_msg_frame_part_9_png = 0x802EC110; -ui_msg_frame_part_A_png = 0x802EC130; -ui_msg_frame_part_B_png = 0x802EC150; -ui_msg_frame_part_C_png = 0x802EC170; -ui_msg_frame_part_D_png = 0x802EC190; -ui_msg_frame_part_E_png = 0x802EC1B0; -ui_msg_frame_part_F_png = 0x802EC1D0; -ui_msg_frame_part_10_png = 0x802EC1F0; -ui_msg_frame_part_11_png = 0x802EC210; -ui_msg_frame_part_12_png = 0x802EC230; -ui_msg_frame_part_13_png = 0x802EC250; -ui_msg_frame_part_14_png = 0x802EC270; -ui_msg_frame_part_15_png = 0x802EC290; -ui_msg_frame_part_16_png = 0x802EC2B0; -ui_msg_frame_part_17_png = 0x802EC2D0; -ui_msg_frame_part_18_png = 0x802EC2F0; -ui_msg_frame_part_19_png = 0x802EC310; -ui_msg_frame_part_1A_png = 0x802EC330; -ui_msg_frame_part_1B_png = 0x802EC350; -ui_msg_frame_part_1C_png = 0x802EC370; -ui_msg_frame_part_1D_png = 0x802EC390; -ui_msg_frame_part_1E_png = 0x802EC3B0; -ui_msg_frame_part_1F_png = 0x802EC3D0; +ui_msg_frame_a_1_1_png = 0x802EBFF0; +ui_msg_frame_a_1_2_png = 0x802EC010; +ui_msg_frame_a_1_3_png = 0x802EC030; +ui_msg_frame_a_1_4_png = 0x802EC050; +ui_msg_frame_a_1_5_png = 0x802EC070; +ui_msg_frame_a_2_1_png = 0x802EC090; +ui_msg_frame_a_2_5_png = 0x802EC0B0; +ui_msg_frame_a_3_1_png = 0x802EC0D0; +ui_msg_frame_a_3_5_png = 0x802EC0F0; +ui_msg_frame_a_4_1_png = 0x802EC110; +ui_msg_frame_a_4_5_png = 0x802EC130; +ui_msg_frame_a_5_1_png = 0x802EC150; +ui_msg_frame_a_5_2_png = 0x802EC170; +ui_msg_frame_a_5_3_png = 0x802EC190; +ui_msg_frame_a_5_4_png = 0x802EC1B0; +ui_msg_frame_a_5_5_png = 0x802EC1D0; +ui_msg_frame_b_1_1_png = 0x802EC1F0; +ui_msg_frame_b_1_2_png = 0x802EC210; +ui_msg_frame_b_1_3_png = 0x802EC230; +ui_msg_frame_b_1_4_png = 0x802EC250; +ui_msg_frame_b_1_5_png = 0x802EC270; +ui_msg_frame_b_2_1_png = 0x802EC290; +ui_msg_frame_b_2_5_png = 0x802EC2B0; +ui_msg_frame_b_3_1_png = 0x802EC2D0; +ui_msg_frame_b_3_5_png = 0x802EC2F0; +ui_msg_frame_b_4_1_png = 0x802EC310; +ui_msg_frame_b_4_5_png = 0x802EC330; +ui_msg_frame_b_5_1_png = 0x802EC350; +ui_msg_frame_b_5_2_png = 0x802EC370; +ui_msg_frame_b_5_3_png = 0x802EC390; +ui_msg_frame_b_5_4_png = 0x802EC3B0; +ui_msg_frame_b_5_5_png = 0x802EC3D0; ui_msg_palettes = 0x802EC3F0; ui_msg_sign_corner_topleft_png = 0x802EC5F0; ui_msg_sign_corner_topright_png = 0x802EC670; diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 62c0a9bb88..3c4cb2a9d6 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -444,7 +444,7 @@ dead_SetItemPos = SetItemPos + 0xD650; dead_AddStarPieces = AddStarPieces + 0xD650; dead_ShowGotItem = ShowGotItem + 0xD650; dead_ShowEmote = ShowEmote + 0xD650; -dead_func_802D7B10 = func_802D7B10 + 0xD650; +dead_DismissEffect = DismissEffect + 0xD650; dead_PlayEffect = PlayEffect + 0xD650; dead_SetSpriteShading = SetSpriteShading + 0xD850; dead_entity_upgrade_block_hide_content = entity_upgrade_block_hide_content + 0xE470;