mirror of
https://github.com/zeldaret/mm.git
synced 2026-07-07 21:10:53 -04:00
Match z_effect.c (#176)
This commit is contained in:
engineer124
+63
-63
@@ -547,16 +547,16 @@ s32 EffectBlure_Update(EffectBlure* params);
|
||||
// void func_800AA498(void);
|
||||
// void func_800AA700(void);
|
||||
// void func_800AABE0(void);
|
||||
void EffectBlure_Draw(EffectBlure* params, GraphicsContext* gCtxt);
|
||||
void EffectBlure_Draw(EffectBlure* params, GraphicsContext* gfxCtx);
|
||||
void EffectShieldParticle_Init(EffShieldParticleParams* params, EffShieldParticleInit* init);
|
||||
void EffectShieldParticle_Destroy(EffShieldParticleParams* params);
|
||||
s32 EffectShieldParticle_Update(EffShieldParticleParams* params);
|
||||
void EffectShieldParticle_CalculateColors(EffShieldParticleParams* params, Color_RGBA8* primColor, Color_RGBA8* envColor);
|
||||
void EffectShieldParticle_Draw(EffShieldParticleParams* params, GraphicsContext* gCtxt);
|
||||
void EffectShieldParticle_Draw(EffShieldParticleParams* params, GraphicsContext* gfxCtx);
|
||||
void EffectSpark_Init(EffSparkParams* params, EffSparkParams* init);
|
||||
void EffectSpark_Destroy(EffSparkParams* params);
|
||||
s32 EffectSpark_Update(EffSparkParams* params);
|
||||
void EffectSpark_Draw(EffSparkParams* params, GraphicsContext* gCtxt);
|
||||
void EffectSpark_Draw(EffSparkParams* params, GraphicsContext* gfxCtx);
|
||||
// void func_800AE2A0(void);
|
||||
void func_800AE434(GlobalContext* globalCtx, Color_RGBA8* color, s16 sParm3, s16 sParm4);
|
||||
void func_800AE5A0(GlobalContext* globalCtx);
|
||||
@@ -570,13 +570,13 @@ void EffectTireMark_Init(EffTireMarkParams* params, EffTireMarkInit* init);
|
||||
void EffectTireMark_Destroy(EffTireMarkParams* params);
|
||||
s32 EffectTireMark_Update(EffTireMarkParams* params);
|
||||
void EffectTireMark_InitVertices(F3DVertexColor* vertices, EffTireMarkParticle* particle, s32 index, s32 alpha);
|
||||
void EffectTireMark_Draw(EffTireMarkParams* params, GraphicsContext* gCtxt);
|
||||
void EffectTireMark_Draw(EffTireMarkParams* params, GraphicsContext* gfxCtx);
|
||||
GlobalContext* Effect_GetContext(void);
|
||||
void* Effect_GetParams(s32 index);
|
||||
void Effect_InitCommon(EffCommon* common);
|
||||
void Effect_Init(GlobalContext* globalCtx);
|
||||
void Effect_Add(GlobalContext* globalCtx, s32* index, s32 type, u8 param_4, u8 param_5, void* initParams);
|
||||
void Effect_DrawAll(GraphicsContext* gCtxt);
|
||||
void Effect_DrawAll(GraphicsContext* gfxCtx);
|
||||
void Effect_UpdateAll(GlobalContext* globalCtx);
|
||||
void Effect_Destroy(GlobalContext* globalCtx, s32 index);
|
||||
void Effect_DestroyAll(GlobalContext* globalCtx);
|
||||
@@ -785,7 +785,7 @@ void func_800B75A0(CollisionPoly* param_1, Vec3f* param_2, s16* param_3);
|
||||
// UNK_TYPE4 func_800B7678(GlobalContext* globalCtx, Actor* param_2, s32 param_3, u32 param_4);
|
||||
void func_800B78B8(GlobalContext* globalCtx, Actor* actor, f32 uParm3, f32 uParm4, f32 param_5, u32 param_6);
|
||||
// void func_800B7E04(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
|
||||
s32 func_800B7FE0(f32* param_1, f32* param_2, f32* param_3, GraphicsContext* gCtxt);
|
||||
s32 func_800B7FE0(f32* param_1, f32* param_2, f32* param_3, GraphicsContext* gfxCtx);
|
||||
// void func_800B8018(void);
|
||||
void func_800B8050(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
|
||||
void func_800B8118(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
|
||||
@@ -1553,7 +1553,7 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx);
|
||||
// void func_800E9CFC(void);
|
||||
// void func_800E9DBC(void);
|
||||
// void func_800E9E94(void);
|
||||
void func_800E9F78(GraphicsContext* gCtxt);
|
||||
void func_800E9F78(GraphicsContext* gfxCtx);
|
||||
void Cutscene_Init(GlobalContext* globalCtx, CutsceneContext* csCtx);
|
||||
void func_800EA0D4(GlobalContext* globalCtx, CutsceneContext* csCtx);
|
||||
void func_800EA0EC(GlobalContext* globalCtx, CutsceneContext* csCtx);
|
||||
@@ -2339,49 +2339,49 @@ void Gfx_CallSetupDLAtPtr(Gfx** gfxp, u32 i);
|
||||
Gfx* func_8012BFC4(Gfx* gfx);
|
||||
Gfx* func_8012BFEC(Gfx* gfx);
|
||||
Gfx* func_8012C014(Gfx* gfx);
|
||||
void func_8012C058(GraphicsContext* gCtxt);
|
||||
void func_8012C080(GraphicsContext* gCtxt);
|
||||
void func_8012C0A8(GraphicsContext* gCtxt);
|
||||
void func_8012C0D0(GraphicsContext* gCtxt);
|
||||
void func_8012C0F8(GraphicsContext* gCtxt);
|
||||
void func_8012C120(GraphicsContext* gCtxt);
|
||||
void func_8012C148(GraphicsContext* gCtxt);
|
||||
void func_8012C170(GraphicsContext* gCtxt);
|
||||
void func_8012C058(GraphicsContext* gfxCtx);
|
||||
void func_8012C080(GraphicsContext* gfxCtx);
|
||||
void func_8012C0A8(GraphicsContext* gfxCtx);
|
||||
void func_8012C0D0(GraphicsContext* gfxCtx);
|
||||
void func_8012C0F8(GraphicsContext* gfxCtx);
|
||||
void func_8012C120(GraphicsContext* gfxCtx);
|
||||
void func_8012C148(GraphicsContext* gfxCtx);
|
||||
void func_8012C170(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C198(Gfx* gfx);
|
||||
void func_8012C1C0(GraphicsContext* gCtxt);
|
||||
void func_8012C1C0(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C1EC(Gfx* gfx);
|
||||
void func_8012C214(GraphicsContext* gCtxt);
|
||||
void func_8012C240(GraphicsContext* gCtxt);
|
||||
void func_8012C214(GraphicsContext* gfxCtx);
|
||||
void func_8012C240(GraphicsContext* gfxCtx);
|
||||
void func_8012C268(GlobalContext* globalCtx);
|
||||
void func_8012C28C(GraphicsContext* gCtxt);
|
||||
void func_8012C28C(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C2B4(Gfx* gfx);
|
||||
void func_8012C2DC(GraphicsContext* gCtxt);
|
||||
void func_8012C2DC(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C304(Gfx* gfx);
|
||||
void func_8012C32C(GraphicsContext* gCtxt);
|
||||
void func_8012C354(GraphicsContext* gCtxt);
|
||||
void func_8012C37C(GraphicsContext* gCtxt);
|
||||
void func_8012C32C(GraphicsContext* gfxCtx);
|
||||
void func_8012C354(GraphicsContext* gfxCtx);
|
||||
void func_8012C37C(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C3A4(Gfx* gfx);
|
||||
Gfx* func_8012C3CC(Gfx* gfx);
|
||||
void func_8012C3F4(GraphicsContext* gCtxt);
|
||||
void func_8012C420(GraphicsContext* gCtxt);
|
||||
void func_8012C448(GraphicsContext* gCtxt);
|
||||
void func_8012C470(GraphicsContext* gCtxt);
|
||||
void func_8012C3F4(GraphicsContext* gfxCtx);
|
||||
void func_8012C420(GraphicsContext* gfxCtx);
|
||||
void func_8012C448(GraphicsContext* gfxCtx);
|
||||
void func_8012C470(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C498(Gfx* gfx);
|
||||
void func_8012C4C0(GraphicsContext* gCtxt);
|
||||
void func_8012C4E8(GraphicsContext* gCtxt);
|
||||
void func_8012C510(GraphicsContext* gCtxt);
|
||||
void func_8012C538(GraphicsContext* gCtxt);
|
||||
void func_8012C560(GraphicsContext* gCtxt);
|
||||
void func_8012C588(GraphicsContext* gCtxt);
|
||||
void func_8012C5B0(GraphicsContext* gCtxt);
|
||||
void func_8012C5D8(GraphicsContext* gCtxt);
|
||||
void func_8012C4C0(GraphicsContext* gfxCtx);
|
||||
void func_8012C4E8(GraphicsContext* gfxCtx);
|
||||
void func_8012C510(GraphicsContext* gfxCtx);
|
||||
void func_8012C538(GraphicsContext* gfxCtx);
|
||||
void func_8012C560(GraphicsContext* gfxCtx);
|
||||
void func_8012C588(GraphicsContext* gfxCtx);
|
||||
void func_8012C5B0(GraphicsContext* gfxCtx);
|
||||
void func_8012C5D8(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C600(Gfx* gfx);
|
||||
void func_8012C628(GraphicsContext* gCtxt);
|
||||
void func_8012C654(GraphicsContext* gCtxt);
|
||||
void func_8012C628(GraphicsContext* gfxCtx);
|
||||
void func_8012C654(GraphicsContext* gfxCtx);
|
||||
void func_8012C680(Gfx** gfxp);
|
||||
void func_8012C6AC(GraphicsContext* gCtxt);
|
||||
void func_8012C6D4(GraphicsContext* gCtxt);
|
||||
void func_8012C6FC(GraphicsContext* gCtxt);
|
||||
void func_8012C6AC(GraphicsContext* gfxCtx);
|
||||
void func_8012C6D4(GraphicsContext* gfxCtx);
|
||||
void func_8012C6FC(GraphicsContext* gfxCtx);
|
||||
Gfx* func_8012C724(Gfx* gfx);
|
||||
Gfx* func_8012C74C(Gfx* gfx);
|
||||
Gfx* func_8012C774(Gfx* gfx);
|
||||
@@ -2389,16 +2389,16 @@ Gfx* func_8012C7B8(Gfx* gfx);
|
||||
Gfx* func_8012C7FC(Gfx* gfx);
|
||||
Gfx* func_8012C840(Gfx* gfx);
|
||||
Gfx* func_8012C868(Gfx* gfx);
|
||||
void func_8012C8AC(GraphicsContext* gCtxt);
|
||||
void func_8012C8D4(GraphicsContext* gCtxt);
|
||||
void func_8012C8FC(GraphicsContext* gCtxt);
|
||||
void func_8012C924(GraphicsContext* gCtxt);
|
||||
void func_8012C94C(GraphicsContext* gCtxt);
|
||||
void func_8012C974(GraphicsContext* gCtxt);
|
||||
void func_8012C9BC(GraphicsContext* gCtxt);
|
||||
void func_8012C9E4(GraphicsContext* gCtxt);
|
||||
void func_8012C8AC(GraphicsContext* gfxCtx);
|
||||
void func_8012C8D4(GraphicsContext* gfxCtx);
|
||||
void func_8012C8FC(GraphicsContext* gfxCtx);
|
||||
void func_8012C924(GraphicsContext* gfxCtx);
|
||||
void func_8012C94C(GraphicsContext* gfxCtx);
|
||||
void func_8012C974(GraphicsContext* gfxCtx);
|
||||
void func_8012C9BC(GraphicsContext* gfxCtx);
|
||||
void func_8012C9E4(GraphicsContext* gfxCtx);
|
||||
void func_8012CA0C(Gfx** gfxp);
|
||||
void func_8012CA38(GraphicsContext* gCtxt);
|
||||
void func_8012CA38(GraphicsContext* gfxCtx);
|
||||
Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height);
|
||||
void func_8012CB04(Gfx** gfxp, u32 x, u32 y);
|
||||
Gfx* func_8012CB28(GraphicsContext* gfxCtx, u32 x, u32 y);
|
||||
@@ -2407,8 +2407,8 @@ Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 wi
|
||||
Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a);
|
||||
Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a);
|
||||
Gfx* Gfx_PrimColor(GraphicsContext* gfxCtx, s32 lodfrac, s32 r, s32 g, s32 b, s32 a);
|
||||
void func_8012CF0C(GraphicsContext* gCtxt, s32 iParm2, s32 iParm3, u8 r, u8 g, u8 b);
|
||||
void func_8012D374(GraphicsContext* gCtxt, u8 r, u8 g, u8 b);
|
||||
void func_8012CF0C(GraphicsContext* gfxCtx, s32 iParm2, s32 iParm3, u8 r, u8 g, u8 b);
|
||||
void func_8012D374(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
|
||||
void func_8012D40C(f32* param_1, f32* param_2, s16* param_3);
|
||||
void Room_nop8012D510(GlobalContext* globalCtx, Room* room, UNK_PTR param_3, UNK_TYPE1 param_4);
|
||||
void Room_DrawType3Mesh(GlobalContext* globalCtx, Room* room, u32 flags);
|
||||
@@ -2738,7 +2738,7 @@ void func_8013EDD0(void);
|
||||
// void func_8013EE38(void);
|
||||
// void func_8013EE48(void);
|
||||
void View_ViewportToVp(Vp* dest, Viewport* src);
|
||||
void View_Init(View* view, GraphicsContext* gCtxt);
|
||||
void View_Init(View* view, GraphicsContext* gfxCtx);
|
||||
void View_SetViewOrientation(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir);
|
||||
void func_8013F050(View* view, Vec3f* eye, Vec3f* focalPoint, Vec3f* upDir);
|
||||
void View_SetScale(View* view, f32 scale);
|
||||
@@ -3139,15 +3139,15 @@ void Game_UpdateFramerateVariables(s32 divisor);
|
||||
void Game_SetFramerateDivisor(GameState* gameState, s32 divisor);
|
||||
void GameState_SetFBFilter(Gfx** gfx, u32 arg1);
|
||||
void Game_Nop80173534(GameState* ctxt);
|
||||
void GameState_Draw(GameState* ctxt, GraphicsContext* gCtxt);
|
||||
void Game_ResetSegments(GraphicsContext* gCtxt);
|
||||
void func_801736DC(GraphicsContext* gCtxt);
|
||||
void GameState_Draw(GameState* ctxt, GraphicsContext* gfxCtx);
|
||||
void Game_ResetSegments(GraphicsContext* gfxCtx);
|
||||
void func_801736DC(GraphicsContext* gfxCtx);
|
||||
void Game_UpdateInput(GameState* ctxt);
|
||||
void Game_Update(GameState* ctxt);
|
||||
void Game_IncrementFrameCount(GameState* ctxt);
|
||||
void Game_InitHeap(GameState* ctxt, u32 size);
|
||||
void Game_ResizeHeap(GameState* ctxt, u32 size);
|
||||
void Game_StateInit(GameState* ctxt, GameStateFunc gameStateInit, GraphicsContext* gCtxt);
|
||||
void Game_StateInit(GameState* ctxt, GameStateFunc gameStateInit, GraphicsContext* gfxCtx);
|
||||
void Game_StateFini(GameState* ctxt);
|
||||
GameStateFunc Game_GetNextStateInit(GameState* ctxt);
|
||||
u32 Game_GetNextStateSize(GameState* ctxt);
|
||||
@@ -3161,15 +3161,15 @@ void Gamealloc_FreeAll(GameAlloc* heap);
|
||||
void Gamealloc_Init(GameAlloc* iParm1);
|
||||
// void Graph_FaultClient(void);
|
||||
void Graph_DlAlloc(TwoHeadGfxArena* dl, void* memoryBlock, u32 size);
|
||||
void Graph_InitTHGA(GraphicsContext* gCtxt);
|
||||
void Graph_InitTHGA(GraphicsContext* gfxCtx);
|
||||
GameStateOverlay* Graph_GetNextGameState(GameState* ctxt);
|
||||
void* Graph_FaultAddrConvFunc(void* addr);
|
||||
void Graph_Init(GraphicsContext* gCtxt);
|
||||
void Graph_Init(GraphicsContext* gfxCtx);
|
||||
// void Graph_Destroy(void);
|
||||
void Graph_Render(GraphicsContext* gCtxt, GameState* ctxt);
|
||||
void Graph_Render(GraphicsContext* gfxCtx, GameState* ctxt);
|
||||
void Graph_FrameSetup(GameState* ctxt);
|
||||
void Graph_RenderFrame(GraphicsContext* gCtxt, GameState* ctxt);
|
||||
void Graph_DoFrame(GraphicsContext* gCtxt, GameState* ctxt);
|
||||
void Graph_RenderFrame(GraphicsContext* gfxCtx, GameState* ctxt);
|
||||
void Graph_DoFrame(GraphicsContext* gfxCtx, GameState* ctxt);
|
||||
void Graph_ThreadEntry(void* arg);
|
||||
Gfx* Graph_GfxPlusOne(Gfx* gfx);
|
||||
Gfx* Graph_BranchDlist(Gfx* gfx, Gfx* dst);
|
||||
@@ -3393,8 +3393,8 @@ void SysMatrix_SetStateRotationAndTranslation(f32 x, f32 y, f32 z, Vec3s* rotati
|
||||
RSPMatrix* SysMatrix_ToRSPMatrix(MtxF* src, RSPMatrix* dst);
|
||||
RSPMatrix* SysMatrix_GetStateAsRSPMatrix(RSPMatrix* matrix);
|
||||
Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx);
|
||||
RSPMatrix* SysMatrix_AppendStateToPolyOpaDisp(GraphicsContext* gCtxt);
|
||||
void SysMatrix_AppendToPolyOpaDisp(MtxF* ctxt, GraphicsContext* gCtxt);
|
||||
RSPMatrix* SysMatrix_AppendStateToPolyOpaDisp(GraphicsContext* gfxCtx);
|
||||
void SysMatrix_AppendToPolyOpaDisp(MtxF* ctxt, GraphicsContext* gfxCtx);
|
||||
void SysMatrix_MultiplyVector3fByState(Vec3f* src, Vec3f* dst);
|
||||
void SysMatrix_GetStateTranslation(Vec3f* dst);
|
||||
void SysMatrix_GetStateTranslationAndScaledX(f32 scale, Vec3f* dst);
|
||||
|
||||
+1
-1
@@ -253,7 +253,7 @@ typedef struct {
|
||||
/* 0x04 */ UNK_TYPE1 pad4[0x40];
|
||||
} GlobalContext17D98; // size = 0x44
|
||||
|
||||
typedef struct {
|
||||
typedef struct GraphicsContext {
|
||||
/* 0x000 */ Gfx* polyOpaBuffer;
|
||||
/* 0x004 */ Gfx* polyXluBuffer;
|
||||
/* 0x008 */ UNK_TYPE1 pad8[0x8];
|
||||
|
||||
+12
-5
@@ -13,12 +13,19 @@ struct EffectSs;
|
||||
|
||||
typedef void(*eff_destroy_func)(void* params);
|
||||
|
||||
typedef void(*eff_draw_func)(void* params, struct GraphicsContext* gCtxt);
|
||||
typedef void(*eff_draw_func)(void* params, struct GraphicsContext* gfxCtx);
|
||||
|
||||
typedef void(*eff_init_func)(void* params, void* init);
|
||||
|
||||
typedef s32(*eff_update_func)(void* params);
|
||||
|
||||
#define SPARK_COUNT 3
|
||||
#define BLURE_COUNT 25
|
||||
#define SHIELD_PARTICLE_COUNT 3
|
||||
#define TIRE_MARK_COUNT 15
|
||||
|
||||
#define TOTAL_EFFECT_COUNT SPARK_COUNT + BLURE_COUNT + SHIELD_PARTICLE_COUNT + TIRE_MARK_COUNT
|
||||
|
||||
/* G Effect Regs */
|
||||
|
||||
#define rgTexIdx regs[0]
|
||||
@@ -210,10 +217,10 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
/* 0x0000 */ struct GlobalContext* globalCtx;
|
||||
/* 0x0004 */ EffSpark sparks[3];
|
||||
/* 0x0E5C */ EffBlure blures[25];
|
||||
/* 0x388C */ EffShieldParticle shieldParticles[3];
|
||||
/* 0x3DF0 */ EffTireMark tireMarks[15];
|
||||
/* 0x0004 */ EffSpark sparks[SPARK_COUNT];
|
||||
/* 0x0E5C */ EffBlure blures[BLURE_COUNT];
|
||||
/* 0x388C */ EffShieldParticle shieldParticles[SHIELD_PARTICLE_COUNT];
|
||||
/* 0x3DF0 */ EffTireMark tireMarks[TIRE_MARK_COUNT];
|
||||
} EffTables; // size = 0x98E0
|
||||
|
||||
typedef struct {
|
||||
|
||||
Reference in New Issue
Block a user