diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2023-06-21 06:29:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-21 09:29:16 -0400 |
| commit | 96a1d37084a5eb93540f712e55fcd3cb717c0ea3 (patch) | |
| tree | 89c3597f1a1a144c22b15bbb2d5f4edfa3e0f47a /include | |
| parent | 763830b185fbd18b6fa982ca15964824107112de (diff) | |
Cleanup of Shooting Gallery actors (#1302)
* Change `EN_SYATEKI_*` enums/defines to `SG_*`
* Name shooting gallery weekeventregs
* Get rid of names on unions (this is what I wanted to begin with!)
* Use ARRAY_COUNT(sGuayFlagsPerWave) instead of 3
* Actually give a proper name for SG_DEKU_GET_PARAM_FF00
* Use anon's suggestion for path param name
* Remove comment that isn't true? What was I cooking back then
* Animation naming stuff + comments
* Tons of score and shooting game logic cleanup
* Fix build issues
* Some more Octorok docs
* Use ANIMMODE enum in EnShn
* Put a bug tag on the weird behavior in EnSyatekiWf
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/z64save.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/functions.h b/include/functions.h index 39cb03363..52ba8b111 100644 --- a/include/functions.h +++ b/include/functions.h @@ -510,7 +510,7 @@ void EffectSsEnIce_Spawn(PlayState* play, Vec3f* pos, f32 scale, Vec3f* velocity void EffectSsFireTail_SpawnFlameOnPlayer(PlayState* play, f32 scale, s16 bodyPart, f32 colorIntensity); void EffectSsEnFire_SpawnVec3f(PlayState* play, Actor* actor, Vec3f* pos, s16 scale, s16 params, s16 flags, s16 bodyPart); // void EffectSsEnFire_SpawnVec3s(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7); -void EffectSsExtra_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx); +void EffectSsExtra_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIndex); void EffectSsDeadDb_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, Color_RGBA8* env, s16 scale, s16 scaleStep, s32 life); void func_800B3030(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s32 colorIndex); void EffectSsDeadDd_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, Color_RGBA8* env, s16 scale, s16 scaleStep, s16 alphaStep, s32 life); diff --git a/include/z64save.h b/include/z64save.h index 0c0af023c..71cb6428b 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -845,8 +845,8 @@ typedef enum { #define WEEKEVENTREG_31_80 PACK_WEEKEVENTREG_FLAG(31, 0x80) #define WEEKEVENTREG_32_01 PACK_WEEKEVENTREG_FLAG(32, 0x01) -#define WEEKEVENTREG_32_02 PACK_WEEKEVENTREG_FLAG(32, 0x02) -#define WEEKEVENTREG_32_04 PACK_WEEKEVENTREG_FLAG(32, 0x04) +#define WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE PACK_WEEKEVENTREG_FLAG(32, 0x02) +#define WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE PACK_WEEKEVENTREG_FLAG(32, 0x04) #define WEEKEVENTREG_32_08 PACK_WEEKEVENTREG_FLAG(32, 0x08) #define WEEKEVENTREG_32_10 PACK_WEEKEVENTREG_FLAG(32, 0x10) #define WEEKEVENTREG_32_20 PACK_WEEKEVENTREG_FLAG(32, 0x20) @@ -1042,8 +1042,8 @@ typedef enum { #define WEEKEVENTREG_59_04 PACK_WEEKEVENTREG_FLAG(59, 0x04) #define WEEKEVENTREG_59_08 PACK_WEEKEVENTREG_FLAG(59, 0x08) -#define WEEKEVENTREG_59_10 PACK_WEEKEVENTREG_FLAG(59, 0x10) -#define WEEKEVENTREG_59_20 PACK_WEEKEVENTREG_FLAG(59, 0x20) +#define WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE PACK_WEEKEVENTREG_FLAG(59, 0x10) +#define WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE PACK_WEEKEVENTREG_FLAG(59, 0x20) #define WEEKEVENTREG_59_40 PACK_WEEKEVENTREG_FLAG(59, 0x40) #define WEEKEVENTREG_59_80 PACK_WEEKEVENTREG_FLAG(59, 0x80) #define WEEKEVENTREG_60_01 PACK_WEEKEVENTREG_FLAG(60, 0x01) |