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

Decompile currentPlayerSetLastRoomForOffset

This commit is contained in:
Ryan Dwyer 2020-04-05 23:37:00 +10:00
parent 43d2f40d8c
commit af4ecb6e88
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/game_0b63b0.c
View File

@ -10873,15 +10873,15 @@ glabel var7f1ad6ac
/* f0bfbb4: 27bd0330 */ addiu $sp,$sp,0x330
);
void currentPlayerSetGlobalDrawWorldOffset(s32 arg0)
void currentPlayerSetGlobalDrawWorldOffset(s32 room)
{
func0f166df0(arg0, &g_Vars.currentplayer->globaldrawworldoffset);
func0f166df0(room, &g_Vars.currentplayer->globaldrawworldoffset);
g_Vars.currentplayer->globaldrawworldbgoffset.x = g_Vars.currentplayer->globaldrawworldoffset.x;
g_Vars.currentplayer->globaldrawworldbgoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y;
g_Vars.currentplayer->globaldrawworldbgoffset.z = g_Vars.currentplayer->globaldrawworldoffset.z;
func0f1668e0(arg0);
currentPlayerSetLastRoomForOffset(room);
}
void currentPlayerSetGlobalDrawCameraOffset(void)

11
src/game/game_1668e0.c
View File

@ -12,13 +12,10 @@
#include "lib/lib_159b0.h"
#include "types.h"
GLOBAL_ASM(
glabel func0f1668e0
/* f1668e0: 3c0e800a */ lui $t6,%hi(g_Vars+0x284)
/* f1668e4: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6)
/* f1668e8: 03e00008 */ jr $ra
/* f1668ec: adc41700 */ sw $a0,0x1700($t6)
);
void currentPlayerSetLastRoomForOffset(s32 room)
{
g_Vars.currentplayer->lastroomforoffset = room;
}
GLOBAL_ASM(
glabel func0f1668f0

2
src/include/game/game_0b63b0.h
View File

@ -104,7 +104,7 @@ void func0f0bb57c(f32 arg0, f32 arg1);
void optionsSetHiRes(bool enable);
void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist);
void func0f0bd4a8(u32 arg0);
void currentPlayerSetGlobalDrawWorldOffset(s32 arg0);
void currentPlayerSetGlobalDrawWorldOffset(s32 room);
void currentPlayerSetGlobalDrawCameraOffset(void);
bool currentPlayerGet00fc(void);
void currentPlayerSetCameraMode(s32 mode);

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

@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void func0f1668e0(s32 arg0);
void currentPlayerSetLastRoomForOffset(s32 room);
u32 func0f1668f0(void);
u32 func0f16692c(void);
u32 func0f16696c(void);
@ -12,6 +12,6 @@ u32 func0f166a6c(void);
u32 func0f166c20(void);
u32 func0f166d7c(void);
u32 func0f166dd0(void);
void func0f166df0(s32 arg0, struct coord *globaldrawworldoffset);
void func0f166df0(s32 room, struct coord *globaldrawworldoffset);
#endif

2
src/include/types.h
View File

@ -2554,7 +2554,7 @@ struct player {
/*0x16ec*/ u32 unk16ec;
/*0x16f0*/ u32 unk16f0;
/*0x16f4*/ f32 gunzoomfovs[3];
/*0x1700*/ u32 unk1700;
/*0x1700*/ u32 lastroomforoffset;
/*0x1704*/ f32 c_screenwidth;
/*0x1708*/ f32 c_screenheight;
/*0x170c*/ f32 c_screenleft;