build soh with LUS 1.0.0 (#2881)

* Bump LUS

* Ship -> LUS namespace change

* z_scene_otr Ship -> LUS namespace

* Starting to get SoH to build with LUS imgui changes.

* start stuff

* gamecontroleditor build issues resolved maybe

* cosmetics editor and what not

* console

* actor viewer

* more stuff

* more stuff

* on to errors that make sense

* putting this down for a bit

* no idea what these errors mean now

* some kind of progress maybe

* latest lus main

* more

* back to linker errors and being lost

* Fixes command function signature.

* More fixes

* Even more fixes

* Bump LUS

* More Fixes.

* Fixes even more errors.

* lus bump

* input editor as var

* audio editor working

* it builds with this

* bump lus

* it opens

* bump lus to latest main again

* make sure to do all the command registering in debugconsole

* lus and what not

* switch type stuff plz

* undo

* do the thing that fixes the thing

* fix mac?

* correctly show/hide menubar on boot

* bump lus

* input blocking updates

* bump lus

* Bump LUS

* Press F1 to open enhancement menus moved to SoH

* lus and rendering backend stuff

* audio backend and lus

* Bump LUS

* Fixes WindowBackend dropdown

* Bump LUS

* misc -> utils and moves binarytools to utils.

* Window refactor

* bump lus

* make it work

* Fixes for moved files again

* Bump LUS

* Mercury -> Config

* Bump LUS

* Reacts to removed LUS hooks and bump LUS

* Remove Hook: GfxInit

* Removes debug audio_setgamevolume to 1

* use non-crashing branch of lus

* fix: make audio init work without hooks

* game icon stuff

* multifix bmp

* use input viewer class branch for now

* just "Ship" it's cleaner

* Bump LUS

* Removed ExitGame hook.

* Bump LUS

* Hook system removed from LUS.

* More LUS updates

* Changes to make window position saving.

* Bump LUS

* Bump LUS (for real)

* LUS resources now return a specialized pointer.

* Bump LUS

* Fixes issue in SetPathways::GetPointerSize

* Bump LUS to 1.0.0

* builds but crashes

* fix crash

* better macro names in debug console

* remove commeted out line

* remove redundant check tracker settings window logic

* remove commented out line

* move the *

* remove extra seqplayers enum def

* this sneaky little guy was hiding behind a wii u ifdef

* remove extra check tracker header

---------

Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
Co-authored-by: briaguya <briaguya@alice>

8 files changed, 18 insertions, 13 deletions

diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c
index 35c21ab95..d9b215d07 100644
--- a/soh/src/code/audioMgr.c
+++ b/soh/src/code/audioMgr.c
@@ -84,7 +84,7 @@ void AudioMgr_Unlock(AudioMgr* audioMgr) {
 }
 
 void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) {
-    AudioPlayer_Init();
+    // AudioPlayer_Init();
 
     memset(audioMgr,0, sizeof(AudioMgr));
 
@@ -108,7 +108,12 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedCon
         AudioLoad_SetDmaHandler(DmaMgr_DmaHandler);
         Audio_InitSound();
         osSendMesgPtr(&audioMgr->unk_C8, NULL, OS_MESG_BLOCK);
-        Hooks_ExecuteAudioInit();
+        
+        Audio_SetGameVolume(SEQ_PLAYER_BGM_MAIN, CVarGetFloat("gMainMusicVolume", 1.0f));
+        Audio_SetGameVolume(SEQ_PLAYER_BGM_SUB, CVarGetFloat("gSubMusicVolume", 1.0f));
+        Audio_SetGameVolume(SEQ_PLAYER_FANFARE, CVarGetFloat("gFanfareVolume", 1.0f));
+        Audio_SetGameVolume(SEQ_PLAYER_SFX, CVarGetFloat("gSFXMusicVolume", 1.0f));
+
         // Removed due to crash
         //IrqMgr_AddClient(audioMgr->irqMgr, &irqClient, &audioMgr->unk_74);
         hasInitialized = true;
diff --git a/soh/src/code/game.c b/soh/src/code/game.c
index 26b26e94c..09e35ea0f 100644
--- a/soh/src/code/game.c
+++ b/soh/src/code/game.c
@@ -466,7 +466,7 @@ void GameState_Destroy(GameState* gameState) {
     ResourceMgr_ClearSkeletons();
 
     if (CVarGetInteger("gAltAssets", 0)) {
-        UnloadResourceDirectory("alt/*");
+        ResourceUnloadDirectory("alt/*");
         gfx_texture_cache_clear();
     }
 }
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 4271955f2..00d55abdb 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include "soh/Enhancements/gameconsole.h"
-#include "soh/Enhancements/debugger/debugger.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
@@ -279,7 +278,6 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
 
     GameState_ReqPadData(gameState);
     GameState_Update(gameState);
-    Debug_Draw();
 
     OPEN_DISPS(gfxCtx);
 
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index d98d23e4a..81227f11e 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -209,6 +209,7 @@ void PadMgr_RumbleSet(PadMgr* padMgr, u8* ctrlrRumbles) {
     padMgr->rumbleOnFrames = 240;
 }
 
+#define PAUSE_BUFFER_INPUT_BLOCK_ID 0
 void PadMgr_ProcessInputs(PadMgr* padMgr) {
     s32 i;
     Input* input;
@@ -298,9 +299,9 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
     OTRControllerCallback(rumble);
 
     if (CVarGetInteger("gPauseBufferBlockInputFrame", 0)) {
-        Controller_BlockGameInput();
+        ControllerBlockGameInput(PAUSE_BUFFER_INPUT_BLOCK_ID);
     } else {
-        Controller_UnblockGameInput();
+        ControllerUnblockGameInput(PAUSE_BUFFER_INPUT_BLOCK_ID);
     }
 
     PadMgr_UnlockPadData(padMgr);
diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c
index 0c267af62..5b23d6ed1 100644
--- a/soh/src/code/z_map_exp.c
+++ b/soh/src/code/z_map_exp.c
@@ -413,7 +413,7 @@ void Map_InitData(PlayState* play, s16 room) {
                                 //gMapData->owMinimapTexSize[mapIndex], __FILE__, __LINE__);
 
             if (sEntranceIconMapIndex < 24) {
-                play->interfaceCtx.mapSegment[0] = GetResourceDataByName(minimapTableOW[sEntranceIconMapIndex]);
+                play->interfaceCtx.mapSegment[0] = ResourceGetDataByName(minimapTableOW[sEntranceIconMapIndex]);
                 play->interfaceCtx.mapSegmentName[0] = minimapTableOW[sEntranceIconMapIndex];
             }
 
@@ -447,7 +447,7 @@ void Map_InitData(PlayState* play, s16 room) {
                                     //((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * 0xFF0),
                                 //0xFF0, __FILE__, __LINE__);
 
-            play->interfaceCtx.mapSegment[0] = GetResourceDataByName(
+            play->interfaceCtx.mapSegment[0] = ResourceGetDataByName(
                     minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]);
             play->interfaceCtx.mapSegmentName[0] = minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room];
             R_COMPASS_OFFSET_X = gMapData->roomCompassOffsetX[mapIndex][room];
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 032191795..b76555b06 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -4,13 +4,14 @@
 #include <string.h>
 
 #include "soh/Enhancements/gameconsole.h"
-#include <ImGuiImpl.h>
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/debugconsole.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include <overlays/actors/ovl_En_Niw/z_en_niw.h>
 
+#include <libultraship/libultraship.h>
+
 #include <time.h>
 
 void* D_8012D1F0 = NULL;
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index 262ac3e91..cb856b870 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -332,8 +332,8 @@ void Player_SetBootData(PlayState* play, Player* this) {
 
 // Custom method used to determine if we're using a custom model for link
 uint8_t Player_IsCustomLinkModel() {
-    return (LINK_IS_ADULT && GetResourceIsCustomByName(gLinkAdultSkel)) ||
-           (LINK_IS_CHILD && GetResourceIsCustomByName(gLinkChildSkel));
+    return (LINK_IS_ADULT && ResourceGetIsCustomByName(gLinkAdultSkel)) ||
+           (LINK_IS_CHILD && ResourceGetIsCustomByName(gLinkChildSkel));
 }
 
 s32 Player_InBlockingCsMode(PlayState* play, Player* this) {
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index 3d5acfe40..1d4b610c5 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -273,7 +273,7 @@ void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 h
     bg->b.imageFlip = 0;
 
     if (ResourceMgr_ResourceIsBackground((char*) source)) {
-        char* blob = (char*) GetResourceDataByName((char *) source);
+        char* blob = (char*) ResourceGetDataByName((char *) source);
         swapAndConvertJPEG(blob);
         bg->b.imagePtr = (uintptr_t) blob;
     }