From 1649bf32d64523ba79f6896d2b9c816a9cd20e77 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Thu, 15 Aug 2024 04:13:23 +0200
Subject: [PATCH] padutils.c, line numbers (#2040)

---
 src/boot/z_std_dma.c |  4 ++++
 src/code/graph.c     | 10 ++++++++++
 src/code/padmgr.c    |  4 ++++
 src/code/padutils.c  | 14 ++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 5fe82a1859..6b5211432e 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -581,7 +581,11 @@ void DmaMgr_Init(void) {
         PRINTF("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart,
                gDmaDataTable[0].file.vromEnd);
         //! @bug The main code file where fault.c resides is not yet loaded
+#if PLATFORM_N64
+        Fault_AddHungupAndCrash("../z_std_dma.c", 840);
+#else
         Fault_AddHungupAndCrash("../z_std_dma.c", 1055);
+#endif
     }
 
     // Start the DMA manager
diff --git a/src/code/graph.c b/src/code/graph.c
index 3e5df91458..8ebad9d4ef 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -366,14 +366,22 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
             PRINTF("%c", BEL);
             // "Dynamic area head is destroyed"
             PRINTF(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST);
+#if PLATFORM_N64
+            Fault_AddHungupAndCrash("../graph.c", 951);
+#else
             Fault_AddHungupAndCrash("../graph.c", 1070);
+#endif
         }
         if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) {
             problem = true;
             PRINTF("%c", BEL);
             // "Dynamic region tail is destroyed"
             PRINTF(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST);
+#if PLATFORM_N64
+            Fault_AddHungupAndCrash("../graph.c", 957);
+#else
             Fault_AddHungupAndCrash("../graph.c", 1076);
+#endif
         }
     }
 
@@ -465,6 +473,8 @@ void Graph_ThreadEntry(void* arg0) {
 
             sprintf(faultMsg, "CLASS SIZE= %d bytes", size);
             Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg);
+#elif PLATFORM_N64
+            Fault_AddHungupAndCrash("../graph.c", 1081);
 #else
             Fault_AddHungupAndCrash("../graph.c", 1200);
 #endif
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 74ca9bd4f6..2d2b91eb9d 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -334,7 +334,11 @@ void PadMgr_UpdateInputs(PadMgr* padMgr) {
             default:
                 // Unknown error response
                 LOG_HEX("padnow1->errno", pad->errno, "../padmgr.c", 396);
+#if PLATFORM_N64
+                Fault_AddHungupAndCrash("../padmgr.c", 382);
+#else
                 Fault_AddHungupAndCrash("../padmgr.c", 397);
+#endif
                 break;
         }
 
diff --git a/src/code/padutils.c b/src/code/padutils.c
index 2f0f571620..7a0407ef96 100644
--- a/src/code/padutils.c
+++ b/src/code/padutils.c
@@ -9,6 +9,10 @@ void func_800FCB70(void) {
 
 void PadUtils_ResetPressRel(Input* input) {
     input->press.button = 0;
+#if PLATFORM_N64
+    input->press.stick_x = 0;
+    input->press.stick_y = 0;
+#endif
     input->rel.button = 0;
 }
 
@@ -65,6 +69,16 @@ s8 PadUtils_GetRelY(Input* input) {
     return PadUtils_GetRelYImpl(input);
 }
 
+#if PLATFORM_N64
+s8 PadUtils_GetPressX(Input* input) {
+    return input->press.stick_x;
+}
+
+s8 PadUtils_GetPressY(Input* input) {
+    return input->press.stick_y;
+}
+#endif
+
 void PadUtils_UpdateRelXY(Input* input) {
     s32 curX = PadUtils_GetCurX(input);
     s32 curY = PadUtils_GetCurY(input);