diff options
| author | Christopher Leggett <chris@leggett.dev> | 2023-05-03 23:00:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 23:00:45 -0400 |
| commit | 071a2d0418d6fb7464a1ddccd2b647683da38eff (patch) | |
| tree | c433e99bdf8e8b398a0c0a1eb2a07bcc5dd61cc0 /soh/src/code/z_parameter.c | |
| parent | 3f896f126ff7f36dff8afc2459104ff1adab548b (diff) | |
| parent | c02dcb598ad6132b4aa5a44aec64a80cea3da269 (diff) | |
Merge pull request #2826 from HarbourMasters/develop-spock
Spock -> Develop
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8198caebf..954ce1190 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" @@ -2270,6 +2271,7 @@ u8 Item_Give(PlayState* play, u8 item) { } gSaveContext.inventory.items[temp + i] = item; + break; } } } else { @@ -5219,7 +5221,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, |