From 9efa2f329f3a012ea04deaf516d60eab849b1e0f Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sun, 19 May 2024 20:30:18 -0400 Subject: [PATCH] Move strings to header. --- mm/assets/2s2h_assets.h | 6 ++++++ .../gamestates/ovl_file_choose/z_file_choose_NES.c | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mm/assets/2s2h_assets.h b/mm/assets/2s2h_assets.h index e71ebb8f4..e51647c4e 100644 --- a/mm/assets/2s2h_assets.h +++ b/mm/assets/2s2h_assets.h @@ -73,3 +73,9 @@ static const ALIGN_ASSET(2) char gPauseSaveConfirmationENGTex[] = dgPauseSaveCon #define dgContinuePlayingENGTex "__OTR__textures/icon_item_static/gContinuePlayingENGTex" static const ALIGN_ASSET(2) char gContinuePlayingENGTex[] = dgContinuePlayingENGTex; + +#define dgFileSelFourthDayTex "__OTR__misc/title_static/gFileSelFourthDayTex" +static const ALIGN_ASSET(2) char gFileSelFourthDayTex[] = dgFileSelFourthDayTex; + +#define dgFileSelCheatingDayTex "__OTR__misc/title_static/gFileSelCheatingDayTex" +static const ALIGN_ASSET(2) char gFileSelCheatingDayTex[] = dgFileSelCheatingDayTex; diff --git a/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c b/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c index 30af80450..8db81594d 100644 --- a/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c +++ b/mm/src/overlays/gamestates/ovl_file_choose/z_file_choose_NES.c @@ -13,6 +13,7 @@ #include "interface/parameter_static/parameter_static.h" #include "misc/title_static/title_static.h" #include "2s2h/Enhancements/FrameInterpolation/FrameInterpolation.h" +#include "2s2h_assets.h" #include s32 D_808144F10 = 100; @@ -1315,12 +1316,6 @@ u16 D_80814654[] = { 0x2A0, }; -#define dgFileSelFourthDayTex "__OTR__misc/title_static/gFileSelFourthDayTex" -static const ALIGN_ASSET(2) char gFileSelFourthDayTex[] = dgFileSelFourthDayTex; - -#define dgFileSelCheatingDayTex "__OTR__misc/title_static/gFileSelCheatingDayTex" -static const ALIGN_ASSET(2) char gFileSelCheatinghDayTex[] = dgFileSelCheatingDayTex; - TexturePtr sFileSelRemainsTextures[] = { gFileSelOdolwasRemainsTex, gFileSelGohtsRemainsTex, @@ -1337,7 +1332,7 @@ TexturePtr sFileSelDayENGTextures[] = { gFileSelSecondDayENGTex, gFileSelFinalDayENGTex, gFileSelFourthDayTex, - gFileSelCheatinghDayTex, + gFileSelCheatingDayTex, }; TexturePtr sFileSelHeartPieceTextures[] = {