mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-13 15:08:03 -05:00
Code Issues Projects Releases Wiki Activity

Change cursor sound and add files to build system

Browse Source
This commit is contained in:
lilDavid 2022-08-06 15:01:35 -05:00
parent f41b939a71
commit 8ee597298c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/CMakeLists.txt
View File

@ -124,6 +124,7 @@ set(Header_Files__include
"include/vt.h" "include/vt.h"
"include/z64.h" "include/z64.h"
"include/z64actor.h" "include/z64actor.h"
"include/z64adult_trade_shuffle.h"
"include/z64animation.h" "include/z64animation.h"
"include/z64audio.h" "include/z64audio.h"
"include/z64bgcheck.h" "include/z64bgcheck.h"
@ -424,6 +425,7 @@ set(Source_Files__src__code
"src/code/ucode_disas.c" "src/code/ucode_disas.c"
"src/code/z_actor.c" "src/code/z_actor.c"
"src/code/z_actor_dlftbls.c" "src/code/z_actor_dlftbls.c"
"src/code/z_adult_trade_shuffle.c"
"src/code/z_bgcheck.c" "src/code/z_bgcheck.c"
"src/code/z_camera.c" "src/code/z_camera.c"
"src/code/z_cheap_proc.c" "src/code/z_cheap_proc.c"

5
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -1,6 +1,7 @@
#include "z_kaleido_scope.h" #include "z_kaleido_scope.h"
#include "textures/parameter_static/parameter_static.h" #include "textures/parameter_static/parameter_static.h"
#include "z64adult_trade_shuffle.h" #include "z64adult_trade_shuffle.h"
#include "soh/Enhancements/randomizer/randomizerTypes.h"
u8 gAmmoItems[] = { u8 gAmmoItems[] = {
ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE, ITEM_STICK, ITEM_NUT, ITEM_BOMB, ITEM_BOW, ITEM_NONE, ITEM_NONE, ITEM_SLINGSHOT, ITEM_NONE,
@ -396,11 +397,11 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
pauseCtx->cursorColorSet = 8; pauseCtx->cursorColorSet = 8;
if (((pauseCtx->stickRelX > 30 || pauseCtx->stickRelY > 30) || if (((pauseCtx->stickRelX > 30 || pauseCtx->stickRelY > 30) ||
dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT | BTN_DUP))) { dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT | BTN_DUP))) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Inventory_ReplaceItem(globalCtx, INV_CONTENT(ITEM_TRADE_ADULT), Randomizer_GetNextAdultTradeItem()); Inventory_ReplaceItem(globalCtx, INV_CONTENT(ITEM_TRADE_ADULT), Randomizer_GetNextAdultTradeItem());
} else if (((pauseCtx->stickRelX < -30 || pauseCtx->stickRelY < -30) || } else if (((pauseCtx->stickRelX < -30 || pauseCtx->stickRelY < -30) ||
dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DDOWN))) { dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DDOWN))) {
Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); Audio_PlaySoundGeneral(NA_SE_SY_CURSOR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
Inventory_ReplaceItem(globalCtx, INV_CONTENT(ITEM_TRADE_ADULT), Randomizer_GetPrevAdultTradeItem()); Inventory_ReplaceItem(globalCtx, INV_CONTENT(ITEM_TRADE_ADULT), Randomizer_GetPrevAdultTradeItem());
} }
gSelectingAdultTrade = cursorSlot == SLOT_TRADE_ADULT; gSelectingAdultTrade = cursorSlot == SLOT_TRADE_ADULT;