Minor Misc Cleanup (#1360)

* misc cleanup

* missed one

* EffectSsDust_UpdateFire

* revert change, needs more testing

10 files changed, 24 insertions, 24 deletions

diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index ceea25526..8d4e6b594 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1173,7 +1173,7 @@ void BgCheck_GetSubdivisionMinBounds(CollisionContext* colCtx, Vec3f* pos, s32*
 
 /**
  * Get positive bias subdivision indices
- * increments indicies if `pos` is within BGCHECK_SUBDIV_OVERLAP units of the postive subdivision boundary
+ * increments indices if `pos` is within BGCHECK_SUBDIV_OVERLAP units of the positive subdivision boundary
  * `sx`, `sy`, `sz` returns the subdivision x, y, z indices
  */
 void BgCheck_GetSubdivisionMaxBounds(CollisionContext* colCtx, Vec3f* pos, s32* sx, s32* sy, s32* sz) {
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index adc90a410..c886bc73a 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -1,10 +1,10 @@
 #include "global.h"
 
-void func_80110990(PlayState* play) {
+void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);
 }
 
-void func_801109B0(PlayState* play) {
+void Interface_Init(PlayState* play) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
     u32 parameterSize;
     u16 doActionOffset;
diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c
index 1df651bf2..106fdee1a 100644
--- a/src/code/z_effect_soft_sprite_old_init.c
+++ b/src/code/z_effect_soft_sprite_old_init.c
@@ -317,7 +317,7 @@ void EffectSsBomb2_SpawnLayered(PlayState* play, Vec3f* pos, Vec3f* velocity, Ve
 // EffectSsBlast Spawn Functions
 
 void EffectSsBlast_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* primColor,
-                         Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 sclaeStepDecay, s16 life) {
+                         Color_RGBA8* envColor, s16 scale, s16 scaleStep, s16 scaleStepDecay, s16 life) {
     EffectSsBlastParams initParams;
 
     Math_Vec3f_Copy(&initParams.pos, pos);
@@ -327,7 +327,7 @@ void EffectSsBlast_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* ac
     Color_RGBA8_Copy(&initParams.envColor, envColor);
     initParams.scale = scale;
     initParams.scaleStep = scaleStep;
-    initParams.sclaeStepDecay = sclaeStepDecay;
+    initParams.scaleStepDecay = scaleStepDecay;
     initParams.life = life;
 
     EffectSs_Spawn(play, EFFECT_SS_BLAST, 128, &initParams);
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index d5c88e7c5..2d56bb9a0 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -14,7 +14,7 @@ typedef struct {
     /* 0x01 */ u8 flags1;
     /* 0x02 */ u8 flags2;
     /* 0x03 */ u8 flags3;
-} RestrictionFlags;
+} RestrictionFlags; // size = 0x4
 
 static RestrictionFlags sRestrictionFlags[] = {
     { SCENE_SPOT00, 0x00, 0x00, 0x10 },
@@ -2169,7 +2169,7 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) {
     // clang-format off
     if (amount > 0) { Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
                                              &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
-    } else if (gSaveContext.doubleDefense && (amount < 0)) {
+    } else if (gSaveContext.isDoubleDefenseAcquired && (amount < 0)) {
         amount >>= 1;
         osSyncPrintf("ハート減少半分！！＝%d\n", amount); // "Heart decrease halved!!＝%d"
     }
diff --git a/src/code/z_play.c b/src/code/z_play.c
index cda37e5b8..5cbc42e77 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -206,7 +206,7 @@ void Play_Destroy(GameState* thisx) {
     }
 
     func_80031C3C(&this->actorCtx, this);
-    func_80110990(this);
+    Interface_Destroy(this);
     KaleidoScopeCall_Destroy(this);
     KaleidoManager_Destroy();
     ZeldaArena_Cleanup();
@@ -335,7 +335,7 @@ void Play_Init(GameState* thisx) {
 
     Cutscene_HandleEntranceTriggers(this);
     KaleidoScopeCall_Init(this);
-    func_801109B0(this);
+    Interface_Init(this);
 
     if (gSaveContext.nextDayTime != NEXT_TIME_NONE) {
         if (gSaveContext.nextDayTime == NEXT_TIME_DAY) {
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 4aa722e66..4ce0b5d3a 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -20,7 +20,7 @@ typedef struct {
     /* 0x1E */ u8 isMagicAcquired;
     /* 0x1F */ u8 unk_1F;
     /* 0x20 */ u8 isDoubleMagicAcquired;
-    /* 0x21 */ u8 doubleDefense;
+    /* 0x21 */ u8 isDoubleDefenseAcquired;
     /* 0x22 */ u8 bgsFlag;
     /* 0x23 */ u8 ocarinaGameRoundNum;
     /* 0x24 */ ItemEquips childEquips;
@@ -111,7 +111,7 @@ static SavePlayerData sNewSavePlayerData = {
     false,                                              // isMagicAcquired
     0,                                                  // unk_1F
     false,                                              // isDoubleMagicAcquired
-    0,                                                  // doubleDefense
+    false,                                              // isDoubleDefenseAcquired
     0,                                                  // bgsFlag
     0,                                                  // ocarinaGameRoundNum
     {
@@ -196,7 +196,7 @@ static SavePlayerData sDebugSavePlayerData = {
     true,                                               // isMagicAcquired
     0,                                                  // unk_1F
     false,                                              // isDoubleMagicAcquired
-    0,                                                  // doubleDefense
+    false,                                              // isDoubleDefenseAcquired
     0,                                                  // bgsFlag
     0,                                                  // ocarinaGameRoundNum
     {
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index fb2f482c1..576fd963e 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -16,7 +16,7 @@
 typedef enum {
     /* 0 */ FAIRY_UPGRADE_MAGIC,
     /* 1 */ FAIRY_UPGRADE_DOUBLE_MAGIC,
-    /* 2 */ FAIRY_UPGRADE_HALF_DAMAGE
+    /* 2 */ FAIRY_UPGRADE_DOUBLE_DEFENSE
 } BgDyYoseizoRewardType;
 
 typedef enum {
@@ -240,8 +240,8 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
                     givingReward = true;
                 }
                 break;
-            case FAIRY_UPGRADE_HALF_DAMAGE:
-                if (!gSaveContext.doubleDefense) {
+            case FAIRY_UPGRADE_DOUBLE_DEFENSE:
+                if (!gSaveContext.isDoubleDefenseAcquired) {
                     // "Damage halved"
                     osSyncPrintf(VT_FGCOL(MAGENTA) " ☆☆☆☆☆ ダメージ半減 ☆☆☆☆☆ \n" VT_RST);
                     this->givingSpell = true;
@@ -278,8 +278,8 @@ void BgDyYoseizo_ChooseType(BgDyYoseizo* this, PlayState* play) {
                         play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDoubleMagicCs);
                         gSaveContext.cutsceneTrigger = 1;
                         break;
-                    case FAIRY_UPGRADE_HALF_DAMAGE:
-                        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDoubleDefenceCs);
+                    case FAIRY_UPGRADE_DOUBLE_DEFENSE:
+                        play->csCtx.segment = SEGMENTED_TO_VIRTUAL(gGreatFairyDoubleDefenseCs);
                         gSaveContext.cutsceneTrigger = 1;
                         break;
                 }
@@ -724,8 +724,8 @@ void BgDyYoseizo_Give_Reward(BgDyYoseizo* this, PlayState* play) {
                 gSaveContext.magicLevel = 0;
                 Interface_ChangeAlpha(9);
                 break;
-            case FAIRY_UPGRADE_HALF_DAMAGE:
-                gSaveContext.doubleDefense = true;
+            case FAIRY_UPGRADE_DOUBLE_DEFENSE:
+                gSaveContext.isDoubleDefenseAcquired = true;
                 Interface_ChangeAlpha(9);
                 break;
         }
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
index 071f5046a..3261f10f6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
@@ -51,7 +51,7 @@ u32 EffectSsBlast_Init(PlayState* play, u32 index, EffectSs* this, void* initPar
     this->rAlphaTarget = initParams->primColor.a / initParams->life;
     this->rScale = initParams->scale;
     this->rScaleStep = initParams->scaleStep;
-    this->rScaleStepDecay = initParams->sclaeStepDecay;
+    this->rScaleStepDecay = initParams->scaleStepDecay;
     return 1;
 }
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
index a22d3092d..a5d4c2e0d 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h
@@ -12,7 +12,7 @@ typedef struct {
     /* 0x28 */ Color_RGBA8 envColor;
     /* 0x2C */ s16 scale;
     /* 0x2E */ s16 scaleStep;
-    /* 0x30 */ s16 sclaeStepDecay;
+    /* 0x30 */ s16 scaleStepDecay;
     /* 0x32 */ s16 life;
 } EffectSsBlastParams; // size = 0x34
 
diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
index 2c264d7eb..7610d1c07 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
@@ -23,7 +23,7 @@
 
 u32 EffectSsDust_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);
 void EffectSsDust_Update(PlayState* play, u32 index, EffectSs* this);
-void EffectSsBlast_UpdateFire(PlayState* play, u32 index, EffectSs* this);
+void EffectSsDust_UpdateFire(PlayState* play, u32 index, EffectSs* this);
 void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this);
 
 EffectSsInit Effect_Ss_Dust_InitVars = {
@@ -33,7 +33,7 @@ EffectSsInit Effect_Ss_Dust_InitVars = {
 
 static EffectSsUpdateFunc sUpdateFuncs[] = {
     EffectSsDust_Update,
-    EffectSsBlast_UpdateFire,
+    EffectSsDust_UpdateFire,
 };
 
 u32 EffectSsDust_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) {
@@ -146,7 +146,7 @@ void EffectSsDust_Update(PlayState* play, u32 index, EffectSs* this) {
 }
 
 // this update mode is unused in the original game
-void EffectSsBlast_UpdateFire(PlayState* play, u32 index, EffectSs* this) {
+void EffectSsDust_UpdateFire(PlayState* play, u32 index, EffectSs* this) {
     this->accel.x = (Rand_ZeroOne() * 0.4f) - 0.2f;
     this->accel.z = (Rand_ZeroOne() * 0.4f) - 0.2f;