diff --git a/assets/objects/gameplay_keep/gameplay_keep.h b/assets/objects/gameplay_keep/gameplay_keep.h index b3cd325f0c..3419f25678 100644 --- a/assets/objects/gameplay_keep/gameplay_keep.h +++ b/assets/objects/gameplay_keep/gameplay_keep.h @@ -1,6 +1,8 @@ #ifndef GAMEPLAY_KEEP_H #define GAMEPLAY_KEEP_H +#include "versions.h" + #include "hilite_textures.h" #include "link_textures.h" #include "player_pause_joint_tables.h" @@ -17,13 +19,13 @@ #include "eff_fragments_1.h" #include "boomerang.h" #include "compass_arrow.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0xC880.h" #endif #include "lock_on_arrow.h" #include "hilite3_tex.h" #include "eff_fragments_2_model.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0xCE60.h" #endif #include "shopkeeper_controls_tex.h" @@ -71,7 +73,7 @@ #include "hover_boots_circle.h" #include "moon.h" #include "gameplay_keep_0x38FB0.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0x39850.h" #include "unused_bomb_icon_model_ntsc.h" #include "unused_heart_icon_model_ntsc.h" @@ -94,28 +96,28 @@ #include "gameplay_keep_0x3AC30.h" #include "heart_piece_interior_model.h" #include "gameplay_keep_0x3B1E0.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0x3C610.h" #include "unused_heart_container_icon_model_ntsc.h" #endif #include "rectangular_sign_model.h" #include "directional_sign_model.h" #include "gameplay_keep_0x3C870.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0x3FD80.h" #endif #include "drop_recovery_heart_tex.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "unused_heart_piece_icon_tex_ntsc.h" #endif #include "item_drop_dl.h" #include "gameplay_keep_0x3F140.h" #include "rupee.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "item_drops_ntsc.h" #endif #include "rupee_light_red_tex.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #include "gameplay_keep_ntsc_0x46A40.h" #endif #include "gameplay_keep_0x42530.h" diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h index 7afb06908a..cfd97d12f4 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h +++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_NTSC_0x39850_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gameplay_keep_Vtx_039850[]; extern Gfx gGameplayKeepDL_39890[27]; #endif diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h index 51465e8b1c..a609e67690 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h +++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_NTSC_0x3C610_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gameplay_keep_Vtx_03C610[]; extern Vtx gameplay_keep_Vtx_03CB10[]; extern Gfx gGameplayKeepDL_3CFD0[39]; diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h index d9cadcb861..fd7b4e43db 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h +++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.h @@ -3,9 +3,9 @@ #include "tex_len.h" #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #define gUnusedBombchuIconTex_WIDTH 32 #define gUnusedBombchuIconTex_HEIGHT 32 extern u64 gUnusedBombchuIconTex[TEX_LEN(u64, gUnusedBombchuIconTex_WIDTH, gUnusedBombchuIconTex_HEIGHT, 16)]; diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h index 1d265d2953..795fc446f6 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h +++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_NTSC_0xC880 #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gameplay_keep_Vtx_00C880[]; extern Gfx gGameplayKeepDL_C8B0[14]; #endif diff --git a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h index a1b1f276d4..24fbaffb87 100644 --- a/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h +++ b/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.h @@ -3,9 +3,9 @@ #include "tex_len.h" #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #define gGameplayKeepTex_CE60_WIDTH 32 #define gGameplayKeepTex_CE60_HEIGHT 32 extern u64 gGameplayKeepTex_CE60[TEX_LEN(u64, gGameplayKeepTex_CE60_WIDTH, gGameplayKeepTex_CE60_HEIGHT, 8)]; diff --git a/assets/objects/gameplay_keep/item_drops_ntsc.h b/assets/objects/gameplay_keep/item_drops_ntsc.h index 15e90e0809..d802ceed9a 100644 --- a/assets/objects/gameplay_keep/item_drops_ntsc.h +++ b/assets/objects/gameplay_keep/item_drops_ntsc.h @@ -3,9 +3,9 @@ #include "tex_len.h" #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #define gUnusedHeartIconTex_WIDTH 32 #define gUnusedHeartIconTex_HEIGHT 32 extern u64 gUnusedHeartIconTex[TEX_LEN(u64, gUnusedHeartIconTex_WIDTH, gUnusedHeartIconTex_HEIGHT, 16)]; diff --git a/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h index 3a98bdfc86..2211d18258 100644 --- a/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h +++ b/assets/objects/gameplay_keep/unused_arrow_icon_model_ntsc.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_UNUSED_ARROW_ICON_MODEL_NTSC_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gUnusedArrowIconVtx[]; extern Gfx gUnusedArrowIconDL[17]; #endif diff --git a/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h index c811b1c727..31550f70e0 100644 --- a/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h +++ b/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_UNUSED_BOMB_ICON_MODEL_NTSC_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gUnusedBombIconVtx[]; extern Gfx gUnusedBombIconDL[17]; #endif diff --git a/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h index 4bc380b34a..df2c08bed8 100644 --- a/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h +++ b/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_UNUSED_HEART_CONTAINER_ICON_MODEL_NTSC_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gUnusedHeartContainerIconVtx[]; extern Gfx gUnusedHeartContainerIconDL[17]; #endif diff --git a/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h index 657a8f24ba..b54bf94aca 100644 --- a/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h +++ b/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.h @@ -2,9 +2,9 @@ #define GAMEPLAY_KEEP_UNUSED_HEART_ICON_MODEL_NTSC_H #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC extern Vtx gUnusedHeartIconVtx[]; extern Gfx gUnusedHeartIconDL[17]; #endif diff --git a/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h index ed4e24f0b2..2ff4073f0b 100644 --- a/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h +++ b/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.h @@ -3,9 +3,9 @@ #include "tex_len.h" #include "ultra64.h" -#include "region.h" +#include "versions.h" -#if OOT_REGION != REGION_EU +#if OOT_NTSC #define gUnusedHeartPieceIconTex_WIDTH 32 #define gUnusedHeartPieceIconTex_HEIGHT 32 extern u64 gUnusedHeartPieceIconTex[TEX_LEN(u64, gUnusedHeartPieceIconTex_WIDTH, gUnusedHeartPieceIconTex_HEIGHT, 16)]; diff --git a/spec/spec b/spec/spec index bb90b4ef15..d4615737fb 100644 --- a/spec/spec +++ b/spec/spec @@ -3,7 +3,6 @@ */ #include "include/versions.h" -#include "include/region.h" beginseg name "makerom" @@ -1013,13 +1012,13 @@ beginseg include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_1.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/boomerang.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/compass_arrow.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xC880.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/lock_on_arrow.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/hilite3_tex.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_fragments_2_model.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0xCE60.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/shopkeeper_controls_tex.o" @@ -1068,7 +1067,7 @@ beginseg include "$(BUILD_DIR)/assets/objects/gameplay_keep/hover_boots_circle.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/moon.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x38FB0.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x39850.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_bomb_icon_model_ntsc.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_icon_model_ntsc.o" @@ -1091,28 +1090,28 @@ beginseg include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3AC30.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/heart_piece_interior_model.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3B1E0.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3C610.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_container_icon_model_ntsc.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/rectangular_sign_model.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/directional_sign_model.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3C870.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x3FD80.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/drop_recovery_heart_tex.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/unused_heart_piece_icon_tex_ntsc.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drop_dl.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x3F140.o" include "$(BUILD_DIR)/assets/objects/gameplay_keep/rupee.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/item_drops_ntsc.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/rupee_light_red_tex.o" -#if OOT_REGION != REGION_EU +#if OOT_NTSC include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_ntsc_0x46A40.o" #endif include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x42530.o" diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index bfdad84ef8..5d5b4b5d8f 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -32,7 +32,7 @@ #include "assets/objects/gameplay_keep/gameplay_keep.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:0 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" + "ique-cn:0 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:128 pal-1.1:128" #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \