izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve and label a bunch of racer.c functions (#348)

Browse Source 
* label some racer funcs

* Update object_functions.c

* match render_epc_lock_up_display

* Update thread0_epc.c

* Update thread0_epc.c

* delta

* racer labelling

* bit more

* last ones for tonight

* nonmatching func_80046524

* take a guess

* quick rename

* Update thread0_epc.c

* some wave correction

* Update waves.c

* suddenly unplanned object cleanup

* quick fixes

* Update thread0_epc.c

* Update src/racer.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2023-01-02 15:42:19 +00:00
committed by GitHub
co-authored by Ryan Myers
parent f38cb6b5bd
commit 51f40789c6
52 changed files with 1821 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/objects/func_8000B750.s
+1 -1
View File
@@ -231,7 +231,7 @@ glabel func_8000B750
/* 00C6A4 8000BAA4 46043200 */ add.s $f8, $f6, $f4
/* 00C6A8 8000BAA8 44078000 */ mfc1 $a3, $f16
/* 00C6AC 8000BAAC 44064000 */ mfc1 $a2, $f8
/* 00C6B0 8000BAB0 0C00455C */ jal func_80011570
/* 00C6B0 8000BAB0 0C00455C */ jal move_object
/* 00C6B4 8000BAB4 00000000 */ nop
.L8000BAB8:
/* 00C6B8 8000BAB8 8FAF0090 */ lw $t7, 0x90($sp)
asm/non_matchings/objects/func_80019808.s
+1 -1
View File
@@ -894,7 +894,7 @@ glabel func_80019808
/* 01B0C4 8001A4C4 AFA80080 */ sw $t0, 0x80($sp)
/* 01B0C8 8001A4C8 0C01997A */ jal set_object_stack_pos
/* 01B0CC 8001A4CC AFAA0044 */ sw $t2, 0x44($sp)
/* 01B0D0 8001A4D0 0C01A73F */ jal func_80069CFC
/* 01B0D0 8001A4D0 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 01B0D4 8001A4D4 00000000 */ nop
/* 01B0D8 8001A4D8 8FA80080 */ lw $t0, 0x80($sp)
/* 01B0DC 8001A4DC 3C098012 */ lui $t1, %hi(gRacersByPosition) # $t1, 0x8012
asm/non_matchings/objects/func_8001C6C4.s
+1 -1
View File
@@ -331,7 +331,7 @@ glabel func_8001C6C4
/* 01D77C 8001CB7C 44055000 */ mfc1 $a1, $f10
/* 01D780 8001CB80 46068482 */ mul.s $f18, $f16, $f6
/* 01D784 8001CB84 44079000 */ mfc1 $a3, $f18
/* 01D788 8001CB88 0C00455C */ jal func_80011570
/* 01D788 8001CB88 0C00455C */ jal move_object
/* 01D78C 8001CB8C 00000000 */ nop
/* 01D790 8001CB90 C7A40088 */ lwc1 $f4, 0x88($sp)
/* 01D794 8001CB94 8FA900EC */ lw $t1, 0xec($sp)
asm/non_matchings/objects/func_8001F460.s
+3 -3
View File
@@ -941,7 +941,7 @@ glabel func_8001F460
/* 020DEC 800201EC AFA70068 */ sw $a3, 0x68($sp)
/* 020DF0 800201F0 0C01997A */ jal set_object_stack_pos
/* 020DF4 800201F4 AFA5005C */ sw $a1, 0x5c($sp)
/* 020DF8 800201F8 0C01A73F */ jal func_80069CFC
/* 020DF8 800201F8 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 020DFC 800201FC 00000000 */ nop
/* 020E00 80020200 3C068012 */ lui $a2, %hi(D_8011AE74) # $a2, 0x8012
/* 020E04 80020204 8CC6AE74 */ lw $a2, %lo(D_8011AE74)($a2)
@@ -1080,7 +1080,7 @@ glabel func_8001F460
/* 021008 80020408 AFA70068 */ sw $a3, 0x68($sp)
/* 02100C 8002040C 0C01997A */ jal set_object_stack_pos
/* 021010 80020410 AFB90080 */ sw $t9, 0x80($sp)
/* 021014 80020414 0C01A73F */ jal func_80069CFC
/* 021014 80020414 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 021018 80020418 00000000 */ nop
/* 02101C 8002041C 3C068012 */ lui $a2, %hi(D_8011AE74) # $a2, 0x8012
/* 021020 80020420 8CC6AE74 */ lw $a2, %lo(D_8011AE74)($a2)
@@ -1322,7 +1322,7 @@ glabel func_8001F460
/* 0213AC 800207AC 8FA7011C */ lw $a3, 0x11c($sp)
/* 0213B0 800207B0 8FA60120 */ lw $a2, 0x120($sp)
/* 0213B4 800207B4 8FA50124 */ lw $a1, 0x124($sp)
/* 0213B8 800207B8 0C00455C */ jal func_80011570
/* 0213B8 800207B8 0C00455C */ jal move_object
/* 0213BC 800207BC 00000000 */ nop
/* 0213C0 800207C0 9263002E */ lbu $v1, 0x2e($s3)
/* 0213C4 800207C4 24010001 */ li $at, 1
asm/non_matchings/objects/func_80021104.s
+1 -1
View File
@@ -25,7 +25,7 @@ glabel func_80021104
/* 021D5C 8002115C 80A40030 */ lb $a0, 0x30($a1)
/* 021D60 80021160 0C01997A */ jal set_object_stack_pos
/* 021D64 80021164 AFA30018 */ sw $v1, 0x18($sp)
/* 021D68 80021168 0C01A73F */ jal func_80069CFC
/* 021D68 80021168 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 021D6C 8002116C 00000000 */ nop
/* 021D70 80021170 8FA30018 */ lw $v1, 0x18($sp)
/* 021D74 80021174 C444000C */ lwc1 $f4, 0xc($v0)
asm/non_matchings/objects/func_80021600.s
+3 -3
View File
@@ -272,7 +272,7 @@ glabel func_80021600
/* 022608 80021A08 AFA9005C */ sw $t1, 0x5c($sp)
/* 02260C 80021A0C 0C01997A */ jal set_object_stack_pos
/* 022610 80021A10 AFA6004C */ sw $a2, 0x4c($sp)
/* 022614 80021A14 0C01A73F */ jal func_80069CFC
/* 022614 80021A14 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 022618 80021A18 00000000 */ nop
/* 02261C 80021A1C 3C078012 */ lui $a3, %hi(D_8011AE74) # $a3, 0x8012
/* 022620 80021A20 8CE7AE74 */ lw $a3, %lo(D_8011AE74)($a3)
@@ -400,7 +400,7 @@ glabel func_80021600
/* 0227F8 80021BF8 AFB80074 */ sw $t8, 0x74($sp)
/* 0227FC 80021BFC 0C01997A */ jal set_object_stack_pos
/* 022800 80021C00 AFA50150 */ sw $a1, 0x150($sp)
/* 022804 80021C04 0C01A73F */ jal func_80069CFC
/* 022804 80021C04 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 022808 80021C08 00000000 */ nop
/* 02280C 80021C0C 3C078012 */ lui $a3, %hi(D_8011AE74) # $a3, 0x8012
/* 022810 80021C10 8CE7AE74 */ lw $a3, %lo(D_8011AE74)($a3)
@@ -526,7 +526,7 @@ glabel func_80021600
/* 0229DC 80021DDC 44064000 */ mfc1 $a2, $f8
/* 0229E0 80021DE0 46043181 */ sub.s $f6, $f6, $f4
/* 0229E4 80021DE4 44073000 */ mfc1 $a3, $f6
/* 0229E8 80021DE8 0C00455C */ jal func_80011570
/* 0229E8 80021DE8 0C00455C */ jal move_object
/* 0229EC 80021DEC E7A600F0 */ swc1 $f6, 0xf0($sp)
/* 0229F0 80021DF0 8FA600EC */ lw $a2, 0xec($sp)
/* 0229F4 80021DF4 27A400D0 */ addiu $a0, $sp, 0xd0
asm/non_matchings/objects/func_800230D0.s
+1 -1
View File
@@ -202,7 +202,7 @@ glabel func_800230D0
/* 023FCC 800233CC 8FBF001C */ lw $ra, 0x1c($sp)
/* 023FD0 800233D0 0C01997A */ jal set_object_stack_pos
/* 023FD4 800233D4 AFA8005C */ sw $t0, 0x5c($sp)
/* 023FD8 800233D8 0C01A73F */ jal func_80069CFC
/* 023FD8 800233D8 0C01A73F */ jal get_active_camera_segment_no_cutscenes
/* 023FDC 800233DC 00000000 */ nop
/* 023FE0 800233E0 C612000C */ lwc1 $f18, 0xc($s0)
/* 023FE4 800233E4 8FA8005C */ lw $t0, 0x5c($sp)
asm/non_matchings/racer/func_80042D20.s
+11 -11
View File
@@ -571,7 +571,7 @@ glabel func_80042D20
/* 044100 80043500 AFA9005C */ sw $t1, 0x5c($sp)
/* 044104 80043504 A3AA004B */ sb $t2, 0x4b($sp)
/* 044108 80043508 A7AC0034 */ sh $t4, 0x34($sp)
/* 04410C 8004350C 0C011114 */ jal func_80044450
/* 04410C 8004350C 0C011114 */ jal roll_percent_chance
/* 044110 80043510 A7AD0078 */ sh $t5, 0x78($sp)
/* 044114 80043514 8FA9005C */ lw $t1, 0x5c($sp)
/* 044118 80043518 83AA004B */ lb $t2, 0x4b($sp)
@@ -592,7 +592,7 @@ glabel func_80042D20
/* 044150 80043550 AFA9005C */ sw $t1, 0x5c($sp)
/* 044154 80043554 A3AA004B */ sb $t2, 0x4b($sp)
/* 044158 80043558 A7AC0034 */ sh $t4, 0x34($sp)
/* 04415C 8004355C 0C011114 */ jal func_80044450
/* 04415C 8004355C 0C011114 */ jal roll_percent_chance
/* 044160 80043560 A7AD0078 */ sh $t5, 0x78($sp)
/* 044164 80043564 8FA9005C */ lw $t1, 0x5c($sp)
/* 044168 80043568 83AA004B */ lb $t2, 0x4b($sp)
@@ -603,10 +603,10 @@ glabel func_80042D20
/* 04417C 8004357C A2000172 */ sb $zero, 0x172($s0)
.L80043580:
/* 044180 80043580 820F01D3 */ lb $t7, 0x1d3($s0)
/* 044184 80043584 3C19800E */ lui $t9, %hi(D_800DCD90) # $t9, 0x800e
/* 044184 80043584 3C19800E */ lui $t9, %hi(gRacerAIBalloonActionTable) # $t9, 0x800e
/* 044188 80043588 15E00016 */ bnez $t7, .L800435E4
/* 04418C 8004358C 032AC821 */ addu $t9, $t9, $t2
/* 044190 80043590 8339CD90 */ lb $t9, %lo(D_800DCD90)($t9)
/* 044190 80043590 8339CD90 */ lb $t9, %lo(gRacerAIBalloonActionTable)($t9)
/* 044194 80043594 24010004 */ li $at, 4
/* 044198 80043598 17210012 */ bne $t9, $at, .L800435E4
/* 04419C 8004359C 00000000 */ nop
@@ -614,7 +614,7 @@ glabel func_80042D20
/* 0441A4 800435A4 AFA9005C */ sw $t1, 0x5c($sp)
/* 0441A8 800435A8 A3AA004B */ sb $t2, 0x4b($sp)
/* 0441AC 800435AC A7AC0034 */ sh $t4, 0x34($sp)
/* 0441B0 800435B0 0C011114 */ jal func_80044450
/* 0441B0 800435B0 0C011114 */ jal roll_percent_chance
/* 0441B4 800435B4 A7AD0078 */ sh $t5, 0x78($sp)
/* 0441B8 800435B8 8FA9005C */ lw $t1, 0x5c($sp)
/* 0441BC 800435BC 83AA004B */ lb $t2, 0x4b($sp)
@@ -629,9 +629,9 @@ glabel func_80042D20
/* 0441E0 800435E0 AC2ED530 */ sw $t6, %lo(gCurrentButtonsReleased)($at)
.L800435E4:
/* 0441E4 800435E4 820F0173 */ lb $t7, 0x173($s0)
/* 0441E8 800435E8 3C19800E */ lui $t9, %hi(D_800DCD90) # $t9, 0x800e
/* 0441E8 800435E8 3C19800E */ lui $t9, %hi(gRacerAIBalloonActionTable) # $t9, 0x800e
/* 0441EC 800435EC 11E00065 */ beqz $t7, .L80043784
/* 0441F0 800435F0 2739CD90 */ addiu $t9, %lo(D_800DCD90) # addiu $t9, $t9, -0x3270
/* 0441F0 800435F0 2739CD90 */ addiu $t9, %lo(gRacerAIBalloonActionTable) # addiu $t9, $t9, -0x3270
/* 0441F4 800435F4 01591821 */ addu $v1, $t2, $t9
/* 0441F8 800435F8 80780000 */ lb $t8, ($v1)
/* 0441FC 800435FC 24010001 */ li $at, 1
@@ -662,7 +662,7 @@ glabel func_80042D20
/* 04425C 8004365C AFA3002C */ sw $v1, 0x2c($sp)
/* 044260 80043660 AFA9005C */ sw $t1, 0x5c($sp)
/* 044264 80043664 A7AC0034 */ sh $t4, 0x34($sp)
/* 044268 80043668 0C011114 */ jal func_80044450
/* 044268 80043668 0C011114 */ jal roll_percent_chance
/* 04426C 8004366C A7AD0078 */ sh $t5, 0x78($sp)
/* 044270 80043670 8FA3002C */ lw $v1, 0x2c($sp)
/* 044274 80043674 8FA9005C */ lw $t1, 0x5c($sp)
@@ -714,7 +714,7 @@ glabel func_80042D20
.L80043728:
/* 044328 80043728 AFA9005C */ sw $t1, 0x5c($sp)
/* 04432C 8004372C A7AC0034 */ sh $t4, 0x34($sp)
/* 044330 80043730 0C011114 */ jal func_80044450
/* 044330 80043730 0C011114 */ jal roll_percent_chance
/* 044334 80043734 A7AD0078 */ sh $t5, 0x78($sp)
/* 044338 80043738 8FA9005C */ lw $t1, 0x5c($sp)
/* 04433C 8004373C 87AC0034 */ lh $t4, 0x34($sp)
@@ -751,7 +751,7 @@ glabel func_80042D20
/* 0443B0 800437B0 87A4003A */ lh $a0, 0x3a($sp)
/* 0443B4 800437B4 AFA9005C */ sw $t1, 0x5c($sp)
/* 0443B8 800437B8 A7AC0034 */ sh $t4, 0x34($sp)
/* 0443BC 800437BC 0C011114 */ jal func_80044450
/* 0443BC 800437BC 0C011114 */ jal roll_percent_chance
/* 0443C0 800437C0 A7AD0078 */ sh $t5, 0x78($sp)
/* 0443C4 800437C4 8FA9005C */ lw $t1, 0x5c($sp)
/* 0443C8 800437C8 87AC0034 */ lh $t4, 0x34($sp)
@@ -866,7 +866,7 @@ glabel func_80042D20
/* 04455C 8004395C 00000000 */ nop
/* 044560 80043960 A20F01CA */ sb $t7, 0x1ca($s0)
/* 044564 80043964 87A4003C */ lh $a0, 0x3c($sp)
/* 044568 80043968 0C011114 */ jal func_80044450
/* 044568 80043968 0C011114 */ jal roll_percent_chance
/* 04456C 8004396C AFA9005C */ sw $t1, 0x5c($sp)
/* 044570 80043970 8FA9005C */ lw $t1, 0x5c($sp)
/* 044574 80043974 10400005 */ beqz $v0, .L8004398C
asm/non_matchings/racer/func_8004447C.s
+8 -8
View File
@@ -169,7 +169,7 @@ glabel L800446AC
/* 0452C8 800446C8 8FAF0038 */ lw $t7, 0x38($sp)
/* 0452CC 800446CC 00000000 */ nop
/* 0452D0 800446D0 81E40003 */ lb $a0, 3($t7)
/* 0452D4 800446D4 0C011114 */ jal func_80044450
/* 0452D4 800446D4 0C011114 */ jal roll_percent_chance
/* 0452D8 800446D8 00000000 */ nop
/* 0452DC 800446DC 10400003 */ beqz $v0, .L800446EC
/* 0452E0 800446E0 24190003 */ li $t9, 3
@@ -179,7 +179,7 @@ glabel L800446AC
/* 0452EC 800446EC 8FB80038 */ lw $t8, 0x38($sp)
/* 0452F0 800446F0 00000000 */ nop
/* 0452F4 800446F4 83040006 */ lb $a0, 6($t8)
/* 0452F8 800446F8 0C011114 */ jal func_80044450
/* 0452F8 800446F8 0C011114 */ jal roll_percent_chance
/* 0452FC 800446FC 00000000 */ nop
/* 045300 80044700 1040000D */ beqz $v0, .L80044738
/* 045304 80044704 8FAF0038 */ lw $t7, 0x38($sp)
@@ -198,7 +198,7 @@ glabel L800446AC
.L80044738:
/* 045338 80044738 00000000 */ nop
/* 04533C 8004473C 81E40005 */ lb $a0, 5($t7)
/* 045340 80044740 0C011114 */ jal func_80044450
/* 045340 80044740 0C011114 */ jal roll_percent_chance
/* 045344 80044744 00000000 */ nop
/* 045348 80044748 1040000E */ beqz $v0, .L80044784
/* 04534C 8004474C 3C188012 */ lui $t8, %hi(D_8011D58C) # $t8, 0x8012
@@ -223,7 +223,7 @@ glabel L800446AC
/* 045394 80044794 A60C01C6 */ sh $t4, 0x1c6($s0)
.L80044798:
/* 045398 80044798 81A40006 */ lb $a0, 6($t5)
/* 04539C 8004479C 0C011114 */ jal func_80044450
/* 04539C 8004479C 0C011114 */ jal roll_percent_chance
/* 0453A0 800447A0 00000000 */ nop
/* 0453A4 800447A4 1040000D */ beqz $v0, .L800447DC
/* 0453A8 800447A8 8FB80038 */ lw $t8, 0x38($sp)
@@ -242,11 +242,11 @@ glabel L800446AC
.L800447DC:
/* 0453DC 800447DC 00000000 */ nop
/* 0453E0 800447E0 83040000 */ lb $a0, ($t8)
/* 0453E4 800447E4 0C011114 */ jal func_80044450
/* 0453E4 800447E4 0C011114 */ jal roll_percent_chance
/* 0453E8 800447E8 00000000 */ nop
/* 0453EC 800447EC 10400081 */ beqz $v0, .L800449F4
/* 0453F0 800447F0 24180002 */ li $t8, 2
/* 0453F4 800447F4 0C011114 */ jal func_80044450
/* 0453F4 800447F4 0C011114 */ jal roll_percent_chance
/* 0453F8 800447F8 24040032 */ li $a0, 50
/* 0453FC 800447FC 8FAC0038 */ lw $t4, 0x38($sp)
/* 045400 80044800 10400003 */ beqz $v0, .L80044810
@@ -255,7 +255,7 @@ glabel L800446AC
/* 04540C 8004480C 240A0001 */ li $t2, 1
.L80044810:
/* 045410 80044810 81840001 */ lb $a0, 1($t4)
/* 045414 80044814 0C011114 */ jal func_80044450
/* 045414 80044814 0C011114 */ jal roll_percent_chance
/* 045418 80044818 A7AA004C */ sh $t2, 0x4c($sp)
/* 04541C 8004481C 87AA004C */ lh $t2, 0x4c($sp)
/* 045420 80044820 10400003 */ beqz $v0, .L80044830
@@ -343,7 +343,7 @@ glabel L800446AC
/* 04554C 8004494C 00000000 */ nop
/* 045550 80044950 81E40002 */ lb $a0, 2($t7)
/* 045554 80044954 A7A8004A */ sh $t0, 0x4a($sp)
/* 045558 80044958 0C011114 */ jal func_80044450
/* 045558 80044958 0C011114 */ jal roll_percent_chance
/* 04555C 8004495C A7A60050 */ sh $a2, 0x50($sp)
/* 045560 80044960 87A60050 */ lh $a2, 0x50($sp)
/* 045564 80044964 87A8004A */ lh $t0, 0x4a($sp)
asm/non_matchings/racer/func_800452A0.s
+2 -2
View File
@@ -141,7 +141,7 @@ glabel func_800452A0
/* 046078 80045478 8FA80074 */ lw $t0, 0x74($sp)
/* 04607C 8004547C 00000000 */ nop
/* 046080 80045480 81040006 */ lb $a0, 6($t0)
/* 046084 80045484 0C011114 */ jal func_80044450
/* 046084 80045484 0C011114 */ jal roll_percent_chance
/* 046088 80045488 00000000 */ nop
/* 04608C 8004548C 10400004 */ beqz $v0, .L800454A0
/* 046090 80045490 8FA90074 */ lw $t1, 0x74($sp)
@@ -151,7 +151,7 @@ glabel func_800452A0
.L800454A0:
/* 0460A0 800454A0 24120001 */ li $s2, 1
/* 0460A4 800454A4 81240002 */ lb $a0, 2($t1)
/* 0460A8 800454A8 0C011114 */ jal func_80044450
/* 0460A8 800454A8 0C011114 */ jal roll_percent_chance
/* 0460AC 800454AC 00000000 */ nop
/* 0460B0 800454B0 10400007 */ beqz $v0, .L800454D0
/* 0460B4 800454B4 24010002 */ li $at, 2
asm/non_matchings/racer/func_80046524.s
+15 -15
View File
@@ -65,7 +65,7 @@ glabel func_80046524
/* 047140 80046540 0C00384E */ jal func_8000E138
/* 047144 80046544 AFA5012C */ sw $a1, 0x12c($sp)
/* 047148 80046548 10400009 */ beqz $v0, .L80046570
/* 04714C 8004654C 3C0A8012 */ lui $t2, %hi(D_8011D586) # $t2, 0x8012
/* 04714C 8004654C 3C0A8012 */ lui $t2, %hi(gDialogueCameraAngle) # $t2, 0x8012
/* 047150 80046550 3C01800E */ lui $at, %hi(D_800E63A8 + 4) # $at, 0x800e
/* 047154 80046554 C7A4012C */ lwc1 $f4, 0x12c($sp)
/* 047158 80046558 C42963A8 */ lwc1 $f9, %lo(D_800E63A8)($at)
@@ -101,7 +101,7 @@ glabel func_80046524
/* 0471C4 800465C4 3C018012 */ lui $at, %hi(D_8011D558) # $at, 0x8012
/* 0471C8 800465C8 AC20D558 */ sw $zero, %lo(D_8011D558)($at)
/* 0471CC 800465CC C626000C */ lwc1 $f6, 0xc($s1)
/* 0471D0 800465D0 854AD586 */ lh $t2, %lo(D_8011D586)($t2)
/* 0471D0 800465D0 854AD586 */ lh $t2, %lo(gDialogueCameraAngle)($t2)
/* 0471D4 800465D4 E7A60110 */ swc1 $f6, 0x110($sp)
/* 0471D8 800465D8 C6280010 */ lwc1 $f8, 0x10($s1)
/* 0471DC 800465DC 448A2000 */ mtc1 $t2, $f4
@@ -186,7 +186,7 @@ glabel func_80046524
/* 047304 80046704 0C014D71 */ jal func_800535C4
/* 047308 80046708 02002825 */ move $a1, $s0
/* 04730C 8004670C 02202025 */ move $a0, $s1
/* 047310 80046710 0C01231F */ jal func_80048C7C
/* 047310 80046710 0C01231F */ jal racer_attack_handler_hovercraft
/* 047314 80046714 02002825 */ move $a1, $s0
/* 047318 80046718 3C188012 */ lui $t8, %hi(gCurrentPlayerIndex) # $t8, 0x8012
/* 04731C 8004671C 8F18D55C */ lw $t8, %lo(gCurrentPlayerIndex)($t8)
@@ -673,9 +673,9 @@ glabel func_80046524
/* 047A18 80046E18 A60C01A4 */ sh $t4, 0x1a4($s0)
.L80046E1C:
/* 047A1C 80046E1C 820301D4 */ lb $v1, 0x1d4($s0)
/* 047A20 80046E20 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 047A20 80046E20 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 047A24 80046E24 10600041 */ beqz $v1, .L80046F2C
/* 047A28 80046E28 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 047A28 80046E28 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 047A2C 80046E2C 86020160 */ lh $v0, 0x160($s0)
/* 047A30 80046E30 A20001D5 */ sb $zero, 0x1d5($s0)
/* 047A34 80046E34 18600018 */ blez $v1, .L80046E98
@@ -1758,7 +1758,7 @@ glabel func_80046524
/* 048A20 80047E20 C628001C */ lwc1 $f8, 0x1c($s1)
/* 048A24 80047E24 46103282 */ mul.s $f10, $f6, $f16
/* 048A28 80047E28 C6260020 */ lwc1 $f6, 0x20($s1)
/* 048A2C 80047E2C 3C018012 */ lui $at, %hi(D_8011D578) # $at, 0x8012
/* 048A2C 80047E2C 3C018012 */ lui $at, %hi(gRacerMagnetVelX) # $at, 0x8012
/* 048A30 80047E30 460A4101 */ sub.s $f4, $f8, $f10
/* 048A34 80047E34 E624001C */ swc1 $f4, 0x1c($s1)
/* 048A38 80047E38 C608003C */ lwc1 $f8, 0x3c($s0)
@@ -1776,10 +1776,10 @@ glabel func_80046524
/* 048A68 80047E68 00000000 */ nop
/* 048A6C 80047E6C 11E00007 */ beqz $t7, .L80047E8C
/* 048A70 80047E70 00000000 */ nop
/* 048A74 80047E74 C426D578 */ lwc1 $f6, %lo(D_8011D578)($at)
/* 048A78 80047E78 3C018012 */ lui $at, %hi(D_8011D57C) # $at, 0x8012
/* 048A74 80047E74 C426D578 */ lwc1 $f6, %lo(gRacerMagnetVelX)($at)
/* 048A78 80047E78 3C018012 */ lui $at, %hi(gRacerMagnetVelZ) # $at, 0x8012
/* 048A7C 80047E7C E626001C */ swc1 $f6, 0x1c($s1)
/* 048A80 80047E80 C428D57C */ lwc1 $f8, %lo(D_8011D57C)($at)
/* 048A80 80047E80 C428D57C */ lwc1 $f8, %lo(gRacerMagnetVelZ)($at)
/* 048A84 80047E84 00000000 */ nop
/* 048A88 80047E88 E6280024 */ swc1 $f8, 0x24($s1)
.L80047E8C:
@@ -1917,7 +1917,7 @@ glabel func_80046524
/* 048C6C 8004806C 44063000 */ mfc1 $a2, $f6
/* 048C70 80048070 460E5100 */ add.s $f4, $f10, $f14
/* 048C74 80048074 44072000 */ mfc1 $a3, $f4
/* 048C78 80048078 0C00455C */ jal func_80011570
/* 048C78 80048078 0C00455C */ jal move_object
/* 048C7C 8004807C 00000000 */ nop
/* 048C80 80048080 1040000F */ beqz $v0, .L800480C0
/* 048C84 80048084 3C198012 */ lui $t9, %hi(gCurrentPlayerIndex) # $t9, 0x8012
@@ -1934,7 +1934,7 @@ glabel func_80046524
/* 048CAC 800480AC 02202025 */ move $a0, $s1
/* 048CB0 800480B0 02002825 */ move $a1, $s0
/* 048CB4 800480B4 E7A800E8 */ swc1 $f8, 0xe8($sp)
/* 048CB8 800480B8 0C0141D5 */ jal func_80050754
/* 048CB8 800480B8 0C0141D5 */ jal racer_approach_object
/* 048CBC 800480BC E7A600E4 */ swc1 $f6, 0xe4($sp)
.L800480C0:
/* 048CC0 800480C0 C60A00D0 */ lwc1 $f10, 0xd0($s0)
@@ -2108,7 +2108,7 @@ glabel func_80046524
/* 048F34 80048334 27A600D4 */ addiu $a2, $sp, 0xd4
/* 048F38 80048338 AFA80014 */ sw $t0, 0x14($sp)
/* 048F3C 8004833C E7AA0018 */ swc1 $f10, 0x18($sp)
/* 048F40 80048340 0C012538 */ jal func_800494E0
/* 048F40 80048340 0C012538 */ jal rotate_racer_in_water
/* 048F44 80048344 AFAD0010 */ sw $t5, 0x10($sp)
/* 048F48 80048348 C60C00C0 */ lwc1 $f12, 0xc0($s0)
/* 048F4C 8004834C 00000000 */ nop
@@ -2494,8 +2494,8 @@ glabel func_80046524
/* 0494E0 800488E0 E6260020 */ swc1 $f6, 0x20($s1)
.L800488E4:
/* 0494E4 800488E4 862A0000 */ lh $t2, ($s1)
/* 0494E8 800488E8 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 0494EC 800488EC 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 0494E8 800488E8 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 0494EC 800488EC 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 0494F0 800488F0 000A6023 */ negu $t4, $t2
/* 0494F4 800488F4 A4AC0000 */ sh $t4, ($a1)
/* 0494F8 800488F8 862B0002 */ lh $t3, 2($s1)
@@ -2726,7 +2726,7 @@ glabel func_80046524
/* 049840 80048C40 A04D003A */ sb $t5, 0x3a($v0)
/* 049844 80048C44 8FA7012C */ lw $a3, 0x12c($sp)
.L80048C48:
/* 049848 80048C48 0C01602D */ jal func_800580B4
/* 049848 80048C48 0C01602D */ jal second_racer_camera_update
/* 04984C 80048C4C 02002825 */ move $a1, $s0
/* 049850 80048C50 83AA0067 */ lb $t2, 0x67($sp)
/* 049854 80048C54 02202025 */ move $a0, $s1
asm/non_matchings/racer/func_800494E0.s
+3 -3
View File
@@ -3,7 +3,7 @@ glabel D_800E64A0
.double 0.16666666666666666
.text
glabel func_800494E0
glabel rotate_racer_in_water
/* 04A0E0 800494E0 27BDFF78 */ addiu $sp, $sp, -0x88
/* 04A0E4 800494E4 8FB80098 */ lw $t8, 0x98($sp)
/* 04A0E8 800494E8 00077600 */ sll $t6, $a3, 0x18
@@ -64,8 +64,8 @@ glabel func_800494E0
/* 04A1BC 800495BC E6300014 */ swc1 $f16, 0x14($s1)
.L800495C0:
/* 04A1C0 800495C0 86280000 */ lh $t0, ($s1)
/* 04A1C4 800495C4 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 04A1C8 800495C8 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 04A1C4 800495C4 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 04A1C8 800495C8 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 04A1CC 800495CC 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 04A1D0 800495D0 44815000 */ mtc1 $at, $f10
/* 04A1D4 800495D4 00084823 */ negu $t1, $t0
asm/non_matchings/racer/func_80049794.s
+13 -13
View File
@@ -384,7 +384,7 @@ glabel func_80049794
/* 04A858 80049C58 0C014D71 */ jal func_800535C4
/* 04A85C 80049C5C 02002825 */ move $a1, $s0
/* 04A860 80049C60 02202025 */ move $a0, $s1
/* 04A864 80049C64 0C013050 */ jal func_8004C140
/* 04A864 80049C64 0C013050 */ jal racer_attack_handler_plane
/* 04A868 80049C68 02002825 */ move $a1, $s0
/* 04A86C 80049C6C 3C0D8012 */ lui $t5, %hi(gCurrentPlayerIndex) # $t5, 0x8012
/* 04A870 80049C70 8DADD55C */ lw $t5, %lo(gCurrentPlayerIndex)($t5)
@@ -550,8 +550,8 @@ glabel func_80049794
/* 04AAC8 80049EC8 E7A200C4 */ swc1 $f2, 0xc4($sp)
.L80049ECC:
/* 04AACC 80049ECC 862E0000 */ lh $t6, ($s1)
/* 04AAD0 80049ED0 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 04AAD4 80049ED4 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 04AAD0 80049ED0 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 04AAD4 80049ED4 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 04AAD8 80049ED8 A4AE0000 */ sh $t6, ($a1)
/* 04AADC 80049EDC 862F0002 */ lh $t7, 2($s1)
/* 04AAE0 80049EE0 3C013F80 */ li $at, 0x3F800000 # 1.000000
@@ -606,7 +606,7 @@ glabel func_80049794
/* 04ABA4 80049FA4 00000000 */ nop
/* 04ABA8 80049FA8 8FA400F8 */ lw $a0, 0xf8($sp)
/* 04ABAC 80049FAC 02202825 */ move $a1, $s1
/* 04ABB0 80049FB0 0C013028 */ jal func_8004C0A0
/* 04ABB0 80049FB0 0C013028 */ jal apply_plane_tilt_anim
/* 04ABB4 80049FB4 02003025 */ move $a2, $s0
.L80049FB8:
/* 04ABB8 80049FB8 86020000 */ lh $v0, ($s0)
@@ -2347,11 +2347,11 @@ glabel func_80049794
/* 04C504 8004B904 820D0175 */ lb $t5, 0x175($s0)
/* 04C508 8004B908 00000000 */ nop
/* 04C50C 8004B90C 11A00007 */ beqz $t5, .L8004B92C
/* 04C510 8004B910 3C018012 */ lui $at, %hi(D_8011D578) # $at, 0x8012
/* 04C514 8004B914 C428D578 */ lwc1 $f8, %lo(D_8011D578)($at)
/* 04C518 8004B918 3C018012 */ lui $at, %hi(D_8011D57C) # $at, 0x8012
/* 04C510 8004B910 3C018012 */ lui $at, %hi(gRacerMagnetVelX) # $at, 0x8012
/* 04C514 8004B914 C428D578 */ lwc1 $f8, %lo(gRacerMagnetVelX)($at)
/* 04C518 8004B918 3C018012 */ lui $at, %hi(gRacerMagnetVelZ) # $at, 0x8012
/* 04C51C 8004B91C E628001C */ swc1 $f8, 0x1c($s1)
/* 04C520 8004B920 C426D57C */ lwc1 $f6, %lo(D_8011D57C)($at)
/* 04C520 8004B920 C426D57C */ lwc1 $f6, %lo(gRacerMagnetVelZ)($at)
/* 04C524 8004B924 00000000 */ nop
/* 04C528 8004B928 E6260024 */ swc1 $f6, 0x24($s1)
.L8004B92C:
@@ -2449,7 +2449,7 @@ glabel func_80049794
/* 04C674 8004BA74 46006482 */ mul.s $f18, $f12, $f0
/* 04C678 8004BA78 44065000 */ mfc1 $a2, $f10
/* 04C67C 8004BA7C 44079000 */ mfc1 $a3, $f18
/* 04C680 8004BA80 0C00455C */ jal func_80011570
/* 04C680 8004BA80 0C00455C */ jal move_object
/* 04C684 8004BA84 00000000 */ nop
/* 04C688 8004BA88 C7AC00EC */ lwc1 $f12, 0xec($sp)
/* 04C68C 8004BA8C 10400006 */ beqz $v0, .L8004BAA8
@@ -2468,7 +2468,7 @@ glabel func_80049794
.L8004BABC:
/* 04C6BC 8004BABC 02202025 */ move $a0, $s1
/* 04C6C0 8004BAC0 02002825 */ move $a1, $s0
/* 04C6C4 8004BAC4 0C0141D5 */ jal func_80050754
/* 04C6C4 8004BAC4 0C0141D5 */ jal racer_approach_object
/* 04C6C8 8004BAC8 E7AC00EC */ swc1 $f12, 0xec($sp)
/* 04C6CC 8004BACC 3C028012 */ lui $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
/* 04C6D0 8004BAD0 8C42D55C */ lw $v0, %lo(gCurrentPlayerIndex)($v0)
@@ -2539,7 +2539,7 @@ glabel func_80049794
/* 04C7BC 8004BBBC 820201D2 */ lb $v0, 0x1d2($s0)
/* 04C7C0 8004BBC0 3C0B8012 */ lui $t3, %hi(gRaceStartTimer) # $t3, 0x8012
/* 04C7C4 8004BBC4 1040000B */ beqz $v0, .L8004BBF4
/* 04C7C8 8004BBC8 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 04C7C8 8004BBC8 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 04C7CC 8004BBCC 8FB900F8 */ lw $t9, 0xf8($sp)
/* 04C7D0 8004BBD0 00000000 */ nop
/* 04C7D4 8004BBD4 00597823 */ subu $t7, $v0, $t9
@@ -2579,7 +2579,7 @@ glabel func_80049794
/* 04C854 8004BC54 8D6BD540 */ lw $t3, %lo(gRaceStartTimer)($t3)
/* 04C858 8004BC58 24010064 */ li $at, 100
/* 04C85C 8004BC5C 15610005 */ bne $t3, $at, .L8004BC74
/* 04C860 8004BC60 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 04C860 8004BC60 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 04C864 8004BC64 3C01C0A0 */ li $at, 0xC0A00000 # -5.000000
/* 04C868 8004BC68 44813000 */ mtc1 $at, $f6
/* 04C86C 8004BC6C 00000000 */ nop
@@ -2856,7 +2856,7 @@ glabel func_80049794
/* 04CC5C 8004C05C AC590000 */ sw $t9, ($v0)
.L8004C060:
/* 04CC60 8004C060 8FA700FC */ lw $a3, 0xfc($sp)
/* 04CC64 8004C064 0C01602D */ jal func_800580B4
/* 04CC64 8004C064 0C01602D */ jal second_racer_camera_update
/* 04CC68 8004C068 24060001 */ li $a2, 1
/* 04CC6C 8004C06C 83AD005F */ lb $t5, 0x5f($sp)
/* 04CC70 8004C070 02202025 */ move $a0, $s1
asm/non_matchings/racer/func_8004CC20.s
+6 -6
View File
@@ -110,8 +110,8 @@ glabel func_8004CC20
/* 04D980 8004CD80 0C015D7B */ jal func_800575EC
/* 04D984 8004CD84 A6000164 */ sh $zero, 0x164($s0)
/* 04D988 8004CD88 862F0000 */ lh $t7, ($s1)
/* 04D98C 8004CD8C 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 04D990 8004CD90 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 04D98C 8004CD8C 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 04D990 8004CD90 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 04D994 8004CD94 A4AF0000 */ sh $t7, ($a1)
/* 04D998 8004CD98 86380002 */ lh $t8, 2($s1)
/* 04D99C 8004CD9C 44800000 */ mtc1 $zero, $f0
@@ -535,7 +535,7 @@ glabel func_8004CC20
/* 04DFD4 8004D3D4 46026402 */ mul.s $f16, $f12, $f2
/* 04DFD8 8004D3D8 44063000 */ mfc1 $a2, $f6
/* 04DFDC 8004D3DC 44078000 */ mfc1 $a3, $f16
/* 04DFE0 8004D3E0 0C00455C */ jal func_80011570
/* 04DFE0 8004D3E0 0C00455C */ jal move_object
/* 04DFE4 8004D3E4 00000000 */ nop
/* 04DFE8 8004D3E8 3C098012 */ lui $t1, %hi(gCurrentPlayerIndex) # $t1, 0x8012
/* 04DFEC 8004D3EC 2529D55C */ addiu $t1, %lo(gCurrentPlayerIndex) # addiu $t1, $t1, -0x2aa4
@@ -573,8 +573,8 @@ glabel func_8004CC20
/* 04E060 8004D460 C6240014 */ lwc1 $f4, 0x14($s1)
/* 04E064 8004D464 46088281 */ sub.s $f10, $f16, $f8
/* 04E068 8004D468 862E0000 */ lh $t6, ($s1)
/* 04E06C 8004D46C 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 04E070 8004D470 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 04E06C 8004D46C 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 04E070 8004D470 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 04E074 8004D474 000E7823 */ negu $t7, $t6
/* 04E078 8004D478 44807000 */ mtc1 $zero, $f14
/* 04E07C 8004D47C 46023002 */ mul.s $f0, $f6, $f2
@@ -611,7 +611,7 @@ glabel func_8004CC20
/* 04E0F8 8004D4F8 8FA700DC */ lw $a3, 0xdc($sp)
/* 04E0FC 8004D4FC 02202025 */ move $a0, $s1
/* 04E100 8004D500 02002825 */ move $a1, $s0
/* 04E104 8004D504 0C01602D */ jal func_800580B4
/* 04E104 8004D504 0C01602D */ jal second_racer_camera_update
/* 04E108 8004D508 24060006 */ li $a2, 6
/* 04E10C 8004D50C 8E220060 */ lw $v0, 0x60($s1)
/* 04E110 8004D510 02202025 */ move $a0, $s1
asm/non_matchings/racer/func_8004F7F4.s
+15 -15
View File
@@ -49,7 +49,7 @@ glabel func_8004F7F4
/* 050464 8004F864 8FA600C0 */ lw $a2, 0xc0($sp)
/* 050468 8004F868 8FA700C4 */ lw $a3, 0xc4($sp)
/* 05046C 8004F86C 02202025 */ move $a0, $s1
/* 050470 8004F870 0C015044 */ jal func_80054110
/* 050470 8004F870 0C015044 */ jal update_onscreen_AI_racer
/* 050474 8004F874 02002825 */ move $a1, $s0
/* 050478 8004F878 100003B2 */ b .L80050744
/* 05047C 8004F87C 8FBF002C */ lw $ra, 0x2c($sp)
@@ -265,7 +265,7 @@ glabel func_8004F7F4
/* 050778 8004FB78 02002825 */ move $a1, $s0
/* 05077C 8004FB7C 8FA600C0 */ lw $a2, 0xc0($sp)
/* 050780 8004FB80 02202025 */ move $a0, $s1
/* 050784 8004FB84 0C014FA7 */ jal racer_attack_handler
/* 050784 8004FB84 0C014FA7 */ jal racer_attack_handler_car
/* 050788 8004FB88 02002825 */ move $a1, $s0
/* 05078C 8004FB8C 820F01DB */ lb $t7, 0x1db($s0)
/* 050790 8004FB90 00000000 */ nop
@@ -292,7 +292,7 @@ glabel func_8004F7F4
/* 0507E0 8004FBE0 8E02001C */ lw $v0, 0x1c($s0)
.L8004FBE4:
/* 0507E4 8004FBE4 8FA700C4 */ lw $a3, 0xc4($sp)
/* 0507E8 8004FBE8 0C014B5F */ jal func_80052D7C
/* 0507E8 8004FBE8 0C014B5F */ jal update_car_velocity_offground
/* 0507EC 8004FBEC 02002825 */ move $a1, $s0
/* 0507F0 8004FBF0 8E02001C */ lw $v0, 0x1c($s0)
.L8004FBF4:
@@ -380,7 +380,7 @@ glabel func_8004F7F4
/* 050920 8004FD20 27AB00B4 */ addiu $t3, $sp, 0xb4
/* 050924 8004FD24 AFAB0010 */ sw $t3, 0x10($sp)
/* 050928 8004FD28 27A600B8 */ addiu $a2, $sp, 0xb8
/* 05092C 8004FD2C 0C016420 */ jal func_80059080
/* 05092C 8004FD2C 0C016420 */ jal set_position_goal_from_path
/* 050930 8004FD30 27A700B0 */ addiu $a3, $sp, 0xb0
/* 050934 8004FD34 920C01F0 */ lbu $t4, 0x1f0($s0)
# Used to access D_800E6620 and D_800E6620 + 4.
@@ -556,8 +556,8 @@ glabel func_8004F7F4
/* 050BAC 8004FFAC 00000000 */ nop
/* 050BB0 8004FFB0 860901A0 */ lh $t1, 0x1a0($s0)
/* 050BB4 8004FFB4 8E0A010C */ lw $t2, 0x10c($s0)
/* 050BB8 8004FFB8 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 050BBC 8004FFBC 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 050BB8 8004FFB8 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 050BBC 8004FFBC 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 050BC0 8004FFC0 44800000 */ mtc1 $zero, $f0
/* 050BC4 8004FFC4 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 050BC8 8004FFC8 44812000 */ mtc1 $at, $f4
@@ -586,11 +586,11 @@ glabel func_8004F7F4
/* 050C20 80050020 820F0175 */ lb $t7, 0x175($s0)
/* 050C24 80050024 00000000 */ nop
/* 050C28 80050028 11E00007 */ beqz $t7, .L80050048
/* 050C2C 8005002C 3C018012 */ lui $at, %hi(D_8011D578) # $at, 0x8012
/* 050C30 80050030 C42AD578 */ lwc1 $f10, %lo(D_8011D578)($at)
/* 050C34 80050034 3C018012 */ lui $at, %hi(D_8011D57C) # $at, 0x8012
/* 050C2C 8005002C 3C018012 */ lui $at, %hi(gRacerMagnetVelX) # $at, 0x8012
/* 050C30 80050030 C42AD578 */ lwc1 $f10, %lo(gRacerMagnetVelX)($at)
/* 050C34 80050034 3C018012 */ lui $at, %hi(gRacerMagnetVelZ) # $at, 0x8012
/* 050C38 80050038 E62A001C */ swc1 $f10, 0x1c($s1)
/* 050C3C 8005003C C426D57C */ lwc1 $f6, %lo(D_8011D57C)($at)
/* 050C3C 8005003C C426D57C */ lwc1 $f6, %lo(gRacerMagnetVelZ)($at)
/* 050C40 80050040 00000000 */ nop
/* 050C44 80050044 E6260024 */ swc1 $f6, 0x24($s1)
.L80050048:
@@ -706,7 +706,7 @@ glabel func_8004F7F4
/* 050DDC 800501DC 46008482 */ mul.s $f18, $f16, $f0
/* 050DE0 800501E0 44063000 */ mfc1 $a2, $f6
/* 050DE4 800501E4 44079000 */ mfc1 $a3, $f18
/* 050DE8 800501E8 0C00455C */ jal func_80011570
/* 050DE8 800501E8 0C00455C */ jal move_object
/* 050DEC 800501EC 00000000 */ nop
/* 050DF0 800501F0 10400006 */ beqz $v0, .L8005020C
/* 050DF4 800501F4 3C098012 */ lui $t1, %hi(gCurrentPlayerIndex) # $t1, 0x8012
@@ -721,7 +721,7 @@ glabel func_8004F7F4
/* 050E14 80050214 10000007 */ b .L80050234
/* 050E18 80050218 2401FFFF */ li $at, -1
.L8005021C:
/* 050E1C 8005021C 0C0141D5 */ jal func_80050754
/* 050E1C 8005021C 0C0141D5 */ jal racer_approach_object
/* 050E20 80050220 02002825 */ move $a1, $s0
/* 050E24 80050224 3C028012 */ lui $v0, %hi(gCurrentPlayerIndex) # $v0, 0x8012
/* 050E28 80050228 8C42D55C */ lw $v0, %lo(gCurrentPlayerIndex)($v0)
@@ -749,8 +749,8 @@ glabel func_8004F7F4
/* 050E74 80050274 3C018012 */ lui $at, %hi(D_8011D548) # $at, 0x8012
/* 050E78 80050278 C428D548 */ lwc1 $f8, %lo(D_8011D548)($at)
/* 050E7C 8005027C 3C018012 */ lui $at, %hi(D_8011D54C) # $at, 0x8012
/* 050E80 80050280 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 050E84 80050284 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 050E80 80050280 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 050E84 80050284 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 050E88 80050288 44800000 */ mtc1 $zero, $f0
/* 050E8C 8005028C 27A40060 */ addiu $a0, $sp, 0x60
/* 050E90 80050290 E7AA00BC */ swc1 $f10, 0xbc($sp)
@@ -1035,7 +1035,7 @@ glabel func_8004F7F4
.L800506C0:
/* 0512C0 800506C0 02202025 */ move $a0, $s1
/* 0512C4 800506C4 02002825 */ move $a1, $s0
/* 0512C8 800506C8 0C01602D */ jal func_800580B4
/* 0512C8 800506C8 0C01602D */ jal second_racer_camera_update
/* 0512CC 800506CC 00003025 */ move $a2, $zero
/* 0512D0 800506D0 3C0A800E */ lui $t2, %hi(gNumViewports) # $t2, 0x800e
/* 0512D4 800506D4 8D4ACB98 */ lw $t2, %lo(gNumViewports)($t2)
asm/non_matchings/racer/func_80050A28.s
+16 -16
View File
@@ -64,8 +64,8 @@ glabel func_80050A28
.L80050A74:
/* 051674 80050A74 E60E0084 */ swc1 $f14, 0x84($s0)
/* 051678 80050A78 E60E0088 */ swc1 $f14, 0x88($s0)
/* 05167C 80050A7C 3C0E8012 */ lui $t6, %hi(D_8011D586) # $t6, 0x8012
/* 051680 80050A80 85CED586 */ lh $t6, %lo(D_8011D586)($t6)
/* 05167C 80050A7C 3C0E8012 */ lui $t6, %hi(gDialogueCameraAngle) # $t6, 0x8012
/* 051680 80050A80 85CED586 */ lh $t6, %lo(gDialogueCameraAngle)($t6)
/* 051684 80050A84 3C088012 */ lui $t0, %hi(gCurrentRacerInput) # $t0, 0x8012
/* 051688 80050A88 15C00041 */ bnez $t6, .L80050B90
/* 05168C 80050A8C 2508D528 */ addiu $t0, %lo(gCurrentRacerInput) # addiu $t0, $t0, -0x2ad8
@@ -791,11 +791,11 @@ glabel func_80050A28
/* 0520D8 800514D8 46087380 */ add.s $f14, $f14, $f8
.L800514DC:
/* 0520DC 800514DC 3C01800E */ lui $at, %hi(D_800DCBE8) # $at, 0x800e
/* 0520E0 800514E0 3C0D800E */ lui $t5, %hi(D_800DCC34) # $t5, 0x800e
/* 0520E0 800514E0 3C0D800E */ lui $t5, %hi(gSurfaceBobbingTable) # $t5, 0x800e
/* 0520E4 800514E4 00230821 */ addu $at, $at, $v1
/* 0520E8 800514E8 01A36821 */ addu $t5, $t5, $v1
/* 0520EC 800514EC C426CBE8 */ lwc1 $f6, %lo(D_800DCBE8)($at)
/* 0520F0 800514F0 8DADCC34 */ lw $t5, %lo(D_800DCC34)($t5)
/* 0520F0 800514F0 8DADCC34 */ lw $t5, %lo(gSurfaceBobbingTable)($t5)
/* 0520F4 800514F4 8FAC0068 */ lw $t4, 0x68($sp)
/* 0520F8 800514F8 0122082A */ slt $at, $t1, $v0
/* 0520FC 800514FC 018D7021 */ addu $t6, $t4, $t5
@@ -1162,9 +1162,9 @@ glabel func_80050A28
/* 052650 80051A50 284100FF */ slti $at, $v0, 0xff
/* 052654 80051A54 10200008 */ beqz $at, .L80051A78
/* 052658 80051A58 00025080 */ sll $t2, $v0, 2
/* 05265C 80051A5C 3C0B800E */ lui $t3, %hi(D_800DCCF4) # $t3, 0x800e
/* 05265C 80051A5C 3C0B800E */ lui $t3, %hi(gSurfaceFlagTable) # $t3, 0x800e
/* 052660 80051A60 016A5821 */ addu $t3, $t3, $t2
/* 052664 80051A64 8D6BCCF4 */ lw $t3, %lo(D_800DCCF4)($t3)
/* 052664 80051A64 8D6BCCF4 */ lw $t3, %lo(gSurfaceFlagTable)($t3)
/* 052668 80051A68 8CD80074 */ lw $t8, 0x74($a2)
/* 05266C 80051A6C 00000000 */ nop
/* 052670 80051A70 030BC825 */ or $t9, $t8, $t3
@@ -1175,9 +1175,9 @@ glabel func_80050A28
/* 052680 80051A80 284100FF */ slti $at, $v0, 0xff
/* 052684 80051A84 10200008 */ beqz $at, .L80051AA8
/* 052688 80051A88 00026880 */ sll $t5, $v0, 2
/* 05268C 80051A8C 3C0E800E */ lui $t6, %hi(D_800DCCF4) # $t6, 0x800e
/* 05268C 80051A8C 3C0E800E */ lui $t6, %hi(gSurfaceFlagTable) # $t6, 0x800e
/* 052690 80051A90 01CD7021 */ addu $t6, $t6, $t5
/* 052694 80051A94 8DCECCF4 */ lw $t6, %lo(D_800DCCF4)($t6)
/* 052694 80051A94 8DCECCF4 */ lw $t6, %lo(gSurfaceFlagTable)($t6)
/* 052698 80051A98 8CCC0074 */ lw $t4, 0x74($a2)
/* 05269C 80051A9C 000E7840 */ sll $t7, $t6, 1
/* 0526A0 80051AA0 018F5025 */ or $t2, $t4, $t7
@@ -1193,24 +1193,24 @@ glabel func_80050A28
/* 0526C4 80051AC4 45000018 */ bc1f .L80051B28
/* 0526C8 80051AC8 0009C080 */ sll $t8, $t1, 2
/* 0526CC 80051ACC 920201DE */ lbu $v0, 0x1de($s0)
/* 0526D0 80051AD0 3C19800E */ lui $t9, %hi(D_800DCD40) # $t9, 0x800e
/* 0526D0 80051AD0 3C19800E */ lui $t9, %hi(gSurfaceFlagTable4P) # $t9, 0x800e
/* 0526D4 80051AD4 284100FF */ slti $at, $v0, 0xff
/* 0526D8 80051AD8 10200007 */ beqz $at, .L80051AF8
/* 0526DC 80051ADC 00025880 */ sll $t3, $v0, 2
/* 0526E0 80051AE0 032BC821 */ addu $t9, $t9, $t3
/* 0526E4 80051AE4 8F39CD40 */ lw $t9, %lo(D_800DCD40)($t9)
/* 0526E4 80051AE4 8F39CD40 */ lw $t9, %lo(gSurfaceFlagTable4P)($t9)
/* 0526E8 80051AE8 8CD80074 */ lw $t8, 0x74($a2)
/* 0526EC 80051AEC 00000000 */ nop
/* 0526F0 80051AF0 03196825 */ or $t5, $t8, $t9
/* 0526F4 80051AF4 ACCD0074 */ sw $t5, 0x74($a2)
.L80051AF8:
/* 0526F8 80051AF8 920201DF */ lbu $v0, 0x1df($s0)
/* 0526FC 80051AFC 3C0F800E */ lui $t7, %hi(D_800DCD40) # $t7, 0x800e
/* 0526FC 80051AFC 3C0F800E */ lui $t7, %hi(gSurfaceFlagTable4P) # $t7, 0x800e
/* 052700 80051B00 284100FF */ slti $at, $v0, 0xff
/* 052704 80051B04 10200007 */ beqz $at, .L80051B24
/* 052708 80051B08 00026080 */ sll $t4, $v0, 2
/* 05270C 80051B0C 01EC7821 */ addu $t7, $t7, $t4
/* 052710 80051B10 8DEFCD40 */ lw $t7, %lo(D_800DCD40)($t7)
/* 052710 80051B10 8DEFCD40 */ lw $t7, %lo(gSurfaceFlagTable4P)($t7)
/* 052714 80051B14 8CCE0074 */ lw $t6, 0x74($a2)
/* 052718 80051B18 000F5040 */ sll $t2, $t7, 1
/* 05271C 80051B1C 01CA5825 */ or $t3, $t6, $t2
@@ -1218,11 +1218,11 @@ glabel func_80050A28
.L80051B24:
/* 052724 80051B24 0009C080 */ sll $t8, $t1, 2
.L80051B28:
/* 052728 80051B28 3C09800E */ lui $t1, %hi(D_800DCC80) # $t1, 0x800e
/* 052728 80051B28 3C09800E */ lui $t1, %hi(gSurfaceSoundTable) # $t1, 0x800e
/* 05272C 80051B2C 8E020018 */ lw $v0, 0x18($s0)
/* 052730 80051B30 01384821 */ addu $t1, $t1, $t8
/* 052734 80051B34 8FA60078 */ lw $a2, 0x78($sp)
/* 052738 80051B38 8D29CC80 */ lw $t1, %lo(D_800DCC80)($t1)
/* 052738 80051B38 8D29CC80 */ lw $t1, %lo(gSurfaceSoundTable)($t1)
/* 05273C 80051B3C 14400011 */ bnez $v0, .L80051B84
/* 052740 80051B40 00000000 */ nop
/* 052744 80051B44 1120000F */ beqz $t1, .L80051B84
@@ -1518,11 +1518,11 @@ glabel func_80050A28
/* 052B88 80051F88 C7AA0084 */ lwc1 $f10, 0x84($sp)
/* 052B8C 80051F8C C4C80020 */ lwc1 $f8, 0x20($a2)
/* 052B90 80051F90 460A7482 */ mul.s $f18, $f14, $f10
/* 052B94 80051F94 3C0D8012 */ lui $t5, %hi(D_8011D586) # $t5, 0x8012
/* 052B94 80051F94 3C0D8012 */ lui $t5, %hi(gDialogueCameraAngle) # $t5, 0x8012
/* 052B98 80051F98 3C01800E */ lui $at, %hi(D_800E66A8 + 4) # $at, 0x800e
/* 052B9C 80051F9C 46124101 */ sub.s $f4, $f8, $f18
/* 052BA0 80051FA0 E4C40020 */ swc1 $f4, 0x20($a2)
/* 052BA4 80051FA4 85ADD586 */ lh $t5, %lo(D_8011D586)($t5)
/* 052BA4 80051FA4 85ADD586 */ lh $t5, %lo(gDialogueCameraAngle)($t5)
/* 052BA8 80051FA8 00000000 */ nop
/* 052BAC 80051FAC 11A00003 */ beqz $t5, .L80051FBC
/* 052BB0 80051FB0 00000000 */ nop
asm/non_matchings/racer/func_80054FD0.s
+4 -4
View File
@@ -25,8 +25,8 @@ glabel func_80054FD0
.L80055010:
/* 055C10 80055010 A7A00130 */ sh $zero, 0x130($sp)
/* 055C14 80055014 862E0000 */ lh $t6, ($s1)
/* 055C18 80055018 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 055C1C 8005501C 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 055C18 80055018 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 055C1C 8005501C 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 055C20 80055020 A4AE0000 */ sh $t6, ($a1)
/* 055C24 80055024 862F0002 */ lh $t7, 2($s1)
/* 055C28 80055028 3C013F80 */ li $at, 0x3F800000 # 1.000000
@@ -508,8 +508,8 @@ glabel func_80054FD0
/* 05633C 8005573C 46004283 */ div.s $f10, $f8, $f0
/* 056340 80055740 C6280014 */ lwc1 $f8, 0x14($s1)
/* 056344 80055744 862F0000 */ lh $t7, ($s1)
/* 056348 80055748 3C058012 */ lui $a1, %hi(D_8011D510) # $a1, 0x8012
/* 05634C 8005574C 24A5D510 */ addiu $a1, %lo(D_8011D510) # addiu $a1, $a1, -0x2af0
/* 056348 80055748 3C058012 */ lui $a1, %hi(gCurrentRacerTransform) # $a1, 0x8012
/* 05634C 8005574C 24A5D510 */ addiu $a1, %lo(gCurrentRacerTransform) # addiu $a1, $a1, -0x2af0
/* 056350 80055750 000FC023 */ negu $t8, $t7
/* 056354 80055754 3C013F80 */ li $at, 0x3F800000 # 1.000000
/* 056358 80055758 27A40060 */ addiu $a0, $sp, 0x60
asm/non_matchings/racer/func_8005B818.s
+1 -1
View File
@@ -589,7 +589,7 @@ glabel func_8005B818
/* 05CC80 8005C080 4406C000 */ mfc1 $a2, $f24
/* 05CC84 8005C084 4407E000 */ mfc1 $a3, $f28
/* 05CC88 8005C088 02602025 */ move $a0, $s3
/* 05CC8C 8005C08C 0C00455C */ jal func_80011570
/* 05CC8C 8005C08C 0C00455C */ jal move_object
/* 05CC90 8005C090 A62E01C0 */ sh $t6, 0x1c0($s1)
/* 05CC94 8005C094 1040000A */ beqz $v0, .L8005C0C0
/* 05CC98 8005C098 3C014034 */ li $at, 0x40340000 # 2.812500
asm/non_matchings/racer/update_camera_car.s
+2 -2
View File
@@ -569,7 +569,7 @@ glabel update_camera_car
/* 059614 80058A14 460A4100 */ add.s $f4, $f8, $f10
/* 059618 80058A18 8D0F0000 */ lw $t7, ($t0)
/* 05961C 80058A1C 460C2180 */ add.s $f6, $f4, $f12
/* 059620 80058A20 3C098012 */ lui $t1, %hi(D_8011D586) # $t1, 0x8012
/* 059620 80058A20 3C098012 */ lui $t1, %hi(gDialogueCameraAngle) # $t1, 0x8012
/* 059624 80058A24 E5E60014 */ swc1 $f6, 0x14($t7)
/* 059628 80058A28 8D180000 */ lw $t8, ($t0)
/* 05962C 80058A2C 84EE0196 */ lh $t6, 0x196($a3)
@@ -589,7 +589,7 @@ glabel update_camera_car
/* 059664 80058A64 45010005 */ bc1t .L80058A7C
/* 059668 80058A68 00000000 */ nop
.L80058A6C:
/* 05966C 80058A6C 8529D586 */ lh $t1, %lo(D_8011D586)($t1)
/* 05966C 80058A6C 8529D586 */ lh $t1, %lo(gDialogueCameraAngle)($t1)
/* 059670 80058A70 00000000 */ nop
/* 059674 80058A74 11200002 */ beqz $t1, .L80058A80
/* 059678 80058A78 00000000 */ nop
asm/non_matchings/racer/update_camera_plane.s
+4 -4
View File
@@ -191,8 +191,8 @@ glabel update_camera_plane
/* 04D130 8004C530 44093000 */ mfc1 $t1, $f6
/* 04D134 8004C534 00000000 */ nop
.L8004C538:
/* 04D138 8004C538 3C0D8012 */ lui $t5, %hi(D_8011D586) # $t5, 0x8012
/* 04D13C 8004C53C 85ADD586 */ lh $t5, %lo(D_8011D586)($t5)
/* 04D138 8004C538 3C0D8012 */ lui $t5, %hi(gDialogueCameraAngle) # $t5, 0x8012
/* 04D13C 8004C53C 85ADD586 */ lh $t5, %lo(gDialogueCameraAngle)($t5)
/* 04D140 8004C540 00000000 */ nop
/* 04D144 8004C544 11A00005 */ beqz $t5, .L8004C55C
/* 04D148 8004C548 00000000 */ nop
@@ -587,7 +587,7 @@ glabel update_camera_plane
/* 04D6E8 8004CAE8 46043280 */ add.s $f10, $f6, $f4
/* 04D6EC 8004CAEC 8D190000 */ lw $t9, ($t0)
/* 04D6F0 8004CAF0 46105200 */ add.s $f8, $f10, $f16
/* 04D6F4 8004CAF4 3C0E8012 */ lui $t6, %hi(D_8011D586) # $t6, 0x8012
/* 04D6F4 8004CAF4 3C0E8012 */ lui $t6, %hi(gDialogueCameraAngle) # $t6, 0x8012
/* 04D6F8 8004CAF8 E7280014 */ swc1 $f8, 0x14($t9)
/* 04D6FC 8004CAFC 8D0A0000 */ lw $t2, ($t0)
/* 04D700 8004CB00 84EB0196 */ lh $t3, 0x196($a3)
@@ -597,7 +597,7 @@ glabel update_camera_plane
/* 04D710 8004CB10 00000000 */ nop
/* 04D714 8004CB14 15A00005 */ bnez $t5, .L8004CB2C
/* 04D718 8004CB18 00000000 */ nop
/* 04D71C 8004CB1C 85CED586 */ lh $t6, %lo(D_8011D586)($t6)
/* 04D71C 8004CB1C 85CED586 */ lh $t6, %lo(gDialogueCameraAngle)($t6)
/* 04D720 8004CB20 34018001 */ li $at, 32769
/* 04D724 8004CB24 11C00014 */ beqz $t6, .L8004CB78
/* 04D728 8004CB28 00000000 */ nop

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