Couple matches (#466)

Removed some things from variables.h and functions.h Added headers for some src/data files
n64decomp · Oct 19, 2023 · a870180 · a870180
1 parent 53f8428
commit a870180
Show file tree

Hide file tree

Showing 27 changed files with 248 additions and 779 deletions.
diff --git a/asm/non_matchings/code_80057C60/func_80067604.s b/asm/non_matchings/code_80057C60/func_80067604.s
diff --git a/asm/non_matchings/code_80091750/func_8009F5E0.s b/asm/non_matchings/code_80091750/func_8009F5E0.s
@@ -1207,13 +1207,13 @@ glabel L800A0578
 /* 0A1188 800A0588 3C013F80 */  li    $at, 0x3F800000 # 1.000000
 /* 0A118C 800A058C 44814000 */  mtc1  $at, $f8
 /* 0A1190 800A0590 C62A0024 */  lwc1  $f10, 0x24($s1)
-/* 0A1194 800A0594 3C06800E */  lui   $a2, %hi(D_800E7500)
+/* 0A1194 800A0594 3C06800E */  lui   $a2, %hi(gCupNames)
 /* 0A1198 800A0598 000FC080 */  sll   $t8, $t7, 2
 /* 0A119C 800A059C 00D83021 */  addu  $a2, $a2, $t8
 /* 0A11A0 800A05A0 8E24000C */  lw    $a0, 0xc($s1)
 /* 0A11A4 800A05A4 8E250010 */  lw    $a1, 0x10($s1)
 /* 0A11A8 800A05A8 8E27001C */  lw    $a3, 0x1c($s1)
-/* 0A11AC 800A05AC 8CC67500 */  lw    $a2, %lo(D_800E7500)($a2)
+/* 0A11AC 800A05AC 8CC67500 */  lw    $a2, %lo(gCupNames)($a2)
 /* 0A11B0 800A05B0 E7A80014 */  swc1  $f8, 0x14($sp)
 /* 0A11B4 800A05B4 0C024DAE */  jal   func_800936B8
 /* 0A11B8 800A05B8 E7AA0010 */   swc1  $f10, 0x10($sp)

diff --git a/asm/non_matchings/code_80091750/func_800A5084.s b/asm/non_matchings/code_80091750/func_800A5084.s
@@ -55,9 +55,9 @@ glabel func_800A5084
 /* 0A5D50 800A5150 0018C940 */  sll   $t9, $t8, 5
 /* 0A5D54 800A5154 82580000 */  lb    $t8, ($s2)
 /* 0A5D58 800A5158 000B60C0 */  sll   $t4, $t3, 3
-/* 0A5D5C 800A515C 3C14800E */  lui   $s4, %hi(D_800E7500) # $s4, 0x800e
+/* 0A5D5C 800A515C 3C14800E */  lui   $s4, %hi(gCupNames) # $s4, 0x800e
 /* 0A5D60 800A5160 032C6821 */  addu  $t5, $t9, $t4
-/* 0A5D64 800A5164 26947500 */  addiu $s4, %lo(D_800E7500) # addiu $s4, $s4, 0x7500
+/* 0A5D64 800A5164 26947500 */  addiu $s4, %lo(gCupNames) # addiu $s4, $s4, 0x7500
 /* 0A5D68 800A5168 3C0F800F */  lui   $t7, %hi(D_800E85C0) # $t7, 0x800f
 /* 0A5D6C 800A516C 00185880 */  sll   $t3, $t8, 2
 /* 0A5D70 800A5170 25EF85C0 */  addiu $t7, %lo(D_800E85C0) # addiu $t7, $t7, -0x7a40