From 6cfbc9d0a2c6787577f49975a64348394898c9d3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 27 Aug 2023 23:00:34 -0400
Subject: [PATCH] Add NONMATCHING for register asm stuff

---
 src/menu_input.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/menu_input.c b/src/menu_input.c
index 87397c3db..7e58cb9aa 100644
--- a/src/menu_input.c
+++ b/src/menu_input.c
@@ -598,7 +598,11 @@ void AddMenuCursorSprite_(struct MenuInputStruct *a0, u32 a1)
         UpdateMenuCursorSpriteCoords(a0);
 
         if (!(a0->unk24 & 8)) {
+            #ifdef NONMATCHING
+            u32 tmp, tmp2;
+            #else
             register u32 tmp asm("r0"), tmp2 asm("r1");
+            #endif
 
             tmp = sp.attrib1;
             sp.attrib1 = tmp & ~SPRITEOAM_MASK_AFFINEMODE1;
@@ -671,9 +675,13 @@ static void sub_801332C(s16 *a0)
 {
     struct SpriteOAM sp = {};
     struct SpriteOAM* ptr;
+    #ifdef NONMATCHING
+    u32 r0, r1, r2;
+    #else
     register u32 r0 asm("r0");
     register u32 r1 asm("r1");
     register u32 r2 asm("r2");
+    #endif
     u32 r3;
     u32 r5;
     u32 r6;
@@ -736,11 +744,16 @@ static void sub_801332C(s16 *a0)
 static void sub_8013470(struct MenuInputStruct *a0)
 {
     struct SpriteOAM sp = {};
-    register struct SpriteOAM* ptr asm("r3");
+    #if NONMATCHING
+    struct SpriteOAM *ptr;
+    u32 r0, r1, r5;
+    #else
+    register struct SpriteOAM *ptr asm("r3");
     register u32 r0 asm("r0");
     register u32 r1 asm("r1");
-    u32 r2;
     register u32 r5 asm("r5");
+    #endif
+    u32 r2;
 
     if (a0->unkC != 0) {
         if (a0->unk1E != 0) {