[ntsc-1.0/1.1] Match audio and loose ends (#2293)

* Match ntsc-1.0/1.1 loose ends

* Revert audioseq_padding

* Fix spelling

src/code/z_scene_table.c

@@ -1190,7 +1190,13 @@ void Scene_DrawConfigKokiriForest(PlayState* play) {
         spA3 = 255 - (u8)play->roomCtx.drawParams[0];
     } else if (gSaveContext.sceneLayer == 6) {
         spA0 = play->roomCtx.drawParams[0] + 500;
-    } else if ((!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07)) {
+    } else if (
+#if OOT_VERSION < PAL_1_0
+        !IS_CUTSCENE_LAYER && GET_EVENTCHKINF(EVENTCHKINF_07)
+#else
+        (!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07)
+#endif
+    ) {
         spA0 = 2150;
     }
 

src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_en_ice.h"
+#include "versions.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rLifespan regs[0]
@@ -133,9 +134,9 @@ void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this) {
 }
 
 void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
-    s16 rand;
-
+#if OOT_VERSION >= NTSC_1_1
     if ((this->actor != NULL) && (this->actor->update != NULL)) {
+#endif
         if ((this->life >= 9) && (this->actor->colorFilterTimer != 0) && !(this->actor->colorFilterParams & 0xC000)) {
             this->pos.x = this->actor->world.pos.x + this->vec.x;
             this->pos.y = this->actor->world.pos.y + this->vec.y;
@@ -147,9 +148,11 @@ void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
             this->accel.y = -1.5f;
             this->velocity.y = 5.0f;
         }
+#if OOT_VERSION >= NTSC_1_1
     } else {
         if (this->life >= 9) {
-            rand = Rand_CenteredFloat(65535.0f);
+            s16 rand = Rand_CenteredFloat(65535.0f);
+
             this->accel.x = Math_SinS(rand) * (Rand_ZeroOne() + 1.0f);
             this->accel.z = Math_CosS(rand) * (Rand_ZeroOne() + 1.0f);
             this->life = 8;
@@ -157,6 +160,7 @@ void EffectSsEnIce_UpdateFlying(PlayState* play, u32 index, EffectSs* this) {
             this->velocity.y = 5.0f;
         }
     }
+#endif
 }
 
 void EffectSsEnIce_Update(PlayState* play, u32 index, EffectSs* this) {

src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c

@@ -5,6 +5,7 @@
  */
 
 #include "z_eff_ss_kakera.h"
+#include "versions.h"
 
 #define rReg0 regs[0]
 #define rGravity regs[1]
@@ -54,7 +55,11 @@ u32 EffectSsKakera_Init(PlayState* play, u32 index, EffectSs* this, void* initPa
 
     } else {
         PRINTF("shape_modelがNULL\n");
+#if OOT_VERSION < NTSC_1_1
+        LogUtils_HungupThread("../z_eff_kakera.c", 175);
+#else
         LogUtils_HungupThread("../z_eff_kakera.c", 178);
+#endif
     }
 
     this->draw = EffectSsKakera_Draw;