From f9cfcde6274fc8a9678ead05616ae5587630b6f2 Mon Sep 17 00:00:00 2001
From: Kenix3 <kenixwhisperwind@gmail.com>
Date: Thu, 4 May 2023 23:56:57 -0400
Subject: Lus updates (#2835)

* Changes for LUS renames in ResourceManager and Archive.

* Moves WriteSaveFile and ReadSaveFile to SaveManager.

* Removes ImGui namespace.

* Bump LUS

* Updates gitignore for intellij projects.

* Controller usage is now up to date with newest LUS.

* Adapters for removal of Controller.WriteToSource from LUS.

* Uses correct capitalization on Controller.GetProfile()

* Bump LUS

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
---
 soh/src/code/padmgr.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index cfc0c05b5..ac0bfc2c6 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -11,8 +11,6 @@ extern void* __cdecl memset(_Out_writes_bytes_all_(_Size) void* _Dst, _In_ int _
 
 s32 D_8012D280 = 1;
 
-static ControllerCallback controllerCallback;
-
 OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padMgr) {
     OSMesgQueue* ctrlrQ = NULL;
 
@@ -296,25 +294,27 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
         input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y);
     }
 
-    controllerCallback.rumble = (padMgr->rumbleEnable[0] > 0);
+    uint8_t rumble = (padMgr->rumbleEnable[0] > 0);
+    uint8_t ledColor = 1;
 
     if (HealthMeter_IsCritical()) {
-        controllerCallback.ledColor = 0;
+        ledColor = 0;
     } else if (gPlayState) {
         switch (CUR_EQUIP_VALUE(EQUIP_TUNIC) - 1) {
             case PLAYER_TUNIC_KOKIRI:
-                controllerCallback.ledColor = 1;
+                ledColor = 1;
                 break;
             case PLAYER_TUNIC_GORON:
-                controllerCallback.ledColor = 2;
+                ledColor = 2;
                 break;
             case PLAYER_TUNIC_ZORA:
-                controllerCallback.ledColor = 3;
+                ledColor = 3;
                 break;
         }
     }
 
-    OTRControllerCallback(&controllerCallback);
+    OTRControllerCallback(rumble, ledColor);
+
     if (CVarGetInteger("gPauseBufferBlockInputFrame", 0)) {
         Controller_BlockGameInput();
     } else {
-- 
cgit v1.2.3