From 7948983a6fcbb06f8379edb05f2c71322fc205fd Mon Sep 17 00:00:00 2001
From: Antonio Castelli <aatcastelli@gmail.com>
Date: Fri, 28 May 2021 18:55:49 -0700
Subject: [PATCH] added glabels using

---
 asm/non_matchings/unknown_005740/func_80006FC8.s          | 4 ++--
 asm/non_matchings/unknown_00BC20/func_8000B750.s          | 4 ++--
 asm/non_matchings/unknown_00BC20/func_8000E2B4.s          | 4 ++--
 asm/non_matchings/unknown_00BC20/func_80010994.s          | 4 ++--
 asm/non_matchings/unknown_00BC20/func_8001E4C4.s          | 4 ++--
 asm/non_matchings/unknown_043920/func_8004447C.s          | 4 ++--
 asm/non_matchings/unknown_066AA0/func_8006A6A0.s          | 4 ++--
 asm/non_matchings/unknown_078050/func_80078190.s          | 4 ++--
 asm/non_matchings/unknown_080500/MenuCreditsLoop.s        | 1 +
 asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s     | 8 ++++----
 asm/non_matchings/unknown_080500/func_8008B758.s          | 4 ++--
 asm/non_matchings/unknown_0AEE70/func_800AF714.s          | 4 ++--
 lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s      | 4 ++--
 lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s      | 4 ++--
 lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s | 4 ++--
 .../non_matchings/unknown_0CE370/__osPackRamWriteData.s   | 4 ++--
 .../non_matchings/unknown_0CE8A0/__osPackRamReadData.s    | 4 ++--
 lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s      | 4 ++--
 tools/python/find_glabels.py                              | 4 ++--
 19 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s
index 4e051b36..4d87566f 100644
--- a/asm/non_matchings/unknown_005740/func_80006FC8.s
+++ b/asm/non_matchings/unknown_005740/func_80006FC8.s
@@ -1089,9 +1089,9 @@ glabel func_80006FC8
 /* 008B80 80007F80 03E00008 */  jr    $ra
 /* 008B84 80007F84 A02EC6D0 */   sb    $t6, %lo(D_800DC6D0)($at)
 
-/* 008B88 80007F88 3C01800E */  lui   $at, 0x800e
+/* 008B88 80007F88 3C01800E */  lui   $at, %hi(D_800DC6D0) #$at, 0x800e
 /* 008B8C 80007F8C 03E00008 */  jr    $ra
-/* 008B90 80007F90 A020C6D0 */   sb    $zero, -0x3930($at)
+/* 008B90 80007F90 A020C6D0 */   sb    $zero, %lo(D_800DC6D0)($at)
 
 /* 008B94 80007F94 3C02800E */  lui   $v0, %hi(D_800DC6D0) # $v0, 0x800e
 /* 008B98 80007F98 9042C6D0 */  lbu   $v0, %lo(D_800DC6D0)($v0)
diff --git a/asm/non_matchings/unknown_00BC20/func_8000B750.s b/asm/non_matchings/unknown_00BC20/func_8000B750.s
index 2118aef7..7a418d32 100644
--- a/asm/non_matchings/unknown_00BC20/func_8000B750.s
+++ b/asm/non_matchings/unknown_00BC20/func_8000B750.s
@@ -228,10 +228,10 @@ glabel func_8000B750
 /* 00C6B4 8000BAB4 00000000 */   nop   
 .L8000BAB8:
 /* 00C6B8 8000BAB8 8FAF0090 */  lw    $t7, 0x90($sp)
-/* 00C6BC 8000BABC 3C018012 */  lui   $at, 0x8012
+/* 00C6BC 8000BABC 3C018012 */  lui   $at, %hi(D_8011B068) #$at, 0x8012
 /* 00C6C0 8000BAC0 11E00002 */  beqz  $t7, .L8000BACC
 /* 00C6C4 8000BAC4 00300821 */   addu  $at, $at, $s0
-/* 00C6C8 8000BAC8 A020B068 */  sb    $zero, -0x4f98($at)
+/* 00C6C8 8000BAC8 A020B068 */  sb    $zero, %lo(D_8011B068)($at)
 .L8000BACC:
 /* 00C6CC 8000BACC 8FBF002C */  lw    $ra, 0x2c($sp)
 .L8000BAD0:
diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
index e995fcb1..7a4a780f 100644
--- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
+++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s
@@ -27,9 +27,9 @@ glabel func_8000E2B4
 /* 00EF18 8000E318 00095080 */  sll   $t2, $t1, 2
 /* 00EF1C 8000E31C 00194040 */  sll   $t0, $t9, 1
 /* 00EF20 8000E320 010A5821 */  addu  $t3, $t0, $t2
-/* 00EF24 8000E324 3C03800E */  lui   $v1, 0x800e
+/* 00EF24 8000E324 3C03800E */  lui   $v1, %hi(D_800DC7A8) #$v1, 0x800e
 /* 00EF28 8000E328 006B1821 */  addu  $v1, $v1, $t3
-/* 00EF2C 8000E32C 8463C7A8 */  lh    $v1, -0x3858($v1)
+/* 00EF2C 8000E32C 8463C7A8 */  lh    $v1, %lo(D_800DC7A8)($v1)
 /* 00EF30 8000E330 10000006 */  b     .L8000E34C
 /* 00EF34 8000E334 00000000 */   nop   
 .L8000E338:
diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s
index 4bbf635c..e80d1e36 100644
--- a/asm/non_matchings/unknown_00BC20/func_80010994.s
+++ b/asm/non_matchings/unknown_00BC20/func_80010994.s
@@ -52,10 +52,10 @@ glabel func_80010994
 /* 011650 80010A50 01285023 */  subu  $t2, $t1, $t0
 /* 011654 80010A54 A04A0000 */  sb    $t2, ($v0)
 /* 011658 80010A58 804B0000 */  lb    $t3, ($v0)
-/* 01165C 80010A5C 3C018012 */  lui   $at, 0x8012
+/* 01165C 80010A5C 3C018012 */  lui   $at, %hi(D_8011AD22) #$at, 0x8012
 /* 011660 80010A60 002B0821 */  addu  $at, $at, $t3
 /* 011664 80010A64 2484AEF0 */  addiu $a0, %lo(playerCount) # addiu $a0, $a0, -0x5110
-/* 011668 80010A68 A020AD22 */  sb    $zero, -0x52de($at)
+/* 011668 80010A68 A020AD22 */  sb    $zero, %lo(D_8011AD22)($at)
 /* 01166C 80010A6C 8C8C0000 */  lw    $t4, ($a0)
 /* 011670 80010A70 00009825 */  move  $s3, $zero
 /* 011674 80010A74 19800021 */  blez  $t4, .L80010AFC
diff --git a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s
index 6c7aa0c9..35e70019 100644
--- a/asm/non_matchings/unknown_00BC20/func_8001E4C4.s
+++ b/asm/non_matchings/unknown_00BC20/func_8001E4C4.s
@@ -151,7 +151,7 @@ glabel func_8001E4C4
 .L8001E6D8:
 /* 01F2D8 8001E6D8 3C018012 */  lui   $at, %hi(D_8011AE60) # $at, 0x8012
 /* 01F2DC 8001E6DC AC22AE60 */  sw    $v0, %lo(D_8011AE60)($at)
-/* 01F2E0 8001E6E0 3C018012 */  lui   $at, 0x8012
+/* 01F2E0 8001E6E0 3C018012 */  lui   $at, %hi(D_8011AE7C) #$at, 0x8012
 /* 01F2E4 8001E6E4 03E00008 */  jr    $ra
-/* 01F2E8 8001E6E8 A420AE7C */   sh    $zero, -0x5184($at)
+/* 01F2E8 8001E6E8 A420AE7C */   sh    $zero, %lo(D_8011AE7C)($at)
 
diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s
index 7be83839..7b9ebcee 100644
--- a/asm/non_matchings/unknown_043920/func_8004447C.s
+++ b/asm/non_matchings/unknown_043920/func_8004447C.s
@@ -476,9 +476,9 @@ glabel func_8004447C
 /* 045764 80044B64 15A10005 */  bne   $t5, $at, .L80044B7C
 /* 045768 80044B68 00000000 */   nop   
 /* 04576C 80044B6C 820E01CF */  lb    $t6, 0x1cf($s0)
-/* 045770 80044B70 3C018012 */  lui   $at, 0x8012
+/* 045770 80044B70 3C018012 */  lui   $at, %hi(D_8011D58C) #$at, 0x8012
 /* 045774 80044B74 002E0821 */  addu  $at, $at, $t6
-/* 045778 80044B78 A020D58C */  sb    $zero, -0x2a74($at)
+/* 045778 80044B78 A020D58C */  sb    $zero, %lo(D_8011D58C)($at)
 .L80044B7C:
 /* 04577C 80044B7C A20F01CD */  sb    $t7, 0x1cd($s0)
 .L80044B80:
diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s
index 4603d6d4..c4e67141 100644
--- a/asm/non_matchings/unknown_066AA0/func_8006A6A0.s
+++ b/asm/non_matchings/unknown_066AA0/func_8006A6A0.s
@@ -1,6 +1,6 @@
 glabel func_8006A6A0
-/* 06B2A0 8006A6A0 3C01800E */  lui   $at, 0x800e
+/* 06B2A0 8006A6A0 3C01800E */  lui   $at, %hi(D_800DD304) #$at, 0x800e
 /* 06B2A4 8006A6A4 03E00008 */  jr    $ra
-/* 06B2A8 8006A6A8 A420D304 */   sh    $zero, -0x2cfc($at)
+/* 06B2A8 8006A6A8 A420D304 */   sh    $zero, %lo(D_800DD304)($at)
 
 /* 06B2AC 8006A6AC 00000000 */  nop   
diff --git a/asm/non_matchings/unknown_078050/func_80078190.s b/asm/non_matchings/unknown_078050/func_80078190.s
index 73d4576c..3fddb3e4 100644
--- a/asm/non_matchings/unknown_078050/func_80078190.s
+++ b/asm/non_matchings/unknown_078050/func_80078190.s
@@ -428,7 +428,7 @@ glabel func_80078190
 /* 0793E8 800787E8 03E00008 */  jr    $ra
 /* 0793EC 800787EC AC28E4CC */   sw    $t0, %lo(D_800DE4CC)($at)
 
-/* 0793F0 800787F0 3C01800E */  lui   $at, 0x800e
+/* 0793F0 800787F0 3C01800E */  lui   $at, %hi(D_800DE4CC) #$at, 0x800e
 /* 0793F4 800787F4 03E00008 */  jr    $ra
-/* 0793F8 800787F8 AC20E4CC */   sw    $zero, -0x1b34($at)
+/* 0793F8 800787F8 AC20E4CC */   sw    $zero, %lo(D_800DE4CC)($at)
 
diff --git a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s
index 3fcde973..6c274152 100644
--- a/asm/non_matchings/unknown_080500/MenuCreditsLoop.s
+++ b/asm/non_matchings/unknown_080500/MenuCreditsLoop.s
@@ -438,6 +438,7 @@ glabel MenuCreditsLoop
 /* 09C578 8009B978 000FC823 */  negu  $t9, $t7
 /* 09C57C 8009B97C 0014C140 */  sll   $t8, $s4, 5
 /* 09C580 8009B980 03194821 */  addu  $t1, $t8, $t9
+# Setting D_800E1B50[1].source? Not sure why adding $t1 then
 /* 09C584 8009B984 3C01800E */  lui   $at, 0x800e
 /* 09C588 8009B988 448A8000 */  mtc1  $t2, $f16
 /* 09C58C 8009B98C 00290821 */  addu  $at, $at, $t1
diff --git a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s
index a7423760..c8ff0060 100644
--- a/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s
+++ b/asm/non_matchings/unknown_080500/MenuMagicCodesLoop.s
@@ -215,9 +215,9 @@ glabel MenuMagicCodesLoop
 /* 08ABE8 80089FE8 244F0001 */  addiu $t7, $v0, 1
 /* 08ABEC 80089FEC A4CF0000 */  sh    $t7, ($a2)
 /* 08ABF0 80089FF0 84D80000 */  lh    $t8, ($a2)
-/* 08ABF4 80089FF4 3C018012 */  lui   $at, 0x8012
+/* 08ABF4 80089FF4 3C018012 */  lui   $at, %hi(D_80126C58) #$at, 0x8012
 /* 08ABF8 80089FF8 00380821 */  addu  $at, $at, $t8
-/* 08ABFC 80089FFC A0206C58 */  sb    $zero, 0x6c58($at)
+/* 08ABFC 80089FFC A0206C58 */  sb    $zero, %lo(D_80126C58)($at)
 .L8008A000:
 /* 08AC00 8008A000 3C068012 */  lui   $a2, %hi(D_80126C44) # $a2, 0x8012
 /* 08AC04 8008A004 31594000 */  andi  $t9, $t2, 0x4000
@@ -253,9 +253,9 @@ glabel MenuMagicCodesLoop
 /* 08AC70 8008A070 244FFFFF */  addiu $t7, $v0, -1
 /* 08AC74 8008A074 A4CF0000 */  sh    $t7, ($a2)
 /* 08AC78 8008A078 84D80000 */  lh    $t8, ($a2)
-/* 08AC7C 8008A07C 3C018012 */  lui   $at, 0x8012
+/* 08AC7C 8008A07C 3C018012 */  lui   $at, %hi(D_80126C58) #$at, 0x8012
 /* 08AC80 8008A080 00380821 */  addu  $at, $at, $t8
-/* 08AC84 8008A084 A0206C58 */  sb    $zero, 0x6c58($at)
+/* 08AC84 8008A084 A0206C58 */  sb    $zero, %lo(D_80126C58)($at)
 .L8008A088:
 /* 08AC88 8008A088 8FB90048 */  lw    $t9, 0x48($sp)
 .L8008A08C:
diff --git a/asm/non_matchings/unknown_080500/func_8008B758.s b/asm/non_matchings/unknown_080500/func_8008B758.s
index bb501060..b0a9a3c6 100644
--- a/asm/non_matchings/unknown_080500/func_8008B758.s
+++ b/asm/non_matchings/unknown_080500/func_8008B758.s
@@ -78,10 +78,10 @@ glabel func_8008B758
 /* 08C47C 8008B87C AC2AF4BC */  sw    $t2, %lo(D_800DF4BC)($at)
 /* 08C480 8008B880 3C06800E */  lui   $a2, %hi(D_800DF4BC) # $a2, 0x800e
 /* 08C484 8008B884 8CC6F4BC */  lw    $a2, %lo(D_800DF4BC)($a2)
-/* 08C488 8008B888 3C018012 */  lui   $at, 0x8012
+/* 08C488 8008B888 3C018012 */  lui   $at, %hi(D_801263D4) #$at, 0x8012
 /* 08C48C 8008B88C 00340821 */  addu  $at, $at, $s4
 /* 08C490 8008B890 18C00026 */  blez  $a2, .L8008B92C
-/* 08C494 8008B894 A02063D4 */   sb    $zero, 0x63d4($at)
+/* 08C494 8008B894 A02063D4 */   sb    $zero, %lo(D_801263D4)($at)
 /* 08C498 8008B898 824C0000 */  lb    $t4, ($s2)
 /* 08C49C 8008B89C 8FC50000 */  lw    $a1, ($fp)
 /* 08C4A0 8008B8A0 01930019 */  multu $t4, $s3
diff --git a/asm/non_matchings/unknown_0AEE70/func_800AF714.s b/asm/non_matchings/unknown_0AEE70/func_800AF714.s
index 2775b4bb..b640349e 100644
--- a/asm/non_matchings/unknown_0AEE70/func_800AF714.s
+++ b/asm/non_matchings/unknown_0AEE70/func_800AF714.s
@@ -328,11 +328,11 @@ glabel func_800AF714
 /* 0B07BC 800AFBBC 00000000 */   nop   
 .L800AFBC0:
 /* 0B07C0 800AFBC0 82790002 */  lb    $t9, 2($s3)
-/* 0B07C4 800AFBC4 3C018012 */  lui   $at, 0x8012
+/* 0B07C4 800AFBC4 3C018012 */  lui   $at, %hi(D_80127C88) #$at, 0x8012
 /* 0B07C8 800AFBC8 33380007 */  andi  $t8, $t9, 7
 /* 0B07CC 800AFBCC 00186040 */  sll   $t4, $t8, 1
 /* 0B07D0 800AFBD0 002C0821 */  addu  $at, $at, $t4
-/* 0B07D4 800AFBD4 A4207C88 */  sh    $zero, 0x7c88($at)
+/* 0B07D4 800AFBD4 A4207C88 */  sh    $zero, %lo(D_80127C88)($at)
 .L800AFBD8:
 /* 0B07D8 800AFBD8 AE200000 */  sw    $zero, ($s1)
 .L800AFBDC:
diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s
index 8a4048c0..77fd000b 100644
--- a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s
+++ b/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s
@@ -5,10 +5,10 @@ glabel func_800CCEE8
 .L800CCEF4:
 /* 0CDAF4 800CCEF4 8FAE0000 */  lw    $t6, ($sp)
 /* 0CDAF8 800CCEF8 8FB80000 */  lw    $t8, ($sp)
-/* 0CDAFC 800CCEFC 3C018013 */  lui   $at, 0x8013
+/* 0CDAFC 800CCEFC 3C018013 */  lui   $at, %hi(D_8012CD50) #$at, 0x8013
 /* 0CDB00 800CCF00 000E7880 */  sll   $t7, $t6, 2
 /* 0CDB04 800CCF04 002F0821 */  addu  $at, $at, $t7
-/* 0CDB08 800CCF08 AC20CD50 */  sw    $zero, -0x32b0($at)
+/* 0CDB08 800CCF08 AC20CD50 */  sw    $zero, %lo(D_8012CD50)($at)
 /* 0CDB0C 800CCF0C 27190001 */  addiu $t9, $t8, 1
 /* 0CDB10 800CCF10 2B210010 */  slti  $at, $t9, 0x10
 /* 0CDB14 800CCF14 1420FFF7 */  bnez  $at, .L800CCEF4
diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s
index 0fc3849d..4f845836 100644
--- a/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s
+++ b/lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s
@@ -7,10 +7,10 @@ glabel func_800CD14C
 .L800CD160:
 /* 0CDD60 800CD160 8FAF0000 */  lw    $t7, ($sp)
 /* 0CDD64 800CD164 8FB90000 */  lw    $t9, ($sp)
-/* 0CDD68 800CD168 3C018013 */  lui   $at, 0x8013
+/* 0CDD68 800CD168 3C018013 */  lui   $at, %hi(D_8012CD50) #$at, 0x8013
 /* 0CDD6C 800CD16C 000FC080 */  sll   $t8, $t7, 2
 /* 0CDD70 800CD170 00380821 */  addu  $at, $at, $t8
-/* 0CDD74 800CD174 AC20CD50 */  sw    $zero, -0x32b0($at)
+/* 0CDD74 800CD174 AC20CD50 */  sw    $zero, %lo(D_8012CD50)($at)
 /* 0CDD78 800CD178 27280001 */  addiu $t0, $t9, 1
 /* 0CDD7C 800CD17C 29010010 */  slti  $at, $t0, 0x10
 /* 0CDD80 800CD180 1420FFF7 */  bnez  $at, .L800CD160
diff --git a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s
index c5950158..a9b3465c 100644
--- a/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s
+++ b/lib/asm/non_matchings/unknown_0CDE90/__osPfsRequestData.s
@@ -7,10 +7,10 @@ glabel __osPfsRequestData
 .L800CD444:
 /* 0CE044 800CD444 8FAE0000 */  lw    $t6, ($sp)
 /* 0CE048 800CD448 8FB80000 */  lw    $t8, ($sp)
-/* 0CE04C 800CD44C 3C018013 */  lui   $at, 0x8013
+/* 0CE04C 800CD44C 3C018013 */  lui   $at, %hi(__osPfsPifRam) #$at, 0x8013
 /* 0CE050 800CD450 000E7880 */  sll   $t7, $t6, 2
 /* 0CE054 800CD454 002F0821 */  addu  $at, $at, $t7
-/* 0CE058 800CD458 AC20CDE0 */  sw    $zero, -0x3220($at)
+/* 0CE058 800CD458 AC20CDE0 */  sw    $zero, %lo(__osPfsPifRam)($at)
 /* 0CE05C 800CD45C 27190001 */  addiu $t9, $t8, 1
 /* 0CE060 800CD460 2B210010 */  slti  $at, $t9, 0x10
 /* 0CE064 800CD464 1420FFF7 */  bnez  $at, .L800CD444
diff --git a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s
index dc820aaa..7afed174 100644
--- a/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s
+++ b/lib/asm/non_matchings/unknown_0CE370/__osPackRamWriteData.s
@@ -11,10 +11,10 @@ glabel __osPackRamWriteData
 .L800CDB44:
 /* 0CE744 800CDB44 8FAF0018 */  lw    $t7, 0x18($sp)
 /* 0CE748 800CDB48 8FB90018 */  lw    $t9, 0x18($sp)
-/* 0CE74C 800CDB4C 3C018013 */  lui   $at, 0x8013
+/* 0CE74C 800CDB4C 3C018013 */  lui   $at, %hi(__osPfsPifRam) #$at, 0x8013
 /* 0CE750 800CDB50 000FC080 */  sll   $t8, $t7, 2
 /* 0CE754 800CDB54 00380821 */  addu  $at, $at, $t8
-/* 0CE758 800CDB58 AC20CDE0 */  sw    $zero, -0x3220($at)
+/* 0CE758 800CDB58 AC20CDE0 */  sw    $zero, %lo(__osPfsPifRam)($at)
 /* 0CE75C 800CDB5C 27280001 */  addiu $t0, $t9, 1
 /* 0CE760 800CDB60 29010010 */  slti  $at, $t0, 0x10
 /* 0CE764 800CDB64 1420FFF7 */  bnez  $at, .L800CDB44
diff --git a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s
index 9031c88c..16e48aca 100644
--- a/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s
+++ b/lib/asm/non_matchings/unknown_0CE8A0/__osPackRamReadData.s
@@ -10,10 +10,10 @@ glabel __osPackRamReadData
 .L800CDF04:
 /* 0CEB04 800CDF04 8FAF0018 */  lw    $t7, 0x18($sp)
 /* 0CEB08 800CDF08 8FB90018 */  lw    $t9, 0x18($sp)
-/* 0CEB0C 800CDF0C 3C018013 */  lui   $at, 0x8013
+/* 0CEB0C 800CDF0C 3C018013 */  lui   $at, %hi(__osPfsPifRam) #$at, 0x8013
 /* 0CEB10 800CDF10 000FC080 */  sll   $t8, $t7, 2
 /* 0CEB14 800CDF14 00380821 */  addu  $at, $at, $t8
-/* 0CEB18 800CDF18 AC20CDE0 */  sw    $zero, -0x3220($at)
+/* 0CEB18 800CDF18 AC20CDE0 */  sw    $zero, %lo(__osPfsPifRam)($at)
 /* 0CEB1C 800CDF1C 27280001 */  addiu $t0, $t9, 1
 /* 0CEB20 800CDF20 29010010 */  slti  $at, $t0, 0x10
 /* 0CEB24 800CDF24 1420FFF7 */  bnez  $at, .L800CDF04
diff --git a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s
index 054dd6b0..9464c0f8 100644
--- a/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s
+++ b/lib/asm/non_matchings/unknown_0CF330/__osEepStatus.s
@@ -11,10 +11,10 @@ glabel __osEepStatus
 .L800CE860:
 /* 0CF460 800CE860 8FAF0028 */  lw    $t7, 0x28($sp)
 /* 0CF464 800CE864 8FB90028 */  lw    $t9, 0x28($sp)
-/* 0CF468 800CE868 3C018013 */  lui   $at, 0x8013
+/* 0CF468 800CE868 3C018013 */  lui   $at, %hi(D_8012CE40) #$at, 0x8013
 /* 0CF46C 800CE86C 000FC080 */  sll   $t8, $t7, 2
 /* 0CF470 800CE870 00380821 */  addu  $at, $at, $t8
-/* 0CF474 800CE874 AC20CE40 */  sw    $zero, -0x31c0($at)
+/* 0CF474 800CE874 AC20CE40 */  sw    $zero, %lo(D_8012CE40)($at)
 /* 0CF478 800CE878 27280001 */  addiu $t0, $t9, 1
 /* 0CF47C 800CE87C 29010010 */  slti  $at, $t0, 0x10
 /* 0CF480 800CE880 1420FFF7 */  bnez  $at, .L800CE860
diff --git a/tools/python/find_glabels.py b/tools/python/find_glabels.py
index 94fe4ea1..c5f7dc14 100644
--- a/tools/python/find_glabels.py
+++ b/tools/python/find_glabels.py
@@ -3,7 +3,7 @@ import re
 from file_util import FileUtil
 
 LINE_START_REGEX = r'\n(/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+|\.L80[0-9A-F]{6}:)'
-REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))'
+REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra|zero))'
 GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))'
 GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'[sl][bhw]u?\s+' + REG_REGEX + r',\s+(-?0x[0-9a-f]{4})\(\4\))'
 GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + GLABEL_LOWER_REGEX
@@ -11,7 +11,7 @@ GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*){0,10}' + G
 UPPER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*lui\s+)([^\n]*)'
 LOWER_INSTR_REGEX_TMPL = r'(/\* %s[^\n]*[ls][bhw]u?\s+' + REG_REGEX + r',\s+)-?0x[0-9a-f]{4}([^\n]*)'
 
-IGNORE_GLABELS = ['D_800E389E', 'D_801264A1']
+IGNORE_GLABELS = ['D_800E389E', 'D_801264A1', 'D_800E1B84']
 
 def _find_glabels(asm):
     glabels = []