better terminology

This commit is contained in:
Fazana
2022-04-13 20:59:11 +01:00
parent a551e62b86
commit 067679e94b
5 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -767,7 +767,7 @@ glabel func_80050A28
/* 05207C 8005147C E7B00040 */ swc1 $f16, 0x40($sp)
/* 052080 80051480 8FA50028 */ lw $a1, 0x28($sp)
/* 052084 80051484 8FA60070 */ lw $a2, 0x70($sp)
/* 052088 80051488 3C07800E */ lui $a3, %hi(gSurfaceSpeedScrubTable) # $a3, 0x800e
/* 052088 80051488 3C07800E */ lui $a3, %hi(gSurfaceTractionTable) # $a3, 0x800e
/* 05208C 8005148C 83A80057 */ lb $t0, 0x57($sp)
/* 052090 80051490 8FA90064 */ lw $t1, 0x64($sp)
/* 052094 80051494 C7A20048 */ lwc1 $f2, 0x48($sp)
@@ -775,7 +775,7 @@ glabel func_80050A28
/* 05209C 8005149C C7B00040 */ lwc1 $f16, 0x40($sp)
/* 0520A0 800514A0 00025A00 */ sll $t3, $v0, 8
/* 0520A4 800514A4 05610006 */ bgez $t3, .L800514C0
/* 0520A8 800514A8 24E7CB9C */ addiu $a3, %lo(gSurfaceSpeedScrubTable) # addiu $a3, $a3, -0x3464
/* 0520A8 800514A8 24E7CB9C */ addiu $a3, %lo(gSurfaceTractionTable) # addiu $a3, $a3, -0x3464
/* 0520AC 800514AC C4E40000 */ lwc1 $f4, ($a3)
/* 0520B0 800514B0 90A201DC */ lbu $v0, 0x1dc($a1)
/* 0520B4 800514B4 46047380 */ add.s $f14, $f14, $f4
+2 -2
View File
@@ -144,9 +144,9 @@ glabel func_8005492C
/* 0556E8 80054AE8 10810008 */ beq $a0, $at, .L80054B0C
/* 0556EC 80054AEC 46009006 */ mov.s $f0, $f18
/* 0556F0 80054AF0 00047080 */ sll $t6, $a0, 2
/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(gSurfaceSpeedScrubTable) # $at, 0x800e
/* 0556F4 80054AF4 3C01800E */ lui $at, %hi(gSurfaceTractionTable) # $at, 0x800e
/* 0556F8 80054AF8 002E0821 */ addu $at, $at, $t6
/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(gSurfaceSpeedScrubTable)($at)
/* 0556FC 80054AFC C426CB9C */ lwc1 $f6, %lo(gSurfaceTractionTable)($at)
/* 055700 80054B00 18800002 */ blez $a0, .L80054B0C
/* 055704 80054B04 46069000 */ add.s $f0, $f18, $f6
/* 055708 80054B08 00801825 */ move $v1, $a0
+1 -1
View File
@@ -67,7 +67,7 @@ void func_8005F850(void) {
checksum += *(u8 *)(((s32)&func_80024D54) + i);
}
if (checksum != gFunc80024D54Checksum) {
antipiracy_modify_surface_speed_table();
antipiracy_modify_surface_traction_table();
}
}
+5 -5
View File
@@ -36,16 +36,16 @@ f32 D_800DCB60[14] = {
};
s32 D_800DCB98 = 0; // Currently unknown, might be a different type.
// Table used for quantifying speed reduction while the car drives over it.
// Table used for quantifying speed reduction while the car drives over it, like how grass will slow you down more than the road.
// An antipiracy trigger can set the first index to 0.5f, which makes that surface type impossible to drive on.
f32 gSurfaceSpeedScrubTable[19] = {
f32 gSurfaceTractionTable[19] = {
0.004f, 0.007f, 0.01f, 0.004f,
0.01f, 0.01f, 0.01f, 0.01f,
0.01f, 0.01f, 0.004f, 0.004f,
0.004f, 0.004f, 0.004f, 0.004f,
0.004f, 0.004f, 0.004f,
};
// Can only assume this is surface related too. Not incline thresholds though.
f32 D_800DCBE8[19] = {
0.8f, 0.85f, 0.85f, 0.5f,
0.5f, 0.5f, 0.5f, 0.5f,
@@ -970,8 +970,8 @@ GLOBAL_ASM("asm/non_matchings/racer/func_8005B818.s")
* Triggered upon failure of an anti-tamper test. Sets the first index of the surface speed
* table to an unreasonable value, wrecking drivability while on it.
*/
void antipiracy_modify_surface_speed_table(void) {
gSurfaceSpeedScrubTable[0] = 0.05f;
void antipiracy_modify_surface_traction_table(void) {
gSurfaceTractionTable[0] = 0.05f;
}
void func_8005C270(unk8005C270 *arg0) {
+2 -2
View File
@@ -156,7 +156,7 @@ extern s32 D_800DCB5C;
extern f32 D_800DCB60[14];
extern s32 D_800DCB98;
extern f32 gSurfaceSpeedScrubTable[19];
extern f32 gSurfaceTractionTable[19];
extern f32 D_800DCBE8[19];
@@ -228,7 +228,7 @@ s16 func_80059E20(void);
void func_8005A3B0(void);
void func_8005A3C0(void);
void func_8005A3D0(void);
void antipiracy_modify_surface_speed_table(void);
void antipiracy_modify_surface_traction_table(void);
//Non Matching
void set_ghost_position_and_rotation(Object *obj);