From c3c97f207f32ff9cb89f3b09b84dab946f9a0ed8 Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Wed, 3 May 2023 20:58:41 -0400 Subject: Fix: add header to align soh.otr file assets and fix asset crash for Mac (#2819) * add header for aligned assets for soh files * remove debug statements * update more string asset usage to aligned vars --- soh/src/code/z_parameter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'soh/src/code/z_parameter.c') diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8198caebf..8f3683d41 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -3,6 +3,7 @@ #include "textures/parameter_static/parameter_static.h" #include "textures/do_action_static/do_action_static.h" #include "textures/icon_item_static/icon_item_static.h" +#include "soh_assets.h" #include "soh/Enhancements/randomizer/adult_trade_shuffle.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" #include "libultraship/bridge.h" @@ -5219,7 +5220,7 @@ void Interface_Draw(PlayState* play) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, dPadColor.r, dPadColor.g, dPadColor.b, dpadAlpha); if (fullUi) { - gDPLoadTextureBlock(OVERLAY_DISP++, "__OTR__textures/parameter_static/gDPad", + gDPLoadTextureBlock(OVERLAY_DISP++, gDPadTex, G_IM_FMT_IA, G_IM_SIZ_16b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSPWideTextureRectangle(OVERLAY_DISP++, DpadPosX << 2, DpadPosY << 2, -- cgit v1.2.3 From f9a696e9bdbfb94e9afd2ae8989da1fd9e01caaa Mon Sep 17 00:00:00 2001 From: Adam Bird Date: Wed, 3 May 2023 21:26:03 -0400 Subject: add back missing early break/return for bottle filling (#2817) --- soh/src/code/z_parameter.c | 1 + 1 file changed, 1 insertion(+) (limited to 'soh/src/code/z_parameter.c') diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8f3683d41..954ce1190 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2271,6 +2271,7 @@ u8 Item_Give(PlayState* play, u8 item) { } gSaveContext.inventory.items[temp + i] = item; + break; } } } else { -- cgit v1.2.3