Fix input being stubbed.

3 files changed, 55 insertions, 47 deletions

diff --git a/mm/src/boot/O2/loadfragment2.c b/mm/src/boot/O2/loadfragment2.c
index 02b3ab218..86c459f9c 100644
--- a/mm/src/boot/O2/loadfragment2.c
+++ b/mm/src/boot/O2/loadfragment2.c
@@ -132,6 +132,8 @@ void Overlay_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlReloc
 }
 
 size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* ramStart, void* ramEnd, void* allocatedRamAddr) {
+    return 0;
+    #if 0
     uintptr_t vramStart = (uintptr_t)ramStart;
     uintptr_t vramEnd = (uintptr_t)ramEnd;
     s32 size = vromEnd - vromStart;
@@ -164,6 +166,7 @@ size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* ramStart, void
     if (gOverlayLogSeverity >= 3) {}
 
     return size;
+    #endif
 }
 
 void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd) {
diff --git a/mm/src/code/padmgr.c b/mm/src/code/padmgr.c
index d77c571fd..09e29eaf5 100644
--- a/mm/src/code/padmgr.c
+++ b/mm/src/code/padmgr.c
@@ -35,9 +35,8 @@
 #include "PR/controller.h"
 #include "PR/os_motor.h"
 #include "fault.h"
-#include "z64voice.h"
 
-extern FaultMgr gFaultMgr;
+//extern FaultMgr gFaultMgr;
 
 #define PADMGR_RETRACE_MSG (1 << 0)
 #define PADMGR_PRE_NMI_MSG (1 << 1)
@@ -172,7 +171,7 @@ OSMesgQueue* PadMgr_VoiceAcquireSerialEventQueue(void) {
  * @see PadMgr_AcquireSerialEventQueue
  */
 void PadMgr_ReleaseSerialEventQueue(OSMesgQueue* serialEventQueue) {
-    osSendMesg(&sPadMgrInstance->serialLockQueue, OS_MESG_PTR(serialEventQueue), OS_MESG_BLOCK);
+    // osSendMesg(&sPadMgrInstance->serialLockQueue, (OSMesg)serialEventQueue, OS_MESG_BLOCK);
 }
 
 /**
@@ -181,7 +180,7 @@ void PadMgr_ReleaseSerialEventQueue(OSMesgQueue* serialEventQueue) {
  * @see PadMgr_VoiceAcquireSerialEventQueue
  */
 void PadMgr_VoiceReleaseSerialEventQueue(OSMesgQueue* serialEventQueue) {
-    osSendMesg(&sPadMgrInstance->serialLockQueue, OS_MESG_PTR(serialEventQueue), OS_MESG_BLOCK);
+    // osSendMesg(&sPadMgrInstance->serialLockQueue, (OSMesg)serialEventQueue, OS_MESG_BLOCK);
 }
 
 /**
@@ -191,7 +190,7 @@ void PadMgr_VoiceReleaseSerialEventQueue(OSMesgQueue* serialEventQueue) {
  * @see PadMgr_UnlockPadData
  */
 void PadMgr_LockPadData(void) {
-    osRecvMesg(&sPadMgrInstance->lockQueue, NULL, OS_MESG_BLOCK);
+    // osRecvMesg(&sPadMgrInstance->lockQueue, NULL, OS_MESG_BLOCK);
 }
 
 /**
@@ -201,7 +200,7 @@ void PadMgr_LockPadData(void) {
  * @see PadMgr_LockPadData
  */
 void PadMgr_UnlockPadData(void) {
-    osSendMesg(&sPadMgrInstance->lockQueue, OS_MESG_PTR(NULL), OS_MESG_BLOCK);
+    // osSendMesg(&sPadMgrInstance->lockQueue, NULL, OS_MESG_BLOCK);
 }
 
 /**
@@ -275,7 +274,7 @@ void PadMgr_UpdateRumble(void) {
                 // No controller pak
             } else {
                 // Unrecognized return code
-                Fault_AddHungupAndCrash("../padmgr.c", 594);
+                // Fault_AddHungupAndCrash("../padmgr.c", 594);
             }
         }
     }
@@ -353,21 +352,20 @@ void PadMgr_AdjustInput(Input* input) {
     f32 angle;
     s8 curX = input->cur.stick_x;
     s8 curY = input->cur.stick_y;
-// BENTODO    
-#if 0
-    if (CHECK_BTN_ANY(input->press.button, BTN_RESET) || (input->press.stick_x == 0)) {
-        input->press.stick_x = 61;
-        input->press.err_no = -61;
-        input->press.stick_y = 63;
-        input->rel.err_no = -63;
-    }
-    #endif
+
+    // BENTODO
+    // if (CHECK_BTN_ANY(input->press.button, BTN_RESET) || (input->press.stick_x == 0)) {
+    //    input->press.stick_x = 61;
+    //    input->press.err_no = -61;
+    //    input->press.stick_y = 63;
+    //    input->rel.err_no = -63;
+    //}
     pressX = input->press.stick_x;
     pressX2 = (s8)input->press.err_no;
     pressY = input->press.stick_y;
     pressY2 = (s8)input->rel.err_no;
-    #if 0
-    if (CHECK_BTN_ANY(input->cur.button, BTN_RESET)) {
+
+    /* if (CHECK_BTN_ANY(input->cur.button, BTN_RESET)) {
         minus = curX - 7;
         plus = curX + 7;
 
@@ -397,8 +395,8 @@ void PadMgr_AdjustInput(Input* input) {
                 input->rel.err_no = plus + 3;
             }
         }
-    }
-    #endif
+    }*/
+
     minus = curX - 7;
     plus = curX + 7;
 
@@ -478,7 +476,7 @@ void PadMgr_UpdateInputs(void) {
 
                 default:
                     // Unknown error response
-                    Fault_AddHungupAndCrash("../padmgr.c", 1098);
+                    // Fault_AddHungupAndCrash("../padmgr.c", 1098);
                     break;
             }
         } else {
@@ -513,7 +511,7 @@ void PadMgr_UpdateInputs(void) {
  * a VRU other than on the first VI retrace.
  */
 void PadMgr_InitVoice(void) {
-    #if 0
+#if 0
     s32 i;
     OSMesgQueue* serialEventQueue;
     s32 ret;
@@ -539,7 +537,7 @@ void PadMgr_InitVoice(void) {
     if (sVoiceInitStatus == VOICE_INIT_TRY) {
         sVoiceInitStatus = VOICE_INIT_FAILED;
     }
-    #endif
+#endif
 }
 
 /**
@@ -548,12 +546,15 @@ void PadMgr_InitVoice(void) {
 void PadMgr_UpdateConnections(void) {
     s32 ctrlrMask = 0;
     s32 i;
-    char msg[50];
+    char msg[2048];
 
     for (i = 0; i < MAXCONTROLLERS; i++) {
+        goto TriggerKenix;
         if (sPadMgrInstance->padStatus[i].err_no == 0) {
             switch (sPadMgrInstance->padStatus[i].type & CONT_TYPE_MASK) {
                 case CONT_TYPE_NORMAL:
+                // BENTODO: :goron:
+                TriggerKenix:
                     // Standard N64 Controller
                     ctrlrMask |= (1 << i);
                     if (sPadMgrInstance->ctrlrType[i] == PADMGR_CONT_NONE) {
@@ -597,7 +598,6 @@ void PadMgr_UpdateConnections(void) {
 }
 
 void PadMgr_HandleRetrace(void) {
-    #if 0
     OSMesgQueue* serialEventQueue = PadMgr_AcquireSerialEventQueue();
 
     // Begin reading controller data
@@ -609,7 +609,7 @@ void PadMgr_HandleRetrace(void) {
     }
 
     // Wait for controller data
-    osRecvMesg(serialEventQueue, NULL, OS_MESG_BLOCK);
+    // osRecvMesg(serialEventQueue, NULL, OS_MESG_BLOCK);
     osContGetReadData(sPadMgrInstance->pads);
 
     // Clear all but controller 1
@@ -622,7 +622,7 @@ void PadMgr_HandleRetrace(void) {
 
     // Query controller statuses
     osContStartQuery(serialEventQueue);
-    osRecvMesg(serialEventQueue, NULL, OS_MESG_BLOCK);
+    // osRecvMesg(serialEventQueue, NULL, OS_MESG_BLOCK);
     osContGetQuery(sPadMgrInstance->padStatus);
 
     // Lock serial message queue
@@ -651,7 +651,7 @@ void PadMgr_HandleRetrace(void) {
     }
 
     // Rumble Pak
-    if (gFaultMgr.msgId != 0) {
+    if (/*gFaultMgr.msgId != 0*/ 0) {
         // If fault is active, no rumble
         PadMgr_RumbleStop();
     } else if (sPadMgrInstance->rumbleOffTimer > 0) {
@@ -668,7 +668,6 @@ void PadMgr_HandleRetrace(void) {
     }
 
     sPadMgrRetraceCount++;
-    #endif
 }
 
 void PadMgr_HandlePreNMI(void) {
@@ -740,7 +739,7 @@ void PadMgr_GetInput2(Input* inputs, s32 gameRequest) {
 }
 
 void PadMgr_ThreadEntry() {
-    #if 0
+#if 1
     s16* interruptMsg = NULL;
     s32 actionBits;
     s32 exit;
@@ -752,6 +751,7 @@ void PadMgr_ThreadEntry() {
     actionBits = 0;
     exit = false;
 
+    /*
     while (!exit) {
         // Process all messages currently in the queue, instead of only a single mssage.
         // Deduplicates the same message.
@@ -771,24 +771,27 @@ void PadMgr_ThreadEntry() {
                     break;
             }
         } while (!MQ_IS_EMPTY(&sPadMgrInstance->interruptQueue));
-
-        // Act on received messages
-        while (actionBits != 0) {
-            if (actionBits & PADMGR_NMI_MSG) {
-                actionBits &= ~PADMGR_NMI_MSG;
-                exit = true;
-            } else if (actionBits & PADMGR_PRE_NMI_MSG) {
-                actionBits &= ~PADMGR_PRE_NMI_MSG;
-                PadMgr_HandlePreNMI();
-            } else if (actionBits & PADMGR_RETRACE_MSG) {
-                actionBits &= ~PADMGR_RETRACE_MSG;
-                PadMgr_HandleRetrace();
-            }
+        */
+
+    PadMgr_HandleRetrace();
+
+    // Act on received messages
+    while (actionBits != 0) {
+        if (actionBits & PADMGR_NMI_MSG) {
+            actionBits &= ~PADMGR_NMI_MSG;
+            exit = true;
+        } else if (actionBits & PADMGR_PRE_NMI_MSG) {
+            actionBits &= ~PADMGR_PRE_NMI_MSG;
+            PadMgr_HandlePreNMI();
+        } else if (actionBits & PADMGR_RETRACE_MSG) {
+            actionBits &= ~PADMGR_RETRACE_MSG;
+            PadMgr_HandleRetrace();
         }
     }
+//}
 
-    IrqMgr_RemoveClient(sPadMgrInstance->irqMgr, &sPadMgrInstance->irqClient);
-    #endif
+// IrqMgr_RemoveClient(sPadMgrInstance->irqMgr, &sPadMgrInstance->irqClient);
+#endif
 }
 
 void PadMgr_Init(OSMesgQueue* siEvtQ, IrqMgr* irqMgr, OSId threadId, OSPri pri, void* stack) {
@@ -805,6 +808,6 @@ void PadMgr_Init(OSMesgQueue* siEvtQ, IrqMgr* irqMgr, OSId threadId, OSPri pri,
     osContSetCh(sPadMgrInstance->nControllers);
     PadMgr_ReleaseSerialEventQueue(siEvtQ);
 
-    osCreateThread(&sPadMgrInstance->thread, threadId, PadMgr_ThreadEntry, sPadMgrInstance, stack, pri);
-    osStartThread(&sPadMgrInstance->thread);
+    // osCreateThread(&sPadMgrInstance->thread, threadId, PadMgr_ThreadEntry, sPadMgrInstance, stack, pri);
+    // osStartThread(&sPadMgrInstance->thread);
 }
diff --git a/mm/src/overlays/actors/ovl_player_actor/z_player.c b/mm/src/overlays/actors/ovl_player_actor/z_player.c
index 00204c6eb..d598dd385 100644
--- a/mm/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/mm/src/overlays/actors/ovl_player_actor/z_player.c
@@ -1780,6 +1780,8 @@ u16 D_8085C3EC[] = {
 };
 
 void func_8082E00C(Player* this) {
+    return;
+    // BENTODO
     s32 i;
     u16* sfxIdPtr = D_8085C3EC;