Rename some functions.

This commit is contained in:
Antonio Castelli
2022-11-06 09:52:53 -08:00
parent e7fe92095b
commit da2d061f62
36 changed files with 71 additions and 70 deletions
+2 -2
View File
@@ -75,7 +75,7 @@ glabel func_8006DCF8
/* 06E9FC 8006DDFC 3C088012 */ lui $t0, %hi(D_801234F4) # $t0, 0x8012
/* 06EA00 8006DE00 250834F4 */ addiu $t0, %lo(D_801234F4) # addiu $t0, $t0, 0x34f4
/* 06EA04 8006DE04 31C4007F */ andi $a0, $t6, 0x7f
/* 06EA08 8006DE08 0C01AC2B */ jal func_8006B0AC
/* 06EA08 8006DE08 0C01AC2B */ jal get_map_default_vehicle
/* 06EA0C 8006DE0C AD040000 */ sw $a0, ($t0)
/* 06EA10 8006DE10 3C098012 */ lui $t1, %hi(D_80123504) # $t1, 0x8012
/* 06EA14 8006DE14 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
@@ -247,7 +247,7 @@ glabel L8006E054
/* 06EC8C 8006E08C 250834F4 */ addiu $t0, %lo(D_801234F4) # addiu $t0, $t0, 0x34f4
/* 06EC90 8006E090 AD040000 */ sw $a0, ($t0)
/* 06EC94 8006E094 AD2E0000 */ sw $t6, ($t1)
/* 06EC98 8006E098 0C01AC2B */ jal func_8006B0AC
/* 06EC98 8006E098 0C01AC2B */ jal get_map_default_vehicle
/* 06EC9C 8006E09C AD790000 */ sw $t9, ($t3)
/* 06ECA0 8006E0A0 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012
/* 06ECA4 8006E0A4 3C088012 */ lui $t0, %hi(D_801234F4) # $t0, 0x8012
+1 -1
View File
@@ -198,7 +198,7 @@ glabel func_800904E8
/* 0913C4 800907C4 8D6B69CC */ lw $t3, %lo(D_801269CC)($t3)
/* 0913C8 800907C8 AC3969F4 */ sw $t9, %lo(gSelectedTrackX)($at)
/* 0913CC 800907CC 3C018012 */ lui $at, %hi(gSelectedTrackY) # $at, 0x8012
/* 0913D0 800907D0 0C01AC2B */ jal func_8006B0AC
/* 0913D0 800907D0 0C01AC2B */ jal get_map_default_vehicle
/* 0913D4 800907D4 AC2B69F8 */ sw $t3, %lo(gSelectedTrackY)($at)
/* 0913D8 800907D8 0C01B6C5 */ jal set_level_default_vehicle
/* 0913DC 800907DC 00402025 */ move $a0, $v0
+1 -1
View File
@@ -180,7 +180,7 @@ glabel func_80092188
/* 093010 80092410 172001F0 */ bnez $t9, .L80092BD4
/* 093014 80092414 8FBF001C */ lw $ra, 0x1c($sp)
/* 093018 80092418 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0)
/* 09301C 8009241C 0C01AC3E */ jal func_8006B0F8
/* 09301C 8009241C 0C01AC3E */ jal get_map_available_vehicles
/* 093020 80092420 00000000 */ nop
/* 093024 80092424 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 093028 80092428 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
+2 -2
View File
@@ -47,7 +47,7 @@ glabel func_80092E94
/* 093B44 80092F44 102001A9 */ beqz $at, .L800935EC
/* 093B48 80092F48 8FBF0034 */ lw $ra, 0x34($sp)
/* 093B4C 80092F4C 8FA40058 */ lw $a0, 0x58($sp)
/* 093B50 80092F50 0C01AC3E */ jal func_8006B0F8
/* 093B50 80092F50 0C01AC3E */ jal get_map_available_vehicles
/* 093B54 80092F54 00000000 */ nop
/* 093B58 80092F58 8FA40058 */ lw $a0, 0x58($sp)
/* 093B5C 80092F5C 0C01AF77 */ jal get_level_name
@@ -299,7 +299,7 @@ glabel func_80092E94
/* 093F24 80093324 29C10002 */ slti $at, $t6, 2
/* 093F28 80093328 10200008 */ beqz $at, .L8009334C
/* 093F2C 8009332C 240200FF */ li $v0, 255
/* 093F30 80093330 0C01AC2B */ jal func_8006B0AC
/* 093F30 80093330 0C01AC2B */ jal get_map_default_vehicle
/* 093F34 80093334 00000000 */ nop
/* 093F38 80093338 10500004 */ beq $v0, $s0, .L8009334C
/* 093F3C 8009333C 240200FF */ li $v0, 255
@@ -53,7 +53,7 @@ glabel menu_trophy_race_round_init
/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerSelectVehicle) # $s2, 0x8012
/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerSelectVehicle) # addiu $s2, $s2, 0x69c0
.L80098330:
/* 098F30 80098330 0C01AC2B */ jal func_8006B0AC
/* 098F30 80098330 0C01AC2B */ jal get_map_default_vehicle
/* 098F34 80098334 02002025 */ move $a0, $s0
/* 098F38 80098338 8E6A0000 */ lw $t2, ($s3)
/* 098F3C 8009833C 26310001 */ addiu $s1, $s1, 1
@@ -62,7 +62,7 @@ glabel menu_trophy_race_round_init
/* 098F48 80098348 1420FFF9 */ bnez $at, .L80098330
/* 098F4C 8009834C A242FFFF */ sb $v0, -1($s2)
.L80098350:
/* 098F50 80098350 0C01AC2B */ jal func_8006B0AC
/* 098F50 80098350 0C01AC2B */ jal get_map_default_vehicle
/* 098F54 80098354 02002025 */ move $a0, $s0
/* 098F58 80098358 0C01B6C5 */ jal set_level_default_vehicle
/* 098F5C 8009835C 00402025 */ move $a0, $v0
@@ -130,7 +130,7 @@ glabel render_track_select_setup_ui
/* 091CF8 800910F8 AFC00000 */ sw $zero, ($fp)
.L800910FC:
/* 091CFC 800910FC 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0)
/* 091D00 80091100 0C01AC3E */ jal func_8006B0F8
/* 091D00 80091100 0C01AC3E */ jal get_map_available_vehicles
/* 091D04 80091104 00000000 */ nop
/* 091D08 80091108 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e
/* 091D0C 8009110C 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0)
+1 -1
View File
@@ -1,7 +1,7 @@
glabel func_8001B2F0
/* 01BEF0 8001B2F0 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 01BEF4 8001B2F4 AFBF0014 */ sw $ra, 0x14($sp)
/* 01BEF8 8001B2F8 0C01AC2B */ jal func_8006B0AC
/* 01BEF8 8001B2F8 0C01AC2B */ jal get_map_default_vehicle
/* 01BEFC 8001B2FC AFA40028 */ sw $a0, 0x28($sp)
/* 01BF00 8001B300 3C058012 */ lui $a1, %hi(D_8011AE84) # $a1, 0x8012
/* 01BF04 8001B304 24A5AE84 */ addiu $a1, %lo(D_8011AE84) # addiu $a1, $a1, -0x517c
+1 -1
View File
@@ -9,7 +9,7 @@ glabel func_8001B4FC
/* 01C118 8001B518 0C01BAA4 */ jal get_settings
/* 01C11C 8001B51C A020C734 */ sb $zero, %lo(D_800DC734)($at)
/* 01C120 8001B520 AFA20020 */ sw $v0, 0x20($sp)
/* 01C124 8001B524 0C01AC2B */ jal func_8006B0AC
/* 01C124 8001B524 0C01AC2B */ jal get_map_default_vehicle
/* 01C128 8001B528 02002025 */ move $a0, $s0
/* 01C12C 8001B52C 3C0E8012 */ lui $t6, %hi(D_8011AE82) # $t6, 0x8012
/* 01C130 8001B530 85CEAE82 */ lh $t6, %lo(D_8011AE82)($t6)
+1 -1
View File
@@ -22,7 +22,7 @@ glabel func_80022948
/* 023598 80022998 AC29AEFC */ sw $t1, %lo(D_8011AEFC)($at)
/* 02359C 8002299C A04A0052 */ sb $t2, 0x52($v0)
/* 0235A0 800229A0 A44B0054 */ sh $t3, 0x54($v0)
/* 0235A4 800229A4 0C006EB2 */ jal get_object_struct
/* 0235A4 800229A4 0C006EB2 */ jal get_racer_object
/* 0235A8 800229A8 00002025 */ move $a0, $zero
/* 0235AC 800229AC 8C500064 */ lw $s0, 0x64($v0)
/* 0235B0 800229B0 3C018012 */ lui $at, %hi(D_8011AEF6) # $at, 0x8012
@@ -1,4 +1,4 @@
glabel func_800576E0
glabel drop_bananas
/* 0582E0 800576E0 27BDFF70 */ addiu $sp, $sp, -0x90
/* 0582E4 800576E4 AFBF005C */ sw $ra, 0x5c($sp)
/* 0582E8 800576E8 AFB20048 */ sw $s2, 0x48($sp)
+4 -4
View File
@@ -296,7 +296,7 @@ glabel L800446AC
/* 045498 80044898 A7A70048 */ sh $a3, 0x48($sp)
/* 04549C 8004489C A7A8004A */ sh $t0, 0x4a($sp)
/* 0454A0 800448A0 A7A90046 */ sh $t1, 0x46($sp)
/* 0454A4 800448A4 0C006EB2 */ jal get_object_struct
/* 0454A4 800448A4 0C006EB2 */ jal get_racer_object
/* 0454A8 800448A8 A7AA004C */ sh $t2, 0x4c($sp)
/* 0454AC 800448AC 87A90046 */ lh $t1, 0x46($sp)
/* 0454B0 800448B0 87A50052 */ lh $a1, 0x52($sp)
@@ -356,7 +356,7 @@ glabel L800446AC
/* 045580 80044980 87A8004A */ lh $t0, 0x4a($sp)
/* 045584 80044984 1440000A */ bnez $v0, .L800449B0
/* 045588 80044988 00C02025 */ move $a0, $a2
/* 04558C 8004498C 0C006EB2 */ jal get_object_struct
/* 04558C 8004498C 0C006EB2 */ jal get_racer_object
/* 045590 80044990 A7A8004A */ sh $t0, 0x4a($sp)
/* 045594 80044994 8C430064 */ lw $v1, 0x64($v0)
/* 045598 80044998 87A8004A */ lh $t0, 0x4a($sp)
@@ -654,7 +654,7 @@ glabel L80044ADC
/* 0459B4 80044DB4 AFA20058 */ sw $v0, 0x58($sp)
.L80044DB8:
/* 0459B8 80044DB8 820401CF */ lb $a0, 0x1cf($s0)
/* 0459BC 80044DBC 0C006EB2 */ jal get_object_struct
/* 0459BC 80044DBC 0C006EB2 */ jal get_racer_object
/* 0459C0 80044DC0 00000000 */ nop
/* 0459C4 80044DC4 8C430064 */ lw $v1, 0x64($v0)
/* 0459C8 80044DC8 2401FFFF */ li $at, -1
@@ -795,7 +795,7 @@ glabel L80044F54
/* 045BA8 80044FA8 00A02025 */ move $a0, $a1
/* 045BAC 80044FAC 10AC0054 */ beq $a1, $t4, .L80045100
/* 045BB0 80044FB0 00000000 */ nop
/* 045BB4 80044FB4 0C006EB2 */ jal get_object_struct
/* 045BB4 80044FB4 0C006EB2 */ jal get_racer_object
/* 045BB8 80044FB8 A7A50052 */ sh $a1, 0x52($sp)
/* 045BBC 80044FBC 8C430064 */ lw $v1, 0x64($v0)
/* 045BC0 80044FC0 87A50052 */ lh $a1, 0x52($sp)
+1 -1
View File
@@ -434,7 +434,7 @@ glabel L800456DC
/* 046468 80045868 2401FFFF */ li $at, -1
/* 04646C 8004586C 12210004 */ beq $s1, $at, .L80045880
/* 046470 80045870 00000000 */ nop
/* 046474 80045874 0C006EB2 */ jal get_object_struct
/* 046474 80045874 0C006EB2 */ jal get_racer_object
/* 046478 80045878 02202025 */ move $a0, $s1
/* 04647C 8004587C 0040F025 */ move $fp, $v0
.L80045880:
+2 -2
View File
@@ -52,7 +52,7 @@ glabel func_80073588
/* 074248 80073648 02202025 */ move $a0, $s1
/* 07424C 8007364C 14400031 */ bnez $v0, .L80073714
/* 074250 80073650 8FAC0040 */ lw $t4, 0x40($sp)
/* 074254 80073654 0C01AC3E */ jal func_8006B0F8
/* 074254 80073654 0C01AC3E */ jal get_map_available_vehicles
/* 074258 80073658 02202025 */ move $a0, $s1
/* 07425C 8007365C 00029400 */ sll $s2, $v0, 0x10
/* 074260 80073660 00127403 */ sra $t6, $s2, 0x10
@@ -149,7 +149,7 @@ glabel func_80073588
/* 0743AC 800737AC 02202025 */ move $a0, $s1
/* 0743B0 800737B0 14400031 */ bnez $v0, .L80073878
/* 0743B4 800737B4 8FAB0040 */ lw $t3, 0x40($sp)
/* 0743B8 800737B8 0C01AC3E */ jal func_8006B0F8
/* 0743B8 800737B8 0C01AC3E */ jal get_map_available_vehicles
/* 0743BC 800737BC 02202025 */ move $a0, $s1
/* 0743C0 800737C0 00029400 */ sll $s2, $v0, 0x10
/* 0743C4 800737C4 00126C03 */ sra $t5, $s2, 0x10
+2 -2
View File
@@ -31,7 +31,7 @@ glabel func_800738A4
/* 074514 80073914 02202025 */ move $a0, $s1
/* 074518 80073918 1440003B */ bnez $v0, .L80073A08
/* 07451C 8007391C 8FAF0048 */ lw $t7, 0x48($sp)
/* 074520 80073920 0C01AC3E */ jal func_8006B0F8
/* 074520 80073920 0C01AC3E */ jal get_map_available_vehicles
/* 074524 80073924 02202025 */ move $a0, $s1
/* 074528 80073928 00029C00 */ sll $s3, $v0, 0x10
/* 07452C 8007392C 0013CC03 */ sra $t9, $s3, 0x10
@@ -144,7 +144,7 @@ glabel func_800738A4
/* 0746B8 80073AB8 02202025 */ move $a0, $s1
/* 0746BC 80073ABC 14400033 */ bnez $v0, .L80073B8C
/* 0746C0 80073AC0 8FAB0048 */ lw $t3, 0x48($sp)
/* 0746C4 80073AC4 0C01AC3E */ jal func_8006B0F8
/* 0746C4 80073AC4 0C01AC3E */ jal get_map_available_vehicles
/* 0746C8 80073AC8 02202025 */ move $a0, $s1
/* 0746CC 80073ACC 00029C00 */ sll $s3, $v0, 0x10
/* 0746D0 80073AD0 00136C03 */ sra $t5, $s3, 0x10
@@ -211,7 +211,7 @@ glabel obj_loop_bridge_whaleramp
.L8003CD6C:
/* 03D96C 8003CD6C AE090078 */ sw $t1, 0x78($s0)
/* 03D970 8003CD70 AFA8005C */ sw $t0, 0x5c($sp)
/* 03D974 8003CD74 0C006EB2 */ jal get_object_struct
/* 03D974 8003CD74 0C006EB2 */ jal get_racer_object
/* 03D978 8003CD78 00002025 */ move $a0, $zero
/* 03D97C 8003CD7C 8FA8005C */ lw $t0, 0x5c($sp)
/* 03D980 8003CD80 10400013 */ beqz $v0, .L8003CDD0
@@ -185,7 +185,7 @@ glabel obj_loop_collectegg
/* 0360F4 800354F4 A22F000A */ sb $t7, 0xa($s1)
/* 0360F8 800354F8 24180003 */ li $t8, 3
/* 0360FC 800354FC 8224000A */ lb $a0, 0xa($s1)
/* 036100 80035500 0C006EB2 */ jal get_object_struct
/* 036100 80035500 0C006EB2 */ jal get_racer_object
/* 036104 80035504 A238000B */ sb $t8, 0xb($s1)
/* 036108 80035508 44800000 */ mtc1 $zero, $f0
/* 03610C 8003550C 10400007 */ beqz $v0, .L8003552C
@@ -205,7 +205,7 @@ glabel obj_loop_collectegg
/* 03613C 8003553C 862A0008 */ lh $t2, 8($s1)
/* 036140 80035540 8224000A */ lb $a0, 0xa($s1)
/* 036144 80035544 01455823 */ subu $t3, $t2, $a1
/* 036148 80035548 0C006EB2 */ jal get_object_struct
/* 036148 80035548 0C006EB2 */ jal get_racer_object
/* 03614C 8003554C A62B0008 */ sh $t3, 8($s1)
/* 036150 80035550 10400004 */ beqz $v0, .L80035564
/* 036154 80035554 00403825 */ move $a3, $v0
@@ -254,7 +254,7 @@ glabel obj_loop_collectegg
/* 0361F0 800355F0 A0C801CF */ sb $t0, 0x1cf($a2)
.L800355F4:
/* 0361F4 800355F4 8224000A */ lb $a0, 0xa($s1)
/* 0361F8 800355F8 0C006EB2 */ jal get_object_struct
/* 0361F8 800355F8 0C006EB2 */ jal get_racer_object
/* 0361FC 800355FC 00000000 */ nop
/* 036200 80035600 10400009 */ beqz $v0, .L80035628
/* 036204 80035604 240B0080 */ li $t3, 128
@@ -68,7 +68,7 @@ glabel obj_loop_parkwarden
/* 039FDC 800393DC 00002025 */ move $a0, $zero
/* 039FE0 800393E0 E7A0009C */ swc1 $f0, 0x9c($sp)
/* 039FE4 800393E4 E600001C */ swc1 $f0, 0x1c($s0)
/* 039FE8 800393E8 0C006EB2 */ jal get_object_struct
/* 039FE8 800393E8 0C006EB2 */ jal get_racer_object
/* 039FEC 800393EC E6000024 */ swc1 $f0, 0x24($s0)
/* 039FF0 800393F0 00401825 */ move $v1, $v0
/* 039FF4 800393F4 10400019 */ beqz $v0, .L8003945C
@@ -55,7 +55,7 @@ glabel obj_loop_stopwatchman
/* 036E80 80036280 E7A00070 */ swc1 $f0, 0x70($sp)
/* 036E84 80036284 00002025 */ move $a0, $zero
/* 036E88 80036288 E600001C */ swc1 $f0, 0x1c($s0)
/* 036E8C 8003628C 0C006EB2 */ jal get_object_struct
/* 036E8C 8003628C 0C006EB2 */ jal get_racer_object
/* 036E90 80036290 E6000024 */ swc1 $f0, 0x24($s0)
/* 036E94 80036294 00402825 */ move $a1, $v0
/* 036E98 80036298 10400042 */ beqz $v0, .L800363A4
@@ -9,7 +9,7 @@ glabel obj_loop_treasuresucker
/* 03DC60 8003D060 AFA5004C */ sw $a1, 0x4c($sp)
/* 03DC64 8003D064 00803025 */ move $a2, $a0
/* 03DC68 8003D068 8C840078 */ lw $a0, 0x78($a0)
/* 03DC6C 8003D06C 0C006EB2 */ jal get_object_struct
/* 03DC6C 8003D06C 0C006EB2 */ jal get_racer_object
/* 03DC70 8003D070 AFA60048 */ sw $a2, 0x48($sp)
/* 03DC74 8003D074 8FA60048 */ lw $a2, 0x48($sp)
/* 03DC78 8003D078 10400088 */ beqz $v0, .L8003D29C
@@ -70,7 +70,7 @@ glabel obj_loop_trophycab
/* 035B8C 80034F8C 8E0D0054 */ lw $t5, 0x54($s0)
/* 035B90 80034F90 00002025 */ move $a0, $zero
/* 035B94 80034F94 E5A60028 */ swc1 $f6, 0x28($t5)
/* 035B98 80034F98 0C006EB2 */ jal get_object_struct
/* 035B98 80034F98 0C006EB2 */ jal get_racer_object
/* 035B9C 80034F9C AFA30054 */ sw $v1, 0x54($sp)
/* 035BA0 80034FA0 8FA30054 */ lw $v1, 0x54($sp)
/* 035BA4 80034FA4 1040009E */ beqz $v0, .L80035220

Some files were not shown because too many files have changed in this diff Show More