diff --git a/assets/audio/sequences/seq_0.prg.seq b/assets/audio/sequences/seq_0.prg.seq index e2e51f5b7e..602ed791c6 100644 --- a/assets/audio/sequences/seq_0.prg.seq +++ b/assets/audio/sequences/seq_0.prg.seq @@ -2408,7 +2408,11 @@ CHAN_0EDC: .layer LAYER_1029 /* 0x1029 [0xC6 0x2F ] */ instr SF0_INST_47 +#if OOT_VERSION < PAL_1_0 +/* 0x102B [0xCB 0x66 0x4C 0xF0 ] */ env ENVELOPE_664C, 240 +#else /* 0x102B [0xCB 0x66 0x4C 0xFF ] */ env ENVELOPE_664C, 255 +#endif /* 0x102F [0x7E 0x0C 0x6C ] */ notedv PITCH_B5, FRAMERATE_CONST(12, 15), 108 /* 0x1032 [0xFF ] */ end diff --git a/assets/audio/sequences/seq_109.prg.seq b/assets/audio/sequences/seq_109.prg.seq index f4d4247e6a..49b0dfb606 100644 --- a/assets/audio/sequences/seq_109.prg.seq +++ b/assets/audio/sequences/seq_109.prg.seq @@ -603,7 +603,9 @@ LAYER_0452: /* 0x046C [0xE9 0x0E ] */ notepri 0, 14 /* 0x046E [0xE5 0x01 ] */ reverbidx 1 /* 0x0470 [0xD4 0x28 ] */ reverb 40 +#if OOT_VERSION >= PAL_1_0 /* 0x0472 [0xC6 0x00 ] */ font Soundfont_0_ID +#endif /* 0x0474 [0xFC 0x01 0x56 ] */ call CHAN_0156 /* 0x0477 [0xFD 0x60 ] */ delay 96 /* 0x0479 [0xFC 0x01 0x56 ] */ call CHAN_0156 @@ -1147,7 +1149,7 @@ ENVELOPE_08BA: point 20, 20000 hang -#if !OOT_PAL_N64 +#if OOT_VERSION == NTSC_1_2 || PLATFORM_GC .filter FILTER_0932 filter 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/include/z64.h b/include/z64.h index 5779205b38..5154001d2f 100644 --- a/include/z64.h +++ b/include/z64.h @@ -389,12 +389,18 @@ ALIGNED(4) typedef struct PreNmiBuff { } PreNmiBuff; // size = 0x18 (actually osAppNMIBuffer is 0x40 bytes large but the rest is unused) typedef enum ViModeEditState { +#if OOT_VERSION < PAL_1_0 /* -2 */ VI_MODE_EDIT_STATE_NEGATIVE_2 = -2, /* -1 */ VI_MODE_EDIT_STATE_NEGATIVE_1, + /* 0 */ VI_MODE_EDIT_STATE_INACTIVE, + /* 1 */ VI_MODE_EDIT_STATE_2, // active, more adjustments + /* 2 */ VI_MODE_EDIT_STATE_3 // active, more adjustments, print comparison with NTSC LAN1 mode +#else /* 0 */ VI_MODE_EDIT_STATE_INACTIVE, /* 1 */ VI_MODE_EDIT_STATE_ACTIVE, /* 2 */ VI_MODE_EDIT_STATE_2, // active, more adjustments /* 3 */ VI_MODE_EDIT_STATE_3 // active, more adjustments, print comparison with NTSC LAN1 mode +#endif } ViModeEditState; typedef struct ViMode { diff --git a/spec b/spec index 8777bb050a..ffc25c14b5 100644 --- a/spec +++ b/spec @@ -219,7 +219,9 @@ beginseg include "$(BUILD_DIR)/assets/audio/soundfonts/Soundfont_35.o" include "$(BUILD_DIR)/assets/audio/soundfonts/Soundfont_36.o" include "$(BUILD_DIR)/assets/audio/soundfonts/Soundfont_37.o" +#if OOT_VERSION >= PAL_1_0 include "$(BUILD_DIR)/assets/audio/audiobank_padding.o" +#endif endseg beginseg diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index d9e238e759..d8386c6887 100644 --- a/src/code/z_scene_table.c +++ b/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; } diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 5351e864ab..4a2d5a584c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/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) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 27d536e1d0..63088f5cf9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/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;