diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 453c58872..a8d186a4a 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -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) diff --git a/src/game/game_1668e0.c b/src/game/game_1668e0.c index 311ab2ebf..e991b53ce 100644 --- a/src/game/game_1668e0.c +++ b/src/game/game_1668e0.c @@ -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 diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index 5ae6154f6..531a4ace5 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -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); diff --git a/src/include/game/game_1668e0.h b/src/include/game/game_1668e0.h index a4862472a..3c5fa3dee 100644 --- a/src/include/game/game_1668e0.h +++ b/src/include/game/game_1668e0.h @@ -3,7 +3,7 @@ #include #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 diff --git a/src/include/types.h b/src/include/types.h index 15484e37f..3a5fcfbc0 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -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;