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

172 lines
9.7 KiB
C
Raw Normal View History

Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
#ifndef _EFFECTS_INTERNAL_H_
#define _EFFECTS_INTERNAL_H_
#include "effects.h"
fold_* , effect_10, and other assorted decomp (#535) * work on appendGfx_message * :OK: * indentation * message window states * SetEntityCullMode & some of appendGfx_model * 9 smalls * 2 more * 2 mo * update_player_actor_shadow * EffectInstanceData rework * some shtuff * effect_10 dun * wip * wip * wipz * rename * progz * remove wip work for appendGfx_model * PR comments * Alex comments * tomorrow for sure * eventually
2021-11-19 15:31:28 +01:00
s32 func_E0200000(s32);
Map func dedupe & fire breath effect (#661) * find_duplicates improvements, closer on a func * UnkFunc54 * UnkFunc55 * UnkFunc56 * fire_breath * name stuff * warnings * cleanup * .
2022-03-13 18:33:10 +01:00
s32 func_E0200044(s32, s32);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
EffectInstance* shim_create_effect_instance(EffectBlueprint* effectBp);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
s32 shim_load_effect(s32 effectIndex);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void shim_remove_effect(EffectInstance*);
KMC GCC, effects, cleanup, map funcs (#476) * warnings, cleanup, 2 npc ai funcs * kmcgcc stuff * effect_75 * effect_9.c done * cleanup, work on kmc gcc * start on fx_73 * guOrtho/guOrthoF * more libultra/cleanup * more libultra * add wine for darwin * effect_73 done * UnkQuizFunc * effect func naming * name appendGfx funcs * fix fx_66 * Add KMC wrapper to Jenkinsfile * mac fixes * fix macro usage * oopz * 3 fixes * blah * KMC_ASM * config changes
2021-10-22 16:01:27 +02:00
s32 shim_rand_int(s32);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void* shim_general_heap_malloc(s32 size);
RenderTask* shim_queue_render_task(RenderTask* task);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
float shim_sqrtf(float value);
f32 shim_atan2(f32 startX, f32 startZ, f32 endX, f32 endZ);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
f32 shim_sin_deg(f32 x);
f32 shim_cos_deg(f32 x);
f32 shim_clamp_angle(f32 theta);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
void shim_get_background_color_blend(u8* r, u8* g, u8* b, u8* a);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void shim_guMtxF2L(float mf[4][4], Mtx *m);
void shim_guMtxCatF(float m[4][4], float n[4][4], float r[4][4]);
Effects & misc (#458) * fx_6_appendGfx * update_effects * effect_6 done * Update diff.py * update configure for new splat * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "0efa552c5d" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "0efa552c5d" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * nu stuff / undefined_syms org * Actor struct refactor to match AddActorVar (thanks Josh) * various cleanup, matched an obfuscation func * fx_7 work * is_block_on_ground * state_* * create_entity_shadow, update asm macro to fix diff.py * set_standard_shadow_scale * set_npc_shadow_scale and set_peach_shadow_scale * create_shadow_type * revert macro.inc * clear_model_data (thanks Josh) * cleanup * mdl_get_next_texture_address * mdl_set_all_fog_mode * load_model_textures * fx_7_appendGfx (effect_7 done) * fx_8_main * fx_8_render * fx_8_update * func_E0010000 * func_E0010104 * effect_8 done * effect_8 done * warnings * cleanup * try to fix some warnings * warnings + change Bowser Slug behavior
2021-10-03 17:44:16 +02:00
void shim_guScaleF(float mf[4][4], float x, float y, float z);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void shim_guRotateF(float mf[4][4], float a, float x, float y, float z);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
void shim_guTranslate(Mtx *m, float x, float y, float z);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void shim_guTranslateF(float mf[4][4], float x, float y, float z);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
void shim_guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale);
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
void shim_guPositionF(float mf[4][4], float r, float p, float h, float s, float x, float y, float z);
several actor funcs (#748) * no sun :( * livin in the sunshine * misc * small fix * splat fix * comments + sparkles enum Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-08-17 03:04:23 +02:00
void shim_guOrthoF(float mf[4][4], float l, float r, float b, float t, float n, float f, float scale);
Assorted Decomp Across The Galaxy (#574) * popup_menu_update & other * a bunch of 190B20 * starting load_player_actor * load_player_actor * blorp * load_partner_actor * fx_11_main * fx_11 done * cleanup * fx_12 * 3 encounter_api funcs * encounter_api done * some 20ec0 funcs * clean * PR comments, warnings * name btl_actorHomePositions * PR comments
2021-12-28 12:43:24 +01:00
void shim_mem_clear(void* data, s32 numBytes);
Match all FX render functions (#540) * match most fx_XX_render functions * match the rest of the fx render functions * resolve data migration issues * resolve issues * Update effect_117.c
2021-11-26 02:25:50 +01:00
void shim_transform_point(Matrix4f mtx, f32 inX, f32 inY, f32 inZ, f32 inS, f32* outX, f32* outY, f32* outZ, f32* outS);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
s32 shim_npc_raycast_down_sides(s32, f32*, f32*, f32*, f32*);
void shim_sfx_play_sound_at_position(s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ);
Effect work and rodata migration (#747) * bombette_breaking WIP * bombette_breaking * migration & stuff * spr funcs * btl_state_update_begin_turn * beginning effect data work * effect rodata migration * fix * fixin * breaking_junk * args * handle gfx * trim yaml * yaml cleanup * gfx stuff * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "b681843a78" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "b681843a78" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * water_splash gfx * move decl down * fix warnings
2022-08-10 17:29:06 +02:00
void shim_mdl_draw_hidden_panel_surface(Gfx**, u16 treeIndex);
4 effect funcs (#851) * tattle_window * cleanup * music_note_appendGfx * motion_blur_flame_update * Gfx bin, PR comments * undefined_syms cleanup * undefined_syms cleanup
2022-11-05 16:31:01 +01:00
void shim_draw_box(s32 flags, WindowStyle windowStyle, s32 posX, s32 posY, s32 posZ, s32 width, s32 height, u8 opacity,
u8 darkening, f32 scaleX, f32 scaleY, f32 rotX, f32 rotY, f32 rotZ, void (*fpDrawContents)(void*),
void* drawContentsArg0, Matrix4f rotScaleMtx, s32 translateX, s32 translateY, f32 (*outMtx)[4]);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
// the actual signature is going to be wrong, but it doesn't matter
// TODO remove when every effect's main is sorted out
#define FX_MAIN(name) void name(void);
void big_smoke_puff_main(f32 x, f32 y, f32 z);
void landing_dust_main(s32 type, f32 x, f32 y, f32 z, f32);
void walking_dust_main(s32, f32, f32, f32, f32, f32);
void flower_splash_main(f32, f32, f32, f32);
void flower_trail_main(s32, f32, f32, f32, f32, f32);
void cloud_puff_main(f32, f32, f32, f32);
void cloud_trail_main(s32, f32, f32, f32);
void footprint_main(f32, f32, f32, f32, f32, f32, f32, f32);
void floating_flower_main(s32, f32, f32, f32, s32);
void snowflake_main(f32, f32, f32, s32, s32);
EffectInstance* star_main(s32, f32, f32, f32, f32, f32, f32, f32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
void emote_main(s32, Npc*, f32, f32, f32, f32, f32, s32, EffectInstance**);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
void sparkles_main(s32, f32, f32, f32, f32);
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652) * music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration * implement requested changes * Recover.c data fixes, style changes * The one newline lol * f
2022-02-21 16:53:26 +01:00
EffectInstance* shape_spell_main(s32, f32, f32, f32, f32, f32, f32, s32);
msg names and more map data prep (#768) * minor NPC fixup * most var type renames * rest of var names * remove deprecated * var types cleanup * fixed -> float 1 * fixed -> float 2 * fixed -> float 3 * fixed -> float 4 * evt fixed removed * localvar shorthand * missing byte names * missing flag names * evt var cleanup * local var shorthand redux * minor cleanup * mario anim name * item ranges cleanup * player anim names * all message names * renames for existing * remove unused enum * squash msg ids * again * all message refs replaced * area headers * idk * also merged * remove superfluous parens Co-authored-by: HailSanta <Hail2Santa@gmail.com>
2022-09-11 18:23:47 +02:00
void gather_energy_pink_main(s32, f32, f32, f32, f32, s32);
Matching effects (#771) * Matching effects * Updated fx_3D_main * Changing color values to decimal
2022-09-13 11:52:01 +02:00
void drop_leaves_main(s32, f32, f32, f32, s32);
Matching effects and some world/area_kkj functions (#756) * Matching effects and some world/area_kkj functions * Partially addressed PR comments * Partially addressed PR comments * Added EVT_FIXED_TO_FLOAT macro
2022-09-05 06:53:21 +02:00
EffectInstance* dust_main(s32, f32, f32, f32, s32);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
void shattering_stones_main(s32, f32, f32, f32, f32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
void smoke_ring_main(s32, f32, f32, f32);
void damage_stars_main(s32, f32, f32, f32, f32, f32, f32, s32);
void explosion_main(s32, f32, f32, f32);
Some effect functions (#846)
2022-11-02 13:51:32 +01:00
void lens_flare_main(s32, f32, f32, f32, s32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
void got_item_outline_main(s32, f32, f32, f32, f32, EffectInstance**);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
void spiky_white_aura_main(s32, f32, f32, f32, s32);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
void smoke_impact_main(s32, f32, f32, f32, f32, s32, f32, s32);
decomp damage_indicator (#705)
2022-05-10 12:25:50 +02:00
void damage_indicator_main(s32, f32, f32, f32, f32, f32, s32, EffectInstance**);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
EffectInstance* purple_ring_main(s32, f32, f32, f32, f32, f32, f32, f32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
void flame_main(s32, f32, f32, f32, f32, EffectInstance**);
[Effects] Gfx data + stars_burst (#803) * [Effects] Gfx data + stars_burst * Addressed PR comments
2022-10-06 01:26:03 +02:00
void stars_burst_main(s32, f32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
FX_MAIN(stars_shimmer_main);
Matched effects funcs (#818) * thunderbolt_ring: Matched update and main * snowfall_main: Matched * shiny_flare_main: Matched * shiny_flare_update: Matched * thunderbolt_ring_update: clean up * rising_bubble_main: matched * ring_blast: Matched main and update * quizmo_stage: Matched main and update * ring_blast_main: Fixed warning message * PR_818: PR clean up
2022-10-12 14:39:03 +02:00
void rising_bubble_main(s32, f32, f32, f32, f32);
void ring_blast_main(s32, f32, f32, f32, f32, s32);
[Effects] Migrating data + a couple of functions (#817) * [Effects] Migrating data + a couple of functions * Addressed PR comments
2022-10-12 02:28:15 +02:00
void shockwave_main(s32, f32, f32, f32);
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652) * music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration * implement requested changes * Recover.c data fixes, style changes * The one newline lol * f
2022-02-21 16:53:26 +01:00
void music_note_main(s32, f32, f32, f32);
Matched effects main funcs (#806) * hieroglyphs_main: Initial c * hieroglyphs_update: Compiled c * hieroglyphs_main: Matched * huff_puff_breath_main: Matched * smoke_burst_main: Matched * sweat_main: Matched * PR_806: Updated init signatures * huff_puff_breath_main: removed unused temp * smoke_burst_main: Updated fx struct with rgba
2022-10-07 09:31:45 +02:00
void smoke_burst_main(s32, f32, f32, f32, f32, s32);
void sweat_main(s32, f32, f32, f32, f32, f32, s32);
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects (#656) * Blast, aura, sleep_bubble, fire_flower, bombette_breaking * run coverage.py * Move the typedefs to effects.h
2022-02-25 14:19:53 +01:00
void sleep_bubble_main(s32, f32, f32, f32, f32, f32, EffectInstance**);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
FX_MAIN(windy_leaves_main);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
void falling_leaves_main(s32, f32, f32, f32);
Some effect functions (#846)
2022-11-02 13:51:32 +01:00
void stars_spread_main(s32, f32, f32, f32, s32, s32);
void steam_burst_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
void stars_orbiting_main(s32, f32, f32, f32, f32, s32, EffectInstance**);
Misc decomp 70 (#716) * aura_appendGfx * 3 more action commands * fire_shell * hammer, hurricane * spiny_surge * data stuff, cleanup, whirlwind * warnings * water_block data and func * water_block * effect stuff cleanup * big_snowflakes effect * data cleanup, fpr abi regs * 2 battle item funcs + data * 2 mo * shooting_star func * 3 16F740 funcs * btl_state_update_end_battle * map funcs * more dedupe * cleanin * draw_entity_model_C/D * effect butterflies, btl state funcs * it is done * it is done * PR comments, some cleanup
2022-05-27 15:03:19 +02:00
void big_snowflakes_main(s32, f32, f32, f32);
debuff effect & 19FAF0 funcs (#653) * debuff.c * 19FAF0 funcs * clean * some API stuff * clean * PR
2022-02-21 17:05:36 +01:00
EffectInstance* debuff_main(s32, f32, f32, f32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
EffectInstance* green_impact_main(s32, f32, f32, f32, f32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* radial_shimmer_main(s32, f32, f32, f32, f32, s32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
void ending_decals_main(s32, f32, f32, f32, f32, EffectInstance**);
Effect gfx data + some light funcs (#809)
2022-10-08 12:07:10 +02:00
void light_rays_main(s32, f32, f32, f32, f32, EffectInstance**);
EffectInstance* lightning_main(s32, f32, f32, f32, f32, f32);
Map func dedupe & fire breath effect (#661) * find_duplicates improvements, closer on a func * UnkFunc54 * UnkFunc55 * UnkFunc56 * fire_breath * name stuff * warnings * cleanup * .
2022-03-13 18:33:10 +01:00
EffectInstance* fire_breath_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, s32);
[Effects] A few functions (#850) * [Effects] A few functions * Addressing PR comments
2022-11-05 01:43:44 +01:00
EffectInstance* shimmer_burst_main(s32, f32, f32, f32, f32, s32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
void energy_shockwave_main(s32, f32, f32, f32, f32, s32);
EffectInstance* shimmer_wave_main(s32, f32, f32, f32, f32, f32, s32, s32);
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects (#656) * Blast, aura, sleep_bubble, fire_flower, bombette_breaking * run coverage.py * Move the typedefs to effects.h
2022-02-25 14:19:53 +01:00
void aura_main(s32, f32, f32, f32, f32, EffectInstance**);
Matching effects and some world/area_kkj functions (#756) * Matching effects and some world/area_kkj functions * Partially addressed PR comments * Partially addressed PR comments * Added EVT_FIXED_TO_FLOAT macro
2022-09-05 06:53:21 +02:00
void bulb_glow_main(s32, f32, f32, f32, f32, EffectInstance**);
Matching effects (#771) * Matching effects * Updated fx_3D_main * Changing color values to decimal
2022-09-13 11:52:01 +02:00
void fx_3D_main(s32, f32, f32, f32, f32, f32, f32, s32, EffectInstance**);
Blast, aura, sleep_bubble, fire_flower, bombette_breaking effects (#656) * Blast, aura, sleep_bubble, fire_flower, bombette_breaking * run coverage.py * Move the typedefs to effects.h
2022-02-25 14:19:53 +01:00
void blast_main(s32, f32, f32, f32, f32, s32);
EffectInstance* fire_flower_main(s32, f32, f32, f32, s32);
[Effects] Migrating data + a couple of functions (#817) * [Effects] Migrating data + a couple of functions * Addressed PR comments
2022-10-12 02:28:15 +02:00
EffectInstance* recover_main(s32, f32, f32, f32, s32);
Misc decomp 53 (#703) * some btl_state work * msg_draw_speech_bubble * cleaners * btl_state_stuff * btl_state_update_next_enemy wip * btl_state stuff * disable_x fx + cleanup * wip * fxstuff * path funcs & cleanup * clean * model_api funcs * two action commands * action_cmd progress * UnkFunc001 * air raid func * cleanup, data migration, goodies * remove data file * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "a847090eac" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "a847090eac" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * fix build * more cleanup * clean * PR comments
2022-05-05 16:08:16 +02:00
EffectInstance* disable_x_main(s32, f32, f32, f32, s32);
Effect work and rodata migration (#747) * bombette_breaking WIP * bombette_breaking * migration & stuff * spr funcs * btl_state_update_begin_turn * beginning effect data work * effect rodata migration * fix * fixin * breaking_junk * args * handle gfx * trim yaml * yaml cleanup * gfx stuff * git subrepo pull --force tools/splat subrepo: subdir: "tools/splat" merged: "b681843a78" upstream: origin: "https://github.com/ethteck/splat.git" branch: "master" commit: "b681843a78" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * water_splash gfx * move decl down * fix warnings
2022-08-10 17:29:06 +02:00
EffectInstance* bombette_breaking_main(s32, s32, s32, f32, s32, s32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* firework_main(s32, f32, f32, f32, f32, s32);
EffectInstance* confetti_main(s32, f32, f32, f32, f32, s32);
Matched effects funcs (#818) * thunderbolt_ring: Matched update and main * snowfall_main: Matched * shiny_flare_main: Matched * shiny_flare_update: Matched * thunderbolt_ring_update: clean up * rising_bubble_main: matched * ring_blast: Matched main and update * quizmo_stage: Matched main and update * ring_blast_main: Fixed warning message * PR_818: PR clean up
2022-10-12 14:39:03 +02:00
EffectInstance* snowfall_main(s32, s32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* fx_46_main(s32, PlayerStatus*, f32, s32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
EffectInstance* gather_magic_main(s32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
EffectInstance* attack_result_text_main(s32, f32, f32, f32, f32, s32);
Misc decomp 70 (#716) * aura_appendGfx * 3 more action commands * fire_shell * hammer, hurricane * spiny_surge * data stuff, cleanup, whirlwind * warnings * water_block data and func * water_block * effect stuff cleanup * big_snowflakes effect * data cleanup, fpr abi regs * 2 battle item funcs + data * 2 mo * shooting_star func * 3 16F740 funcs * btl_state_update_end_battle * map funcs * more dedupe * cleanin * draw_entity_model_C/D * effect butterflies, btl state funcs * it is done * it is done * PR comments, some cleanup
2022-05-27 15:03:19 +02:00
EffectInstance* small_gold_sparkle_main(s32, f32, f32, f32, f32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
EffectInstance* flashing_box_shockwave_main(s32, f32, f32, f32, f32, f32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
EffectInstance* balloon_main(s32, f32, f32, f32, f32, s32);
Matching effects and some world/area_kkj functions (#756) * Matching effects and some world/area_kkj functions * Partially addressed PR comments * Partially addressed PR comments * Added EVT_FIXED_TO_FLOAT macro
2022-09-05 06:53:21 +02:00
EffectInstance* floating_rock_main(s32, f32, f32, f32, f32, f32, f32, f32, s32);
EffectInstance* chomp_drop_main(s32, f32, f32, f32, f32, s32, f32, s32, f32, s32);
Matched effects funcs (#818) * thunderbolt_ring: Matched update and main * snowfall_main: Matched * shiny_flare_main: Matched * shiny_flare_update: Matched * thunderbolt_ring_update: clean up * rising_bubble_main: matched * ring_blast: Matched main and update * quizmo_stage: Matched main and update * ring_blast_main: Fixed warning message * PR_818: PR clean up
2022-10-12 14:39:03 +02:00
EffectInstance* quizmo_stage_main(s32, f32, f32, f32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* radiating_energy_orb_main(s32, f32, f32, f32, f32, s32);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
EffectInstance* quizmo_answer_main(s32, f32, f32, f32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* motion_blur_flame_main(s32, f32, f32, f32, f32, s32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
EffectInstance* energy_orb_wave_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* merlin_house_stars_main(s32, f32, f32, f32);
more effects functions (#836) * water_fountain: matched main * water_fountain: Matched update * quizmo_audience: Matched main * star_outline: Matched main * star_outline: Matched update * quizmo_audience: Removed unused struct
2022-10-27 15:07:27 +02:00
EffectInstance* quizmo_audience_main(s32, f32, f32, f32);
Misc decomp 70 (#716) * aura_appendGfx * 3 more action commands * fire_shell * hammer, hurricane * spiny_surge * data stuff, cleanup, whirlwind * warnings * water_block data and func * water_block * effect stuff cleanup * big_snowflakes effect * data cleanup, fpr abi regs * 2 battle item funcs + data * 2 mo * shooting_star func * 3 16F740 funcs * btl_state_update_end_battle * map funcs * more dedupe * cleanin * draw_entity_model_C/D * effect butterflies, btl state funcs * it is done * it is done * PR comments, some cleanup
2022-05-27 15:03:19 +02:00
EffectInstance* butterflies_main(s32, f32, f32, f32);
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652) * music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration * implement requested changes * Recover.c data fixes, style changes * The one newline lol * f
2022-02-21 16:53:26 +01:00
EffectInstance* stat_change_main(s32, f32, f32, f32, f32, s32);
Effect gfx data + some light funcs (#809)
2022-10-08 12:07:10 +02:00
EffectInstance* snaking_static_main(s32, f32, f32, f32, f32, s32);
Matched effects funcs (#818) * thunderbolt_ring: Matched update and main * snowfall_main: Matched * shiny_flare_main: Matched * shiny_flare_update: Matched * thunderbolt_ring_update: clean up * rising_bubble_main: matched * ring_blast: Matched main and update * quizmo_stage: Matched main and update * ring_blast_main: Fixed warning message * PR_818: PR clean up
2022-10-12 14:39:03 +02:00
EffectInstance* thunderbolt_ring_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* squirt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
FX_MAIN(water_block_main);
[Effects] A few functions (#850) * [Effects] A few functions * Addressing PR comments
2022-11-05 01:43:44 +01:00
EffectInstance* waterfall_main(s32, f32, f32, f32, f32, s32);
more effects functions (#836) * water_fountain: matched main * water_fountain: Matched update * quizmo_audience: Matched main * star_outline: Matched main * star_outline: Matched update * quizmo_audience: Removed unused struct
2022-10-27 15:07:27 +02:00
EffectInstance* water_fountain_main(s32, f32, f32, f32, f32, s32);
[Effects] A few functions (#850) * [Effects] A few functions * Addressing PR comments
2022-11-05 01:43:44 +01:00
EffectInstance* underwater_main(s32, f32, f32, f32, f32, s32);
Effect gfx data + some light funcs (#809)
2022-10-08 12:07:10 +02:00
EffectInstance* lightning_bolt_main(s32, f32, f32, f32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
FX_MAIN(water_splash_main);
Some effect functions (#846)
2022-11-02 13:51:32 +01:00
EffectInstance* snowman_doll_main(s32, f32, f32, f32, f32, s32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
EffectInstance* fright_jar_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* stop_watch_main(s32, f32, f32, f32, f32, s32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
EffectInstance* fx_63_main(s32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
More overworld partner functions and other various functions (#680) * decomp appendGfx_player, fix warnings in 77480.c file * small style fixes * fix action state enum and make use of enum * merge master * decomp some mario rendering functions * run coverage.py * review changes * use decimal in func arg * 891b0 and sprite functions * finish lakilester world file * run coverage.py * remove duplication declarations * requested changes and remove some warnings from sprite.c * ...run coverage.py * decomp 2 funcs in throw_spiny.c * throw_spiny_appendGfx * match spiny throw.c and remaining kooper overworld functions * cleanup throw_spiny.c and decomp spin.c * combine variable declarations in spin.c * run coverage.py * more spin.c cleanup * req changes Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-04-12 03:59:20 +02:00
EffectInstance* throw_spiny_main(s32, f32, f32, f32, f32, f32, f32, f32, s32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
EffectInstance* fx_65_main(s32, f32, f32, f32, f32, s32);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
EffectInstance* tubba_heart_attack_main(s32, f32, f32, f32, f32, s32);
Match whirlwind effect (#869) * match whirlwind effect * delete asm * PR comments
2022-11-24 15:57:29 +01:00
EffectInstance* whirlwind_main(s32, f32, f32, f32, f32, s32);
[Effects] Migrating data + a couple of functions (#817) * [Effects] Migrating data + a couple of functions * Addressed PR comments
2022-10-12 02:28:15 +02:00
EffectInstance* red_impact_main(s32, f32, f32, f32, f32);
[Effects] Matched 29 functions (#789) * [Effects] Matched 29 functions * Fixing a warning * Addressed PR feedback
2022-09-27 20:10:05 +02:00
EffectInstance* floating_cloud_puff_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* energy_in_out_main(s32, f32, f32, f32, f32, s32);
music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration (#652) * music_note.c, shape_spell.c, stat_change.c, tattle_window.c, recover.c data migration * implement requested changes * Recover.c data fixes, style changes * The one newline lol * f
2022-02-21 16:53:26 +01:00
EffectInstance* tattle_window_main(s32, f32, f32, f32, f32, s32);
Matched effects funcs (#818) * thunderbolt_ring: Matched update and main * snowfall_main: Matched * shiny_flare_main: Matched * shiny_flare_update: Matched * thunderbolt_ring_update: clean up * rising_bubble_main: matched * ring_blast: Matched main and update * quizmo_stage: Matched main and update * ring_blast_main: Fixed warning message * PR_818: PR clean up
2022-10-12 14:39:03 +02:00
EffectInstance* shiny_flare_main(s32, f32, f32, f32, f32);
Matched effects main funcs (#806) * hieroglyphs_main: Initial c * hieroglyphs_update: Compiled c * hieroglyphs_main: Matched * huff_puff_breath_main: Matched * smoke_burst_main: Matched * sweat_main: Matched * PR_806: Updated init signatures * huff_puff_breath_main: removed unused temp * smoke_burst_main: Updated fx struct with rgba
2022-10-07 09:31:45 +02:00
EffectInstance* huff_puff_breath_main(s32, f32, f32, f32, f32, f32, f32, s32);
Matching effects and some world/area_kkj functions (#756) * Matching effects and some world/area_kkj functions * Partially addressed PR comments * Partially addressed PR comments * Added EVT_FIXED_TO_FLOAT macro
2022-09-05 06:53:21 +02:00
EffectInstance* cold_breath_main(s32, f32, f32, f32, f32, s32);
Matching effects (#771) * Matching effects * Updated fx_3D_main * Changing color values to decimal
2022-09-13 11:52:01 +02:00
EffectInstance* embers_main(s32, f32, f32, f32, f32, f32, f32, s32, s32, f32, f32);
Matched effects main funcs (#806) * hieroglyphs_main: Initial c * hieroglyphs_update: Compiled c * hieroglyphs_main: Matched * huff_puff_breath_main: Matched * smoke_burst_main: Matched * sweat_main: Matched * PR_806: Updated init signatures * huff_puff_breath_main: removed unused temp * smoke_burst_main: Updated fx struct with rgba
2022-10-07 09:31:45 +02:00
EffectInstance* hieroglyphs_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance *misc_particles_main(s32, f32, f32, f32, f32, f32, f32, s32, s32);
EffectInstance* static_status_main(s32, f32, f32, f32, f32, s32, s32);
[Effects] More functions (#838)
2022-10-30 02:22:40 +02:00
EffectInstance* moving_cloud_main(s32, f32, f32, f32, f32, f32, f32, f32, f32);
Matching effects (#771) * Matching effects * Updated fx_3D_main * Changing color values to decimal
2022-09-13 11:52:01 +02:00
EffectInstance* fx_75_main(s32, f32, f32, f32, f32, s32);
Matching more effects (#780) * Matching more effects * Deleted matched functions * Addressed PR comments * PR comments and remove goto Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-09-21 09:09:22 +02:00
EffectInstance* firework_rocket_main(s32, f32, f32, f32, f32, f32, f32, f32, s32);
A few funcs (#751) * update_item_entity_collectable * cleanup * snibblets and bits * CancelablePlayerRunToGoal and PlayerRunToGoal * nonmatch * PR comments and peach_star_beam effect * PR stuffs
2022-08-25 12:18:04 +02:00
EffectInstance* peach_star_beam_main(s32, f32, f32, f32, f32, s32);
Matching effects and some world/area_kkj functions (#756) * Matching effects and some world/area_kkj functions * Partially addressed PR comments * Partially addressed PR comments * Added EVT_FIXED_TO_FLOAT macro
2022-09-05 06:53:21 +02:00
EffectInstance* chapter_change_main(s32, f32, f32, f32, f32, s32);
Some effect functions (#846)
2022-11-02 13:51:32 +01:00
EffectInstance* ice_shard_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* spirit_card_main(s32, f32, f32, f32, f32, s32);
Pigs and speech bubbles 🐽 💬 (#767) * lil_oink effect * oink map funcs * fix build to not be big * machi funcs * mac func * data migration * draw_shop_items * e20eb0.c funcs + data * warnings * PR warnings and cleanup
2022-09-10 19:04:04 +02:00
EffectInstance* lil_oink_main(void);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* something_rotating_main(s32, f32, f32, f32, f32, s32);
A few funcs (#751) * update_item_entity_collectable * cleanup * snibblets and bits * CancelablePlayerRunToGoal and PlayerRunToGoal * nonmatch * PR comments and peach_star_beam effect * PR stuffs
2022-08-25 12:18:04 +02:00
EffectInstance* breaking_junk_main(s32, f32, f32, f32, f32, s32);
actor decor stuff (#750) * big func * this and that * checkpoint * more funcs * enough * formatting Co-authored-by: HailSanta <Hail2Santa@gmail.com> Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2022-08-26 12:13:57 +02:00
EffectInstance* partner_buff_main(s32, f32, f32, f32, f32, s32);
Some effect functions (#846)
2022-11-02 13:51:32 +01:00
EffectInstance* quizmo_assistant_main(s32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
FX_MAIN(ice_pillar_main);
isk + misc (#746) * isk + warning patrol * minor reorg * effect data union * structs sorted and dummy structs added * effect data cleanup + some end funcs * two more PAL_PTR* * temp * flower fx * pal_inc_c * remove tabs * isk_05 * blur union * more isk * isk funcs done * sun stuff * delete sun_main * sun comments * extra stuff * actor decorations
2022-08-10 15:36:38 +02:00
EffectInstance* sun_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching a couple of functions (#834) * [Effects] Matching a couple of functions * Addressed comments
2022-10-25 11:49:05 +02:00
EffectInstance* star_spirits_energy_main(s32, f32, f32, f32, f32, s32);
[Effects] Matching 23 effect functions (#831) * [Effects] Matching 23 effect functions * Addressed PR comments
2022-10-18 12:07:21 +02:00
EffectInstance* pink_sparkles_main(s32, f32, f32, f32, f32, f32);
more effects functions (#836) * water_fountain: matched main * water_fountain: Matched update * quizmo_audience: Matched main * star_outline: Matched main * star_outline: Matched update * quizmo_audience: Removed unused struct
2022-10-27 15:07:27 +02:00
EffectInstance* star_outline_main(s32, f32, f32, f32, f32, s32);
The Great Effect Naming (#632) * name big_smoke_puff * 0-5 * 6 -> land * more effect stuff * flower effects * name fix * cloud_puff * flower splash * cloud_trail * 2 more * more * a bunch more * -2F * more * the rest * cleanup and the rest * PR stuffs
2022-01-24 17:58:33 +01:00
EffectInstance* fx_86_main(s32, f32, f32, f32, f32, s32);
Effects, includes (#589) * effect_13 * effect_14 * most of effect_15 * clean, standardize effects * fx_16 wip * UnkNpcAIFunc35 * includes * UnkPosFunc2 * UnkNpcAIFunc36 * PR comments
2021-12-30 06:14:55 +01:00
Effects (#442) * effect shim names * fx_1_main and data migration * fx_1_renderWorld * header reorg * remove stale comment * effect_1 * cleanup * fx_6 stuff * most of effect_6, misc changes * cleanup * PR stuff * warningz
2021-09-27 01:19:58 +02:00
#endif
Reference in New Issue Copy Permalink