falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile currentPlayerSetFovY and currentPlayerSetAspectRatio

This commit is contained in:
Ryan Dwyer 2020-02-29 16:56:28 +10:00
parent a5aeb61596
commit b789d2b480
4 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/game_0b63b0.c
View File

@ -4620,7 +4620,7 @@ glabel func0f0ba29c
/* f0ba784: 27a50190 */ addiu $a1,$sp,0x190
/* f0ba788: 0fc306f6 */ jal func0f0c1bd8
/* f0ba78c: 27a60184 */ addiu $a2,$sp,0x184
/* f0ba790: 0fc4a2b5 */ jal func0f128ad4
/* f0ba790: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0ba794: c7ac0114 */ lwc1 $f12,0x114($sp)
/* f0ba798: 0c002f4c */ jal func0000bd30
/* f0ba79c: c7ac0114 */ lwc1 $f12,0x114($sp)
@ -4903,7 +4903,7 @@ glabel func0f0baac0
/* f0bab50: e4461848 */ swc1 $f6,0x1848($v0)
.L0f0bab54:
/* f0bab54: 8c6e0284 */ lw $t6,0x284($v1)
/* f0bab58: 0fc4a2b5 */ jal func0f128ad4
/* f0bab58: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bab5c: c5cc1848 */ lwc1 $f12,0x1848($t6)
/* f0bab60: 3c03800a */ lui $v1,%hi(g_Vars)
/* f0bab64: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
@ -4919,7 +4919,7 @@ glabel func0f0baac0
/* f0bab8c: 0fc2ea52 */ jal func0f0ba948
/* f0bab90: 00000000 */ sll $zero,$zero,0x0
/* f0bab94: e7a00018 */ swc1 $f0,0x18($sp)
/* f0bab98: 0fc4a2b5 */ jal func0f128ad4
/* f0bab98: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bab9c: 46000306 */ mov.s $f12,$f0
/* f0baba0: 0c002f4c */ jal func0000bd30
/* f0baba4: c7ac0018 */ lwc1 $f12,0x18($sp)
@ -7888,7 +7888,7 @@ glabel func0f0bd4e4
/* f0bd738: 0fc2ea52 */ jal func0f0ba948
/* f0bd73c: 00000000 */ sll $zero,$zero,0x0
/* f0bd740: e7a00018 */ swc1 $f0,0x18($sp)
/* f0bd744: 0fc4a2b5 */ jal func0f128ad4
/* f0bd744: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bd748: 46000306 */ mov.s $f12,$f0
/* f0bd74c: 0c002f4c */ jal func0000bd30
/* f0bd750: c7ac0018 */ lwc1 $f12,0x18($sp)
@ -7912,9 +7912,9 @@ glabel func0f0bd764
/* f0bd784: 00002025 */ or $a0,$zero,$zero
/* f0bd788: 3c014270 */ lui $at,0x4270
/* f0bd78c: 44816000 */ mtc1 $at,$f12
/* f0bd790: 0fc4a2b5 */ jal func0f128ad4
/* f0bd790: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bd794: 00000000 */ sll $zero,$zero,0x0
/* f0bd798: 0fc4a2b9 */ jal func0f128ae4
/* f0bd798: 0fc4a2b9 */ jal currentPlayerSetAspectRatio
/* f0bd79c: c7ac0024 */ lwc1 $f12,0x24($sp)
/* f0bd7a0: 0fc2f155 */ jal func0f0bc554
/* f0bd7a4: 00000000 */ sll $zero,$zero,0x0
@ -8136,9 +8136,9 @@ glabel func0f0bd904
/* f0bdac4: 3c014270 */ lui $at,0x4270
.L0f0bdac8:
/* f0bdac8: 44816000 */ mtc1 $at,$f12
/* f0bdacc: 0fc4a2b5 */ jal func0f128ad4
/* f0bdacc: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bdad0: 00000000 */ sll $zero,$zero,0x0
/* f0bdad4: 0fc4a2b9 */ jal func0f128ae4
/* f0bdad4: 0fc4a2b9 */ jal currentPlayerSetAspectRatio
/* f0bdad8: c7ac032c */ lwc1 $f12,0x32c($sp)
/* f0bdadc: 0fc2f155 */ jal func0f0bc554
/* f0bdae0: 00000000 */ sll $zero,$zero,0x0
@ -8587,7 +8587,7 @@ glabel func0f0bd904
/* f0be150: 51a00024 */ beqzl $t5,.L0f0be1e4
/* f0be154: 920e1bfc */ lbu $t6,0x1bfc($s0)
/* f0be158: 4481a000 */ mtc1 $at,$f20
/* f0be15c: 0fc4a2b5 */ jal func0f128ad4
/* f0be15c: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0be160: 4600a306 */ mov.s $f12,$f20
/* f0be164: 0c002f4c */ jal func0000bd30
/* f0be168: 4600a306 */ mov.s $f12,$f20

22
src/game/game_127910.c
View File

@ -1144,21 +1144,15 @@ glabel func0f128ab8
/* f128ad0: a5e50636 */ sh $a1,0x636($t7)
);
GLOBAL_ASM(
glabel func0f128ad4
/* f128ad4: 3c0e800a */ lui $t6,0x800a
/* f128ad8: 8dcea244 */ lw $t6,-0x5dbc($t6)
/* f128adc: 03e00008 */ jr $ra
/* f128ae0: e5cc1854 */ swc1 $f12,0x1854($t6)
);
void currentPlayerSetFovY(f32 fovy)
{
g_Vars.currentplayer->fovy = fovy;
}
GLOBAL_ASM(
glabel func0f128ae4
/* f128ae4: 3c0e800a */ lui $t6,0x800a
/* f128ae8: 8dcea244 */ lw $t6,-0x5dbc($t6)
/* f128aec: 03e00008 */ jr $ra
/* f128af0: e5cc1858 */ swc1 $f12,0x1858($t6)
);
void currentPlayerSetAspectRatio(f32 aspect)
{
g_Vars.currentplayer->aspect = aspect;
}
GLOBAL_ASM(
glabel func0f128af4

4
src/include/game/game_127910.h
View File

@ -11,8 +11,8 @@ void currentPlayerCalculateAiBuddyNums(void);
u32 propGetPlayerNum(struct prop *prop);
void func0f128a9c(u32 arg0, u32 arg2);
u32 func0f128ab8(void);
u32 func0f128ad4(void);
u32 func0f128ae4(void);
void currentPlayerSetFovY(f32 fovy);
void currentPlayerSetAspectRatio(f32 aspect);
s32 func0f128af4(s32 arg0);
u32 func0f128cf0(void);
u32 func0f128d20(void);

7
src/include/types.h
View File

@ -1378,7 +1378,8 @@ struct player {
/*0x0624*/ u32 unk0624;
/*0x0628*/ u32 unk0628;
/*0x062c*/ u32 unk062c;
/*0x0630*/ u32 unk0630;
/*0x0630*/ u16 unk0630;
/*0x0632*/ u16 unk0632;
/*0x0634*/ u32 unk0634;
/*0x0638*/ u8 unk0638;
/*0x063c*/ u32 unk063c;
@ -2535,8 +2536,8 @@ struct player {
/*0x1848*/ u32 unk1848;
/*0x184c*/ u32 unk184c;
/*0x1850*/ u32 unk1850;
/*0x1854*/ u32 unk1854;
/*0x1858*/ u32 unk1858;
/*0x1854*/ f32 fovy;
/*0x1858*/ f32 aspect;
/*0x185c*/ u32 flags;
/*0x1860*/ u32 unk1860;
/*0x1864*/ struct invitem *weapons; // circular linked list