izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

effect_soft_sprite matching! (#177)

Browse Source
This commit is contained in:
engineer124
2021-06-10 18:05:40 -04:00
committed by GitHub
parent d7fc053441
commit 059c9075ca
7 changed files with 114 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -585,14 +585,14 @@ void EffectSS_Clear(GlobalContext* globalCtx);
EffectSs* EffectSS_GetTable(void);
void EffectSS_Delete(EffectSs* param_1);
void EffectSS_ResetEntry(EffectSs* particle);
s32 EffectSS_FindFreeSpace(u32 priority, u32* tableEntry);
s32 EffectSS_FindFreeSpace(s32 priority, s32* tableEntry);
void EffectSS_Copy(GlobalContext* globalCtx, EffectSs* particle);
void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* initParams);
void EffectSS_UpdateParticle(GlobalContext* globalCtx, s32 index);
void EffectSS_UpdateAllParticles(GlobalContext* globalCtx);
void EffectSS_DrawParticle(GlobalContext* globalCtx, s32 index);
void EffectSS_DrawAllParticles(GlobalContext* globalCtx);
s32 func_800B096C(s16 param_1, s16 param_2, s32 param_3);
s16 func_800B096C(s16 param_1, s16 param_2, s32 param_3);
s16 func_800B09D0(s16 a0, s16 a1, f32 a2);
u8 func_800B0A24(u8 a0, u8 a1, f32 a2);
void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* texture);
@@ -3058,7 +3058,7 @@ void func_80169E6C(GlobalContext* globalCtx, s32 param_1, s32 param_2);
// void func_80169F78(void);
// void func_80169FDC(void);
// void func_80169FFC(void);
u32 func_8016A01C(GlobalContext* globalCtx);
s32 FrameAdvance_IsEnabled(GlobalContext* globalCtx);
// UNK_TYPE4 func_8016A02C(s32 param_1, s32 param_2, s16* param_3);
// void func_8016A0AC(void);
// void func_8016A168(void);
include/z64effect.h
+2 -2
View File
@@ -236,8 +236,8 @@ typedef struct {
/* 0x34 */ u8 type; // type0: start small, get big, fade away type1: start big, fade away
} EffectDustInit; // size = 0x35
typedef u32 (*EffectSsInitFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* effectSs, void* initParams);
typedef void(*EffectSsUpdateFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* particle);
typedef void(*EffectSsDrawFunc)(struct GlobalContext* globalCtx, u32 index, struct EffectSs* particle);
typedef struct EffectSs {
@@ -264,7 +264,7 @@ typedef struct {
typedef struct {
/* 0x0 */ UNK_TYPE4 unk0;
/* 0x4 */ EffectSsDrawFunc init;
/* 0x4 */ EffectSsInitFunc init;
} ParticleOverlayInfo; // size = 0x8
typedef struct {