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 /src/code | |
| 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 'src/code')
| -rw-r--r-- | src/code/z_effect_soft_sprite_old_init.c | 4 | ||||
| -rw-r--r-- | src/code/z_sram_NES.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 17852c4c1..63b6861a7 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -925,14 +925,14 @@ void EffectSsEnFire_SpawnVec3s(PlayState* play, Actor* actor, Vec3s* pos, s16 sc // EffectSsExtra Spawn Functions -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) { EffectSsExtraInitParams initParams; Math_Vec3f_Copy(&initParams.pos, pos); Math_Vec3f_Copy(&initParams.velocity, velocity); Math_Vec3f_Copy(&initParams.accel, accel); initParams.scale = scale; - initParams.scoreIdx = scoreIdx; + initParams.scoreIndex = scoreIndex; EffectSs_Spawn(play, EFFECT_SS_EXTRA, 100, &initParams); } diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index f03d38e45..79f2d7043 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -112,8 +112,9 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_01) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_31_20), /* 32 */ - PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_01) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_02) | - PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_04), + PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_32_01) | + PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_HEART_PIECE) | + PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_HEART_PIECE), /* 33 */ 0, /* 34 */ 0, /* 35 */ @@ -146,7 +147,8 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve /* 58 */ 0, /* 59 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_04) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_08) | - PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_10) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_59_20), + PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SWAMP_SHOOTING_GALLERY_QUIVER_UPGRADE) | + PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_TOWN_SHOOTING_GALLERY_QUIVER_UPGRADE), /* 60 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_60_10), /* 61 */ 0, /* 62 */ 0, |