From 7b7725b62a9d489f3b0ec458013259d8592b0d34 Mon Sep 17 00:00:00 2001
From: Tyler McGavran <tyler.taggerung@gmail.com>
Date: Tue, 21 Dec 2021 01:07:18 -0500
Subject: [PATCH] Match swap_values (#111)

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
---
 asm/non_matchings/code_80091750/draw_box.s    |  4 +--
 .../code_80091750/func_80091B64.s             |  6 -----
 .../code_80091750/func_80098C18.s             |  4 +--
 src/code_80091750.c                           | 25 ++++++++-----------
 4 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100644 asm/non_matchings/code_80091750/func_80091B64.s

diff --git a/asm/non_matchings/code_80091750/draw_box.s b/asm/non_matchings/code_80091750/draw_box.s
index 4b32ac035..cace7d58b 100644
--- a/asm/non_matchings/code_80091750/draw_box.s
+++ b/asm/non_matchings/code_80091750/draw_box.s
@@ -21,7 +21,7 @@ glabel draw_box
 /* 099A44 80098E44 10200004 */  beqz  $at, .L80098E58
 /* 099A48 80098E48 AFAB0040 */   sw    $t3, 0x40($sp)
 /* 099A4C 80098E4C 27A40024 */  addiu $a0, $sp, 0x24
-/* 099A50 80098E50 0C0246D9 */  jal   func_80091B64
+/* 099A50 80098E50 0C0246D9 */  jal   swap_values
 /* 099A54 80098E54 27A5002C */   addiu $a1, $sp, 0x2c
 .L80098E58:
 /* 099A58 80098E58 8FA20030 */  lw    $v0, 0x30($sp)
@@ -30,7 +30,7 @@ glabel draw_box
 /* 099A64 80098E64 004E082A */  slt   $at, $v0, $t6
 /* 099A68 80098E68 50200005 */  beql  $at, $zero, .L80098E80
 /* 099A6C 80098E6C 8FAF0024 */   lw    $t7, 0x24($sp)
-/* 099A70 80098E70 0C0246D9 */  jal   func_80091B64
+/* 099A70 80098E70 0C0246D9 */  jal   swap_values
 /* 099A74 80098E74 27A50030 */   addiu $a1, $sp, 0x30
 /* 099A78 80098E78 8FA20030 */  lw    $v0, 0x30($sp)
 /* 099A7C 80098E7C 8FAF0024 */  lw    $t7, 0x24($sp)
diff --git a/asm/non_matchings/code_80091750/func_80091B64.s b/asm/non_matchings/code_80091750/func_80091B64.s
deleted file mode 100644
index 2f2f650a0..000000000
--- a/asm/non_matchings/code_80091750/func_80091B64.s
+++ /dev/null
@@ -1,6 +0,0 @@
-glabel func_80091B64
-/* 092764 80091B64 8CAE0000 */  lw    $t6, ($a1)
-/* 092768 80091B68 8C820000 */  lw    $v0, ($a0)
-/* 09276C 80091B6C AC8E0000 */  sw    $t6, ($a0)
-/* 092770 80091B70 03E00008 */  jr    $ra
-/* 092774 80091B74 ACA20000 */   sw    $v0, ($a1)
diff --git a/asm/non_matchings/code_80091750/func_80098C18.s b/asm/non_matchings/code_80091750/func_80098C18.s
index 7371a243e..2119ab76b 100644
--- a/asm/non_matchings/code_80091750/func_80098C18.s
+++ b/asm/non_matchings/code_80091750/func_80098C18.s
@@ -21,7 +21,7 @@ glabel func_80098C18
 /* 099864 80098C64 10200004 */  beqz  $at, .L80098C78
 /* 099868 80098C68 AFAB0040 */   sw    $t3, 0x40($sp)
 /* 09986C 80098C6C 27A40024 */  addiu $a0, $sp, 0x24
-/* 099870 80098C70 0C0246D9 */  jal   func_80091B64
+/* 099870 80098C70 0C0246D9 */  jal   swap_values
 /* 099874 80098C74 27A5002C */   addiu $a1, $sp, 0x2c
 .L80098C78:
 /* 099878 80098C78 8FA20030 */  lw    $v0, 0x30($sp)
@@ -30,7 +30,7 @@ glabel func_80098C18
 /* 099884 80098C84 004E082A */  slt   $at, $v0, $t6
 /* 099888 80098C88 50200005 */  beql  $at, $zero, .L80098CA0
 /* 09988C 80098C8C 8FAF0024 */   lw    $t7, 0x24($sp)
-/* 099890 80098C90 0C0246D9 */  jal   func_80091B64
+/* 099890 80098C90 0C0246D9 */  jal   swap_values
 /* 099894 80098C94 27A50030 */   addiu $a1, $sp, 0x30
 /* 099898 80098C98 8FA20030 */  lw    $v0, 0x30($sp)
 /* 09989C 80098C9C 8FAF0024 */  lw    $t7, 0x24($sp)
diff --git a/src/code_80091750.c b/src/code_80091750.c
index f98996123..a103716ea 100644
--- a/src/code_80091750.c
+++ b/src/code_80091750.c
@@ -205,18 +205,13 @@ loop_2:
 GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091AC0.s")
 #endif
 
-#ifdef MIPS_TO_C
-//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-void func_80091B64(s32 *arg0, s32 *arg1) {
-    s32 temp_v0;
+void swap_values(s32 *arg0, s32 *arg1) {
+    s32 temp;
 
-    temp_v0 = *arg0;
+    temp = *arg0;
     *arg0 = *arg1;
-    *arg1 = temp_v0;
+    *arg1 = temp;
 }
-#else
-GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091B64.s")
-#endif
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -4168,7 +4163,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800987D0.s")
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80091B64(s32 *, s32 *); // extern
+void swap_values(s32 *, s32 *); // extern
 extern ? D_02008030;
 extern ? D_02008058;
 
@@ -4182,10 +4177,10 @@ void *func_80098C18(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5
     arg7 &= 0xFF;
     arg8 &= 0xFF;
     if (arg3 < arg1) {
-        func_80091B64(&arg1, &arg3);
+        swap_values(&arg1, &arg3);
     }
     if (arg4 < arg2) {
-        func_80091B64(&arg2, &arg4);
+        swap_values(&arg2, &arg4);
     }
     if ((arg1 >= 0x140) || (arg2 >= 0xF0)) {
         return arg0;
@@ -4224,7 +4219,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80098C18.s")
 
 #ifdef MIPS_TO_C
 //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
-? func_80091B64(s32 *, s32 *); // extern
+void swap_values(s32, s32);
 extern ? D_02008008;
 
 void *draw_box(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8) {
@@ -4236,10 +4231,10 @@ void *draw_box(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32
     arg7 &= 0xFF;
     arg8 &= 0xFF;
     if (arg3 < arg1) {
-        func_80091B64(&arg1, &arg3);
+        swap_values(&arg1, &arg3);
     }
     if (arg4 < arg2) {
-        func_80091B64(&arg2, &arg4);
+        swap_values(&arg2, &arg4);
     }
     if ((arg1 >= 0x140) || (arg2 >= 0xF0)) {
         return arg0;