From e8e1763d3db6f77c072c54aefc80aa30b185de7c Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Mon, 26 May 2025 15:02:14 +0200 Subject: [PATCH] make NTSC compatible --- assets/textures/icon_item_static/icon_item_static.c | 5 ++--- assets/textures/icon_item_static/icon_item_static.h | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/textures/icon_item_static/icon_item_static.c b/assets/textures/icon_item_static/icon_item_static.c index ba830c3c28..20123ed027 100644 --- a/assets/textures/icon_item_static/icon_item_static.c +++ b/assets/textures/icon_item_static/icon_item_static.c @@ -415,6 +415,7 @@ u64 gPauseMap20Tex[TEX_LEN(u64, gPauseMap20Tex_WIDTH, gPauseMap20Tex_HEIGHT, 8)] #include "assets/textures/icon_item_static/gPauseMap20Tex.ia8.inc.c" }; +#if OOT_PAL u64 gPauseQuestStatus00Tex[TEX_LEN(u64, gPauseQuestStatus00Tex_WIDTH, gPauseQuestStatus00Tex_HEIGHT, 8)] = { #include "assets/textures/icon_item_static/gPauseQuestStatus00Tex.ia8.inc.c" }; @@ -422,6 +423,7 @@ u64 gPauseQuestStatus00Tex[TEX_LEN(u64, gPauseQuestStatus00Tex_WIDTH, gPauseQues u64 gPauseQuestStatus20Tex[TEX_LEN(u64, gPauseQuestStatus20Tex_WIDTH, gPauseQuestStatus20Tex_HEIGHT, 8)] = { #include "assets/textures/icon_item_static/gPauseQuestStatus20Tex.ia8.inc.c" }; +#endif u64 gPauseSave00Tex[TEX_LEN(u64, gPauseSave00Tex_WIDTH, gPauseSave00Tex_HEIGHT, 8)] = { #include "assets/textures/icon_item_static/gPauseSave00Tex.ia8.inc.c" @@ -746,6 +748,3 @@ Gfx gPromptCursorLeftDL[10] = { Gfx gPromptCursorRightDL[10] = { #include "assets/textures/icon_item_static/gPromptCursorRightDL.inc.c" }; - -u8 icon_item_static_zeros_089C98[8] = { 0 }; - diff --git a/assets/textures/icon_item_static/icon_item_static.h b/assets/textures/icon_item_static/icon_item_static.h index ffd540f902..20518fe9a5 100644 --- a/assets/textures/icon_item_static/icon_item_static.h +++ b/assets/textures/icon_item_static/icon_item_static.h @@ -3,6 +3,7 @@ #include "tex_len.h" #include "ultra64.h" +#include "versions.h" #define gItemIconDekuStickTex_WIDTH 32 #define gItemIconDekuStickTex_HEIGHT 32 @@ -313,12 +314,14 @@ extern u64 gPauseMap00Tex[TEX_LEN(u64, gPauseMap00Tex_WIDTH, gPauseMap00Tex_HEIG #define gPauseMap20Tex_WIDTH 80 #define gPauseMap20Tex_HEIGHT 32 extern u64 gPauseMap20Tex[TEX_LEN(u64, gPauseMap20Tex_WIDTH, gPauseMap20Tex_HEIGHT, 8)]; +#if OOT_PAL #define gPauseQuestStatus00Tex_WIDTH 80 #define gPauseQuestStatus00Tex_HEIGHT 32 extern u64 gPauseQuestStatus00Tex[TEX_LEN(u64, gPauseQuestStatus00Tex_WIDTH, gPauseQuestStatus00Tex_HEIGHT, 8)]; #define gPauseQuestStatus20Tex_WIDTH 80 #define gPauseQuestStatus20Tex_HEIGHT 32 extern u64 gPauseQuestStatus20Tex[TEX_LEN(u64, gPauseQuestStatus20Tex_WIDTH, gPauseQuestStatus20Tex_HEIGHT, 8)]; +#endif #define gPauseSave00Tex_WIDTH 80 #define gPauseSave00Tex_HEIGHT 32 extern u64 gPauseSave00Tex[TEX_LEN(u64, gPauseSave00Tex_WIDTH, gPauseSave00Tex_HEIGHT, 8)];