mirror of
https://github.com/pmret/papermario.git
synced 2024-11-09 12:32:38 +01:00
InterpPlayerYaw
This commit is contained in:
Ethan Roseman
parent
7376b736d0
commit
977fa7117d
@ -1,122 +0,0 @@
|
|||||||
.set noat # allow manual use of $at
|
|
||||||
.set noreorder # don't insert nops after branches
|
|
||||||
|
|
||||||
glabel InterpPlayerYaw
|
|
||||||
/* F62EC 802D193C 27BDFFD0 */ addiu $sp, $sp, -0x30
|
|
||||||
/* F62F0 802D1940 AFB10014 */ sw $s1, 0x14($sp)
|
|
||||||
/* F62F4 802D1944 0080882D */ daddu $s1, $a0, $zero
|
|
||||||
/* F62F8 802D1948 AFB50024 */ sw $s5, 0x24($sp)
|
|
||||||
/* F62FC 802D194C 3C158011 */ lui $s5, %hi(gPlayerStatus)
|
|
||||||
/* F6300 802D1950 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus)
|
|
||||||
/* F6304 802D1954 AFB60028 */ sw $s6, 0x28($sp)
|
|
||||||
/* F6308 802D1958 26360074 */ addiu $s6, $s1, 0x74
|
|
||||||
/* F630C 802D195C AFB40020 */ sw $s4, 0x20($sp)
|
|
||||||
/* F6310 802D1960 26340078 */ addiu $s4, $s1, 0x78
|
|
||||||
/* F6314 802D1964 AFB3001C */ sw $s3, 0x1c($sp)
|
|
||||||
/* F6318 802D1968 AFBF002C */ sw $ra, 0x2c($sp)
|
|
||||||
/* F631C 802D196C AFB20018 */ sw $s2, 0x18($sp)
|
|
||||||
/* F6320 802D1970 AFB00010 */ sw $s0, 0x10($sp)
|
|
||||||
/* F6324 802D1974 8E32000C */ lw $s2, 0xc($s1)
|
|
||||||
/* F6328 802D1978 10A0002C */ beqz $a1, .L802D1A2C
|
|
||||||
/* F632C 802D197C 2633007C */ addiu $s3, $s1, 0x7c
|
|
||||||
/* F6330 802D1980 3C10802E */ lui $s0, %hi(gPlayerNpcPtr)
|
|
||||||
/* F6334 802D1984 26109D20 */ addiu $s0, $s0, %lo(gPlayerNpcPtr)
|
|
||||||
/* F6338 802D1988 8E020000 */ lw $v0, ($s0)
|
|
||||||
/* F633C 802D198C C6A00080 */ lwc1 $f0, 0x80($s5)
|
|
||||||
/* F6340 802D1990 E440000C */ swc1 $f0, 0xc($v0)
|
|
||||||
/* F6344 802D1994 E6200074 */ swc1 $f0, 0x74($s1)
|
|
||||||
/* F6348 802D1998 8E450000 */ lw $a1, ($s2)
|
|
||||||
/* F634C 802D199C 0C0B210B */ jal get_float_variable
|
|
||||||
/* F6350 802D19A0 26520004 */ addiu $s2, $s2, 4
|
|
||||||
/* F6354 802D19A4 C6220074 */ lwc1 $f2, 0x74($s1)
|
|
||||||
/* F6358 802D19A8 46020001 */ sub.s $f0, $f0, $f2
|
|
||||||
/* F635C 802D19AC E6200078 */ swc1 $f0, 0x78($s1)
|
|
||||||
/* F6360 802D19B0 8E450000 */ lw $a1, ($s2)
|
|
||||||
/* F6364 802D19B4 0C0B1EAF */ jal get_variable
|
|
||||||
/* F6368 802D19B8 0220202D */ daddu $a0, $s1, $zero
|
|
||||||
/* F636C 802D19BC AE22007C */ sw $v0, 0x7c($s1)
|
|
||||||
/* F6370 802D19C0 8E020000 */ lw $v0, ($s0)
|
|
||||||
/* F6374 802D19C4 3C01C334 */ lui $at, 0xc334
|
|
||||||
/* F6378 802D19C8 44810000 */ mtc1 $at, $f0
|
|
||||||
/* F637C 802D19CC A440008E */ sh $zero, 0x8e($v0)
|
|
||||||
/* F6380 802D19D0 C6220078 */ lwc1 $f2, 0x78($s1)
|
|
||||||
/* F6384 802D19D4 4600103C */ c.lt.s $f2, $f0
|
|
||||||
/* F6388 802D19D8 00000000 */ nop
|
|
||||||
/* F638C 802D19DC 45000007 */ bc1f .L802D19FC
|
|
||||||
/* F6390 802D19E0 00000000 */ nop
|
|
||||||
/* F6394 802D19E4 3C0143B4 */ lui $at, 0x43b4
|
|
||||||
/* F6398 802D19E8 44810000 */ mtc1 $at, $f0
|
|
||||||
/* F639C 802D19EC 00000000 */ nop
|
|
||||||
/* F63A0 802D19F0 46001000 */ add.s $f0, $f2, $f0
|
|
||||||
/* F63A4 802D19F4 E6200078 */ swc1 $f0, 0x78($s1)
|
|
||||||
/* F63A8 802D19F8 C6220078 */ lwc1 $f2, 0x78($s1)
|
|
||||||
.L802D19FC:
|
|
||||||
/* F63AC 802D19FC 3C014334 */ lui $at, 0x4334
|
|
||||||
/* F63B0 802D1A00 44810000 */ mtc1 $at, $f0
|
|
||||||
/* F63B4 802D1A04 00000000 */ nop
|
|
||||||
/* F63B8 802D1A08 4602003C */ c.lt.s $f0, $f2
|
|
||||||
/* F63BC 802D1A0C 00000000 */ nop
|
|
||||||
/* F63C0 802D1A10 45000006 */ bc1f .L802D1A2C
|
|
||||||
/* F63C4 802D1A14 00000000 */ nop
|
|
||||||
/* F63C8 802D1A18 3C0143B4 */ lui $at, 0x43b4
|
|
||||||
/* F63CC 802D1A1C 44810000 */ mtc1 $at, $f0
|
|
||||||
/* F63D0 802D1A20 00000000 */ nop
|
|
||||||
/* F63D4 802D1A24 46001001 */ sub.s $f0, $f2, $f0
|
|
||||||
/* F63D8 802D1A28 E6200078 */ swc1 $f0, 0x78($s1)
|
|
||||||
.L802D1A2C:
|
|
||||||
/* F63DC 802D1A2C 8E620000 */ lw $v0, ($s3)
|
|
||||||
/* F63E0 802D1A30 1C40000E */ bgtz $v0, .L802D1A6C
|
|
||||||
/* F63E4 802D1A34 00000000 */ nop
|
|
||||||
/* F63E8 802D1A38 3C10802E */ lui $s0, %hi(gPlayerNpcPtr)
|
|
||||||
/* F63EC 802D1A3C 26109D20 */ addiu $s0, $s0, %lo(gPlayerNpcPtr)
|
|
||||||
/* F63F0 802D1A40 8E020000 */ lw $v0, ($s0)
|
|
||||||
/* F63F4 802D1A44 C6800000 */ lwc1 $f0, ($s4)
|
|
||||||
/* F63F8 802D1A48 C44C000C */ lwc1 $f12, 0xc($v0)
|
|
||||||
/* F63FC 802D1A4C 46006300 */ add.s $f12, $f12, $f0
|
|
||||||
/* F6400 802D1A50 0C00A6C9 */ jal clamp_angle
|
|
||||||
/* F6404 802D1A54 E44C000C */ swc1 $f12, 0xc($v0)
|
|
||||||
/* F6408 802D1A58 8E030000 */ lw $v1, ($s0)
|
|
||||||
/* F640C 802D1A5C 24020002 */ addiu $v0, $zero, 2
|
|
||||||
/* F6410 802D1A60 E460000C */ swc1 $f0, 0xc($v1)
|
|
||||||
/* F6414 802D1A64 080B46B7 */ j .L802D1ADC
|
|
||||||
/* F6418 802D1A68 E6A00080 */ swc1 $f0, 0x80($s5)
|
|
||||||
.L802D1A6C:
|
|
||||||
/* F641C 802D1A6C 3C10802E */ lui $s0, %hi(gPlayerNpcPtr)
|
|
||||||
/* F6420 802D1A70 26109D20 */ addiu $s0, $s0, %lo(gPlayerNpcPtr)
|
|
||||||
/* F6424 802D1A74 8E030000 */ lw $v1, ($s0)
|
|
||||||
/* F6428 802D1A78 9462008E */ lhu $v0, 0x8e($v1)
|
|
||||||
/* F642C 802D1A7C 24420001 */ addiu $v0, $v0, 1
|
|
||||||
/* F6430 802D1A80 A462008E */ sh $v0, 0x8e($v1)
|
|
||||||
/* F6434 802D1A84 00021400 */ sll $v0, $v0, 0x10
|
|
||||||
/* F6438 802D1A88 00021403 */ sra $v0, $v0, 0x10
|
|
||||||
/* F643C 802D1A8C C6800000 */ lwc1 $f0, ($s4)
|
|
||||||
/* F6440 802D1A90 44821000 */ mtc1 $v0, $f2
|
|
||||||
/* F6444 802D1A94 00000000 */ nop
|
|
||||||
/* F6448 802D1A98 468010A0 */ cvt.s.w $f2, $f2
|
|
||||||
/* F644C 802D1A9C 46020002 */ mul.s $f0, $f0, $f2
|
|
||||||
/* F6450 802D1AA0 00000000 */ nop
|
|
||||||
/* F6454 802D1AA4 C6CC0000 */ lwc1 $f12, ($s6)
|
|
||||||
/* F6458 802D1AA8 C6620000 */ lwc1 $f2, ($s3)
|
|
||||||
/* F645C 802D1AAC 468010A0 */ cvt.s.w $f2, $f2
|
|
||||||
/* F6460 802D1AB0 46020003 */ div.s $f0, $f0, $f2
|
|
||||||
/* F6464 802D1AB4 46006300 */ add.s $f12, $f12, $f0
|
|
||||||
/* F6468 802D1AB8 0C00A6C9 */ jal clamp_angle
|
|
||||||
/* F646C 802D1ABC E46C000C */ swc1 $f12, 0xc($v1)
|
|
||||||
/* F6470 802D1AC0 8E020000 */ lw $v0, ($s0)
|
|
||||||
/* F6474 802D1AC4 E440000C */ swc1 $f0, 0xc($v0)
|
|
||||||
/* F6478 802D1AC8 E6A00080 */ swc1 $f0, 0x80($s5)
|
|
||||||
/* F647C 802D1ACC 8442008E */ lh $v0, 0x8e($v0)
|
|
||||||
/* F6480 802D1AD0 8E630000 */ lw $v1, ($s3)
|
|
||||||
/* F6484 802D1AD4 0043102A */ slt $v0, $v0, $v1
|
|
||||||
/* F6488 802D1AD8 38420001 */ xori $v0, $v0, 1
|
|
||||||
.L802D1ADC:
|
|
||||||
/* F648C 802D1ADC 8FBF002C */ lw $ra, 0x2c($sp)
|
|
||||||
/* F6490 802D1AE0 8FB60028 */ lw $s6, 0x28($sp)
|
|
||||||
/* F6494 802D1AE4 8FB50024 */ lw $s5, 0x24($sp)
|
|
||||||
/* F6498 802D1AE8 8FB40020 */ lw $s4, 0x20($sp)
|
|
||||||
/* F649C 802D1AEC 8FB3001C */ lw $s3, 0x1c($sp)
|
|
||||||
/* F64A0 802D1AF0 8FB20018 */ lw $s2, 0x18($sp)
|
|
||||||
/* F64A4 802D1AF4 8FB10014 */ lw $s1, 0x14($sp)
|
|
||||||
/* F64A8 802D1AF8 8FB00010 */ lw $s0, 0x10($sp)
|
|
||||||
/* F64AC 802D1AFC 03E00008 */ jr $ra
|
|
||||||
/* F64B0 802D1B00 27BD0030 */ addiu $sp, $sp, 0x30
|
|
||||||
@ -167,7 +167,47 @@ void PlayerJump2(ScriptInstance* script, s32 isInitialCall) {
|
|||||||
player_jump(script, isInitialCall, 2);
|
player_jump(script, isInitialCall, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_F5750", InterpPlayerYaw, ScriptInstance* script, s32 isInitialCall);
|
ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) {
|
||||||
|
Bytecode* args = script->ptrReadPos;
|
||||||
|
PlayerStatus* playerStatus = PLAYER_STATUS;
|
||||||
|
f32* t1 = &script->functionTemp[1].f;
|
||||||
|
f32* t2 = &script->functionTemp[2].f;
|
||||||
|
s32* t3 = &script->functionTemp[3].s;
|
||||||
|
|
||||||
|
if (isInitialCall) {
|
||||||
|
Npc** player = &gPlayerNpcPtr;
|
||||||
|
|
||||||
|
(*player)->yaw = playerStatus->targetYaw;
|
||||||
|
*t1 = (*player)->yaw;
|
||||||
|
*t2 = get_float_variable(script, *args++) - *t1;
|
||||||
|
*t3 = get_variable(script, *args++);
|
||||||
|
(*player)->duration = 0;
|
||||||
|
|
||||||
|
if (*t2 < -180.0f) {
|
||||||
|
*t2 += 360.0f;
|
||||||
|
}
|
||||||
|
if (*t2 > 180.0f) {
|
||||||
|
*t2 -= 360.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*t3 > 0) {
|
||||||
|
Npc** player = &gPlayerNpcPtr;
|
||||||
|
|
||||||
|
(*player)->duration++;
|
||||||
|
(*player)->yaw = *t1 + ((*t2 * (*player)->duration) / *t3);
|
||||||
|
(*player)->yaw = clamp_angle((*player)->yaw);
|
||||||
|
playerStatus->targetYaw = (*player)->yaw;
|
||||||
|
return ((*player)->duration < *t3) ^ 1;
|
||||||
|
} else {
|
||||||
|
Npc** player = &gPlayerNpcPtr;
|
||||||
|
|
||||||
|
(*player)->yaw += *t2;
|
||||||
|
(*player)->yaw = clamp_angle((*player)->yaw);;
|
||||||
|
playerStatus->targetYaw = (*player)->yaw;
|
||||||
|
return ApiStatus_DONE2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDE_ASM(s32, "code_F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
|
INCLUDE_ASM(s32, "code_F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user