github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added and implemented TrailType enum (#5059)

Browse source 
* added TrailType enum

* fixed build, moved declaration

* added enhancement comment

* Apply suggestions from code review

---------

Co-authored-by: link5669 <acqmiles@gmail.com>
This commit is contained in:
Miles Acquaviva 2025-02-17 20:03:55 -05:00 • committed by GitHub
commit cc25c96385
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
soh/include/z64effect.h
View file

@ -14,6 +14,18 @@ struct PlayState;
#define TOTAL_EFFECT_COUNT SPARK_COUNT + BLURE_COUNT + SHIELD_PARTICLE_COUNT
typedef enum {
TRAIL_TYPE_REST,
TRAIL_TYPE_SWORDS,
TRAIL_TYPE_BOOMERANG,
TRAIL_TYPE_BOMBCHU,
TRAIL_TYPE_KOKIRI_SWORD,
TRAIL_TYPE_MASTER_SWORD,
TRAIL_TYPE_BIGGORON_SWORD,
TRAIL_TYPE_STICK,
TRAIL_TYPE_HAMMER
} TrailType; //SOH [Enhancements]
typedef struct {
/* 0x00 */ u8 active;
/* 0x01 */ u8 unk_01;
@ -73,7 +85,7 @@ typedef struct {
/* 0x194 */ s32 elemDuration;
/* 0x198 */ s32 unkFlag;
/* 0x19C */ s32 calcMode;
/* 0x1A0 */ u8 trailType; // 1 is swords, 2 is boomerang, 3 is bombchu, 0 is rest
/* 0x1A0 */ TrailType trailType; //SOH [Enhancements]
} EffectBlureInit1; // size = 0x1A0
typedef struct {
@ -90,7 +102,7 @@ typedef struct {
/* 0x1B */ u8 mode4Param;
/* 0x1C */ Color_RGBA8 altPrimColor; // used with drawMode 1
/* 0x20 */ Color_RGBA8 altEnvColor; // used with drawMode 1
/* 0x1A0 */ u8 trailType; // 1 is swords, 2 is boomerang, 3 is bombchu, 4 is stick, 0 is rest
/* 0x1A0 */ TrailType trailType; //SOH [Enhancements]
} EffectBlureInit2; // size = 0x24
typedef struct {
@ -110,7 +122,7 @@ typedef struct {
/* 0x1A1 */ u8 drawMode; // 0: simple; 1: simple with alt colors; 2+: smooth
/* 0x1A2 */ Color_RGBA8 altPrimColor; // used with drawMode 1
/* 0x1A6 */ Color_RGBA8 altEnvColor; // used with drawMode 1
/* 0x1A0 */ u8 trailType; // 1 is default swords, 2 is boomerang, 3 is bombchu, 0 is rest. 4 is Kokiri, 5 is Master, 6 is BGS, 7 is Stick, 8 is Hammer.
/* 0x1A0 */ TrailType trailType; //SOH [Enhancements]
} EffectBlure; // size = 0x1AC
typedef struct {