diff --git a/asm/non_matchings/code_80040E50/func_800413B8.s b/asm/non_matchings/code_80040E50/func_800413B8.s index 804f6a8ca..ffff47447 100644 --- a/asm/non_matchings/code_80040E50/func_800413B8.s +++ b/asm/non_matchings/code_80040E50/func_800413B8.s @@ -1,4 +1,4 @@ -glabel func_800413B8 +glabel f32_step_towards /* 041FB8 800413B8 44856000 */ mtc1 $a1, $f12 /* 041FBC 800413BC C4800000 */ lwc1 $f0, ($a0) /* 041FC0 800413C0 44867000 */ mtc1 $a2, $f14 diff --git a/asm/non_matchings/code_80057C60/func_8005A14C.s b/asm/non_matchings/code_80057C60/func_8005A14C.s index b0d621f47..d4a3912aa 100644 --- a/asm/non_matchings/code_80057C60/func_8005A14C.s +++ b/asm/non_matchings/code_80057C60/func_8005A14C.s @@ -62,7 +62,7 @@ glabel func_8005A14C /* 05AE34 8005A234 34A5999A */ ori $a1, (0x3E99999A & 0xFFFF) # ori $a1, $a1, 0x999a /* 05AE38 8005A238 02002025 */ move $a0, $s0 /* 05AE3C 8005A23C AFA7002C */ sw $a3, 0x2c($sp) -/* 05AE40 8005A240 0C0104EE */ jal func_800413B8 +/* 05AE40 8005A240 0C0104EE */ jal f32_step_towards /* 05AE44 8005A244 AFA80024 */ sw $t0, 0x24($sp) /* 05AE48 8005A248 10000009 */ b .L8005A270 /* 05AE4C 8005A24C 8FA80024 */ lw $t0, 0x24($sp) @@ -72,7 +72,7 @@ glabel func_8005A14C /* 05AE58 8005A258 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a /* 05AE5C 8005A25C 34A5999A */ ori $a1, (0x3F19999A & 0xFFFF) # ori $a1, $a1, 0x999a /* 05AE60 8005A260 AFA7002C */ sw $a3, 0x2c($sp) -/* 05AE64 8005A264 0C0104EE */ jal func_800413B8 +/* 05AE64 8005A264 0C0104EE */ jal f32_step_towards /* 05AE68 8005A268 AFA80024 */ sw $t0, 0x24($sp) /* 05AE6C 8005A26C 8FA80024 */ lw $t0, 0x24($sp) .L8005A270: @@ -85,12 +85,12 @@ glabel func_8005A14C /* 05AE88 8005A288 260400BE */ addiu $a0, $s0, 0xbe /* 05AE8C 8005A28C 24050C00 */ li $a1, 3072 /* 05AE90 8005A290 24060100 */ li $a2, 256 -/* 05AE94 8005A294 0C01040A */ jal func_80041028 +/* 05AE94 8005A294 0C01040A */ jal u16_step_up_towards /* 05AE98 8005A298 AFA80024 */ sw $t0, 0x24($sp) /* 05AE9C 8005A29C 10000004 */ b .L8005A2B0 /* 05AEA0 8005A2A0 8FA80024 */ lw $t0, 0x24($sp) .L8005A2A4: -/* 05AEA4 8005A2A4 0C01042F */ jal func_800410BC +/* 05AEA4 8005A2A4 0C01042F */ jal u16_step_down_towards /* 05AEA8 8005A2A8 AFA80024 */ sw $t0, 0x24($sp) /* 05AEAC 8005A2AC 8FA80024 */ lw $t0, 0x24($sp) .L8005A2B0: @@ -110,7 +110,7 @@ glabel func_8005A14C /* 05AEE4 8005A2E4 8FA80024 */ lw $t0, 0x24($sp) .L8005A2E8: /* 05AEE8 8005A2E8 3C063F80 */ lui $a2, 0x3f80 -/* 05AEEC 8005A2EC 0C0104EE */ jal func_800413B8 +/* 05AEEC 8005A2EC 0C0104EE */ jal f32_step_towards /* 05AEF0 8005A2F0 AFA80024 */ sw $t0, 0x24($sp) /* 05AEF4 8005A2F4 8FA80024 */ lw $t0, 0x24($sp) .L8005A2F8: diff --git a/asm/non_matchings/code_80057C60/func_8005AB60.s b/asm/non_matchings/code_80057C60/func_8005AB60.s index 70aac68a2..0a28b5ae3 100644 --- a/asm/non_matchings/code_80057C60/func_8005AB60.s +++ b/asm/non_matchings/code_80057C60/func_8005AB60.s @@ -17,12 +17,12 @@ glabel L8005AB98 /* 05B798 8005AB98 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B79C 8005AB9C 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B7A0 8005ABA0 24050106 */ li $a1, 262 -/* 05B7A4 8005ABA4 0C0104A2 */ jal func_80041288 +/* 05B7A4 8005ABA4 0C0104A2 */ jal s16_step_towards /* 05B7A8 8005ABA8 24060010 */ li $a2, 16 /* 05B7AC 8005ABAC 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B7B0 8005ABB0 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B7B4 8005ABB4 240500B6 */ li $a1, 182 -/* 05B7B8 8005ABB8 0C0104A2 */ jal func_80041288 +/* 05B7B8 8005ABB8 0C0104A2 */ jal s16_step_towards /* 05B7BC 8005ABBC 24060010 */ li $a2, 16 /* 05B7C0 8005ABC0 50400069 */ beql $v0, $zero, .L8005AD68 /* 05B7C4 8005ABC4 92020079 */ lbu $v0, 0x79($s0) @@ -36,12 +36,12 @@ glabel L8005ABE0 /* 05B7E0 8005ABE0 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B7E4 8005ABE4 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B7E8 8005ABE8 24050116 */ li $a1, 278 -/* 05B7EC 8005ABEC 0C0104A2 */ jal func_80041288 +/* 05B7EC 8005ABEC 0C0104A2 */ jal s16_step_towards /* 05B7F0 8005ABF0 24060004 */ li $a2, 4 /* 05B7F4 8005ABF4 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B7F8 8005ABF8 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B7FC 8005ABFC 240500C6 */ li $a1, 198 -/* 05B800 8005AC00 0C0104A2 */ jal func_80041288 +/* 05B800 8005AC00 0C0104A2 */ jal s16_step_towards /* 05B804 8005AC04 24060004 */ li $a2, 4 /* 05B808 8005AC08 50400057 */ beql $v0, $zero, .L8005AD68 /* 05B80C 8005AC0C 92020079 */ lbu $v0, 0x79($s0) @@ -53,12 +53,12 @@ glabel L8005AC20 /* 05B820 8005AC20 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B824 8005AC24 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B828 8005AC28 24050106 */ li $a1, 262 -/* 05B82C 8005AC2C 0C0104A2 */ jal func_80041288 +/* 05B82C 8005AC2C 0C0104A2 */ jal s16_step_towards /* 05B830 8005AC30 24060004 */ li $a2, 4 /* 05B834 8005AC34 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B838 8005AC38 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B83C 8005AC3C 240500B6 */ li $a1, 182 -/* 05B840 8005AC40 0C0104A2 */ jal func_80041288 +/* 05B840 8005AC40 0C0104A2 */ jal s16_step_towards /* 05B844 8005AC44 24060004 */ li $a2, 4 /* 05B848 8005AC48 50400047 */ beql $v0, $zero, .L8005AD68 /* 05B84C 8005AC4C 92020079 */ lbu $v0, 0x79($s0) @@ -70,12 +70,12 @@ glabel L8005AC60 /* 05B860 8005AC60 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B864 8005AC64 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B868 8005AC68 2405010E */ li $a1, 270 -/* 05B86C 8005AC6C 0C0104A2 */ jal func_80041288 +/* 05B86C 8005AC6C 0C0104A2 */ jal s16_step_towards /* 05B870 8005AC70 24060004 */ li $a2, 4 /* 05B874 8005AC74 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B878 8005AC78 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B87C 8005AC7C 240500BE */ li $a1, 190 -/* 05B880 8005AC80 0C0104A2 */ jal func_80041288 +/* 05B880 8005AC80 0C0104A2 */ jal s16_step_towards /* 05B884 8005AC84 24060004 */ li $a2, 4 /* 05B888 8005AC88 50400037 */ beql $v0, $zero, .L8005AD68 /* 05B88C 8005AC8C 92020079 */ lbu $v0, 0x79($s0) @@ -87,12 +87,12 @@ glabel L8005ACA0 /* 05B8A0 8005ACA0 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B8A4 8005ACA4 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B8A8 8005ACA8 24050106 */ li $a1, 262 -/* 05B8AC 8005ACAC 0C0104A2 */ jal func_80041288 +/* 05B8AC 8005ACAC 0C0104A2 */ jal s16_step_towards /* 05B8B0 8005ACB0 24060004 */ li $a2, 4 /* 05B8B4 8005ACB4 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B8B8 8005ACB8 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B8BC 8005ACBC 240500B6 */ li $a1, 182 -/* 05B8C0 8005ACC0 0C0104A2 */ jal func_80041288 +/* 05B8C0 8005ACC0 0C0104A2 */ jal s16_step_towards /* 05B8C4 8005ACC4 24060004 */ li $a2, 4 /* 05B8C8 8005ACC8 50400027 */ beql $v0, $zero, .L8005AD68 /* 05B8CC 8005ACCC 92020079 */ lbu $v0, 0x79($s0) @@ -104,12 +104,12 @@ glabel L8005ACE0 /* 05B8E0 8005ACE0 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B8E4 8005ACE4 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B8E8 8005ACE8 2405010A */ li $a1, 266 -/* 05B8EC 8005ACEC 0C0104A2 */ jal func_80041288 +/* 05B8EC 8005ACEC 0C0104A2 */ jal s16_step_towards /* 05B8F0 8005ACF0 24060002 */ li $a2, 2 /* 05B8F4 8005ACF4 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B8F8 8005ACF8 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B8FC 8005ACFC 240500BA */ li $a1, 186 -/* 05B900 8005AD00 0C0104A2 */ jal func_80041288 +/* 05B900 8005AD00 0C0104A2 */ jal s16_step_towards /* 05B904 8005AD04 24060002 */ li $a2, 2 /* 05B908 8005AD08 50400017 */ beql $v0, $zero, .L8005AD68 /* 05B90C 8005AD0C 92020079 */ lbu $v0, 0x79($s0) @@ -121,12 +121,12 @@ glabel L8005AD20 /* 05B920 8005AD20 3C048019 */ lui $a0, %hi(D_8018CAAE) # $a0, 0x8019 /* 05B924 8005AD24 2484CAAE */ addiu $a0, %lo(D_8018CAAE) # addiu $a0, $a0, -0x3552 /* 05B928 8005AD28 24050106 */ li $a1, 262 -/* 05B92C 8005AD2C 0C0104A2 */ jal func_80041288 +/* 05B92C 8005AD2C 0C0104A2 */ jal s16_step_towards /* 05B930 8005AD30 24060002 */ li $a2, 2 /* 05B934 8005AD34 3C048019 */ lui $a0, %hi(D_8018CAB0) # $a0, 0x8019 /* 05B938 8005AD38 2484CAB0 */ addiu $a0, %lo(D_8018CAB0) # addiu $a0, $a0, -0x3550 /* 05B93C 8005AD3C 240500B6 */ li $a1, 182 -/* 05B940 8005AD40 0C0104A2 */ jal func_80041288 +/* 05B940 8005AD40 0C0104A2 */ jal s16_step_towards /* 05B944 8005AD44 24060002 */ li $a2, 2 /* 05B948 8005AD48 50400007 */ beql $v0, $zero, .L8005AD68 /* 05B94C 8005AD4C 92020079 */ lbu $v0, 0x79($s0) @@ -182,7 +182,7 @@ glabel L8005ADF4 /* 05B9F4 8005ADF4 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05B9F8 8005ADF8 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05B9FC 8005ADFC 24050040 */ li $a1, 64 -/* 05BA00 8005AE00 0C0104A2 */ jal func_80041288 +/* 05BA00 8005AE00 0C0104A2 */ jal s16_step_towards /* 05BA04 8005AE04 24060008 */ li $a2, 8 /* 05BA08 8005AE08 50400049 */ beql $v0, $zero, .L8005AF30 /* 05BA0C 8005AE0C 920B007A */ lbu $t3, 0x7a($s0) @@ -194,7 +194,7 @@ glabel L8005AE20 /* 05BA20 8005AE20 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BA24 8005AE24 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BA28 8005AE28 24050038 */ li $a1, 56 -/* 05BA2C 8005AE2C 0C0104A2 */ jal func_80041288 +/* 05BA2C 8005AE2C 0C0104A2 */ jal s16_step_towards /* 05BA30 8005AE30 24060008 */ li $a2, 8 /* 05BA34 8005AE34 5040003E */ beql $v0, $zero, .L8005AF30 /* 05BA38 8005AE38 920B007A */ lbu $t3, 0x7a($s0) @@ -206,7 +206,7 @@ glabel L8005AE4C /* 05BA4C 8005AE4C 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BA50 8005AE50 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BA54 8005AE54 24050040 */ li $a1, 64 -/* 05BA58 8005AE58 0C0104A2 */ jal func_80041288 +/* 05BA58 8005AE58 0C0104A2 */ jal s16_step_towards /* 05BA5C 8005AE5C 24060008 */ li $a2, 8 /* 05BA60 8005AE60 50400033 */ beql $v0, $zero, .L8005AF30 /* 05BA64 8005AE64 920B007A */ lbu $t3, 0x7a($s0) @@ -218,7 +218,7 @@ glabel L8005AE78 /* 05BA78 8005AE78 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BA7C 8005AE7C 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BA80 8005AE80 24050038 */ li $a1, 56 -/* 05BA84 8005AE84 0C0104A2 */ jal func_80041288 +/* 05BA84 8005AE84 0C0104A2 */ jal s16_step_towards /* 05BA88 8005AE88 24060008 */ li $a2, 8 /* 05BA8C 8005AE8C 50400028 */ beql $v0, $zero, .L8005AF30 /* 05BA90 8005AE90 920B007A */ lbu $t3, 0x7a($s0) @@ -230,7 +230,7 @@ glabel L8005AEA4 /* 05BAA4 8005AEA4 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BAA8 8005AEA8 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BAAC 8005AEAC 24050040 */ li $a1, 64 -/* 05BAB0 8005AEB0 0C0104A2 */ jal func_80041288 +/* 05BAB0 8005AEB0 0C0104A2 */ jal s16_step_towards /* 05BAB4 8005AEB4 24060008 */ li $a2, 8 /* 05BAB8 8005AEB8 5040001D */ beql $v0, $zero, .L8005AF30 /* 05BABC 8005AEBC 920B007A */ lbu $t3, 0x7a($s0) @@ -242,7 +242,7 @@ glabel L8005AED0 /* 05BAD0 8005AED0 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BAD4 8005AED4 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BAD8 8005AED8 24050038 */ li $a1, 56 -/* 05BADC 8005AEDC 0C0104A2 */ jal func_80041288 +/* 05BADC 8005AEDC 0C0104A2 */ jal s16_step_towards /* 05BAE0 8005AEE0 24060004 */ li $a2, 4 /* 05BAE4 8005AEE4 50400012 */ beql $v0, $zero, .L8005AF30 /* 05BAE8 8005AEE8 920B007A */ lbu $t3, 0x7a($s0) @@ -254,7 +254,7 @@ glabel L8005AEFC /* 05BAFC 8005AEFC 3C048019 */ lui $a0, %hi(D_8018CAB8) # $a0, 0x8019 /* 05BB00 8005AF00 2484CAB8 */ addiu $a0, %lo(D_8018CAB8) # addiu $a0, $a0, -0x3548 /* 05BB04 8005AF04 24050040 */ li $a1, 64 -/* 05BB08 8005AF08 0C0104A2 */ jal func_80041288 +/* 05BB08 8005AF08 0C0104A2 */ jal s16_step_towards /* 05BB0C 8005AF0C 24060004 */ li $a2, 4 /* 05BB10 8005AF10 50400007 */ beql $v0, $zero, .L8005AF30 /* 05BB14 8005AF14 920B007A */ lbu $t3, 0x7a($s0) @@ -280,7 +280,7 @@ glabel L8005AF50 /* 05BB50 8005AF50 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BB54 8005AF54 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BB58 8005AF58 240500E4 */ li $a1, 228 -/* 05BB5C 8005AF5C 0C0104A2 */ jal func_80041288 +/* 05BB5C 8005AF5C 0C0104A2 */ jal s16_step_towards /* 05BB60 8005AF60 24060010 */ li $a2, 16 /* 05BB64 8005AF64 50400049 */ beql $v0, $zero, .L8005B08C /* 05BB68 8005AF68 9218007D */ lbu $t8, 0x7d($s0) @@ -292,7 +292,7 @@ glabel L8005AF7C /* 05BB7C 8005AF7C 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BB80 8005AF80 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BB84 8005AF84 240500F4 */ li $a1, 244 -/* 05BB88 8005AF88 0C0104A2 */ jal func_80041288 +/* 05BB88 8005AF88 0C0104A2 */ jal s16_step_towards /* 05BB8C 8005AF8C 24060004 */ li $a2, 4 /* 05BB90 8005AF90 5040003E */ beql $v0, $zero, .L8005B08C /* 05BB94 8005AF94 9218007D */ lbu $t8, 0x7d($s0) @@ -304,7 +304,7 @@ glabel L8005AFA8 /* 05BBA8 8005AFA8 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BBAC 8005AFAC 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BBB0 8005AFB0 240500E4 */ li $a1, 228 -/* 05BBB4 8005AFB4 0C0104A2 */ jal func_80041288 +/* 05BBB4 8005AFB4 0C0104A2 */ jal s16_step_towards /* 05BBB8 8005AFB8 24060004 */ li $a2, 4 /* 05BBBC 8005AFBC 50400033 */ beql $v0, $zero, .L8005B08C /* 05BBC0 8005AFC0 9218007D */ lbu $t8, 0x7d($s0) @@ -316,7 +316,7 @@ glabel L8005AFD4 /* 05BBD4 8005AFD4 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BBD8 8005AFD8 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BBDC 8005AFDC 240500EC */ li $a1, 236 -/* 05BBE0 8005AFE0 0C0104A2 */ jal func_80041288 +/* 05BBE0 8005AFE0 0C0104A2 */ jal s16_step_towards /* 05BBE4 8005AFE4 24060004 */ li $a2, 4 /* 05BBE8 8005AFE8 50400028 */ beql $v0, $zero, .L8005B08C /* 05BBEC 8005AFEC 9218007D */ lbu $t8, 0x7d($s0) @@ -328,7 +328,7 @@ glabel L8005B000 /* 05BC00 8005B000 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BC04 8005B004 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BC08 8005B008 240500E4 */ li $a1, 228 -/* 05BC0C 8005B00C 0C0104A2 */ jal func_80041288 +/* 05BC0C 8005B00C 0C0104A2 */ jal s16_step_towards /* 05BC10 8005B010 24060004 */ li $a2, 4 /* 05BC14 8005B014 5040001D */ beql $v0, $zero, .L8005B08C /* 05BC18 8005B018 9218007D */ lbu $t8, 0x7d($s0) @@ -340,7 +340,7 @@ glabel L8005B02C /* 05BC2C 8005B02C 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BC30 8005B030 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BC34 8005B034 240500E8 */ li $a1, 232 -/* 05BC38 8005B038 0C0104A2 */ jal func_80041288 +/* 05BC38 8005B038 0C0104A2 */ jal s16_step_towards /* 05BC3C 8005B03C 24060002 */ li $a2, 2 /* 05BC40 8005B040 50400012 */ beql $v0, $zero, .L8005B08C /* 05BC44 8005B044 9218007D */ lbu $t8, 0x7d($s0) @@ -352,7 +352,7 @@ glabel L8005B058 /* 05BC58 8005B058 3C048019 */ lui $a0, %hi(D_8018CABE) # $a0, 0x8019 /* 05BC5C 8005B05C 2484CABE */ addiu $a0, %lo(D_8018CABE) # addiu $a0, $a0, -0x3542 /* 05BC60 8005B060 240500E4 */ li $a1, 228 -/* 05BC64 8005B064 0C0104A2 */ jal func_80041288 +/* 05BC64 8005B064 0C0104A2 */ jal s16_step_towards /* 05BC68 8005B068 24060002 */ li $a2, 2 /* 05BC6C 8005B06C 50400007 */ beql $v0, $zero, .L8005B08C /* 05BC70 8005B070 9218007D */ lbu $t8, 0x7d($s0) @@ -378,7 +378,7 @@ glabel L8005B0AC /* 05BCAC 8005B0AC 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BCB0 8005B0B0 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BCB4 8005B0B4 24050053 */ li $a1, 83 -/* 05BCB8 8005B0B8 0C0104A2 */ jal func_80041288 +/* 05BCB8 8005B0B8 0C0104A2 */ jal s16_step_towards /* 05BCBC 8005B0BC 24060010 */ li $a2, 16 /* 05BCC0 8005B0C0 50400049 */ beql $v0, $zero, .L8005B1E8 /* 05BCC4 8005B0C4 860B003E */ lh $t3, 0x3e($s0) @@ -390,7 +390,7 @@ glabel L8005B0D8 /* 05BCD8 8005B0D8 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BCDC 8005B0DC 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BCE0 8005B0E0 24050043 */ li $a1, 67 -/* 05BCE4 8005B0E4 0C0104A2 */ jal func_80041288 +/* 05BCE4 8005B0E4 0C0104A2 */ jal s16_step_towards /* 05BCE8 8005B0E8 24060004 */ li $a2, 4 /* 05BCEC 8005B0EC 5040003E */ beql $v0, $zero, .L8005B1E8 /* 05BCF0 8005B0F0 860B003E */ lh $t3, 0x3e($s0) @@ -402,7 +402,7 @@ glabel L8005B104 /* 05BD04 8005B104 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BD08 8005B108 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BD0C 8005B10C 24050053 */ li $a1, 83 -/* 05BD10 8005B110 0C0104A2 */ jal func_80041288 +/* 05BD10 8005B110 0C0104A2 */ jal s16_step_towards /* 05BD14 8005B114 24060004 */ li $a2, 4 /* 05BD18 8005B118 50400033 */ beql $v0, $zero, .L8005B1E8 /* 05BD1C 8005B11C 860B003E */ lh $t3, 0x3e($s0) @@ -414,7 +414,7 @@ glabel L8005B130 /* 05BD30 8005B130 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BD34 8005B134 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BD38 8005B138 2405004B */ li $a1, 75 -/* 05BD3C 8005B13C 0C0104A2 */ jal func_80041288 +/* 05BD3C 8005B13C 0C0104A2 */ jal s16_step_towards /* 05BD40 8005B140 24060004 */ li $a2, 4 /* 05BD44 8005B144 50400028 */ beql $v0, $zero, .L8005B1E8 /* 05BD48 8005B148 860B003E */ lh $t3, 0x3e($s0) @@ -426,7 +426,7 @@ glabel L8005B15C /* 05BD5C 8005B15C 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BD60 8005B160 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BD64 8005B164 24050053 */ li $a1, 83 -/* 05BD68 8005B168 0C0104A2 */ jal func_80041288 +/* 05BD68 8005B168 0C0104A2 */ jal s16_step_towards /* 05BD6C 8005B16C 24060004 */ li $a2, 4 /* 05BD70 8005B170 5040001D */ beql $v0, $zero, .L8005B1E8 /* 05BD74 8005B174 860B003E */ lh $t3, 0x3e($s0) @@ -438,7 +438,7 @@ glabel L8005B188 /* 05BD88 8005B188 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BD8C 8005B18C 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BD90 8005B190 2405004F */ li $a1, 79 -/* 05BD94 8005B194 0C0104A2 */ jal func_80041288 +/* 05BD94 8005B194 0C0104A2 */ jal s16_step_towards /* 05BD98 8005B198 24060002 */ li $a2, 2 /* 05BD9C 8005B19C 50400012 */ beql $v0, $zero, .L8005B1E8 /* 05BDA0 8005B1A0 860B003E */ lh $t3, 0x3e($s0) @@ -450,7 +450,7 @@ glabel L8005B1B4 /* 05BDB4 8005B1B4 3C048019 */ lui $a0, %hi(D_8018CACA) # $a0, 0x8019 /* 05BDB8 8005B1B8 2484CACA */ addiu $a0, %lo(D_8018CACA) # addiu $a0, $a0, -0x3536 /* 05BDBC 8005B1BC 24050053 */ li $a1, 83 -/* 05BDC0 8005B1C0 0C0104A2 */ jal func_80041288 +/* 05BDC0 8005B1C0 0C0104A2 */ jal s16_step_towards /* 05BDC4 8005B1C4 24060002 */ li $a2, 2 /* 05BDC8 8005B1C8 50400007 */ beql $v0, $zero, .L8005B1E8 /* 05BDCC 8005B1CC 860B003E */ lh $t3, 0x3e($s0) @@ -490,7 +490,7 @@ glabel L8005B240 /* 05BE40 8005B240 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BE44 8005B244 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BE48 8005B248 240500E4 */ li $a1, 228 -/* 05BE4C 8005B24C 0C0104A2 */ jal func_80041288 +/* 05BE4C 8005B24C 0C0104A2 */ jal s16_step_towards /* 05BE50 8005B250 24060010 */ li $a2, 16 /* 05BE54 8005B254 50400049 */ beql $v0, $zero, .L8005B37C /* 05BE58 8005B258 920A007E */ lbu $t2, 0x7e($s0) @@ -502,7 +502,7 @@ glabel L8005B26C /* 05BE6C 8005B26C 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BE70 8005B270 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BE74 8005B274 240500F4 */ li $a1, 244 -/* 05BE78 8005B278 0C0104A2 */ jal func_80041288 +/* 05BE78 8005B278 0C0104A2 */ jal s16_step_towards /* 05BE7C 8005B27C 24060004 */ li $a2, 4 /* 05BE80 8005B280 5040003E */ beql $v0, $zero, .L8005B37C /* 05BE84 8005B284 920A007E */ lbu $t2, 0x7e($s0) @@ -514,7 +514,7 @@ glabel L8005B298 /* 05BE98 8005B298 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BE9C 8005B29C 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BEA0 8005B2A0 240500E4 */ li $a1, 228 -/* 05BEA4 8005B2A4 0C0104A2 */ jal func_80041288 +/* 05BEA4 8005B2A4 0C0104A2 */ jal s16_step_towards /* 05BEA8 8005B2A8 24060004 */ li $a2, 4 /* 05BEAC 8005B2AC 50400033 */ beql $v0, $zero, .L8005B37C /* 05BEB0 8005B2B0 920A007E */ lbu $t2, 0x7e($s0) @@ -526,7 +526,7 @@ glabel L8005B2C4 /* 05BEC4 8005B2C4 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BEC8 8005B2C8 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BECC 8005B2CC 240500EC */ li $a1, 236 -/* 05BED0 8005B2D0 0C0104A2 */ jal func_80041288 +/* 05BED0 8005B2D0 0C0104A2 */ jal s16_step_towards /* 05BED4 8005B2D4 24060004 */ li $a2, 4 /* 05BED8 8005B2D8 50400028 */ beql $v0, $zero, .L8005B37C /* 05BEDC 8005B2DC 920A007E */ lbu $t2, 0x7e($s0) @@ -538,7 +538,7 @@ glabel L8005B2F0 /* 05BEF0 8005B2F0 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BEF4 8005B2F4 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BEF8 8005B2F8 240500E4 */ li $a1, 228 -/* 05BEFC 8005B2FC 0C0104A2 */ jal func_80041288 +/* 05BEFC 8005B2FC 0C0104A2 */ jal s16_step_towards /* 05BF00 8005B300 24060004 */ li $a2, 4 /* 05BF04 8005B304 5040001D */ beql $v0, $zero, .L8005B37C /* 05BF08 8005B308 920A007E */ lbu $t2, 0x7e($s0) @@ -550,7 +550,7 @@ glabel L8005B31C /* 05BF1C 8005B31C 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BF20 8005B320 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BF24 8005B324 240500E8 */ li $a1, 232 -/* 05BF28 8005B328 0C0104A2 */ jal func_80041288 +/* 05BF28 8005B328 0C0104A2 */ jal s16_step_towards /* 05BF2C 8005B32C 24060002 */ li $a2, 2 /* 05BF30 8005B330 50400012 */ beql $v0, $zero, .L8005B37C /* 05BF34 8005B334 920A007E */ lbu $t2, 0x7e($s0) @@ -562,7 +562,7 @@ glabel L8005B348 /* 05BF48 8005B348 3C048019 */ lui $a0, %hi(D_8018CAC0) # $a0, 0x8019 /* 05BF4C 8005B34C 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05BF50 8005B350 240500E4 */ li $a1, 228 -/* 05BF54 8005B354 0C0104A2 */ jal func_80041288 +/* 05BF54 8005B354 0C0104A2 */ jal s16_step_towards /* 05BF58 8005B358 24060002 */ li $a2, 2 /* 05BF5C 8005B35C 50400007 */ beql $v0, $zero, .L8005B37C /* 05BF60 8005B360 920A007E */ lbu $t2, 0x7e($s0) @@ -588,7 +588,7 @@ glabel L8005B39C /* 05BF9C 8005B39C 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05BFA0 8005B3A0 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05BFA4 8005B3A4 24050053 */ li $a1, 83 -/* 05BFA8 8005B3A8 0C0104A2 */ jal func_80041288 +/* 05BFA8 8005B3A8 0C0104A2 */ jal s16_step_towards /* 05BFAC 8005B3AC 24060010 */ li $a2, 16 /* 05BFB0 8005B3B0 50400049 */ beql $v0, $zero, .L8005B4D8 /* 05BFB4 8005B3B4 920F007C */ lbu $t7, 0x7c($s0) @@ -600,7 +600,7 @@ glabel L8005B3C8 /* 05BFC8 8005B3C8 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05BFCC 8005B3CC 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05BFD0 8005B3D0 24050043 */ li $a1, 67 -/* 05BFD4 8005B3D4 0C0104A2 */ jal func_80041288 +/* 05BFD4 8005B3D4 0C0104A2 */ jal s16_step_towards /* 05BFD8 8005B3D8 24060004 */ li $a2, 4 /* 05BFDC 8005B3DC 5040003E */ beql $v0, $zero, .L8005B4D8 /* 05BFE0 8005B3E0 920F007C */ lbu $t7, 0x7c($s0) @@ -612,7 +612,7 @@ glabel L8005B3F4 /* 05BFF4 8005B3F4 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05BFF8 8005B3F8 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05BFFC 8005B3FC 24050053 */ li $a1, 83 -/* 05C000 8005B400 0C0104A2 */ jal func_80041288 +/* 05C000 8005B400 0C0104A2 */ jal s16_step_towards /* 05C004 8005B404 24060004 */ li $a2, 4 /* 05C008 8005B408 50400033 */ beql $v0, $zero, .L8005B4D8 /* 05C00C 8005B40C 920F007C */ lbu $t7, 0x7c($s0) @@ -624,7 +624,7 @@ glabel L8005B420 /* 05C020 8005B420 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05C024 8005B424 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05C028 8005B428 2405004B */ li $a1, 75 -/* 05C02C 8005B42C 0C0104A2 */ jal func_80041288 +/* 05C02C 8005B42C 0C0104A2 */ jal s16_step_towards /* 05C030 8005B430 24060004 */ li $a2, 4 /* 05C034 8005B434 50400028 */ beql $v0, $zero, .L8005B4D8 /* 05C038 8005B438 920F007C */ lbu $t7, 0x7c($s0) @@ -636,7 +636,7 @@ glabel L8005B44C /* 05C04C 8005B44C 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05C050 8005B450 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05C054 8005B454 24050053 */ li $a1, 83 -/* 05C058 8005B458 0C0104A2 */ jal func_80041288 +/* 05C058 8005B458 0C0104A2 */ jal s16_step_towards /* 05C05C 8005B45C 24060004 */ li $a2, 4 /* 05C060 8005B460 5040001D */ beql $v0, $zero, .L8005B4D8 /* 05C064 8005B464 920F007C */ lbu $t7, 0x7c($s0) @@ -648,7 +648,7 @@ glabel L8005B478 /* 05C078 8005B478 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05C07C 8005B47C 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05C080 8005B480 2405004F */ li $a1, 79 -/* 05C084 8005B484 0C0104A2 */ jal func_80041288 +/* 05C084 8005B484 0C0104A2 */ jal s16_step_towards /* 05C088 8005B488 24060002 */ li $a2, 2 /* 05C08C 8005B48C 50400012 */ beql $v0, $zero, .L8005B4D8 /* 05C090 8005B490 920F007C */ lbu $t7, 0x7c($s0) @@ -660,7 +660,7 @@ glabel L8005B4A4 /* 05C0A4 8005B4A4 3C048019 */ lui $a0, %hi(D_8018CACC) # $a0, 0x8019 /* 05C0A8 8005B4A8 2484CACC */ addiu $a0, %lo(D_8018CACC) # addiu $a0, $a0, -0x3534 /* 05C0AC 8005B4AC 24050053 */ li $a1, 83 -/* 05C0B0 8005B4B0 0C0104A2 */ jal func_80041288 +/* 05C0B0 8005B4B0 0C0104A2 */ jal s16_step_towards /* 05C0B4 8005B4B4 24060002 */ li $a2, 2 /* 05C0B8 8005B4B8 50400007 */ beql $v0, $zero, .L8005B4D8 /* 05C0BC 8005B4BC 920F007C */ lbu $t7, 0x7c($s0) @@ -686,7 +686,7 @@ glabel L8005B4F8 /* 05C0F8 8005B4F8 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C0FC 8005B4FC 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C100 8005B500 240500E4 */ li $a1, 228 -/* 05C104 8005B504 0C0104A2 */ jal func_80041288 +/* 05C104 8005B504 0C0104A2 */ jal s16_step_towards /* 05C108 8005B508 24060010 */ li $a2, 16 /* 05C10C 8005B50C 50400049 */ beql $v0, $zero, .L8005B634 /* 05C110 8005B510 920A007F */ lbu $t2, 0x7f($s0) @@ -698,7 +698,7 @@ glabel L8005B524 /* 05C124 8005B524 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C128 8005B528 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C12C 8005B52C 240500F4 */ li $a1, 244 -/* 05C130 8005B530 0C0104A2 */ jal func_80041288 +/* 05C130 8005B530 0C0104A2 */ jal s16_step_towards /* 05C134 8005B534 24060004 */ li $a2, 4 /* 05C138 8005B538 5040003E */ beql $v0, $zero, .L8005B634 /* 05C13C 8005B53C 920A007F */ lbu $t2, 0x7f($s0) @@ -710,7 +710,7 @@ glabel L8005B550 /* 05C150 8005B550 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C154 8005B554 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C158 8005B558 240500E4 */ li $a1, 228 -/* 05C15C 8005B55C 0C0104A2 */ jal func_80041288 +/* 05C15C 8005B55C 0C0104A2 */ jal s16_step_towards /* 05C160 8005B560 24060004 */ li $a2, 4 /* 05C164 8005B564 50400033 */ beql $v0, $zero, .L8005B634 /* 05C168 8005B568 920A007F */ lbu $t2, 0x7f($s0) @@ -722,7 +722,7 @@ glabel L8005B57C /* 05C17C 8005B57C 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C180 8005B580 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C184 8005B584 240500EC */ li $a1, 236 -/* 05C188 8005B588 0C0104A2 */ jal func_80041288 +/* 05C188 8005B588 0C0104A2 */ jal s16_step_towards /* 05C18C 8005B58C 24060004 */ li $a2, 4 /* 05C190 8005B590 50400028 */ beql $v0, $zero, .L8005B634 /* 05C194 8005B594 920A007F */ lbu $t2, 0x7f($s0) @@ -734,7 +734,7 @@ glabel L8005B5A8 /* 05C1A8 8005B5A8 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C1AC 8005B5AC 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C1B0 8005B5B0 240500E4 */ li $a1, 228 -/* 05C1B4 8005B5B4 0C0104A2 */ jal func_80041288 +/* 05C1B4 8005B5B4 0C0104A2 */ jal s16_step_towards /* 05C1B8 8005B5B8 24060004 */ li $a2, 4 /* 05C1BC 8005B5BC 5040001D */ beql $v0, $zero, .L8005B634 /* 05C1C0 8005B5C0 920A007F */ lbu $t2, 0x7f($s0) @@ -746,7 +746,7 @@ glabel L8005B5D4 /* 05C1D4 8005B5D4 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C1D8 8005B5D8 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C1DC 8005B5DC 240500E8 */ li $a1, 232 -/* 05C1E0 8005B5E0 0C0104A2 */ jal func_80041288 +/* 05C1E0 8005B5E0 0C0104A2 */ jal s16_step_towards /* 05C1E4 8005B5E4 24060002 */ li $a2, 2 /* 05C1E8 8005B5E8 50400012 */ beql $v0, $zero, .L8005B634 /* 05C1EC 8005B5EC 920A007F */ lbu $t2, 0x7f($s0) @@ -758,7 +758,7 @@ glabel L8005B600 /* 05C200 8005B600 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C204 8005B604 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C208 8005B608 240500E4 */ li $a1, 228 -/* 05C20C 8005B60C 0C0104A2 */ jal func_80041288 +/* 05C20C 8005B60C 0C0104A2 */ jal s16_step_towards /* 05C210 8005B610 24060002 */ li $a2, 2 /* 05C214 8005B614 50400007 */ beql $v0, $zero, .L8005B634 /* 05C218 8005B618 920A007F */ lbu $t2, 0x7f($s0) @@ -784,7 +784,7 @@ glabel L8005B654 /* 05C254 8005B654 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C258 8005B658 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C25C 8005B65C 24050053 */ li $a1, 83 -/* 05C260 8005B660 0C0104A2 */ jal func_80041288 +/* 05C260 8005B660 0C0104A2 */ jal s16_step_towards /* 05C264 8005B664 24060010 */ li $a2, 16 /* 05C268 8005B668 50400049 */ beql $v0, $zero, .L8005B790 /* 05C26C 8005B66C 8FBF001C */ lw $ra, 0x1c($sp) @@ -796,7 +796,7 @@ glabel L8005B680 /* 05C280 8005B680 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C284 8005B684 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C288 8005B688 24050043 */ li $a1, 67 -/* 05C28C 8005B68C 0C0104A2 */ jal func_80041288 +/* 05C28C 8005B68C 0C0104A2 */ jal s16_step_towards /* 05C290 8005B690 24060004 */ li $a2, 4 /* 05C294 8005B694 5040003E */ beql $v0, $zero, .L8005B790 /* 05C298 8005B698 8FBF001C */ lw $ra, 0x1c($sp) @@ -808,7 +808,7 @@ glabel L8005B6AC /* 05C2AC 8005B6AC 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C2B0 8005B6B0 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C2B4 8005B6B4 24050053 */ li $a1, 83 -/* 05C2B8 8005B6B8 0C0104A2 */ jal func_80041288 +/* 05C2B8 8005B6B8 0C0104A2 */ jal s16_step_towards /* 05C2BC 8005B6BC 24060004 */ li $a2, 4 /* 05C2C0 8005B6C0 50400033 */ beql $v0, $zero, .L8005B790 /* 05C2C4 8005B6C4 8FBF001C */ lw $ra, 0x1c($sp) @@ -820,7 +820,7 @@ glabel L8005B6D8 /* 05C2D8 8005B6D8 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C2DC 8005B6DC 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C2E0 8005B6E0 2405004B */ li $a1, 75 -/* 05C2E4 8005B6E4 0C0104A2 */ jal func_80041288 +/* 05C2E4 8005B6E4 0C0104A2 */ jal s16_step_towards /* 05C2E8 8005B6E8 24060004 */ li $a2, 4 /* 05C2EC 8005B6EC 50400028 */ beql $v0, $zero, .L8005B790 /* 05C2F0 8005B6F0 8FBF001C */ lw $ra, 0x1c($sp) @@ -832,7 +832,7 @@ glabel L8005B704 /* 05C304 8005B704 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C308 8005B708 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C30C 8005B70C 24050053 */ li $a1, 83 -/* 05C310 8005B710 0C0104A2 */ jal func_80041288 +/* 05C310 8005B710 0C0104A2 */ jal s16_step_towards /* 05C314 8005B714 24060004 */ li $a2, 4 /* 05C318 8005B718 5040001D */ beql $v0, $zero, .L8005B790 /* 05C31C 8005B71C 8FBF001C */ lw $ra, 0x1c($sp) @@ -844,7 +844,7 @@ glabel L8005B730 /* 05C330 8005B730 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C334 8005B734 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C338 8005B738 2405004F */ li $a1, 79 -/* 05C33C 8005B73C 0C0104A2 */ jal func_80041288 +/* 05C33C 8005B73C 0C0104A2 */ jal s16_step_towards /* 05C340 8005B740 24060002 */ li $a2, 2 /* 05C344 8005B744 50400012 */ beql $v0, $zero, .L8005B790 /* 05C348 8005B748 8FBF001C */ lw $ra, 0x1c($sp) @@ -856,7 +856,7 @@ glabel L8005B75C /* 05C35C 8005B75C 3C048019 */ lui $a0, %hi(D_8018CACE) # $a0, 0x8019 /* 05C360 8005B760 2484CACE */ addiu $a0, %lo(D_8018CACE) # addiu $a0, $a0, -0x3532 /* 05C364 8005B764 24050053 */ li $a1, 83 -/* 05C368 8005B768 0C0104A2 */ jal func_80041288 +/* 05C368 8005B768 0C0104A2 */ jal s16_step_towards /* 05C36C 8005B76C 24060002 */ li $a2, 2 /* 05C370 8005B770 50400007 */ beql $v0, $zero, .L8005B790 /* 05C374 8005B774 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8005B7A0.s b/asm/non_matchings/code_80057C60/func_8005B7A0.s index aa73c99b7..a87a12546 100644 --- a/asm/non_matchings/code_80057C60/func_8005B7A0.s +++ b/asm/non_matchings/code_80057C60/func_8005B7A0.s @@ -16,22 +16,22 @@ glabel func_8005B7A0 /* 05C3D8 8005B7D8 F7B40018 */ sdc1 $f20, 0x18($sp) /* 05C3DC 8005B7DC 2484CAC0 */ addiu $a0, %lo(D_8018CAC0) # addiu $a0, $a0, -0x3540 /* 05C3E0 8005B7E0 240500E4 */ li $a1, 228 -/* 05C3E4 8005B7E4 0C0104A2 */ jal func_80041288 +/* 05C3E4 8005B7E4 0C0104A2 */ jal s16_step_towards /* 05C3E8 8005B7E8 24060010 */ li $a2, 16 /* 05C3EC 8005B7EC 3C048019 */ lui $a0, %hi(D_8018CAC2) # $a0, 0x8019 /* 05C3F0 8005B7F0 2484CAC2 */ addiu $a0, %lo(D_8018CAC2) # addiu $a0, $a0, -0x353e /* 05C3F4 8005B7F4 240500E4 */ li $a1, 228 -/* 05C3F8 8005B7F8 0C0104A2 */ jal func_80041288 +/* 05C3F8 8005B7F8 0C0104A2 */ jal s16_step_towards /* 05C3FC 8005B7FC 24060010 */ li $a2, 16 /* 05C400 8005B800 3C048019 */ lui $a0, %hi(D_8018CAC4) # $a0, 0x8019 /* 05C404 8005B804 2484CAC4 */ addiu $a0, %lo(D_8018CAC4) # addiu $a0, $a0, -0x353c /* 05C408 8005B808 240500E4 */ li $a1, 228 -/* 05C40C 8005B80C 0C0104A2 */ jal func_80041288 +/* 05C40C 8005B80C 0C0104A2 */ jal s16_step_towards /* 05C410 8005B810 24060010 */ li $a2, 16 /* 05C414 8005B814 3C048019 */ lui $a0, %hi(D_8018CAC6) # $a0, 0x8019 /* 05C418 8005B818 2484CAC6 */ addiu $a0, %lo(D_8018CAC6) # addiu $a0, $a0, -0x353a /* 05C41C 8005B81C 240500E4 */ li $a1, 228 -/* 05C420 8005B820 0C0104A2 */ jal func_80041288 +/* 05C420 8005B820 0C0104A2 */ jal s16_step_towards /* 05C424 8005B824 24060010 */ li $a2, 16 /* 05C428 8005B828 3C01C200 */ li $at, 0xC2000000 # -32.000000 /* 05C42C 8005B82C 4481C000 */ mtc1 $at, $f24 @@ -60,7 +60,7 @@ glabel func_8005B7A0 /* 05C484 8005B884 45020012 */ bc1fl .L8005B8D0 /* 05C488 8005B888 26310004 */ addiu $s1, $s1, 4 /* 05C48C 8005B88C 8E650000 */ lw $a1, ($s3) -/* 05C490 8005B890 0C0104EE */ jal func_800413B8 +/* 05C490 8005B890 0C0104EE */ jal f32_step_towards /* 05C494 8005B894 8E860000 */ lw $a2, ($s4) /* 05C498 8005B898 C6400000 */ lwc1 $f0, ($s2) /* 05C49C 8005B89C C6660000 */ lwc1 $f6, ($s3) diff --git a/asm/non_matchings/code_80057C60/func_8005B914.s b/asm/non_matchings/code_80057C60/func_8005B914.s index c8abe1af8..4c6de2858 100644 --- a/asm/non_matchings/code_80057C60/func_8005B914.s +++ b/asm/non_matchings/code_80057C60/func_8005B914.s @@ -709,7 +709,7 @@ glabel L8005C290 /* 05CEFC 8005C2FC 8C460000 */ lw $a2, ($v0) /* 05CF00 8005C300 AFA20020 */ sw $v0, 0x20($sp) /* 05CF04 8005C304 AFA30018 */ sw $v1, 0x18($sp) -/* 05CF08 8005C308 0C0104EE */ jal func_800413B8 +/* 05CF08 8005C308 0C0104EE */ jal f32_step_towards /* 05CF0C 8005C30C AFA4001C */ sw $a0, 0x1c($sp) /* 05CF10 8005C310 8FA30018 */ lw $v1, 0x18($sp) /* 05CF14 8005C314 8FA4001C */ lw $a0, 0x1c($sp) diff --git a/asm/non_matchings/code_80057C60/func_8005CB60.s b/asm/non_matchings/code_80057C60/func_8005CB60.s index 9184b10fe..329115187 100644 --- a/asm/non_matchings/code_80057C60/func_8005CB60.s +++ b/asm/non_matchings/code_80057C60/func_8005CB60.s @@ -259,7 +259,7 @@ glabel func_8005CB60 /* 05DB24 8005CF24 26040004 */ addiu $a0, $s0, 4 /* 05DB28 8005CF28 3C053F80 */ lui $a1, 0x3f80 /* 05DB2C 8005CF2C 3C063E00 */ lui $a2, 0x3e00 -/* 05DB30 8005CF30 0C0104EE */ jal func_800413B8 +/* 05DB30 8005CF30 0C0104EE */ jal f32_step_towards /* 05DB34 8005CF34 AFA70040 */ sw $a3, 0x40($sp) /* 05DB38 8005CF38 3C02800E */ lui $v0, %hi(gScreenModeSelection) # $v0, 0x800e /* 05DB3C 8005CF3C 8C42C530 */ lw $v0, %lo(gScreenModeSelection)($v0) @@ -279,7 +279,7 @@ glabel func_8005CB60 /* 05DB74 8005CF74 10000044 */ b .L8005D088 /* 05DB78 8005CF78 8602003C */ lh $v0, 0x3c($s0) .L8005CF7C: -/* 05DB7C 8005CF7C 0C0104A2 */ jal func_80041288 +/* 05DB7C 8005CF7C 0C0104A2 */ jal s16_step_towards /* 05DB80 8005CF80 24060007 */ li $a2, 7 /* 05DB84 8005CF84 3C0B8019 */ lui $t3, %hi(D_8018D1FC) # $t3, 0x8019 /* 05DB88 8005CF88 8D6BD1FC */ lw $t3, %lo(D_8018D1FC)($t3) @@ -288,48 +288,48 @@ glabel func_8005CB60 /* 05DB94 8005CF94 11600006 */ beqz $t3, .L8005CFB0 /* 05DB98 8005CF98 2405FFF0 */ li $a1, -16 /* 05DB9C 8005CF9C 26040068 */ addiu $a0, $s0, 0x68 -/* 05DBA0 8005CFA0 0C0104A2 */ jal func_80041288 +/* 05DBA0 8005CFA0 0C0104A2 */ jal s16_step_towards /* 05DBA4 8005CFA4 2405FFD8 */ li $a1, -40 /* 05DBA8 8005CFA8 10000037 */ b .L8005D088 /* 05DBAC 8005CFAC 8602003C */ lh $v0, 0x3c($s0) .L8005CFB0: -/* 05DBB0 8005CFB0 0C0104A2 */ jal func_80041288 +/* 05DBB0 8005CFB0 0C0104A2 */ jal s16_step_towards /* 05DBB4 8005CFB4 24060004 */ li $a2, 4 /* 05DBB8 8005CFB8 10000033 */ b .L8005D088 /* 05DBBC 8005CFBC 8602003C */ lh $v0, 0x3c($s0) .L8005CFC0: /* 05DBC0 8005CFC0 26040066 */ addiu $a0, $s0, 0x66 -/* 05DBC4 8005CFC4 0C0104A2 */ jal func_80041288 +/* 05DBC4 8005CFC4 0C0104A2 */ jal s16_step_towards /* 05DBC8 8005CFC8 24060007 */ li $a2, 7 /* 05DBCC 8005CFCC 26040068 */ addiu $a0, $s0, 0x68 /* 05DBD0 8005CFD0 2405FFF0 */ li $a1, -16 -/* 05DBD4 8005CFD4 0C0104A2 */ jal func_80041288 +/* 05DBD4 8005CFD4 0C0104A2 */ jal s16_step_towards /* 05DBD8 8005CFD8 24060004 */ li $a2, 4 /* 05DBDC 8005CFDC 1000002A */ b .L8005D088 /* 05DBE0 8005CFE0 8602003C */ lh $v0, 0x3c($s0) .L8005CFE4: /* 05DBE4 8005CFE4 2405001C */ li $a1, 28 -/* 05DBE8 8005CFE8 0C0104A2 */ jal func_80041288 +/* 05DBE8 8005CFE8 0C0104A2 */ jal s16_step_towards /* 05DBEC 8005CFEC 24060007 */ li $a2, 7 /* 05DBF0 8005CFF0 26040068 */ addiu $a0, $s0, 0x68 /* 05DBF4 8005CFF4 2405FFF0 */ li $a1, -16 -/* 05DBF8 8005CFF8 0C0104A2 */ jal func_80041288 +/* 05DBF8 8005CFF8 0C0104A2 */ jal s16_step_towards /* 05DBFC 8005CFFC 24060004 */ li $a2, 4 /* 05DC00 8005D000 26040050 */ addiu $a0, $s0, 0x50 /* 05DC04 8005D004 240500E4 */ li $a1, 228 -/* 05DC08 8005D008 0C0104A2 */ jal func_80041288 +/* 05DC08 8005D008 0C0104A2 */ jal s16_step_towards /* 05DC0C 8005D00C 24060010 */ li $a2, 16 /* 05DC10 8005D010 26040052 */ addiu $a0, $s0, 0x52 /* 05DC14 8005D014 240500E4 */ li $a1, 228 -/* 05DC18 8005D018 0C0104A2 */ jal func_80041288 +/* 05DC18 8005D018 0C0104A2 */ jal s16_step_towards /* 05DC1C 8005D01C 24060010 */ li $a2, 16 /* 05DC20 8005D020 26040054 */ addiu $a0, $s0, 0x54 /* 05DC24 8005D024 240500E4 */ li $a1, 228 -/* 05DC28 8005D028 0C0104A2 */ jal func_80041288 +/* 05DC28 8005D028 0C0104A2 */ jal s16_step_towards /* 05DC2C 8005D02C 24060010 */ li $a2, 16 /* 05DC30 8005D030 26040056 */ addiu $a0, $s0, 0x56 /* 05DC34 8005D034 240500E4 */ li $a1, 228 -/* 05DC38 8005D038 0C0104A2 */ jal func_80041288 +/* 05DC38 8005D038 0C0104A2 */ jal s16_step_towards /* 05DC3C 8005D03C 24060010 */ li $a2, 16 /* 05DC40 8005D040 10000011 */ b .L8005D088 /* 05DC44 8005D044 8602003C */ lh $v0, 0x3c($s0) @@ -338,18 +338,18 @@ glabel func_8005CB60 /* 05DC4C 8005D04C 26040066 */ addiu $a0, $s0, 0x66 /* 05DC50 8005D050 26040066 */ addiu $a0, $s0, 0x66 /* 05DC54 8005D054 2405FFF8 */ li $a1, -8 -/* 05DC58 8005D058 0C0104A2 */ jal func_80041288 +/* 05DC58 8005D058 0C0104A2 */ jal s16_step_towards /* 05DC5C 8005D05C 24060002 */ li $a2, 2 /* 05DC60 8005D060 10000005 */ b .L8005D078 /* 05DC64 8005D064 26040068 */ addiu $a0, $s0, 0x68 .L8005D068: /* 05DC68 8005D068 24050008 */ li $a1, 8 -/* 05DC6C 8005D06C 0C0104A2 */ jal func_80041288 +/* 05DC6C 8005D06C 0C0104A2 */ jal s16_step_towards /* 05DC70 8005D070 24060002 */ li $a2, 2 /* 05DC74 8005D074 26040068 */ addiu $a0, $s0, 0x68 .L8005D078: /* 05DC78 8005D078 2405FFF0 */ li $a1, -16 -/* 05DC7C 8005D07C 0C0104A2 */ jal func_80041288 +/* 05DC7C 8005D07C 0C0104A2 */ jal s16_step_towards /* 05DC80 8005D080 24060004 */ li $a2, 4 .L8005D084: /* 05DC84 8005D084 8602003C */ lh $v0, 0x3c($s0) diff --git a/asm/non_matchings/code_80071F00/func_800763CC.s b/asm/non_matchings/code_80071F00/func_800763CC.s index ed3aaf200..dba21fff1 100644 --- a/asm/non_matchings/code_80071F00/func_800763CC.s +++ b/asm/non_matchings/code_80071F00/func_800763CC.s @@ -43,29 +43,29 @@ glabel L80076450 /* 077064 80076464 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc /* 077068 80076468 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 07706C 8007646C 02002025 */ move $a0, $s0 -/* 077070 80076470 0C0104EE */ jal func_800413B8 +/* 077070 80076470 0C0104EE */ jal f32_step_towards /* 077074 80076474 3C054080 */ lui $a1, 0x4080 /* 077078 80076478 260400A4 */ addiu $a0, $s0, 0xa4 /* 07707C 8007647C 00002825 */ move $a1, $zero -/* 077080 80076480 0C0104A2 */ jal func_80041288 +/* 077080 80076480 0C0104A2 */ jal s16_step_towards /* 077084 80076484 24060018 */ li $a2, 24 /* 077088 80076488 260400A2 */ addiu $a0, $s0, 0xa2 /* 07708C 8007648C 24050080 */ li $a1, 128 -/* 077090 80076490 0C0104A2 */ jal func_80041288 +/* 077090 80076490 0C0104A2 */ jal s16_step_towards /* 077094 80076494 2406000C */ li $a2, 12 /* 077098 80076498 1000000D */ b .L800764D0 /* 07709C 8007649C 860800AE */ lh $t0, 0xae($s0) .L800764A0: /* 0770A0 800764A0 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 0770A4 800764A4 0C0104EE */ jal func_800413B8 +/* 0770A4 800764A4 0C0104EE */ jal f32_step_towards /* 0770A8 800764A8 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 0770AC 800764AC 260400A4 */ addiu $a0, $s0, 0xa4 /* 0770B0 800764B0 00002825 */ move $a1, $zero -/* 0770B4 800764B4 0C0104A2 */ jal func_80041288 +/* 0770B4 800764B4 0C0104A2 */ jal s16_step_towards /* 0770B8 800764B8 24060018 */ li $a2, 24 /* 0770BC 800764BC 260400A2 */ addiu $a0, $s0, 0xa2 /* 0770C0 800764C0 24050080 */ li $a1, 128 -/* 0770C4 800764C4 0C0104A2 */ jal func_80041288 +/* 0770C4 800764C4 0C0104A2 */ jal s16_step_towards /* 0770C8 800764C8 2406000C */ li $a2, 12 /* 0770CC 800764CC 860800AE */ lh $t0, 0xae($s0) .L800764D0: diff --git a/asm/non_matchings/code_80071F00/func_80076538.s b/asm/non_matchings/code_80071F00/func_80076538.s index 7c58877f5..69f5ff6b6 100644 --- a/asm/non_matchings/code_80071F00/func_80076538.s +++ b/asm/non_matchings/code_80071F00/func_80076538.s @@ -46,7 +46,7 @@ glabel func_80076538 /* 0771DC 800765DC 860300AE */ lh $v1, 0xae($s0) .L800765E0: /* 0771E0 800765E0 00002825 */ move $a1, $zero -/* 0771E4 800765E4 0C01042F */ jal func_800410BC +/* 0771E4 800765E4 0C01042F */ jal u16_step_down_towards /* 0771E8 800765E8 24060400 */ li $a2, 1024 /* 0771EC 800765EC 860300AE */ lh $v1, 0xae($s0) .L800765F0: diff --git a/asm/non_matchings/code_80071F00/func_800769D8.s b/asm/non_matchings/code_80071F00/func_800769D8.s index 9c18b9331..01a487f0b 100644 --- a/asm/non_matchings/code_80071F00/func_800769D8.s +++ b/asm/non_matchings/code_80071F00/func_800769D8.s @@ -38,11 +38,11 @@ glabel L80076A5C /* 07765C 80076A5C 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 077660 80076A60 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 077664 80076A64 02002025 */ move $a0, $s0 -/* 077668 80076A68 0C0104EE */ jal func_800413B8 +/* 077668 80076A68 0C0104EE */ jal f32_step_towards /* 07766C 80076A6C 3C054000 */ lui $a1, 0x4000 /* 077670 80076A70 260400A4 */ addiu $a0, $s0, 0xa4 /* 077674 80076A74 00002825 */ move $a1, $zero -/* 077678 80076A78 0C0104A2 */ jal func_80041288 +/* 077678 80076A78 0C0104A2 */ jal s16_step_towards /* 07767C 80076A7C 24060018 */ li $a2, 24 /* 077680 80076A80 861900AE */ lh $t9, 0xae($s0) /* 077684 80076A84 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/code_80071F00/func_80077450.s b/asm/non_matchings/code_80071F00/func_80077450.s index f77795463..22e2ce13d 100644 --- a/asm/non_matchings/code_80071F00/func_80077450.s +++ b/asm/non_matchings/code_80071F00/func_80077450.s @@ -28,7 +28,7 @@ glabel func_80077450 /* 0780B0 800774B0 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23 /* 0780B4 800774B4 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a /* 0780B8 800774B8 34A5CCCD */ ori $a1, (0x3DCCCCCD & 0xFFFF) # ori $a1, $a1, 0xcccd -/* 0780BC 800774BC 0C0103B8 */ jal func_80040EE0 +/* 0780BC 800774BC 0C0103B8 */ jal f32_step_up_towards /* 0780C0 800774C0 AFA70040 */ sw $a3, 0x40($sp) /* 0780C4 800774C4 8618008E */ lh $t8, 0x8e($s0) /* 0780C8 800774C8 C6080008 */ lwc1 $f8, 8($s0) diff --git a/asm/non_matchings/code_80071F00/func_80079A5C.s b/asm/non_matchings/code_80071F00/func_80079A5C.s index f8db21435..2a5bde658 100644 --- a/asm/non_matchings/code_80071F00/func_80079A5C.s +++ b/asm/non_matchings/code_80071F00/func_80079A5C.s @@ -38,7 +38,7 @@ glabel func_80079A5C .L80079AE8: /* 07A6E8 80079AE8 3C0540A0 */ lui $a1, 0x40a0 /* 07A6EC 80079AEC 3C063F80 */ lui $a2, 0x3f80 -/* 07A6F0 80079AF0 0C0103CB */ jal func_80040F2C +/* 07A6F0 80079AF0 0C0103CB */ jal f32_step_down_towards /* 07A6F4 80079AF4 AFA70018 */ sw $a3, 0x18($sp) /* 07A6F8 80079AF8 1040000D */ beqz $v0, .L80079B30 /* 07A6FC 80079AFC 8FA70018 */ lw $a3, 0x18($sp) @@ -49,7 +49,7 @@ glabel func_80079A5C .L80079B10: /* 07A710 80079B10 3C0542C8 */ lui $a1, 0x42c8 /* 07A714 80079B14 3C063F80 */ lui $a2, 0x3f80 -/* 07A718 80079B18 0C0103B8 */ jal func_80040EE0 +/* 07A718 80079B18 0C0103B8 */ jal f32_step_up_towards /* 07A71C 80079B1C AFA70018 */ sw $a3, 0x18($sp) /* 07A720 80079B20 10400003 */ beqz $v0, .L80079B30 /* 07A724 80079B24 8FA70018 */ lw $a3, 0x18($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s index 2d56b0b67..59014d046 100644 --- a/asm/non_matchings/code_80071F00/func_8007B34C.s +++ b/asm/non_matchings/code_80071F00/func_8007B34C.s @@ -74,7 +74,7 @@ glabel L8007B430 /* 07C05C 8007B45C 24640048 */ addiu $a0, $v1, 0x48 /* 07C060 8007B460 AFA30028 */ sw $v1, 0x28($sp) /* 07C064 8007B464 24050040 */ li $a1, 64 -/* 07C068 8007B468 0C0103F6 */ jal func_80040FD8 +/* 07C068 8007B468 0C0103F6 */ jal s16_step_up_towards /* 07C06C 8007B46C 24060004 */ li $a2, 4 /* 07C070 8007B470 8FA30028 */ lw $v1, 0x28($sp) /* 07C074 8007B474 24010040 */ li $at, 64 @@ -104,7 +104,7 @@ glabel L8007B430 /* 07C0CC 8007B4CC 24640046 */ addiu $a0, $v1, 0x46 /* 07C0D0 8007B4D0 AFA30028 */ sw $v1, 0x28($sp) /* 07C0D4 8007B4D4 24050080 */ li $a1, 128 -/* 07C0D8 8007B4D8 0C0103F6 */ jal func_80040FD8 +/* 07C0D8 8007B4D8 0C0103F6 */ jal s16_step_up_towards /* 07C0DC 8007B4DC 24060008 */ li $a2, 8 /* 07C0E0 8007B4E0 8FA30028 */ lw $v1, 0x28($sp) /* 07C0E4 8007B4E4 24010080 */ li $at, 128 @@ -125,7 +125,7 @@ glabel L8007B430 /* 07C11C 8007B51C 24640046 */ addiu $a0, $v1, 0x46 /* 07C120 8007B520 AFA30028 */ sw $v1, 0x28($sp) /* 07C124 8007B524 2405FF80 */ li $a1, -128 -/* 07C128 8007B528 0C01041B */ jal func_8004106C +/* 07C128 8007B528 0C01041B */ jal s16_step_down_towards /* 07C12C 8007B52C 24060008 */ li $a2, 8 /* 07C130 8007B530 8FA30028 */ lw $v1, 0x28($sp) /* 07C134 8007B534 2401FF80 */ li $at, -128 @@ -146,7 +146,7 @@ glabel L8007B430 /* 07C16C 8007B56C 24640046 */ addiu $a0, $v1, 0x46 /* 07C170 8007B570 AFA30028 */ sw $v1, 0x28($sp) /* 07C174 8007B574 24050080 */ li $a1, 128 -/* 07C178 8007B578 0C0103F6 */ jal func_80040FD8 +/* 07C178 8007B578 0C0103F6 */ jal s16_step_up_towards /* 07C17C 8007B57C 24060008 */ li $a2, 8 /* 07C180 8007B580 8FA30028 */ lw $v1, 0x28($sp) /* 07C184 8007B584 24010080 */ li $at, 128 @@ -259,7 +259,7 @@ glabel L8007B6E8 /* 07C310 8007B710 252A0048 */ addiu $t2, $t1, 0x48 /* 07C314 8007B714 014B2021 */ addu $a0, $t2, $t3 /* 07C318 8007B718 00002825 */ move $a1, $zero -/* 07C31C 8007B71C 0C01041B */ jal func_8004106C +/* 07C31C 8007B71C 0C01041B */ jal s16_step_down_towards /* 07C320 8007B720 24060004 */ li $a2, 4 /* 07C324 8007B724 5040009D */ beql $v0, $zero, .L8007B99C /* 07C328 8007B728 02002025 */ move $a0, $s0 @@ -286,7 +286,7 @@ glabel L8007B6E8 /* 07C374 8007B774 24640046 */ addiu $a0, $v1, 0x46 /* 07C378 8007B778 AFA30028 */ sw $v1, 0x28($sp) /* 07C37C 8007B77C 00002825 */ move $a1, $zero -/* 07C380 8007B780 0C01041B */ jal func_8004106C +/* 07C380 8007B780 0C01041B */ jal s16_step_down_towards /* 07C384 8007B784 24060008 */ li $a2, 8 /* 07C388 8007B788 8FA30028 */ lw $v1, 0x28($sp) /* 07C38C 8007B78C 84790046 */ lh $t9, 0x46($v1) @@ -306,7 +306,7 @@ glabel L8007B6E8 /* 07C3C0 8007B7C0 24640046 */ addiu $a0, $v1, 0x46 /* 07C3C4 8007B7C4 AFA30028 */ sw $v1, 0x28($sp) /* 07C3C8 8007B7C8 00002825 */ move $a1, $zero -/* 07C3CC 8007B7CC 0C0103F6 */ jal func_80040FD8 +/* 07C3CC 8007B7CC 0C0103F6 */ jal s16_step_up_towards /* 07C3D0 8007B7D0 24060008 */ li $a2, 8 /* 07C3D4 8007B7D4 8FA30028 */ lw $v1, 0x28($sp) /* 07C3D8 8007B7D8 846A0046 */ lh $t2, 0x46($v1) @@ -325,7 +325,7 @@ glabel L8007B6E8 /* 07C408 8007B808 25AF0046 */ addiu $t7, $t5, 0x46 /* 07C40C 8007B80C 01EC2021 */ addu $a0, $t7, $t4 /* 07C410 8007B810 00002825 */ move $a1, $zero -/* 07C414 8007B814 0C01041B */ jal func_8004106C +/* 07C414 8007B814 0C01041B */ jal s16_step_down_towards /* 07C418 8007B818 24060008 */ li $a2, 8 /* 07C41C 8007B81C 5040005F */ beql $v0, $zero, .L8007B99C /* 07C420 8007B820 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code_80071F00/func_8007BFB0.s b/asm/non_matchings/code_80071F00/func_8007BFB0.s index faf762b06..983d8f9c6 100644 --- a/asm/non_matchings/code_80071F00/func_8007BFB0.s +++ b/asm/non_matchings/code_80071F00/func_8007BFB0.s @@ -64,7 +64,7 @@ glabel L8007C060 /* 07CC94 8007C094 252AFFFC */ addiu $t2, $t1, -4 /* 07CC98 8007C098 A60A0092 */ sh $t2, 0x92($s0) .L8007C09C: -/* 07CC9C 8007C09C 0C01040A */ jal func_80041028 +/* 07CC9C 8007C09C 0C01040A */ jal u16_step_up_towards /* 07CCA0 8007C0A0 96060092 */ lhu $a2, 0x92($s0) /* 07CCA4 8007C0A4 10400003 */ beqz $v0, .L8007C0B4 /* 07CCA8 8007C0A8 00000000 */ nop @@ -110,7 +110,7 @@ glabel L8007C0F8 /* 07CD38 8007C138 24050100 */ li $a1, 256 /* 07CD3C 8007C13C 46024180 */ add.s $f6, $f8, $f2 /* 07CD40 8007C140 24060010 */ li $a2, 16 -/* 07CD44 8007C144 0C0103F6 */ jal func_80040FD8 +/* 07CD44 8007C144 0C0103F6 */ jal s16_step_up_towards /* 07CD48 8007C148 E6060000 */ swc1 $f6, ($s0) /* 07CD4C 8007C14C 960B00BE */ lhu $t3, 0xbe($s0) /* 07CD50 8007C150 860C0092 */ lh $t4, 0x92($s0) diff --git a/asm/non_matchings/code_80071F00/func_8007E63C.s b/asm/non_matchings/code_80071F00/func_8007E63C.s index 19a7371b2..82e2aa3bb 100644 --- a/asm/non_matchings/code_80071F00/func_8007E63C.s +++ b/asm/non_matchings/code_80071F00/func_8007E63C.s @@ -53,7 +53,7 @@ glabel L8007E6E0 /* 07F2FC 8007E6FC 3C063FC0 */ lui $a2, 0x3fc0 /* 07F300 8007E700 46205420 */ cvt.s.d $f16, $f10 /* 07F304 8007E704 44058000 */ mfc1 $a1, $f16 -/* 07F308 8007E708 0C0103B8 */ jal func_80040EE0 +/* 07F308 8007E708 0C0103B8 */ jal f32_step_up_towards /* 07F30C 8007E70C 00000000 */ nop /* 07F310 8007E710 10400142 */ beqz $v0, .L8007EC1C /* 07F314 8007E714 02002025 */ move $a0, $s0 @@ -73,7 +73,7 @@ glabel L8007E748 /* 07F348 8007E748 2464002C */ addiu $a0, $v1, 0x2c /* 07F34C 8007E74C 24050000 */ li $a1, 0 /* 07F350 8007E750 3C064000 */ lui $a2, 0x4000 -/* 07F354 8007E754 0C0103CB */ jal func_80040F2C +/* 07F354 8007E754 0C0103CB */ jal f32_step_down_towards /* 07F358 8007E758 AFA30028 */ sw $v1, 0x28($sp) /* 07F35C 8007E75C 1040012F */ beqz $v0, .L8007EC1C /* 07F360 8007E760 8FA30028 */ lw $v1, 0x28($sp) @@ -166,7 +166,7 @@ glabel L8007E85C /* 07F49C 8007E89C 00000000 */ nop /* 07F4A0 8007E8A0 A06A00D2 */ sb $t2, 0xd2($v1) .L8007E8A4: -/* 07F4A4 8007E8A4 0C0103B8 */ jal func_80040EE0 +/* 07F4A4 8007E8A4 0C0103B8 */ jal f32_step_up_towards /* 07F4A8 8007E8A8 8C650020 */ lw $a1, 0x20($v1) /* 07F4AC 8007E8AC 104000DB */ beqz $v0, .L8007EC1C /* 07F4B0 8007E8B0 02002025 */ move $a0, $s0 @@ -196,7 +196,7 @@ glabel L8007E8F4 glabel L8007E908 /* 07F508 8007E908 2464002C */ addiu $a0, $v1, 0x2c /* 07F50C 8007E90C 3C0541A0 */ lui $a1, 0x41a0 -/* 07F510 8007E910 0C0103B8 */ jal func_80040EE0 +/* 07F510 8007E910 0C0103B8 */ jal f32_step_up_towards /* 07F514 8007E914 3C063FC0 */ lui $a2, 0x3fc0 /* 07F518 8007E918 504000C1 */ beql $v0, $zero, .L8007EC20 /* 07F51C 8007E91C 8FBF0024 */ lw $ra, 0x24($sp) @@ -207,7 +207,7 @@ glabel L8007E908 glabel L8007E930 /* 07F530 8007E930 2464002C */ addiu $a0, $v1, 0x2c /* 07F534 8007E934 24050000 */ li $a1, 0 -/* 07F538 8007E938 0C0103CB */ jal func_80040F2C +/* 07F538 8007E938 0C0103CB */ jal f32_step_down_towards /* 07F53C 8007E93C 3C063FC0 */ lui $a2, 0x3fc0 /* 07F540 8007E940 104000B6 */ beqz $v0, .L8007EC1C /* 07F544 8007E944 02002025 */ move $a0, $s0 @@ -232,7 +232,7 @@ glabel L8007E930 glabel L8007E98C /* 07F58C 8007E98C 2464002C */ addiu $a0, $v1, 0x2c /* 07F590 8007E990 3C054140 */ lui $a1, 0x4140 -/* 07F594 8007E994 0C0103B8 */ jal func_80040EE0 +/* 07F594 8007E994 0C0103B8 */ jal f32_step_up_towards /* 07F598 8007E998 3C063FC0 */ lui $a2, 0x3fc0 /* 07F59C 8007E99C 504000A0 */ beql $v0, $zero, .L8007EC20 /* 07F5A0 8007E9A0 8FBF0024 */ lw $ra, 0x24($sp) @@ -244,7 +244,7 @@ glabel L8007E9B4 /* 07F5B4 8007E9B4 2464002C */ addiu $a0, $v1, 0x2c /* 07F5B8 8007E9B8 24050000 */ li $a1, 0 /* 07F5BC 8007E9BC 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F5C0 8007E9C0 0C0103CB */ jal func_80040F2C +/* 07F5C0 8007E9C0 0C0103CB */ jal f32_step_down_towards /* 07F5C4 8007E9C4 AFA30028 */ sw $v1, 0x28($sp) /* 07F5C8 8007E9C8 10400094 */ beqz $v0, .L8007EC1C /* 07F5CC 8007E9CC 8FA30028 */ lw $v1, 0x28($sp) @@ -357,7 +357,7 @@ glabel L8007EA80 .L8007EB58: /* 07F758 8007EB58 2464002C */ addiu $a0, $v1, 0x2c /* 07F75C 8007EB5C 8C650020 */ lw $a1, 0x20($v1) -/* 07F760 8007EB60 0C0103B8 */ jal func_80040EE0 +/* 07F760 8007EB60 0C0103B8 */ jal f32_step_up_towards /* 07F764 8007EB64 3C063F00 */ lui $a2, 0x3f00 /* 07F768 8007EB68 1040002C */ beqz $v0, .L8007EC1C /* 07F76C 8007EB6C 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code_80071F00/func_8007EFBC.s b/asm/non_matchings/code_80071F00/func_8007EFBC.s index c5c0991b5..1f19e636d 100644 --- a/asm/non_matchings/code_80071F00/func_8007EFBC.s +++ b/asm/non_matchings/code_80071F00/func_8007EFBC.s @@ -43,7 +43,7 @@ glabel L8007F008 glabel L8007F05C /* 07FC5C 8007F05C 24640028 */ addiu $a0, $v1, 0x28 /* 07FC60 8007F060 8C65001C */ lw $a1, 0x1c($v1) -/* 07FC64 8007F064 0C0104EE */ jal func_800413B8 +/* 07FC64 8007F064 0C0104EE */ jal f32_step_towards /* 07FC68 8007F068 3C064080 */ lui $a2, 0x4080 /* 07FC6C 8007F06C 50400080 */ beql $v0, $zero, .L8007F270 /* 07FC70 8007F070 8FBF001C */ lw $ra, 0x1c($sp) @@ -80,7 +80,7 @@ glabel L8007F0B8 glabel L8007F0E4 /* 07FCE4 8007F0E4 24640030 */ addiu $a0, $v1, 0x30 /* 07FCE8 8007F0E8 3C05C2C8 */ lui $a1, 0xc2c8 -/* 07FCEC 8007F0EC 0C0103CB */ jal func_80040F2C +/* 07FCEC 8007F0EC 0C0103CB */ jal f32_step_down_towards /* 07FCF0 8007F0F0 3C064000 */ lui $a2, 0x4000 /* 07FCF4 8007F0F4 5040005E */ beql $v0, $zero, .L8007F270 /* 07FCF8 8007F0F8 8FBF001C */ lw $ra, 0x1c($sp) @@ -118,7 +118,7 @@ glabel L8007F144 glabel L8007F170 /* 07FD70 8007F170 24640028 */ addiu $a0, $v1, 0x28 /* 07FD74 8007F174 24050000 */ li $a1, 0 -/* 07FD78 8007F178 0C0104EE */ jal func_800413B8 +/* 07FD78 8007F178 0C0104EE */ jal f32_step_towards /* 07FD7C 8007F17C 3C064080 */ lui $a2, 0x4080 /* 07FD80 8007F180 5040003B */ beql $v0, $zero, .L8007F270 /* 07FD84 8007F184 8FBF001C */ lw $ra, 0x1c($sp) @@ -157,7 +157,7 @@ glabel L8007F1D0 glabel L8007F200 /* 07FE00 8007F200 24640030 */ addiu $a0, $v1, 0x30 /* 07FE04 8007F204 24050000 */ li $a1, 0 -/* 07FE08 8007F208 0C0103B8 */ jal func_80040EE0 +/* 07FE08 8007F208 0C0103B8 */ jal f32_step_up_towards /* 07FE0C 8007F20C 3C064000 */ lui $a2, 0x4000 /* 07FE10 8007F210 50400017 */ beql $v0, $zero, .L8007F270 /* 07FE14 8007F214 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007F280.s b/asm/non_matchings/code_80071F00/func_8007F280.s index 49b1c3fe9..200a05e07 100644 --- a/asm/non_matchings/code_80071F00/func_8007F280.s +++ b/asm/non_matchings/code_80071F00/func_8007F280.s @@ -43,7 +43,7 @@ glabel L8007F2CC glabel L8007F320 /* 07FF20 8007F320 24640028 */ addiu $a0, $v1, 0x28 /* 07FF24 8007F324 8C65001C */ lw $a1, 0x1c($v1) -/* 07FF28 8007F328 0C0104EE */ jal func_800413B8 +/* 07FF28 8007F328 0C0104EE */ jal f32_step_towards /* 07FF2C 8007F32C 3C064080 */ lui $a2, 0x4080 /* 07FF30 8007F330 50400080 */ beql $v0, $zero, .L8007F534 /* 07FF34 8007F334 8FBF001C */ lw $ra, 0x1c($sp) @@ -80,7 +80,7 @@ glabel L8007F37C glabel L8007F3A8 /* 07FFA8 8007F3A8 24640030 */ addiu $a0, $v1, 0x30 /* 07FFAC 8007F3AC 3C0542C8 */ lui $a1, 0x42c8 -/* 07FFB0 8007F3B0 0C0103B8 */ jal func_80040EE0 +/* 07FFB0 8007F3B0 0C0103B8 */ jal f32_step_up_towards /* 07FFB4 8007F3B4 3C064000 */ lui $a2, 0x4000 /* 07FFB8 8007F3B8 5040005E */ beql $v0, $zero, .L8007F534 /* 07FFBC 8007F3BC 8FBF001C */ lw $ra, 0x1c($sp) @@ -118,7 +118,7 @@ glabel L8007F408 glabel L8007F434 /* 080034 8007F434 24640028 */ addiu $a0, $v1, 0x28 /* 080038 8007F438 24050000 */ li $a1, 0 -/* 08003C 8007F43C 0C0104EE */ jal func_800413B8 +/* 08003C 8007F43C 0C0104EE */ jal f32_step_towards /* 080040 8007F440 3C064080 */ lui $a2, 0x4080 /* 080044 8007F444 5040003B */ beql $v0, $zero, .L8007F534 /* 080048 8007F448 8FBF001C */ lw $ra, 0x1c($sp) @@ -156,7 +156,7 @@ glabel L8007F494 glabel L8007F4C0 /* 0800C0 8007F4C0 24640030 */ addiu $a0, $v1, 0x30 /* 0800C4 8007F4C4 24050000 */ li $a1, 0 -/* 0800C8 8007F4C8 0C0103CB */ jal func_80040F2C +/* 0800C8 8007F4C8 0C0103CB */ jal f32_step_down_towards /* 0800CC 8007F4CC 3C064000 */ lui $a2, 0x4000 /* 0800D0 8007F4D0 50400018 */ beql $v0, $zero, .L8007F534 /* 0800D4 8007F4D4 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007FB48.s b/asm/non_matchings/code_80071F00/func_8007FB48.s index 91ca41cc4..015d9741e 100644 --- a/asm/non_matchings/code_80071F00/func_8007FB48.s +++ b/asm/non_matchings/code_80071F00/func_8007FB48.s @@ -182,13 +182,13 @@ glabel L8007FDE0 /* 0809E4 8007FDE4 24640030 */ addiu $a0, $v1, 0x30 /* 0809E8 8007FDE8 3C064000 */ lui $a2, 0x4000 /* 0809EC 8007FDEC 44050000 */ mfc1 $a1, $f0 -/* 0809F0 8007FDF0 0C0104EE */ jal func_800413B8 +/* 0809F0 8007FDF0 0C0104EE */ jal f32_step_towards /* 0809F4 8007FDF4 AFA30018 */ sw $v1, 0x18($sp) /* 0809F8 8007FDF8 44800000 */ mtc1 $zero, $f0 /* 0809FC 8007FDFC 8FA30018 */ lw $v1, 0x18($sp) /* 080A00 8007FE00 3C0640A0 */ lui $a2, 0x40a0 /* 080A04 8007FE04 44050000 */ mfc1 $a1, $f0 -/* 080A08 8007FE08 0C0104EE */ jal func_800413B8 +/* 080A08 8007FE08 0C0104EE */ jal f32_step_towards /* 080A0C 8007FE0C 24640028 */ addiu $a0, $v1, 0x28 /* 080A10 8007FE10 8FA30018 */ lw $v1, 0x18($sp) /* 080A14 8007FE14 44805800 */ mtc1 $zero, $f11 diff --git a/asm/non_matchings/code_80071F00/func_8007FEA4.s b/asm/non_matchings/code_80071F00/func_8007FEA4.s index 10f15da45..ac3165a99 100644 --- a/asm/non_matchings/code_80071F00/func_8007FEA4.s +++ b/asm/non_matchings/code_80071F00/func_8007FEA4.s @@ -22,7 +22,7 @@ glabel func_8007FEA4 /* 080AF4 8007FEF4 8FBF0014 */ lw $ra, 0x14($sp) .L8007FEF8: /* 080AF8 8007FEF8 8C65001C */ lw $a1, 0x1c($v1) -/* 080AFC 8007FEFC 0C0104EE */ jal func_800413B8 +/* 080AFC 8007FEFC 0C0104EE */ jal f32_step_towards /* 080B00 8007FF00 3C0640A0 */ lui $a2, 0x40a0 /* 080B04 8007FF04 10400011 */ beqz $v0, .L8007FF4C /* 080B08 8007FF08 8FA40018 */ lw $a0, 0x18($sp) @@ -34,7 +34,7 @@ glabel func_8007FEA4 /* 080B20 8007FF20 8FBF0014 */ lw $ra, 0x14($sp) .L8007FF24: /* 080B24 8007FF24 24050000 */ li $a1, 0 -/* 080B28 8007FF28 0C0104EE */ jal func_800413B8 +/* 080B28 8007FF28 0C0104EE */ jal f32_step_towards /* 080B2C 8007FF2C 3C0640A0 */ lui $a2, 0x40a0 /* 080B30 8007FF30 50400007 */ beql $v0, $zero, .L8007FF50 /* 080B34 8007FF34 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/code_80071F00/func_800806BC.s b/asm/non_matchings/code_80071F00/func_800806BC.s index 46e661e69..b79eeaf69 100644 --- a/asm/non_matchings/code_80071F00/func_800806BC.s +++ b/asm/non_matchings/code_80071F00/func_800806BC.s @@ -22,7 +22,7 @@ glabel func_800806BC /* 081308 80080708 3C05437A */ lui $a1, 0x437a /* 08130C 8008070C 8C660040 */ lw $a2, 0x40($v1) /* 081310 80080710 AFA30018 */ sw $v1, 0x18($sp) -/* 081314 80080714 0C0104EE */ jal func_800413B8 +/* 081314 80080714 0C0104EE */ jal f32_step_towards /* 081318 80080718 AFA70020 */ sw $a3, 0x20($sp) /* 08131C 8008071C 8FA30018 */ lw $v1, 0x18($sp) /* 081320 80080720 10400016 */ beqz $v0, .L8008077C @@ -38,7 +38,7 @@ glabel func_800806BC /* 081344 80080744 24050000 */ li $a1, 0 /* 081348 80080748 8C660040 */ lw $a2, 0x40($v1) /* 08134C 8008074C AFA30018 */ sw $v1, 0x18($sp) -/* 081350 80080750 0C0104EE */ jal func_800413B8 +/* 081350 80080750 0C0104EE */ jal f32_step_towards /* 081354 80080754 AFA70020 */ sw $a3, 0x20($sp) /* 081358 80080758 8FA30018 */ lw $v1, 0x18($sp) /* 08135C 8008075C 10400007 */ beqz $v0, .L8008077C diff --git a/asm/non_matchings/code_80071F00/func_8008078C.s b/asm/non_matchings/code_80071F00/func_8008078C.s index 3b8d33b22..e81821dd3 100644 --- a/asm/non_matchings/code_80071F00/func_8008078C.s +++ b/asm/non_matchings/code_80071F00/func_8008078C.s @@ -22,7 +22,7 @@ glabel func_8008078C /* 0813D8 800807D8 3C05C37A */ lui $a1, 0xc37a /* 0813DC 800807DC 8C660040 */ lw $a2, 0x40($v1) /* 0813E0 800807E0 AFA30018 */ sw $v1, 0x18($sp) -/* 0813E4 800807E4 0C0104EE */ jal func_800413B8 +/* 0813E4 800807E4 0C0104EE */ jal f32_step_towards /* 0813E8 800807E8 AFA70020 */ sw $a3, 0x20($sp) /* 0813EC 800807EC 8FA30018 */ lw $v1, 0x18($sp) /* 0813F0 800807F0 10400016 */ beqz $v0, .L8008084C @@ -38,7 +38,7 @@ glabel func_8008078C /* 081414 80080814 24050000 */ li $a1, 0 /* 081418 80080818 8C660040 */ lw $a2, 0x40($v1) /* 08141C 8008081C AFA30018 */ sw $v1, 0x18($sp) -/* 081420 80080820 0C0104EE */ jal func_800413B8 +/* 081420 80080820 0C0104EE */ jal f32_step_towards /* 081424 80080824 AFA70020 */ sw $a3, 0x20($sp) /* 081428 80080828 8FA30018 */ lw $v1, 0x18($sp) /* 08142C 8008082C 10400007 */ beqz $v0, .L8008084C diff --git a/asm/non_matchings/code_80071F00/func_800810F4.s b/asm/non_matchings/code_80071F00/func_800810F4.s index 872c92fa7..52cd3b973 100644 --- a/asm/non_matchings/code_80071F00/func_800810F4.s +++ b/asm/non_matchings/code_80071F00/func_800810F4.s @@ -32,7 +32,7 @@ glabel func_800810F4 /* 081D64 80081164 8FA40030 */ lw $a0, 0x30($sp) /* 081D68 80081168 3C054160 */ lui $a1, 0x4160 /* 081D6C 8008116C 3C063F00 */ lui $a2, 0x3f00 -/* 081D70 80081170 0C0103B8 */ jal func_80040EE0 +/* 081D70 80081170 0C0103B8 */ jal f32_step_up_towards /* 081D74 80081174 2484002C */ addiu $a0, $a0, 0x2c /* 081D78 80081178 3C01800F */ lui $at, %hi(D_800EF0C8) # $at, 0x800f /* 081D7C 8008117C C424F0C8 */ lwc1 $f4, %lo(D_800EF0C8)($at) diff --git a/asm/non_matchings/code_80071F00/func_80081924.s b/asm/non_matchings/code_80071F00/func_80081924.s index 25492a377..4e75d2471 100644 --- a/asm/non_matchings/code_80071F00/func_80081924.s +++ b/asm/non_matchings/code_80071F00/func_80081924.s @@ -22,7 +22,7 @@ glabel L80081970 /* 082570 80081970 3C063F33 */ lui $a2, (0x3F333333 >> 16) # lui $a2, 0x3f33 /* 082574 80081974 34C63333 */ ori $a2, (0x3F333333 & 0xFFFF) # ori $a2, $a2, 0x3333 /* 082578 80081978 2444002C */ addiu $a0, $v0, 0x2c -/* 08257C 8008197C 0C0103B8 */ jal func_80040EE0 +/* 08257C 8008197C 0C0103B8 */ jal f32_step_up_towards /* 082580 80081980 3C054110 */ lui $a1, 0x4110 /* 082584 80081984 5040003C */ beql $v0, $zero, .L80081A78 /* 082588 80081988 8FBF001C */ lw $ra, 0x1c($sp) @@ -39,7 +39,7 @@ glabel L8008199C glabel L800819B0 /* 0825B0 800819B0 2444002C */ addiu $a0, $v0, 0x2c /* 0825B4 800819B4 3C054040 */ lui $a1, 0x4040 -/* 0825B8 800819B8 0C0103CB */ jal func_80040F2C +/* 0825B8 800819B8 0C0103CB */ jal f32_step_down_towards /* 0825BC 800819BC 3C063F80 */ lui $a2, 0x3f80 /* 0825C0 800819C0 5040002D */ beql $v0, $zero, .L80081A78 /* 0825C4 800819C4 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code_80071F00/func_80083948.s b/asm/non_matchings/code_80071F00/func_80083948.s index 5afc8e9f5..010900155 100644 --- a/asm/non_matchings/code_80071F00/func_80083948.s +++ b/asm/non_matchings/code_80071F00/func_80083948.s @@ -57,7 +57,7 @@ glabel L80083A0C /* 08460C 80083A0C 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c /* 084610 80083A10 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 084614 80083A14 2624002C */ addiu $a0, $s1, 0x2c -/* 084618 80083A18 0C0103B8 */ jal func_80040EE0 +/* 084618 80083A18 0C0103B8 */ jal f32_step_up_towards /* 08461C 80083A1C 24050000 */ li $a1, 0 /* 084620 80083A20 10400006 */ beqz $v0, .L80083A3C /* 084624 80083A24 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code_80071F00/func_80084D2C.s b/asm/non_matchings/code_80071F00/func_80084D2C.s index 15c00e59e..bb0184444 100644 --- a/asm/non_matchings/code_80071F00/func_80084D2C.s +++ b/asm/non_matchings/code_80071F00/func_80084D2C.s @@ -41,7 +41,7 @@ glabel L80084DBC /* 0859C0 80084DC0 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 /* 0859C4 80084DC4 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a /* 0859C8 80084DC8 34A5CCCD */ ori $a1, (0x3F4CCCCD & 0xFFFF) # ori $a1, $a1, 0xcccd -/* 0859CC 80084DCC 0C0104EE */ jal func_800413B8 +/* 0859CC 80084DCC 0C0104EE */ jal f32_step_towards /* 0859D0 80084DD0 26040034 */ addiu $a0, $s0, 0x34 /* 0859D4 80084DD4 02202025 */ move $a0, $s1 /* 0859D8 80084DD8 0C021C18 */ jal func_80087060 @@ -113,7 +113,7 @@ glabel L80084E5C /* 085AC8 80084EC8 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 .L80084ECC: /* 085ACC 80084ECC 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 085AD0 80084ED0 0C0104EE */ jal func_800413B8 +/* 085AD0 80084ED0 0C0104EE */ jal f32_step_towards /* 085AD4 80084ED4 8FA50024 */ lw $a1, 0x24($sp) /* 085AD8 80084ED8 02202025 */ move $a0, $s1 /* 085ADC 80084EDC 0C01C8D5 */ jal func_80072354 @@ -146,7 +146,7 @@ glabel L80084F3C /* 085B40 80084F40 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c /* 085B44 80084F44 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 085B48 80084F48 34A5CCCD */ ori $a1, (0x3ECCCCCD & 0xFFFF) # ori $a1, $a1, 0xcccd -/* 085B4C 80084F4C 0C0104EE */ jal func_800413B8 +/* 085B4C 80084F4C 0C0104EE */ jal f32_step_towards /* 085B50 80084F50 26040034 */ addiu $a0, $s0, 0x34 /* 085B54 80084F54 02202025 */ move $a0, $s1 /* 085B58 80084F58 0C021C18 */ jal func_80087060 diff --git a/asm/non_matchings/code_80071F00/func_80085534.s b/asm/non_matchings/code_80071F00/func_80085534.s index 34a7530e0..ea2792a8e 100644 --- a/asm/non_matchings/code_80071F00/func_80085534.s +++ b/asm/non_matchings/code_80071F00/func_80085534.s @@ -38,7 +38,7 @@ glabel L800855BC /* 0861BC 800855BC 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 0861C0 800855C0 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 0861C4 800855C4 2604003C */ addiu $a0, $s0, 0x3c -/* 0861C8 800855C8 0C0104EE */ jal func_800413B8 +/* 0861C8 800855C8 0C0104EE */ jal f32_step_towards /* 0861CC 800855CC 24050000 */ li $a1, 0 /* 0861D0 800855D0 C610003C */ lwc1 $f16, 0x3c($s0) /* 0861D4 800855D4 44805800 */ mtc1 $zero, $f11 @@ -62,7 +62,7 @@ glabel L80085614 /* 086214 80085614 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 086218 80085618 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 08621C 8008561C 2604003C */ addiu $a0, $s0, 0x3c -/* 086220 80085620 0C0104EE */ jal func_800413B8 +/* 086220 80085620 0C0104EE */ jal f32_step_towards /* 086224 80085624 3C053F80 */ lui $a1, 0x3f80 /* 086228 80085628 C604003C */ lwc1 $f4, 0x3c($s0) /* 08622C 8008562C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 @@ -87,7 +87,7 @@ glabel L80085670 /* 086270 80085670 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 086274 80085674 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 086278 80085678 2604003C */ addiu $a0, $s0, 0x3c -/* 08627C 8008567C 0C0104EE */ jal func_800413B8 +/* 08627C 8008567C 0C0104EE */ jal f32_step_towards /* 086280 80085680 24050000 */ li $a1, 0 /* 086284 80085684 C60A003C */ lwc1 $f10, 0x3c($s0) /* 086288 80085688 44808800 */ mtc1 $zero, $f17 @@ -105,7 +105,7 @@ glabel L800856B4 /* 0862B4 800856B4 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 0862B8 800856B8 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 0862BC 800856BC 2604003C */ addiu $a0, $s0, 0x3c -/* 0862C0 800856C0 0C0104EE */ jal func_800413B8 +/* 0862C0 800856C0 0C0104EE */ jal f32_step_towards /* 0862C4 800856C4 3C05BF80 */ lui $a1, 0xbf80 /* 0862C8 800856C8 C606003C */ lwc1 $f6, 0x3c($s0) /* 0862CC 800856CC 3C01BFF0 */ li $at, 0xBFF00000 # -1.875000 @@ -130,7 +130,7 @@ glabel L80085710 /* 086310 80085710 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c /* 086314 80085714 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd /* 086318 80085718 2604003C */ addiu $a0, $s0, 0x3c -/* 08631C 8008571C 0C0104EE */ jal func_800413B8 +/* 08631C 8008571C 0C0104EE */ jal f32_step_towards /* 086320 80085720 24050000 */ li $a1, 0 /* 086324 80085724 02202025 */ move $a0, $s1 /* 086328 80085728 0C021C18 */ jal func_80087060 diff --git a/asm/non_matchings/code_80071F00/func_80086940.s b/asm/non_matchings/code_80071F00/func_80086940.s index bb7a9a149..d3da55361 100644 --- a/asm/non_matchings/code_80071F00/func_80086940.s +++ b/asm/non_matchings/code_80071F00/func_80086940.s @@ -29,7 +29,7 @@ glabel L800869A0 /* 0875A4 800869A4 3C063A83 */ lui $a2, (0x3A83126F >> 16) # lui $a2, 0x3a83 /* 0875A8 800869A8 34C6126F */ ori $a2, (0x3A83126F & 0xFFFF) # ori $a2, $a2, 0x126f /* 0875AC 800869AC 34A5CCCD */ ori $a1, (0x3CCCCCCD & 0xFFFF) # ori $a1, $a1, 0xcccd -/* 0875B0 800869B0 0C0104EE */ jal func_800413B8 +/* 0875B0 800869B0 0C0104EE */ jal f32_step_towards /* 0875B4 800869B4 02002025 */ move $a0, $s0 /* 0875B8 800869B8 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc /* 0875BC 800869BC 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd @@ -129,7 +129,7 @@ glabel L80086AFC /* 087720 80086B20 3C06BC23 */ lui $a2, (0xBC23D70A >> 16) # lui $a2, 0xbc23 /* 087724 80086B24 45000003 */ bc1f .L80086B34 /* 087728 80086B28 00000000 */ nop -/* 08772C 80086B2C 0C0104EE */ jal func_800413B8 +/* 08772C 80086B2C 0C0104EE */ jal f32_step_towards /* 087730 80086B30 34C6D70A */ ori $a2, (0xBC23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a .L80086B34: /* 087734 80086B34 0C021DF1 */ jal func_800877C4 diff --git a/asm/non_matchings/code_80086E70/func_80089020.s b/asm/non_matchings/code_80086E70/func_80089020.s index cedfa736e..9ae98c711 100644 --- a/asm/non_matchings/code_80086E70/func_80089020.s +++ b/asm/non_matchings/code_80086E70/func_80089020.s @@ -188,7 +188,7 @@ glabel func_80089020 .L800892C4: /* 089EC4 800892C4 44060000 */ mfc1 $a2, $f0 .L800892C8: -/* 089EC8 800892C8 0C0104EE */ jal func_800413B8 +/* 089EC8 800892C8 0C0104EE */ jal f32_step_towards /* 089ECC 800892CC 00E02025 */ move $a0, $a3 /* 089ED0 800892D0 8FBF0014 */ lw $ra, 0x14($sp) /* 089ED4 800892D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/code_800029B0.c b/src/code_800029B0.c index 5a0827562..630322b5d 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -98,16 +98,8 @@ u8 *D_800DC600 = &osAppNmiBuffer[0]; s32 gIsMirrorMode = 0; f32 D_800DC608 = 1.0f; Lights1 D_800DC610[] = { - { - {175, 175, 175, 0, 175, 175, 175, 0}, - {255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0}, - }, - - { - {115, 115, 115, 0, 115, 115, 115, 0}, - {255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0}, - - }, + gdSPDefLights1(175, 175, 175, 255, 255, 255, 0, 0, 120), + gdSPDefLights1(115, 115, 115, 255, 255, 255, 0, 0, 120), }; static s32 pad = 0x80000000; s16 gCreditsCourseId = COURSE_LUIGI_RACEWAY; diff --git a/src/code_80040E50.c b/src/code_80040E50.c index 21e66c210..361dfd7ba 100644 --- a/src/code_80040E50.c +++ b/src/code_80040E50.c @@ -4,9 +4,8 @@ #include "code_80040E50.h" #include "main.h" #include "variables.h" +#include "math_util.h" -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 UNUSED void func_80040E50(s32 *arg0, s32 arg1) { *arg0 = (s32) (*arg0 | arg1); } @@ -45,282 +44,276 @@ void func_80040EC4(Vec3f arg0, Vec3f arg1) { arg0[2] = arg1[2]; } -s32 func_80040EE0(f32 *arg0, f32 arg1, f32 arg2) { - s32 phi_v1 = 0; +s32 f32_step_up_towards(f32 *value, f32 target, f32 step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - - *arg0 += arg2; - - if (arg1 <= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value += step; + if (target <= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_80040F2C(f32 *arg0, f32 arg1, f32 arg2) { - s32 phi_v1 = 0; +s32 f32_step_down_towards(f32 *value, f32 target, f32 step) { + s32 targetReached = 0; - if (arg1 < *arg0) { - *arg0 -= arg2; - if (*arg0 <= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value -= step; + if (*value <= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_80040F78(s32 *arg0, s32 arg1, s32 arg2) { - s32 phi_v1 = 0; +s32 s32_step_up_towards(s32 *value, s32 target, s32 step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - *arg0 = *arg0 + arg2; - phi_v1 = 0; - if (*arg0 >= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value = *value + step; + targetReached = 0; + if (*value >= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_80040FA8(s32 *arg0, s32 arg1, s32 arg2) { - s32 phi_v1 = 0; +s32 s32_step_down_towards(s32 *value, s32 target, s32 step) { + s32 targetReached = 0; - if (arg1 < *arg0) { - *arg0 = *arg0 - arg2;; - if (arg1 >= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value = *value - step;; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_80040FD8(s16 *arg0, s16 arg1, s16 arg2) { - s32 phi_v1 = 0; +s32 s16_step_up_towards(s16 *value, s16 target, s16 step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - *arg0 = *arg0 + arg2; - if (*arg0 >= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value = *value + step; + if (*value >= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_80041028(u16 *arg0, u16 arg1, u16 arg2) { - s32 phi_v1 = 0; - u16 temp_t6 = arg1; - u16 temp_t8 = arg2; +s32 u16_step_up_towards(u16 *value, u16 target, u16 step) { + s32 targetReached = 0; - if (*arg0 < temp_t6) { - *arg0 += temp_t8; - if (*arg0 >= temp_t6) { - *arg0 = temp_t6; - phi_v1 = 1; + if (*value < target) { + *value += step; + if (*value >= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_8004106C(s16 *arg0, s16 arg1, s16 arg2) { - s32 phi_v1 = 0; +s32 s16_step_down_towards(s16 *value, s16 target, s16 step) { + s32 targetReached = 0; - if (arg1 < *arg0) { - *arg0 -= arg2; - if (arg1 >= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value -= step; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_800410BC(u16 *arg0, s32 arg1, s32 arg2) { - s32 phi_v1 = 0; - s32 temp = *arg0; +// wtf is up with the argument types for this one? +s32 u16_step_down_towards(u16 *value, s32 target, s32 step) { + s32 targetReached = 0; + s32 temp = *value; - if (arg1 < temp) { - temp -= arg2; - if (arg1 >= temp) { - temp = arg1; - phi_v1 = 1; + if (target < temp) { + temp -= step; + if (target >= temp) { + temp = target; + targetReached = 1; } - *arg0 = temp; + *value = temp; } - return phi_v1; + return targetReached; } -UNUSED s32 func_800410F0(f32 *arg0, f32 arg1, f32 *arg2) { - s32 phi_v1 = 0; +UNUSED s32 f32_step_up_towards_alternate(f32 *value, f32 target, f32 *step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - *arg0 = (f32) (*arg2 + *arg0); - if (arg1 <= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value += *step; + if (target <= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_8004113C(f32 *arg0, f32 arg1, f32 *arg2) { - s32 phi_v1 = 0; +UNUSED s32 f32_step_down_towards_alternate(f32 *value, f32 target, f32 *step) { + s32 targetReached = 0; - if (arg1 < *arg0) { - *arg0 = (f32) (*arg0 - *arg2); - if (*arg0 <= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value -= *step; + if (*value <= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_80041188(s32 *arg0, s32 arg1, s32 *arg2) { - s32 phi_v1 = 0; +UNUSED s32 s32_step_up_towards_alternate(s32 *value, s32 target, s32 *step) { + s32 targetReached = 0; - - if (*arg0 < arg1) { - *arg0 += *arg2; - if (*arg0 >= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value += *step; + if (*value >= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_800411C0(s32 *arg0, s32 arg1, s32 *arg2) { +UNUSED s32 s32_step_down_towards_alternate(s32 *value, s32 target, s32 *step) { s32 temp_t7; - s32 phi_v1 = 0; + s32 targetReached = 0; - if (arg1 < *arg0) { - *arg0 -= *arg2; - if (arg1 >= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value -= *step; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_800411F8(s16 *arg0, s16 arg1, s16 *arg2) { - s32 phi_v1 = 0; +UNUSED s32 s16_step_up_towards_alternate(s16 *value, s16 target, s16 *step) { + s32 targetReached = 0; - if ((s32) *arg0 < (s32) arg1) { - *arg0 = (s16) (*arg2 + *arg0); - if ((s32) *arg0 >= (s32) arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value < target) { + *value += *step; + if (*value >= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_80041240(s16 *arg0, s16 arg1, s16 *arg2) { - s32 phi_v1 = 0; +UNUSED s32 s16_step_down_towards_alternate(s16 *value, s16 target, s16 *step) { + s32 targetReached = 0; - if ((s32) arg1 < (s32) *arg0) { - *arg0 = (s16) (*arg0 - *arg2); - if ((s32) arg1 >= (s32) *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target < *value) { + *value -= *step; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80041288(s16 *arg0, s16 arg1, s16 arg2) { - s32 phi_v1 = 0; +s32 s16_step_towards(s16 *value, s16 target, s16 step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - if (arg2 >= 0) { - *arg0 += arg2; + if (*value < target) { + if (step >= 0) { + *value += step; } else { - *arg0 -= arg2; + *value -= step; } - if (*arg0 >= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value >= target) { + *value = target; + targetReached = 1; } - } else if (arg1 < *arg0) { - if (arg2 >= 0) { - *arg0 -= arg2; + } else if (target < *value) { + if (step >= 0) { + *value -= step; } else { - *arg0 += arg2; + *value += step; } - if (arg1 >= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -UNUSED s32 func_8004132C(s32 *arg0, s32 arg1, s32 arg2) { +UNUSED s32 s32_step_towards(s32 *value, s32 target, s32 step) { s32 temp_v0; - s32 phi_v1; + s32 targetReached; - temp_v0 = *arg0; - phi_v1 = 0; - if (temp_v0 < arg1) { - if (arg2 >= 0) { - *arg0 = (s32) (temp_v0 + arg2); + temp_v0 = *value; + targetReached = 0; + if (temp_v0 < target) { + if (step >= 0) { + *value = (s32) (temp_v0 + step); } else { - *arg0 = (s32) (temp_v0 - arg2); + *value = (s32) (temp_v0 - step); } - if (*arg0 >= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value >= target) { + *value = target; + targetReached = 1; } - } else if (arg1 < temp_v0) { - if (arg2 >= 0) { - *arg0 = (s32) (temp_v0 - arg2); + } else if (target < temp_v0) { + if (step >= 0) { + *value = (s32) (temp_v0 - step); } else { - *arg0 = (s32) (temp_v0 + arg2); + *value = (s32) (temp_v0 + step); } - if (arg1 >= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target >= *value) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } -s32 func_800413B8(f32 *arg0, f32 arg1, f32 arg2) { - s32 phi_v1 = 0; +s32 f32_step_towards(f32 *value, f32 target, f32 step) { + s32 targetReached = 0; - if (*arg0 < arg1) { - if (arg2 >= 0.0f) { - *arg0 += arg2; + if (*value < target) { + if (step >= 0.0f) { + *value += step; } else { - *arg0 -= arg2; + *value -= step; } - if (arg1 <= *arg0) { - *arg0 = arg1; - phi_v1 = 1; + if (target <= *value) { + *value = target; + targetReached = 1; } - } else if (arg1 < *arg0) { - if (arg2 >= 0.0f) { - *arg0 -= arg2; + } else if (target < *value) { + if (step >= 0.0f) { + *value -= step; } else { - *arg0 += arg2; + *value += step; } - if (*arg0 <= arg1) { - *arg0 = arg1; - phi_v1 = 1; + if (*value <= target) { + *value = target; + targetReached = 1; } } - return phi_v1; + return targetReached; } void func_80041480(s16 *arg0, s16 arg1, s16 arg2, s16 *arg3) { @@ -384,10 +377,6 @@ UNUSED s32 func_80041608(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { GLOBAL_ASM("asm/non_matchings/code_80040E50/func_80041608.s") #endif -// todo: Check that func_802B7830 is s32 and not void. -// these funcs match as void with no return. (except func_80041658) -extern s32 func_802B7830(f32 arg0, f32 arg1); // extern - s32 func_80041658(f32 arg0, f32 arg1) { return -func_802B7830(arg0, arg1) & 0xFFFF; } @@ -400,9 +389,6 @@ UNUSED s32 func_800416AC(f32 arg0, f32 arg1) { return func_802B7830(arg1, arg0); } -f32 sins(u16); // extern -f32 coss(u16); // extern - f32 func_800416D8(f32 arg0, f32 arg1, u16 arg2) { f32 sp1C; @@ -410,9 +396,6 @@ f32 func_800416D8(f32 arg0, f32 arg1, u16 arg2) { return (sp1C * arg0) - (sins(arg2) * arg1); } -f32 sins(u16); // extern -f32 coss(u16); // extern - f32 func_80041724(f32 arg0, f32 arg1, u16 arg2) { f32 sp1C; @@ -463,15 +446,9 @@ s32 func_800418AC(f32 arg0, f32 arg1, Vec3f arg2) { return func_802B7830(arg0 - arg2[0], arg1 - arg2[2]); } -//#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - s32 func_800418E8(f32 arg0, f32 arg1, Vec3f arg2) { return func_802B7830(arg0 - arg2[1], arg1 - arg2[2]); } -//#else -//GLOBAL_ASM("asm/non_matchings/code_80040E50/func_800418E8.s") -//#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 diff --git a/src/code_80040E50.h b/src/code_80040E50.h index c4358ff25..76b222140 100644 --- a/src/code_80040E50.h +++ b/src/code_80040E50.h @@ -4,6 +4,44 @@ #include "common_structs.h" /* Function Prototypes */ + +// Unused functions +void func_80040E50(s32*, s32); +void func_80040E60(s32*,s32); +void func_80040E74(s32*, s32); +s32 func_80040E84(s32*, s32); +s32 func_80040EA4(s32*, s32); +s32 f32_step_up_towards_alternate(f32*, f32, f32*); +s32 f32_step_down_towards_alternate(f32*, f32, f32*); +s32 s32_step_up_towards_alternate(s32*, s32, s32*); +s32 s32_step_down_towards_alternate(s32*, s32, s32*); +s32 s16_step_up_towards_alternate(s16*, s16, s16*); +s32 s16_step_down_towards_alternate(s16*, s16, s16*); +s32 s32_step_towards(s32*, s32, s32); +s32 func_80041680(f32, f32); +s32 func_800416AC(f32, f32); + + +void func_80040EC4(Vec3f, Vec3f); +s32 f32_step_up_towards(f32*, f32, f32); +s32 f32_step_down_towards(f32*, f32, f32); +s32 s32_step_up_towards(s32*, s32, s32); +s32 s32_step_down_towards(s32*, s32, s32); +s32 s16_step_up_towards(s16*, s16, s16); +s32 u16_step_up_towards(u16*, u16, u16); +s32 s16_step_down_towards(s16*, s16, s16); +s32 u16_step_down_towards(u16*, s32, s32); +s32 s16_step_towards(s16*, s16, s16); +s32 f32_step_towards(f32*, f32, f32); +void func_80041480(s16*, s16, s16, s16*); +s32 func_80041500(Vec3f, f32, f32, f32); +Vec3f *func_80041594(Vec3f, Vec3f, Vec3f); +s32 func_80041658(f32, f32); +f32 func_800416D8(f32, f32, u16); +f32 func_80041724(f32, f32, u16); +s32 func_80041770(f32, f32, f32, f32); +s32 func_800418AC(f32, f32, Vec3f); +s32 func_800418E8(f32, f32, Vec3f); void func_80041EF4(); /* This is where I'd put my static data, if I had any */ diff --git a/src/code_80057C60.c b/src/code_80057C60.c index e47484528..311330e92 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -1250,9 +1250,9 @@ void func_8005A070(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80041028(s32, ?, ?); // extern -? func_800410BC(s32, ?, ?); // extern -? func_800413B8(void *, ?, ?, s32); // extern +? u16_step_up_towards(s32, ?, ?); // extern +? u16_step_down_towards(s32, ?, ?); // extern +? f32_step_towards(void *, ?, ?, s32); // extern ? func_80087D24(s32, ?, ?, ?); // extern extern f32 D_800EE1E0; extern ? D_80165C18; @@ -1291,25 +1291,25 @@ block_5: if ((temp_t0->unk_0BC * 2) < 0) { sp2C = temp_a3; sp24 = temp_t0; - func_800413B8(phi_s0, 0x3E99999A, 0x3CA3D70A, temp_a3); + f32_step_towards(phi_s0, 0x3E99999A, 0x3CA3D70A, temp_a3); } else { sp2C = temp_a3; sp24 = temp_t0; - func_800413B8(phi_s0, 0x3F19999A, 0x3CA3D70A, temp_a3); + f32_step_towards(phi_s0, 0x3F19999A, 0x3CA3D70A, temp_a3); } if (sp24->unk_0BC & 0x4000000) { sp24 = sp24; - func_80041028(phi_s0 + 0xBE, 0xC00, 0x100); + u16_step_up_towards(phi_s0 + 0xBE, 0xC00, 0x100); } else { sp24 = sp24; - func_800410BC(phi_s0 + 0xBE, 0, 0x100); + u16_step_down_towards(phi_s0 + 0xBE, 0, 0x100); } if ((sp24->unk_0BC & 0x3000000) != 0) { sp24 = sp24; func_80087D24(sp2C, 0x40C00000, 0x3FC00000, 0); } else { sp24 = sp24; - func_800413B8(phi_s0 + 0x2C, 0, 0x3F800000); + f32_step_towards(phi_s0 + 0x2C, 0, 0x3F800000); } if (((sp24->unk_000 & 0x100) != 0) || (sp24->unk_0BC & 0x80000000)) { phi_s0->unkA0 = 0x50; @@ -1626,7 +1626,7 @@ void func_8005AB20(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -s32 func_80041288(? *, ?, ?); /* extern */ +s32 s16_step_towards(? *, ?, ?); /* extern */ extern s16 D_8016579E; extern u8 D_801657E7; extern ? D_8018CAAE; @@ -1658,45 +1658,45 @@ void func_8005AB60(void) { temp_t6 = (u8) D_8018CA70->unk_78; switch (temp_t6) { /* switch 1 */ case 1: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x106, 0x10); - if (func_80041288(&D_8018CAB0, 0xB6, 0x10) != 0) { + s16_step_towards(&D_8018CAAE, 0x106, 0x10); + if (s16_step_towards(&D_8018CAB0, 0xB6, 0x10) != 0) { D_8018CA70->unk_79 = 1; D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 2: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x116, 4); - if (func_80041288(&D_8018CAB0, 0xC6, 4) != 0) { + s16_step_towards(&D_8018CAAE, 0x116, 4); + if (s16_step_towards(&D_8018CAB0, 0xC6, 4) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 3: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x106, 4); - if (func_80041288(&D_8018CAB0, 0xB6, 4) != 0) { + s16_step_towards(&D_8018CAAE, 0x106, 4); + if (s16_step_towards(&D_8018CAB0, 0xB6, 4) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 4: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x10E, 4); - if (func_80041288(&D_8018CAB0, 0xBE, 4) != 0) { + s16_step_towards(&D_8018CAAE, 0x10E, 4); + if (s16_step_towards(&D_8018CAB0, 0xBE, 4) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 5: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x106, 4); - if (func_80041288(&D_8018CAB0, 0xB6, 4) != 0) { + s16_step_towards(&D_8018CAAE, 0x106, 4); + if (s16_step_towards(&D_8018CAB0, 0xB6, 4) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 6: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x10A, 2); - if (func_80041288(&D_8018CAB0, 0xBA, 2) != 0) { + s16_step_towards(&D_8018CAAE, 0x10A, 2); + if (s16_step_towards(&D_8018CAB0, 0xBA, 2) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; case 7: /* switch 1 */ - func_80041288(&D_8018CAAE, 0x106, 2); - if (func_80041288(&D_8018CAB0, 0xB6, 2) != 0) { + s16_step_towards(&D_8018CAAE, 0x106, 2); + if (s16_step_towards(&D_8018CAB0, 0xB6, 2) != 0) { D_8018CA70->unk_78 = (u8) D_8018CA70->unk_78 + 1; } break; @@ -1720,37 +1720,37 @@ void func_8005AB60(void) { temp_t8 = D_8018CA70->unk80; switch (temp_t8) { /* switch 2 */ case 1: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 2: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x38, 8) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x38, 8) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 3: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 4: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x38, 8) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x38, 8) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 5: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x40, 8) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x40, 8) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 6: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x38, 4) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x38, 4) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; case 7: /* switch 2 */ - if (func_80041288(&D_8018CAB8, 0x40, 4) != 0) { + if (s16_step_towards(&D_8018CAB8, 0x40, 4) != 0) { D_8018CA70->unk80 = (u8) (D_8018CA70->unk80 + 1); } break; @@ -1761,37 +1761,37 @@ void func_8005AB60(void) { temp_t3_2 = (u8) D_8018CA70->unk_7A; switch (temp_t3_2) { /* switch 3 */ case 1: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xE4, 0x10) != 0) { + if (s16_step_towards(&D_8018CABE, 0xE4, 0x10) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 2: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xF4, 4) != 0) { + if (s16_step_towards(&D_8018CABE, 0xF4, 4) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 3: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CABE, 0xE4, 4) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 4: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xEC, 4) != 0) { + if (s16_step_towards(&D_8018CABE, 0xEC, 4) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 5: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CABE, 0xE4, 4) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 6: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xE8, 2) != 0) { + if (s16_step_towards(&D_8018CABE, 0xE8, 2) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; case 7: /* switch 3 */ - if (func_80041288(&D_8018CABE, 0xE4, 2) != 0) { + if (s16_step_towards(&D_8018CABE, 0xE4, 2) != 0) { D_8018CA70->unk_7A = (u8) D_8018CA70->unk_7A + 1; } break; @@ -1802,37 +1802,37 @@ void func_8005AB60(void) { temp_t8_2 = (u8) D_8018CA70->unk_7D; switch (temp_t8_2) { /* switch 4 */ case 1: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x53, 0x10) != 0) { + if (s16_step_towards(&D_8018CACA, 0x53, 0x10) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 2: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x43, 4) != 0) { + if (s16_step_towards(&D_8018CACA, 0x43, 4) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 3: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACA, 0x53, 4) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 4: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x4B, 4) != 0) { + if (s16_step_towards(&D_8018CACA, 0x4B, 4) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 5: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACA, 0x53, 4) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 6: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x4F, 2) != 0) { + if (s16_step_towards(&D_8018CACA, 0x4F, 2) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; case 7: /* switch 4 */ - if (func_80041288(&D_8018CACA, 0x53, 2) != 0) { + if (s16_step_towards(&D_8018CACA, 0x53, 2) != 0) { D_8018CA70->unk_7D = (u8) D_8018CA70->unk_7D + 1; } break; @@ -1845,37 +1845,37 @@ void func_8005AB60(void) { temp_t7 = (u8) D_8018CA70->unk_7B; switch (temp_t7) { /* switch 5 */ case 1: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xE4, 0x10) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xE4, 0x10) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 2: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xF4, 4) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xF4, 4) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 3: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xE4, 4) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 4: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xEC, 4) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xEC, 4) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 5: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xE4, 4) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 6: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xE8, 2) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xE8, 2) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; case 7: /* switch 5 */ - if (func_80041288(&D_8018CAC0, 0xE4, 2) != 0) { + if (s16_step_towards(&D_8018CAC0, 0xE4, 2) != 0) { D_8018CA70->unk_7B = (u8) D_8018CA70->unk_7B + 1; } break; @@ -1886,37 +1886,37 @@ void func_8005AB60(void) { temp_t2 = (u8) D_8018CA70->unk_7E; switch (temp_t2) { /* switch 6 */ case 1: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x53, 0x10) != 0) { + if (s16_step_towards(&D_8018CACC, 0x53, 0x10) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 2: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x43, 4) != 0) { + if (s16_step_towards(&D_8018CACC, 0x43, 4) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 3: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACC, 0x53, 4) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 4: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x4B, 4) != 0) { + if (s16_step_towards(&D_8018CACC, 0x4B, 4) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 5: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACC, 0x53, 4) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 6: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x4F, 2) != 0) { + if (s16_step_towards(&D_8018CACC, 0x4F, 2) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; case 7: /* switch 6 */ - if (func_80041288(&D_8018CACC, 0x53, 2) != 0) { + if (s16_step_towards(&D_8018CACC, 0x53, 2) != 0) { D_8018CA70->unk_7E = (u8) D_8018CA70->unk_7E + 1; } break; @@ -1927,37 +1927,37 @@ void func_8005AB60(void) { temp_t7_2 = (u8) D_8018CA70->unk_7C; switch (temp_t7_2) { /* switch 7 */ case 1: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xE4, 0x10) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xE4, 0x10) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 2: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xF4, 4) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xF4, 4) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 3: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xE4, 4) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 4: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xEC, 4) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xEC, 4) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 5: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xE4, 4) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xE4, 4) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 6: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xE8, 2) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xE8, 2) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; case 7: /* switch 7 */ - if (func_80041288(&D_8018CAC2, 0xE4, 2) != 0) { + if (s16_step_towards(&D_8018CAC2, 0xE4, 2) != 0) { D_8018CA70->unk_7C = (u8) D_8018CA70->unk_7C + 1; } break; @@ -1968,44 +1968,44 @@ void func_8005AB60(void) { temp_t2_2 = (u8) D_8018CA70->unk_7F; switch (temp_t2_2) { /* switch 8 */ case 1: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x53, 0x10) != 0) { + if (s16_step_towards(&D_8018CACE, 0x53, 0x10) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } default: /* switch 8 */ return; case 2: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x43, 4) != 0) { + if (s16_step_towards(&D_8018CACE, 0x43, 4) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } break; case 3: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACE, 0x53, 4) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } break; case 4: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x4B, 4) != 0) { + if (s16_step_towards(&D_8018CACE, 0x4B, 4) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } break; case 5: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x53, 4) != 0) { + if (s16_step_towards(&D_8018CACE, 0x53, 4) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } break; case 6: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x4F, 2) != 0) { + if (s16_step_towards(&D_8018CACE, 0x4F, 2) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } break; case 7: /* switch 8 */ - if (func_80041288(&D_8018CACE, 0x53, 2) != 0) { + if (s16_step_towards(&D_8018CACE, 0x53, 2) != 0) { D_8018CA70->unk_7F = (u8) D_8018CA70->unk_7F + 1; return; } @@ -2021,8 +2021,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AB60.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_80041288(? *, ?, ?); /* extern */ -? func_800413B8(f32 *, f32, f32); /* extern */ +? s16_step_towards(? *, ?, ?); /* extern */ +? f32_step_towards(f32 *, f32, f32); /* extern */ extern ? D_8018CAC0; extern ? D_8018CAC2; extern ? D_8018CAC4; @@ -2042,10 +2042,10 @@ void func_8005B7A0(void) { f32 *phi_s1; s32 phi_s0; - func_80041288(&D_8018CAC0, 0xE4, 0x10); - func_80041288(&D_8018CAC2, 0xE4, 0x10); - func_80041288(&D_8018CAC4, 0xE4, 0x10); - func_80041288(&D_8018CAC6, 0xE4, 0x10); + s16_step_towards(&D_8018CAC0, 0xE4, 0x10); + s16_step_towards(&D_8018CAC2, 0xE4, 0x10); + s16_step_towards(&D_8018CAC4, 0xE4, 0x10); + s16_step_towards(&D_8018CAC6, 0xE4, 0x10); phi_s1 = &D_8018D050; phi_s0 = 0; do { @@ -2053,7 +2053,7 @@ void func_8005B7A0(void) { temp_s3 = &D_8018D0C8 + phi_s0; temp_s4 = &D_8018D078 + phi_s0; if (*phi_s1 >= 0.0f) { - func_800413B8(temp_s2, *temp_s3, *temp_s4); + f32_step_towards(temp_s2, *temp_s3, *temp_s4); temp_f0 = *temp_s2; if (temp_f0 == *temp_s3) { *temp_s4 = 0.0f; @@ -2073,7 +2073,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005B7A0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_800413B8(f32 *, f32, ?32); /* extern */ +? f32_step_towards(f32 *, f32, ?32); /* extern */ ? func_8005AA4C(); /* extern */ ? func_8005AA6C(?); /* extern */ ? func_8005AA80(); /* extern */ @@ -2438,7 +2438,7 @@ block_81: sp20 = phi_v0_5; sp18 = phi_v1; sp1C = phi_a0; - func_800413B8(phi_a0, *phi_v1, *phi_v0_5); + f32_step_towards(phi_a0, *phi_v1, *phi_v0_5); temp_v1 = phi_v1 + 4; phi_v1 = temp_v1; phi_a0 += 4; @@ -2746,8 +2746,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C980.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_80041288(s16 *, ?, ?, s32); /* extern */ -? func_800413B8(f32 *, ?, ?, s32); /* extern */ +? s16_step_towards(s16 *, ?, ?, s32); /* extern */ +? f32_step_towards(f32 *, ?, ?, s32); /* extern */ ? func_80079054(s32); /* extern */ ? func_80079084(s32); /* extern */ ? func_800790B4(s32); /* extern */ @@ -2906,36 +2906,36 @@ void func_8005CB60(s32 playerId, s32 arg1) { } } else { playerId = temp_a3; - func_800413B8(&temp_s0->rankScaling, 0x3F800000, 0x3E000000, temp_a3); + f32_step_towards(&temp_s0->rankScaling, 0x3F800000, 0x3E000000, temp_a3); temp_v0_6 = gScreenModeSelection; switch (temp_v0_6) { /* irregular */ case 0: - func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId); + s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); if (D_8018D1FC != 0) { - func_80041288(&temp_s0->slideRankY, -0x28, 1); + s16_step_towards(&temp_s0->slideRankY, -0x28, 1); } else { - func_80041288(&temp_s0->slideRankY, -0x10, 4); + s16_step_towards(&temp_s0->slideRankY, -0x10, 4); } break; case 2: - func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId); - func_80041288(&temp_s0->slideRankY, -0x10, 4); + s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); + s16_step_towards(&temp_s0->slideRankY, -0x10, 4); break; case 1: - func_80041288(&temp_s0->slideRankX, 0x1C, 7, playerId); - func_80041288(&temp_s0->slideRankY, -0x10, 4); - func_80041288(&temp_s0->lap1CompletionTimeX, 0xE4, 0x10); - func_80041288(&temp_s0->lap2CompletionTimeX, 0xE4, 0x10); - func_80041288(&temp_s0->lap3CompletionTimeX, 0xE4, 0x10); - func_80041288(&temp_s0->totalTimeX, 0xE4, 0x10); + s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); + s16_step_towards(&temp_s0->slideRankY, -0x10, 4); + s16_step_towards(&temp_s0->lap1CompletionTimeX, 0xE4, 0x10); + s16_step_towards(&temp_s0->lap2CompletionTimeX, 0xE4, 0x10); + s16_step_towards(&temp_s0->lap3CompletionTimeX, 0xE4, 0x10); + s16_step_towards(&temp_s0->totalTimeX, 0xE4, 0x10); break; case 3: if ((playerId & 1) == 1) { - func_80041288(&temp_s0->slideRankX, -8, 2, playerId); + s16_step_towards(&temp_s0->slideRankX, -8, 2, playerId); } else { - func_80041288(&temp_s0->slideRankX, 8, 2, playerId); + s16_step_towards(&temp_s0->slideRankX, 8, 2, playerId); } - func_80041288(&temp_s0->slideRankY, -0x10, 4); + s16_step_towards(&temp_s0->slideRankY, -0x10, 4); break; } } diff --git a/src/code_80071F00.c b/src/code_80071F00.c index e7a1b6f41..01cbc5ce7 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -1534,7 +1534,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80074924.s") void func_80074D94(s32 arg0) { if (D_80165C18[arg0].unk_0AE == 1) { - if ((D_80165740 <= D_80165C18[arg0].unk_02C) && (func_8004106C(&D_80165C18[arg0].unk_0A0, 0, 8) != 0)) { + if ((D_80165740 <= D_80165C18[arg0].unk_02C) && (s16_step_down_towards(&D_80165C18[arg0].unk_0A0, 0, 8) != 0)) { func_80086F60(arg0); } func_800877C4(arg0); @@ -1926,7 +1926,7 @@ void func_80075714(s32 arg0) { break; case 2: D_80165C18[arg0].unk_03C -= D_800EEAD0; - func_80040EE0(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C); + f32_step_up_towards(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C); func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, D_800EEAD8, 1, 0); if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(arg0); @@ -2097,7 +2097,7 @@ void func_80075B84(s32 arg0) { break; case 2: D_80165C18[arg0].unk_03C -= D_800EEAE0; - func_80040EE0(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C); + f32_step_up_towards(&D_80165C18[arg0].unk_02C, 100.0f, D_80165C18[arg0].unk_03C); func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, D_800EEAE8, 1, 0); if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(arg0); @@ -2429,8 +2429,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007634C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80041288(void *, ?, ?); /* extern */ -? func_800413B8(void *, ?, ?); /* extern */ +? s16_step_towards(void *, ?, ?); /* extern */ +? f32_step_towards(void *, ?, ?); /* extern */ ? func_80072428(s32); /* extern */ ? func_80072488(s32); /* extern */ s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); /* extern */ @@ -2458,13 +2458,13 @@ void func_800763CC(s32 arg0) { return; case 3: if (temp_s0->unkD5 == 4) { - func_800413B8(temp_s0, 0x40800000, 0x3DCCCCCD); - func_80041288(temp_s0 + 0xA4, 0, 0x18); - func_80041288(temp_s0 + 0xA2, 0x80, 0xC); + f32_step_towards(temp_s0, 0x40800000, 0x3DCCCCCD); + s16_step_towards(temp_s0 + 0xA4, 0, 0x18); + s16_step_towards(temp_s0 + 0xA2, 0x80, 0xC); } else { - func_800413B8(temp_s0, 0x3F800000, 0x3DCCCCCD); - func_80041288(temp_s0 + 0xA4, 0, 0x18); - func_80041288(temp_s0 + 0xA2, 0x80, 0xC); + f32_step_towards(temp_s0, 0x3F800000, 0x3DCCCCCD); + s16_step_towards(temp_s0 + 0xA4, 0, 0x18); + s16_step_towards(temp_s0 + 0xA2, 0x80, 0xC); } if ((temp_s0->unkAE >= 2) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0x50, 0x20, 0, 0) != 0)) { func_80072488(arg0); @@ -2485,7 +2485,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800763CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800410BC(void *, ?, ?); // extern +? u16_step_down_towards(void *, ?, ?); // extern ? func_80086FD4(s32); // extern s32 func_80087060(s32, ?); // extern ? func_80087844(s32); // extern @@ -2503,7 +2503,7 @@ void func_80076538(s32 arg0) { if (temp_v1 != 2) { } else { - func_800410BC(temp_s0 + 0xBE, 0, 0x400); + u16_step_down_towards(temp_s0 + 0xBE, 0, 0x400); goto block_11; } } else { @@ -2674,8 +2674,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076958.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80041288(void *, ?, ?); /* extern */ -? func_800413B8(void *, ?, ?); /* extern */ +? s16_step_towards(void *, ?, ?); /* extern */ +? f32_step_towards(void *, ?, ?); /* extern */ ? func_80072428(s32); /* extern */ ? func_80072488(s32); /* extern */ s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); /* extern */ @@ -2702,8 +2702,8 @@ void func_800769D8(s32 arg0) { default: return; case 3: - func_800413B8(temp_s0, 0x40000000, 0x3D4CCCCD); - func_80041288(temp_s0 + 0xA4, 0, 0x18); + f32_step_towards(temp_s0, 0x40000000, 0x3D4CCCCD); + s16_step_towards(temp_s0 + 0xA4, 0, 0x18); if ((temp_s0->unkAE >= 2) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0x50, 0x20, 0, 0) != 0)) { func_80072488(arg0); return; @@ -3155,7 +3155,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077428.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80040EE0(void *, ?, ?, s32); // extern +? f32_step_up_towards(void *, ?, ?, s32); // extern ? func_8005C6B4(s8, s16 *, s16 *, s16 *); // extern ? func_80072428(s32); // extern s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); // extern @@ -3182,7 +3182,7 @@ void func_80077450(s32 arg0) { } else { arg0 = temp_a3; - func_80040EE0(temp_a0, 0x3DCCCCCD, 0x3C23D70A, temp_a3); + f32_step_up_towards(temp_a0, 0x3DCCCCCD, 0x3C23D70A, temp_a3); if ((temp_s0->unk8 <= temp_s0->unk8E) && (func_80073B00(arg0, temp_s0 + 0xA0, 0xFF, 0, 0x10, 0, 0) != 0)) { func_80086F60(arg0); func_80072428(arg0); @@ -4724,8 +4724,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800799A8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80040EE0(void *, ?, ?, s32); // extern -s32 func_80040F2C(void *, ?, ?, s32); // extern +s32 f32_step_up_towards(void *, ?, ?, s32); // extern +s32 f32_step_down_towards(void *, ?, ?, s32); // extern ? func_80086F60(s32); // extern ? func_80086FD4(s32, s32); // extern extern ? D_80165C18; @@ -4747,14 +4747,14 @@ void func_80079A5C(s32 arg0, ? arg1) { return; } arg0 = temp_a3; - if (func_80040EE0(temp_a0, 0x42C80000, 0x3F800000, temp_a3) != 0) { + if (f32_step_up_towards(temp_a0, 0x42C80000, 0x3F800000, temp_a3) != 0) { func_80086F60(arg0); } // Duplicate return node #10. Try simplifying control flow for better match return; } arg0 = temp_a3; - if (func_80040F2C(temp_v0 + 0x2C, 0x40A00000, 0x3F800000, temp_a3) != 0) { + if (f32_step_down_towards(temp_v0 + 0x2C, 0x40A00000, 0x3F800000, temp_a3) != 0) { func_80086F60(arg0); return; } @@ -5796,8 +5796,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B254.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_80040FD8(s16 *, ?, ?); /* extern */ -s32 func_8004106C(s16 *, ?, ?); /* extern */ +? s16_step_up_towards(s16 *, ?, ?); /* extern */ +s32 s16_step_down_towards(s16 *, ?, ?); /* extern */ ? func_800722CC(s32, ?); /* extern */ s32 func_80072320(s32, ?); /* extern */ s32 func_80072354(s32, ?); /* extern */ @@ -5936,7 +5936,7 @@ void func_8007B34C(s32 playerId) { if (temp_v0 == 0) { temp_v1 = &D_8018CA70[playerId]; sp28 = temp_v1; - func_80040FD8(&temp_v1->slideItemBoxY, 0x40, 4); + s16_step_up_towards(&temp_v1->slideItemBoxY, 0x40, 4); if (temp_v1->slideItemBoxY == 0x40) { func_80072488(temp_s0); } @@ -5944,14 +5944,14 @@ void func_8007B34C(s32 playerId) { if ((playerId == 0) || (playerId == 2)) { temp_v1_2 = &D_8018CA70[playerId]; sp28 = temp_v1_2; - func_80040FD8(&temp_v1_2->slideItemBoxX, 0x80, 8); + s16_step_up_towards(&temp_v1_2->slideItemBoxX, 0x80, 8); if (temp_v1_2->slideItemBoxX == 0x80) { func_80072488(temp_s0); } } else { temp_v1_3 = &D_8018CA70[playerId]; sp28 = temp_v1_3; - func_8004106C(&temp_v1_3->slideItemBoxX, -0x80, 8); + s16_step_down_towards(&temp_v1_3->slideItemBoxX, -0x80, 8); if (temp_v1_3->slideItemBoxX == -0x80) { func_80072488(temp_s0); } @@ -5959,7 +5959,7 @@ void func_8007B34C(s32 playerId) { } else { temp_v1_4 = &D_8018CA70[playerId]; sp28 = temp_v1_4; - func_80040FD8(&temp_v1_4->slideItemBoxX, 0x80, 8); + s16_step_up_towards(&temp_v1_4->slideItemBoxX, 0x80, 8); if (temp_v1_4->slideItemBoxX == 0x80) { func_80072488(temp_s0); } @@ -5998,26 +5998,26 @@ void func_8007B34C(s32 playerId) { case 11: temp_v0_2 = gActiveScreenMode; if (temp_v0_2 == 0) { - if (func_8004106C((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) { + if (s16_step_down_towards((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) { func_80072488(temp_s0); } } else if (temp_v0_2 == 3) { if ((playerId == 0) || (playerId == 2)) { temp_v1_5 = &D_8018CA70[playerId]; sp28 = temp_v1_5; - func_8004106C(&temp_v1_5->slideItemBoxX, 0, 8); + s16_step_down_towards(&temp_v1_5->slideItemBoxX, 0, 8); if (temp_v1_5->slideItemBoxX == 0) { func_80072488(temp_s0); } } else { temp_v1_6 = &D_8018CA70[playerId]; sp28 = temp_v1_6; - func_80040FD8(&temp_v1_6->slideItemBoxX, 0, 8); + s16_step_up_towards(&temp_v1_6->slideItemBoxX, 0, 8); if (temp_v1_6->slideItemBoxX == 0) { func_80072488(temp_s0); } } - } else if (func_8004106C((playerId * 0x84) + 0x46 + D_8018CA70, 0, 8) != 0) { + } else if (s16_step_down_towards((playerId * 0x84) + 0x46 + D_8018CA70, 0, 8) != 0) { func_80072488(temp_s0); } break; @@ -6328,8 +6328,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BEC8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80040FD8(void *, ?, ?); /* extern */ -s32 func_80041028(void *, ?, u16); /* extern */ +? s16_step_up_towards(void *, ?, ?); /* extern */ +s32 u16_step_up_towards(void *, ?, u16); /* extern */ ? func_800721E8(s32, ?); /* extern */ ? func_80074344(s32, void *, ?, ?, f32, s32, s32); /* extern */ ? func_80086F60(s32); /* extern */ @@ -6367,7 +6367,7 @@ block_26: if (temp_s0->unkBE >= 0xA01) { temp_s0->unk92 = temp_s0->unk92 - 4; } - if (func_80041028(temp_s0 + 0xBE, 0xC00, temp_s0->unk92) != 0) { + if (u16_step_up_towards(temp_s0 + 0xBE, 0xC00, temp_s0->unk92) != 0) { func_80086FD4(arg0); } goto block_26; @@ -6383,7 +6383,7 @@ block_26: temp_s0->unk34 = temp_f0 + 0.0002; } temp_s0->unk0 = temp_s0->unk0 + temp_s0->unk34; - func_80040FD8(temp_s0 + 0x92, 0x100, 0x10); + s16_step_up_towards(temp_s0 + 0x92, 0x100, 0x10); temp_s0->unkBE = temp_s0->unkBE - temp_s0->unk92; if (func_80087060(arg0, 0x35) != 0) { func_80086FD4(arg0); @@ -7858,8 +7858,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E59C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80040EE0(void *, f32, ?); /* extern */ -s32 func_80040F2C(void *, ?, ?); /* extern */ +s32 f32_step_up_towards(void *, f32, ?); /* extern */ +s32 f32_step_down_towards(void *, ?, ?); /* extern */ ? func_800721C0(s32, ?); /* extern */ ? func_800721E8(s32, ?); /* extern */ s32 func_8007223C(s32, ?); /* extern */ @@ -7923,14 +7923,14 @@ void func_8007E63C(s32 arg0) { func_8007278C(arg0, 0x1E); return; case 0x66: /* switch 1 */ - if (func_80040EE0(temp_v1 + 0x2C, 20.0f, 0x3FC00000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x2C, 20.0f, 0x3FC00000) != 0) { func_80072488(arg0); return; } /* Duplicate return node #68. Try simplifying control flow for better match */ return; case 0x67: /* switch 1 */ - if (func_80040F2C(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) { + if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) { if (func_8007223C(arg0, 0x20000) != 0) { func_800722A4(arg0, 0x10); if (func_8007223C(arg0, 0x40000) != 0) { @@ -7943,7 +7943,7 @@ void func_8007E63C(s32 arg0) { /* Duplicate return node #68. Try simplifying control flow for better match */ return; case 0x68: /* switch 1 */ - if (func_80040EE0(temp_v1 + 0x2C, 12.0f, 0x3FC00000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x2C, 12.0f, 0x3FC00000) != 0) { func_80072488(arg0); return; } @@ -7951,7 +7951,7 @@ void func_8007E63C(s32 arg0) { return; case 0x69: /* switch 1 */ sp28 = temp_v1; - if (func_80040F2C(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) { + if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x3FC00000) != 0) { sp28 = temp_v1; if (func_8007223C(arg0, 0x20000) != 0) { sp28 = temp_v1; @@ -7990,7 +7990,7 @@ void func_8007E63C(s32 arg0) { sp28 = temp_v1; func_800730BC(arg0, 3, 5, 1, 6, -1); } - if (func_80040EE0(temp_t6 + &D_80165C18 + 0x2C, (temp_t6 + &D_80165C18)->unk20, 0x3F000000) != 0) { + if (f32_step_up_towards(temp_t6 + &D_80165C18 + 0x2C, (temp_t6 + &D_80165C18)->unk20, 0x3F000000) != 0) { func_80072388(arg0, 0); func_80072488(arg0); return; @@ -8010,7 +8010,7 @@ void func_8007E63C(s32 arg0) { } else { switch (temp_v0) { /* switch 2 */ case 0x32: /* switch 2 */ - if (func_80040EE0(temp_v1 + 0x2C, temp_v1->unk20 + 15.0, 0x3FC00000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x2C, temp_v1->unk20 + 15.0, 0x3FC00000) != 0) { func_800721C0(arg0, 0x200); func_800722A4(arg0, 1); func_800722CC(arg0, 2); @@ -8022,7 +8022,7 @@ void func_8007E63C(s32 arg0) { return; case 0x33: /* switch 2 */ sp28 = temp_v1; - if (func_80040F2C(temp_v1 + 0x2C, 0, 0x40000000) != 0) { + if (f32_step_down_towards(temp_v1 + 0x2C, 0, 0x40000000) != 0) { temp_f0_2 = temp_v1->unk2C; if (temp_f0_2 >= 16.0f) { temp_v1->unkD2 = 0; @@ -8060,7 +8060,7 @@ void func_8007E63C(s32 arg0) { } else if (temp_f0_3 >= 18.0f) { temp_v1->unkD2 = 1; } - if (func_80040EE0(temp_v1 + 0x2C, temp_v1->unk20, 0x3F000000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x2C, temp_v1->unk20, 0x3F000000) != 0) { func_800721E8(arg0, 0x200); func_8007266C(arg0); return; @@ -8215,9 +8215,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EE5C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80040EE0(void *, ?, ?); /* extern */ -s32 func_80040F2C(void *, ?, ?); /* extern */ -s32 func_800413B8(void *, f32, ?); /* extern */ +s32 f32_step_up_towards(void *, ?, ?); /* extern */ +s32 f32_step_down_towards(void *, ?, ?); /* extern */ +s32 f32_step_towards(void *, f32, ?); /* extern */ ? func_800726CC(s32, ?); /* extern */ s32 func_80073E18(s32, void *, ?, ?); /* extern */ ? func_80086FD4(s32); /* extern */ @@ -8242,7 +8242,7 @@ void func_8007EFBC(s32 arg0) { default: return; case 2: - if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) { func_80086FD4(arg0); return; } @@ -8264,7 +8264,7 @@ void func_8007EFBC(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 6: - if (func_80040F2C(temp_v1 + 0x30, 0xC2C80000, 0x40000000) != 0) { + if (f32_step_down_towards(temp_v1 + 0x30, 0xC2C80000, 0x40000000) != 0) { func_80086FD4(arg0); return; } @@ -8286,7 +8286,7 @@ void func_8007EFBC(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 10: - if (func_800413B8(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) { func_80086FD4(arg0); return; } @@ -8308,7 +8308,7 @@ void func_8007EFBC(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 14: - if (func_80040EE0(temp_v1 + 0x30, 0, 0x40000000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x30, 0, 0x40000000) != 0) { func_80086FD4(arg0); return; } @@ -8334,9 +8334,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EFBC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80040EE0(void *, ?, ?); /* extern */ -s32 func_80040F2C(void *, ?, ?); /* extern */ -s32 func_800413B8(void *, f32, ?); /* extern */ +s32 f32_step_up_towards(void *, ?, ?); /* extern */ +s32 f32_step_down_towards(void *, ?, ?); /* extern */ +s32 f32_step_towards(void *, f32, ?); /* extern */ ? func_800726CC(s32, ?); /* extern */ s32 func_80073E18(s32, void *, ?, ?); /* extern */ ? func_80086FD4(s32); /* extern */ @@ -8361,7 +8361,7 @@ void func_8007F280(s32 arg0) { default: return; case 2: - if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40800000) != 0) { func_80086FD4(arg0); return; } @@ -8383,7 +8383,7 @@ void func_8007F280(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 6: - if (func_80040EE0(temp_v1 + 0x30, 0x42C80000, 0x40000000) != 0) { + if (f32_step_up_towards(temp_v1 + 0x30, 0x42C80000, 0x40000000) != 0) { func_80086FD4(arg0); return; } @@ -8405,7 +8405,7 @@ void func_8007F280(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 10: - if (func_800413B8(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, 0.0f, 0x40800000) != 0) { func_80086FD4(arg0); return; } @@ -8427,7 +8427,7 @@ void func_8007F280(s32 arg0) { /* Duplicate return node #27. Try simplifying control flow for better match */ return; case 14: - if (func_80040F2C(temp_v1 + 0x30, 0, 0x40000000) != 0) { + if (f32_step_down_towards(temp_v1 + 0x30, 0, 0x40000000) != 0) { func_80086FD4(arg0); return; } @@ -8692,7 +8692,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FA08.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_800413B8(void *, ?, ?); /* extern */ +? f32_step_towards(void *, ?, ?); /* extern */ ? func_800722CC(s32, ?); /* extern */ ? func_800726CC(s32, ?); /* extern */ ? func_80086FD4(s32, void *); /* extern */ @@ -8780,8 +8780,8 @@ block_20: return; case 4: sp18 = temp_v1; - func_800413B8(temp_v1 + 0x30, 0, 0x40000000); - func_800413B8(temp_v1 + 0x28, 0, 0x40A00000); + f32_step_towards(temp_v1 + 0x30, 0, 0x40000000); + f32_step_towards(temp_v1 + 0x28, 0, 0x40A00000); if ((temp_v1->unk30 + temp_v1->unk28) == 0.0) { func_80086FD4(arg0); return; @@ -8809,7 +8809,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FB48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_800413B8(void *, s32, ?); // extern +s32 f32_step_towards(void *, s32, ?); // extern ? func_800722CC(s32, ?); // extern ? func_800726CC(s32, ?); // extern ? func_80086FD4(s32); // extern @@ -8827,7 +8827,7 @@ void func_8007FEA4(s32 arg0) { if (temp_v0 != 3) { return; } - if (func_800413B8(temp_v1 + 0x28, 0, 0x40A00000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, 0, 0x40A00000) != 0) { func_80086FD4(arg0); func_800722CC(arg0, 8); } @@ -8837,7 +8837,7 @@ void func_8007FEA4(s32 arg0) { // Duplicate return node #9. Try simplifying control flow for better match return; } - if (func_800413B8(temp_v1 + 0x28, temp_v1->unk1C, 0x40A00000) != 0) { + if (f32_step_towards(temp_v1 + 0x28, temp_v1->unk1C, 0x40A00000) != 0) { func_800726CC(arg0, 3); func_80086FD4(arg0); return; @@ -9173,7 +9173,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080524.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_800413B8(void *, ?, f32, s32); // extern +s32 f32_step_towards(void *, ?, f32, s32); // extern ? func_80086FD4(s32); // extern ? func_8008701C(s32, ?); // extern extern ? D_80165C18; @@ -9194,7 +9194,7 @@ void func_800806BC(s32 arg0) { } sp18 = temp_v1; arg0 = temp_a3; - if (func_800413B8(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) { + if (f32_step_towards(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) { temp_v1->unk40 = -temp_v1->unk40; func_8008701C(arg0, 1); } @@ -9203,7 +9203,7 @@ void func_800806BC(s32 arg0) { } sp18 = temp_v1; arg0 = temp_a3; - if (func_800413B8(temp_v1 + 0x30, 0x437A0000, temp_v1->unk40, temp_a3) != 0) { + if (f32_step_towards(temp_v1 + 0x30, 0x437A0000, temp_v1->unk40, temp_a3) != 0) { temp_v1->unk40 = -temp_v1->unk40; func_80086FD4(arg0); return; @@ -9217,7 +9217,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800806BC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_800413B8(void *, ?, f32, s32); // extern +s32 f32_step_towards(void *, ?, f32, s32); // extern ? func_80086FD4(s32); // extern ? func_8008701C(s32, ?); // extern extern ? D_80165C18; @@ -9238,7 +9238,7 @@ void func_8008078C(s32 arg0) { } sp18 = temp_v1; arg0 = temp_a3; - if (func_800413B8(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) { + if (f32_step_towards(temp_v1 + 0x30, 0, temp_v1->unk40, temp_a3) != 0) { temp_v1->unk40 = -temp_v1->unk40; func_8008701C(arg0, 1); } @@ -9247,7 +9247,7 @@ void func_8008078C(s32 arg0) { } sp18 = temp_v1; arg0 = temp_a3; - if (func_800413B8(temp_v1 + 0x30, 0xC37A0000, temp_v1->unk40, temp_a3) != 0) { + if (f32_step_towards(temp_v1 + 0x30, 0xC37A0000, temp_v1->unk40, temp_a3) != 0) { temp_v1->unk40 = -temp_v1->unk40; func_80086FD4(arg0); return; @@ -9628,7 +9628,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081080.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80040EE0(void *, ?, ?); // extern +? f32_step_up_towards(void *, ?, ?); // extern ? func_80072428(s32); // extern ? func_80072488(s32); // extern s32 func_80073B00(s32, void *, ?, ?, s32, s32, s32); // extern @@ -9657,7 +9657,7 @@ void func_800810F4(s32 arg0) { } else { sp30 = temp_v1; func_8008775C(arg0); - func_80040EE0(sp30 + 0x2C, 0x41600000, 0x3F000000); + f32_step_up_towards(sp30 + 0x2C, 0x41600000, 0x3F000000); func_8007415C(arg0, sp30, 0x3E800000, 0x3F400000, D_800EF0C8, 1, 0); if (func_80073B00(arg0, sp30 + 0xA0, 0xFF, 0, 4, 0, 0) != 0) { func_80072488(arg0); @@ -10012,8 +10012,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081848.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80040EE0(void *, ?, ?); /* extern */ -s32 func_80040F2C(void *, ?, ?); /* extern */ +s32 f32_step_up_towards(void *, ?, ?); /* extern */ +s32 f32_step_down_towards(void *, ?, ?); /* extern */ ? func_80086F60(s32); /* extern */ ? func_80086FD4(s32); /* extern */ ? func_800871AC(s32, ?); /* extern */ @@ -10031,7 +10031,7 @@ void func_80081924(s32 arg0) { temp_t8 = temp_v0->unkAE; switch (temp_t8) { case 1: - if (func_80040EE0(temp_v0 + 0x2C, 0x41100000, 0x3F333333) != 0) { + if (f32_step_up_towards(temp_v0 + 0x2C, 0x41100000, 0x3F333333) != 0) { func_80086FD4(arg0); return; } @@ -10041,7 +10041,7 @@ void func_80081924(s32 arg0) { func_800871AC(arg0, 0xA); return; case 3: - if (func_80040F2C(temp_v0 + 0x2C, 0x40400000, 0x3F800000) != 0) { + if (f32_step_down_towards(temp_v0 + 0x2C, 0x40400000, 0x3F800000) != 0) { func_80086F60(arg0); return; } @@ -11290,7 +11290,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083868.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80040EE0(void *, ?, ?); /* extern */ +s32 f32_step_up_towards(void *, ?, ?); /* extern */ ? func_80073800(s32, ?); /* extern */ ? func_80073D0C(s32, void *, ?, ?, s32, s32, s32); /* extern */ ? func_80086FD4(s32); /* extern */ @@ -11324,7 +11324,7 @@ void func_80083948(s32 arg0) { func_80087D24(arg0, 0, 0x3E4CCCCD, 0xC0E00000); break; case 20: - if (func_80040EE0(temp_s1 + 0x2C, 0, 0x3E4CCCCD) != 0) { + if (f32_step_up_towards(temp_s1 + 0x2C, 0, 0x3E4CCCCD) != 0) { func_80073800(arg0, 0); func_8008701C(arg0, 1); } @@ -12020,7 +12020,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80084B7C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 s16 func_80004EAC(? *, s32); /* extern */ -? func_800413B8(void *, f32, ?); /* extern */ +? f32_step_towards(void *, f32, ?); /* extern */ ? func_800722A4(s32, ?); /* extern */ ? func_800722CC(s32, ?); /* extern */ s32 func_80072354(s32, ?); /* extern */ @@ -12054,7 +12054,7 @@ void func_80084D2C(s32 arg0, s32 arg1) { } break; case 2: - func_800413B8(temp_s0 + 0x34, 0.8f, 0x3CA3D70A); + f32_step_towards(temp_s0 + 0x34, 0.8f, 0x3CA3D70A); if (func_80087060(arg0, 0xF) != 0) { func_800722A4(arg0, 1); func_800722A4(arg0, 2); @@ -12087,7 +12087,7 @@ void func_80084D2C(s32 arg0, s32 arg1) { } else { sp24 = 1.0f; } - func_800413B8(temp_s0 + 0x34, sp24, 0x3E19999A); + f32_step_towards(temp_s0 + 0x34, sp24, 0x3E19999A); if ((func_80072354(arg0, 2) != 0) && (sp24 == temp_s0->unk34)) { func_80086FD4(arg0); } @@ -12099,7 +12099,7 @@ void func_80084D2C(s32 arg0, s32 arg1) { } break; case 5: - func_800413B8(temp_s0 + 0x34, 0.4f, 0x3E4CCCCD); + f32_step_towards(temp_s0 + 0x34, 0.4f, 0x3E4CCCCD); if (func_80087060(arg0, 0xA) != 0) { func_800722A4(arg0, 2); temp_s0->unkD8 = 2; @@ -12320,7 +12320,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800853DC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_800413B8(void *, ?, ?); /* extern */ +? f32_step_towards(void *, ?, ?); /* extern */ ? func_80086FD4(s32); /* extern */ ? func_8008701C(s32, ?); /* extern */ s32 func_80087060(s32, ?); /* extern */ @@ -12341,7 +12341,7 @@ void func_80085534(s32 arg0) { } break; case 2: - func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD); + f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD); if (temp_s0->unk3C == 0.0) { func_80086FD4(arg0); } @@ -12350,7 +12350,7 @@ void func_80085534(s32 arg0) { func_800871AC(arg0, 1); break; case 4: - func_800413B8(temp_s0 + 0x3C, 0x3F800000, 0x3D4CCCCD); + f32_step_towards(temp_s0 + 0x3C, 0x3F800000, 0x3D4CCCCD); if (temp_s0->unk3C == 1.0) { func_80086FD4(arg0); } @@ -12359,13 +12359,13 @@ void func_80085534(s32 arg0) { func_800871AC(arg0, 0x5A); break; case 6: - func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD); + f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD); if (temp_s0->unk3C == 0.0) { func_80086FD4(arg0); } break; case 7: - func_800413B8(temp_s0 + 0x3C, 0xBF800000, 0x3D4CCCCD); + f32_step_towards(temp_s0 + 0x3C, 0xBF800000, 0x3D4CCCCD); if (temp_s0->unk3C == -1.0) { func_80086FD4(arg0); } @@ -12374,7 +12374,7 @@ void func_80085534(s32 arg0) { func_800871AC(arg0, 0x5A); break; case 9: - func_800413B8(temp_s0 + 0x3C, 0, 0x3D4CCCCD); + f32_step_towards(temp_s0 + 0x3C, 0, 0x3D4CCCCD); if (func_80087060(arg0, 0x5A) != 0) { func_8008701C(arg0, 3); } @@ -13172,7 +13172,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086700.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_800413B8(void *, ?, ?); /* extern */ +? f32_step_towards(void *, ?, ?); /* extern */ ? func_80086F60(s32); /* extern */ ? func_80086FD4(s32); /* extern */ ? func_8008701C(s32, ?); /* extern */ @@ -13195,7 +13195,7 @@ void func_80086940(s32 arg0) { func_80086FD4(arg0); break; case 2: - func_800413B8(temp_s0, 0x3CCCCCCD, 0x3A83126F); + f32_step_towards(temp_s0, 0x3CCCCCCD, 0x3A83126F); func_80087C48(arg0, 0x40C00000, 0x3DCCCCCD, 0xC8); if (temp_s0->unk3C <= 0.0) { func_8008701C(arg0, 3); @@ -13225,7 +13225,7 @@ void func_80086940(s32 arg0) { break; case 5: if (temp_s0->unk2C <= 8.0) { - func_800413B8(temp_s0 + 0x3C, 0xBDCCCCCD, 0xBC23D70A); + f32_step_towards(temp_s0 + 0x3C, 0xBDCCCCCD, 0xBC23D70A); } func_800877C4(arg0); if (temp_s0->unk2C <= 0.0) { diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 8fbcbffcc..e8fa9ecc3 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -3,8 +3,8 @@ #include "common_structs.h" -s32 func_80040EE0(f32*, f32, f32); -s32 func_8004106C(s16*, s16, s16); +s32 f32_step_up_towards(f32*, f32, f32); +s32 s16_step_down_towards(s16*, s16, s16); void func_80041480(s16*, s16, s16, s16*); s32 func_80072044(s32*, s32*, s32); void func_800721C0(s32, s32); diff --git a/src/code_80086E70.c b/src/code_80086E70.c index e3ec1b918..7f5bea8dc 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1223,7 +1223,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088FF0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800413B8(f32, f32 *, f32, f32, f32 *); // extern +? f32_step_towards(f32, f32 *, f32, f32, f32 *); // extern extern f32 D_800EF4A0; extern f32 D_800EF4A4; extern f32 D_800EF4A8; @@ -1301,7 +1301,7 @@ void func_80089020(s32 arg0, f32 *arg1) { phi_f0 = D_800EF4D0; } } - func_800413B8(0.0f, arg1, 0.0f, phi_f0, arg1); + f32_step_towards(0.0f, arg1, 0.0f, phi_f0, arg1); } #else GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089020.s")