continue rename and place const

MegaMech · Sep 22, 2024 · 066d18b · 066d18b
1 parent 87e7caa
commit 066d18b
Show file tree

Hide file tree

Showing 8 changed files with 670 additions and 648 deletions.
diff --git a/asm/non_matchings/code_80091750/func_8009F5E0.s b/asm/non_matchings/code_80091750/func_8009F5E0.s
@@ -383,7 +383,7 @@ glabel L8009F904
 /* 0A059C 8009F99C 8E260000 */  lw    $a2, ($s1)
 /* 0A05A0 8009F9A0 00003825 */  move  $a3, $zero
 /* 0A05A4 8009F9A4 E7A00010 */  swc1  $f0, 0x10($sp)
-/* 0A05A8 8009F9A8 0C024DBB */  jal   draw_text
+/* 0A05A8 8009F9A8 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A05AC 8009F9AC E7A00014 */   swc1  $f0, 0x14($sp)
 /* 0A05B0 8009F9B0 00002025 */  move  $a0, $zero
 /* 0A05B4 8009F9B4 0C02D3AD */  jal   func_800B4EB4
@@ -583,7 +583,7 @@ glabel L8009FB24
 /* 0A0898 8009FC98 46101480 */  add.s $f18, $f2, $f16
 /* 0A089C 8009FC9C 4600910D */  trunc.w.s $f4, $f18
 /* 0A08A0 8009FCA0 44052000 */  mfc1  $a1, $f4
-/* 0A08A4 8009FCA4 0C024DBB */  jal   draw_text
+/* 0A08A4 8009FCA4 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A08A8 8009FCA8 00000000 */   nop
 /* 0A08AC 8009FCAC 8FA20040 */  lw    $v0, 0x40($sp)
 /* 0A08B0 8009FCB0 8FA30044 */  lw    $v1, 0x44($sp)
@@ -1186,7 +1186,7 @@ glabel L800A0428
 /* 0A113C 800A053C 2405001C */  li    $a1, 28
 /* 0A1140 800A0540 00003825 */  move  $a3, $zero
 /* 0A1144 800A0544 E7A00010 */  swc1  $f0, 0x10($sp)
-/* 0A1148 800A0548 0C024DAE */  jal   func_800936B8
+/* 0A1148 800A0548 0C024DAE */  jal   print_text1_left
 /* 0A114C 800A054C E7A00014 */   swc1  $f0, 0x14($sp)
 /* 0A1150 800A0550 100000DD */  b     .L800A08C8
 /* 0A1154 800A0554 8FBF0034 */   lw    $ra, 0x34($sp)
@@ -1216,7 +1216,7 @@ glabel L800A0578
 /* 0A11A8 800A05A8 8E27001C */  lw    $a3, 0x1c($s1)
 /* 0A11AC 800A05AC 8CC67500 */  lw    $a2, %lo(gCupNames)($a2)
 /* 0A11B0 800A05B0 E7A80014 */  swc1  $f8, 0x14($sp)
-/* 0A11B4 800A05B4 0C024DAE */  jal   func_800936B8
+/* 0A11B4 800A05B4 0C024DAE */  jal   print_text1_left
 /* 0A11B8 800A05B8 E7AA0010 */   swc1  $f10, 0x10($sp)
 /* 0A11BC 800A05BC 100000C2 */  b     .L800A08C8
 /* 0A11C0 800A05C0 8FBF0034 */   lw    $ra, 0x34($sp)
@@ -1316,7 +1316,7 @@ glabel L800A0694
 /* 0A1314 800A0714 1000006C */  b     .L800A08C8
 /* 0A1318 800A0718 8FBF0034 */   lw    $ra, 0x34($sp)
 glabel L800A071C
-/* 0A131C 800A071C 0C028F21 */  jal   func_800A3C84
+/* 0A131C 800A071C 0C028F21 */  jal   menu_item_end_time_trial_render
 /* 0A1320 800A0720 02202025 */   move  $a0, $s1
 /* 0A1324 800A0724 10000068 */  b     .L800A08C8
 /* 0A1328 800A0728 8FBF0034 */   lw    $ra, 0x34($sp)
@@ -1351,7 +1351,7 @@ glabel L800A077C
 /* 0A1384 800A0784 10000050 */  b     .L800A08C8
 /* 0A1388 800A0788 8FBF0034 */   lw    $ra, 0x34($sp)
 glabel L800A078C
-/* 0A138C 800A078C 0C0286F8 */  jal   func_800A1BE0
+/* 0A138C 800A078C 0C0286F8 */  jal   menu_item_course_data_render
 /* 0A1390 800A0790 02202025 */   move  $a0, $s1
 /* 0A1394 800A0794 1000004C */  b     .L800A08C8
 /* 0A1398 800A0798 8FBF0034 */   lw    $ra, 0x34($sp)
@@ -1439,7 +1439,7 @@ glabel L800A084C
 /* 0A14B4 800A08B4 10000004 */  b     .L800A08C8
 /* 0A14B8 800A08B8 8FBF0034 */   lw    $ra, 0x34($sp)
 glabel L800A08BC
-/* 0A14BC 800A08BC 0C029DE4 */  jal   func_800A7790
+/* 0A14BC 800A08BC 0C029DE4 */  jal   menu_item_credit_render
 /* 0A14C0 800A08C0 02202025 */   move  $a0, $s1
 .L800A08C4:
 glabel L800A08C4

diff --git a/asm/non_matchings/code_80091750/func_800A1FB0.s b/asm/non_matchings/code_80091750/func_800A1FB0.s
@@ -137,7 +137,7 @@ glabel L800A2054
 /* 0A2CF8 800A20F8 24050078 */  li    $a1, 120
 /* 0A2CFC 800A20FC 00003825 */  move  $a3, $zero
 /* 0A2D00 800A2100 E7B60010 */  swc1  $f22, 0x10($sp)
-/* 0A2D04 800A2104 0C024DBB */  jal   draw_text
+/* 0A2D04 800A2104 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A2D08 800A2108 E7B60014 */   swc1  $f22, 0x14($sp)
 /* 0A2D0C 800A210C 3C038019 */  lui   $v1, %hi(D_8018EDEC) # $v1, 0x8019
 /* 0A2D10 800A2110 100002DA */  b     .L800A2C7C
@@ -365,7 +365,7 @@ glabel L800A23DC
 /* 0A3040 800A2440 24050055 */  li    $a1, 85
 /* 0A3044 800A2444 00003825 */  move  $a3, $zero
 /* 0A3048 800A2448 E7B60010 */  swc1  $f22, 0x10($sp)
-/* 0A304C 800A244C 0C024DBB */  jal   draw_text
+/* 0A304C 800A244C 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A3050 800A2450 E7B60014 */   swc1  $f22, 0x14($sp)
 /* 0A3054 800A2454 00146900 */  sll   $t5, $s4, 4
 /* 0A3058 800A2458 01B46821 */  addu  $t5, $t5, $s4
@@ -396,7 +396,7 @@ glabel L800A23DC
 /* 0A30B8 800A24B8 8DE60000 */  lw    $a2, ($t7)
 /* 0A30BC 800A24BC E7B80014 */  swc1  $f24, 0x14($sp)
 /* 0A30C0 800A24C0 E7B80010 */  swc1  $f24, 0x10($sp)
-/* 0A30C4 800A24C4 0C024DBB */  jal   draw_text
+/* 0A30C4 800A24C4 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A30C8 800A24C8 00003825 */   move  $a3, $zero
 /* 0A30CC 800A24CC 00008025 */  move  $s0, $zero
 /* 0A30D0 800A24D0 24120096 */  li    $s2, 150
@@ -546,7 +546,7 @@ glabel L800A26A8
 /* 0A32D4 800A26D4 8E060000 */  lw    $a2, ($s0)
 /* 0A32D8 800A26D8 00003825 */  move  $a3, $zero
 /* 0A32DC 800A26DC E7B40010 */  swc1  $f20, 0x10($sp)
-/* 0A32E0 800A26E0 0C024DBB */  jal   draw_text
+/* 0A32E0 800A26E0 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A32E4 800A26E4 E7B40014 */   swc1  $f20, 0x14($sp)
 /* 0A32E8 800A26E8 26100004 */  addiu $s0, $s0, 4
 /* 0A32EC 800A26EC 0212082B */  sltu  $at, $s0, $s2
@@ -579,7 +579,7 @@ glabel L800A26A8
 /* 0A3354 800A2754 8D660000 */  lw    $a2, ($t3)
 /* 0A3358 800A2758 E7B80014 */  swc1  $f24, 0x14($sp)
 /* 0A335C 800A275C E7B80010 */  swc1  $f24, 0x10($sp)
-/* 0A3360 800A2760 0C024DBB */  jal   draw_text
+/* 0A3360 800A2760 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A3364 800A2764 00003825 */   move  $a3, $zero
 /* 0A3368 800A2768 00008025 */  move  $s0, $zero
 /* 0A336C 800A276C 24120096 */  li    $s2, 150
@@ -774,7 +774,7 @@ glabel L800A29D0
 /* 0A3614 800A2A14 24050055 */  li    $a1, 85
 /* 0A3618 800A2A18 00003825 */  move  $a3, $zero
 /* 0A361C 800A2A1C E7B60010 */  swc1  $f22, 0x10($sp)
-/* 0A3620 800A2A20 0C024DBB */  jal   draw_text
+/* 0A3620 800A2A20 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A3624 800A2A24 E7B60014 */   swc1  $f22, 0x14($sp)
 /* 0A3628 800A2A28 3C013F40 */  li    $at, 0x3F400000 # 0.750000
 /* 0A362C 800A2A2C 4481C000 */  mtc1  $at, $f24
@@ -804,7 +804,7 @@ glabel L800A29D0
 /* 0A3688 800A2A88 8D260000 */  lw    $a2, ($t1)
 /* 0A368C 800A2A8C E7B80014 */  swc1  $f24, 0x14($sp)
 /* 0A3690 800A2A90 E7B80010 */  swc1  $f24, 0x10($sp)
-/* 0A3694 800A2A94 0C024DBB */  jal   draw_text
+/* 0A3694 800A2A94 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A3698 800A2A98 00003825 */   move  $a3, $zero
 /* 0A369C 800A2A9C 00008025 */  move  $s0, $zero
 /* 0A36A0 800A2AA0 24120096 */  li    $s2, 150

diff --git a/asm/non_matchings/code_80091750/func_800A474C.s b/asm/non_matchings/code_80091750/func_800A474C.s
@@ -15,7 +15,7 @@ glabel D_800F1DC8
 
 .section .text
 
-glabel func_800A474C
+glabel render_player_time
 /* 0A534C 800A474C 27BDFFB0 */  addiu $sp, $sp, -0x50
 /* 0A5350 800A4750 3C0E800E */  lui   $t6, %hi(gGamestate) # $t6, 0x800e
 /* 0A5354 800A4754 8DCEC50C */  lw    $t6, %lo(gGamestate)($t6)
@@ -206,7 +206,7 @@ glabel func_800A474C
 /* 0A55FC 800A49FC 8FA50058 */  lw    $a1, 0x58($sp)
 /* 0A5600 800A4A00 00003825 */  move  $a3, $zero
 /* 0A5604 800A4A04 E7B40010 */  swc1  $f20, 0x10($sp)
-/* 0A5608 800A4A08 0C024DBB */  jal   draw_text
+/* 0A5608 800A4A08 0C024DBB */  jal   print_text1_center_mode_1
 /* 0A560C 800A4A0C E7B40014 */   swc1  $f20, 0x14($sp)
 /* 0A5610 800A4A10 8FBF0024 */  lw    $ra, 0x24($sp)
 /* 0A5614 800A4A14 D7B40018 */  ldc1  $f20, 0x18($sp)