From f44cabe1c9185b2c1fbe4fd0684478c82c382e6a Mon Sep 17 00:00:00 2001
From: David Benepe <benepe96@gmail.com>
Date: Fri, 11 Jun 2021 17:17:43 -0500
Subject: [PATCH] More minor fixes

---
 asm/non_matchings/unknown_00BC20/D_80019808.s    | 2 +-
 asm/non_matchings/unknown_00BC20/func_8000CC7C.s | 4 ++--
 asm/non_matchings/unknown_00BC20/func_8000E2B4.s | 2 +-
 asm/non_matchings/unknown_066AA0/func_80065EA0.s | 2 +-
 asm/non_matchings/unknown_066AA0/func_8006A434.s | 2 +-
 src/unknown_001050.c                             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/asm/non_matchings/unknown_00BC20/D_80019808.s b/asm/non_matchings/unknown_00BC20/D_80019808.s
index 3c3a5a0f..e4d09db7 100644
--- a/asm/non_matchings/unknown_00BC20/D_80019808.s
+++ b/asm/non_matchings/unknown_00BC20/D_80019808.s
@@ -933,7 +933,7 @@ glabel D_80019808
 /* 01B150 8001A550 00000000 */   nop   
 .L8001A554:
 /* 01B154 8001A554 8F0F0574 */  lw    $t7, %lo(D_B0000574)($t8)
-/* 01B158 8001A558 24016C07 */  li    $at, 27655
+/* 01B158 8001A558 24016C07 */  li    $at, 0x6C07
 /* 01B15C 8001A55C 31EEFFFF */  andi  $t6, $t7, 0xffff
 /* 01B160 8001A560 11C10004 */  beq   $t6, $at, .L8001A574
 /* 01B164 8001A564 3C188012 */   lui   $t8, %hi(D_8011AEF5) # $t8, 0x8012
diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s
index 8a24cf2f..75b28cfb 100644
--- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s
+++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s
@@ -641,7 +641,7 @@ glabel func_8000CC7C
 /* 00E148 8000D548 3C1E800E */  lui   $fp, %hi(D_800DC820) # $fp, 0x800e
 /* 00E14C 8000D54C 00186840 */  sll   $t5, $t8, 1
 /* 00E150 8000D550 03CDF021 */  addu  $fp, $fp, $t5
-/* 00E154 8000D554 83DEC821 */  lb    $fp, -0x37df($fp)
+/* 00E154 8000D554 83DEC821 */  lb    $fp, %lo(D_800DC820+1)($fp)
 /* 00E158 8000D558 10000021 */  b     .L8000D5E0
 /* 00E15C 8000D55C 00000000 */   nop   
 .L8000D560:
@@ -728,7 +728,7 @@ glabel func_8000CC7C
 /* 00E284 8000D684 0314C023 */  subu  $t8, $t8, $s4
 /* 00E288 8000D688 00591021 */  addu  $v0, $v0, $t9
 /* 00E28C 8000D68C 0018C0C0 */  sll   $t8, $t8, 3
-/* 00E290 8000D690 8442C802 */  lh    $v0, -0x37fe($v0)
+/* 00E290 8000D690 8442C802 */  lh    $v0, %lo(D_800DC7B8+0x4A)/*-0x37fe*/($v0)
 /* 00E294 8000D694 02F83821 */  addu  $a3, $s7, $t8
 .L8000D698:
 /* 00E298 8000D698 304F0100 */  andi  $t7, $v0, 0x100
diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
index ac164001..489c085f 100644
--- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
+++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
@@ -44,7 +44,7 @@ glabel func_8000E2B4
 # Indexing into D_800DC7B8 starting at index 37?
 /* 00EF3C 8000E33C 3C03800E */  lui   $v1, %hi(D_800DC7B8) # $v1, 0x800e
 /* 00EF40 8000E340 006C1821 */  addu  $v1, $v1, $t4
-/* 00EF44 8000E344 8463C802 */  lh    $v1, -0x37fe($v1)
+/* 00EF44 8000E344 8463C802 */  lh    $v1, %lo(D_800DC7B8+0x4A)/*-0x37fe*/($v1)
 /* 00EF48 8000E348 00000000 */  nop   
 .L8000E34C:
 /* 00EF4C 8000E34C 0C01B6C5 */  jal   func_8006DB14
diff --git a/asm/non_matchings/unknown_066AA0/func_80065EA0.s b/asm/non_matchings/unknown_066AA0/func_80065EA0.s
index 802fbf6c..23d23556 100644
--- a/asm/non_matchings/unknown_066AA0/func_80065EA0.s
+++ b/asm/non_matchings/unknown_066AA0/func_80065EA0.s
@@ -83,7 +83,7 @@ glabel func_80065EA0
 /* 066BC8 80065FC8 00000000 */   nop   
 .L80065FCC:
 /* 066BCC 80065FCC 8DCF0578 */  lw    $t7, %lo(D_B0000578)($t6)
-/* 066BD0 80065FD0 34018965 */  li    $at, 35173
+/* 066BD0 80065FD0 34018965 */  li    $at, 0x8965
 /* 066BD4 80065FD4 31F8FFFF */  andi  $t8, $t7, 0xffff
 /* 066BD8 80065FD8 13010003 */  beq   $t8, $at, .L80065FE8
 /* 066BDC 80065FDC 26100EE0 */   addiu $s0, %lo(D_80120EE0) # addiu $s0, $s0, 0xee0
diff --git a/asm/non_matchings/unknown_066AA0/func_8006A434.s b/asm/non_matchings/unknown_066AA0/func_8006A434.s
index ba2fef6a..fc49980d 100644
--- a/asm/non_matchings/unknown_066AA0/func_8006A434.s
+++ b/asm/non_matchings/unknown_066AA0/func_8006A434.s
@@ -7,5 +7,5 @@ glabel func_8006A434
 /* 06B048 8006A448 A02F1152 */  sb    $t7, %lo(D_80121150+2)($at)
 /* 06B04C 8006A44C A02E1151 */  sb    $t6, %lo(D_80121150+1)($at)
 /* 06B050 8006A450 03E00008 */  jr    $ra
-/* 06B054 8006A454 A0201150 */   sb    $zero, 0x1150($at)
+/* 06B054 8006A454 A0201150 */   sb    $zero, %lo(D_80121150)($at)
 
diff --git a/src/unknown_001050.c b/src/unknown_001050.c
index 581dec97..7cb74044 100644
--- a/src/unknown_001050.c
+++ b/src/unknown_001050.c
@@ -137,7 +137,7 @@ void audio_init(u32 arg0){
     audioMgrConfig audConfig;
     
     // Uncomment this to test shiftibilty!
-    // *((s32*)0x803FFFFC) = 0xDEADBEEF;
+    //*((s32*)0x803FFFFC) = 0xDEADBEEF;
    
     seq_max_len = 0;
     alHeapInit(&gALHeap, gBssSectionStart, 0x00029D88);