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

Decompile viSetFovY

This commit is contained in:
Ryan Dwyer 2020-06-15 19:50:41 +10:00
parent a2860cae1e
commit a93db4ceb9
4 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/game_0b63b0.c
View File

@ -4905,7 +4905,7 @@ glabel var7f1ad5dc
/* f0ba78c: 27a60184 */ addiu $a2,$sp,0x184
/* f0ba790: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0ba794: c7ac0114 */ lwc1 $f12,0x114($sp)
/* f0ba798: 0c002f4c */ jal func0000bd30
/* f0ba798: 0c002f4c */ jal viSetFovY
/* f0ba79c: c7ac0114 */ lwc1 $f12,0x114($sp)
/* f0ba7a0: 8e6f0290 */ lw $t7,0x290($s3)
/* f0ba7a4: 3c0141f0 */ lui $at,0x41f0
@ -5116,12 +5116,12 @@ void currentPlayerUpdateZoom(void)
}
currentPlayerSetFovY(g_Vars.currentplayer->zoominfovy);
func0000bd30(g_Vars.currentplayer->zoominfovy);
viSetFovY(g_Vars.currentplayer->zoominfovy);
if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_0) {
fovy = currentPlayerGetTeleportFovY();
currentPlayerSetFovY(fovy);
func0000bd30(fovy);
viSetFovY(fovy);
}
if (g_Vars.currentplayer->zoominfovy >= 15) {
@ -8060,7 +8060,7 @@ glabel var7f1ad67c
/* f0bd740: e7a00018 */ swc1 $f0,0x18($sp)
/* f0bd744: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0bd748: 46000306 */ mov.s $f12,$f0
/* f0bd74c: 0c002f4c */ jal func0000bd30
/* f0bd74c: 0c002f4c */ jal viSetFovY
/* f0bd750: c7ac0018 */ lwc1 $f12,0x18($sp)
/* f0bd754: 8fbf0014 */ lw $ra,0x14($sp)
.L0f0bd758:
@ -8797,7 +8797,7 @@ glabel var7f1ad6ac
/* f0be158: 4481a000 */ mtc1 $at,$f20
/* f0be15c: 0fc4a2b5 */ jal currentPlayerSetFovY
/* f0be160: 4600a306 */ mov.s $f12,$f20
/* f0be164: 0c002f4c */ jal func0000bd30
/* f0be164: 0c002f4c */ jal viSetFovY
/* f0be168: 4600a306 */ mov.s $f12,$f20
/* f0be16c: 8e700284 */ lw $s0,0x284($s3)
/* f0be170: 8e190480 */ lw $t9,0x480($s0)
@ -10787,7 +10787,7 @@ glabel var7f1ad6ac
// && g_Vars.currentplayer->eyespy->active) {
// struct coord sp776;
// currentPlayerSetFovY(120);
// func0000bd30(120);
// viSetFovY(120);
// sp776.x = g_Vars.currentplayer->eyespy->prop->pos.x;
// sp776.y = g_Vars.currentplayer->eyespy->prop->pos.y;
// sp776.z = g_Vars.currentplayer->eyespy->prop->pos.z;

12
src/game/title.c
View File

@ -422,7 +422,7 @@ void titleExitLegal(void)
void titleTickLegal(void)
{
func0000bd30(60);
viSetFovY(60);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);
@ -1307,7 +1307,7 @@ void titleExitPdLogo(void)
void titleTickPdLogo(void)
{
func0000bd30(46);
viSetFovY(46);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);
@ -3301,7 +3301,7 @@ void titleExitRarePresents(void)
void titleTickRarePresents(void)
{
func0000bd30(60);
viSetFovY(60);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);
@ -3557,7 +3557,7 @@ u32 var800628c4 = 0x00000000;
void titleTickNintendoLogo(void)
{
func0000bd30(60);
viSetFovY(60);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);
@ -3951,7 +3951,7 @@ u32 var8006293c = 0x00000000;
void titleTickRareLogo(void)
{
func0000bd30(60);
viSetFovY(60);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);
@ -4474,7 +4474,7 @@ void titleExitNoController(void)
void titleTickNoController(void)
{
func0000bd30(60);
viSetFovY(60);
func0000bd7c(1.33333333f);
func0000be84(100, 10000);
viSetUseZBuf(false);

2
src/include/lib/lib_09660.h
View File

@ -48,7 +48,7 @@ void viSetViewPosition(s16 left, s16 top);
s16 viGetViewLeft(void);
s16 viGetViewTop(void);
void viSetUseZBuf(bool use);
void func0000bd30(f32 fovy);
void viSetFovY(f32 fovy);
void func0000bd7c(f32 arg0);
u32 func0000bdc8(void);
void func0000bdd8(f32 arg0, f32 arg1, s16 viewx, s16 viewy);

29
src/lib/lib_09660.c
View File

@ -2789,28 +2789,13 @@ void viSetUseZBuf(bool use)
g_ViData->usezbuf = use;
}
GLOBAL_ASM(
glabel func0000bd30
/* bd30: 27bdffe8 */ addiu $sp,$sp,-24
/* bd34: 3c038006 */ lui $v1,%hi(g_ViData)
/* bd38: 2463d594 */ addiu $v1,$v1,%lo(g_ViData)
/* bd3c: e7ac0018 */ swc1 $f12,0x18($sp)
/* bd40: c7a40018 */ lwc1 $f4,0x18($sp)
/* bd44: 8c6e0000 */ lw $t6,0x0($v1)
/* bd48: afbf0014 */ sw $ra,0x14($sp)
/* bd4c: e5c40008 */ swc1 $f4,0x8($t6)
/* bd50: 8c620000 */ lw $v0,0x0($v1)
/* bd54: c44c0010 */ lwc1 $f12,0x10($v0)
/* bd58: c44e0008 */ lwc1 $f14,0x8($v0)
/* bd5c: 0fc2d266 */ jal currentPlayerSetPerspective
/* bd60: 8c46000c */ lw $a2,0xc($v0)
/* bd64: 0fc2d289 */ jal currentPlayerSetCameraScale
/* bd68: 00000000 */ sll $zero,$zero,0x0
/* bd6c: 8fbf0014 */ lw $ra,0x14($sp)
/* bd70: 27bd0018 */ addiu $sp,$sp,0x18
/* bd74: 03e00008 */ jr $ra
/* bd78: 00000000 */ sll $zero,$zero,0x0
);
void viSetFovY(f32 fovy)
{
g_ViData->fovy = fovy;
currentPlayerSetPerspective(g_ViData->znear, g_ViData->fovy, g_ViData->aspect);
currentPlayerSetCameraScale();
}
GLOBAL_ASM(
glabel func0000bd7c