From 583796e7aa473337ca488530147579f814b17e85 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 9 Feb 2022 20:23:06 +1000 Subject: [PATCH] Rename game_0b69d0.c to player.c --- ld/gamefiles.ntsc-beta.inc | 2 +- ld/gamefiles.ntsc-final.inc | 2 +- ld/gamefiles.pal-final.inc | 2 +- src/game/bg.c | 8 +- src/game/bondbike.c | 8 +- src/game/bondeyespy.c | 6 +- src/game/bondgrab.c | 14 +- src/game/bondgun.c | 26 +- src/game/bondmove.c | 10 +- src/game/bondwalk.c | 42 +-- src/game/bossfile.c | 2 +- src/game/bot.c | 2 +- src/game/chr/chr.c | 2 +- src/game/chr/chraction.c | 14 +- src/game/chr/chraicommands.c | 26 +- src/game/credits.c | 4 +- src/game/dlights.c | 2 +- src/game/endscreen.c | 14 +- src/game/filelist.c | 2 +- src/game/game_011110.c | 56 +-- src/game/game_01bea0.c | 8 +- src/game/game_0b0fd0.c | 2 +- src/game/game_127910.c | 10 +- src/game/game_176080.c | 16 +- src/game/gamefile.c | 14 +- src/game/healthbar.c | 4 +- src/game/hudmsg.c | 22 +- src/game/lv.c | 76 ++-- src/game/mainmenu.c | 4 +- src/game/menu.c | 6 +- src/game/mplayer/mplayer.c | 6 +- src/game/mplayer/scenarios.c | 2 +- src/game/mpstats.c | 6 +- src/game/{game_0b69d0.c => player.c} | 544 ++++++++++++++------------- src/game/prop.c | 4 +- src/game/propobj.c | 24 +- src/game/training/training.c | 8 +- src/include/constants.h | 14 +- src/include/data.h | 2 +- src/include/game/game_0b69d0.h | 110 ------ src/include/game/player.h | 110 ++++++ src/lib/gvars.c | 2 +- src/lib/vi.c | 6 +- 43 files changed, 623 insertions(+), 621 deletions(-) rename src/game/{game_0b69d0.c => player.c} (93%) delete mode 100644 src/include/game/game_0b69d0.h create mode 100644 src/include/game/player.h diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc index 8368b0f42..8c8ebcc34 100644 --- a/ld/gamefiles.ntsc-beta.inc +++ b/ld/gamefiles.ntsc-beta.inc @@ -106,7 +106,7 @@ build/ROMID/game/game_0b3350.o (section); \ build/ROMID/game/game_0b4950.o (section); \ build/ROMID/game/game_0b63b0.o (section); \ - build/ROMID/game/game_0b69d0.o (section); \ + build/ROMID/game/player.o (section); \ build/ROMID/game/game_0c33f0.o (section); \ build/ROMID/game/bondcutscene.o (section); \ build/ROMID/game/bondwalk.o (section); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index f189aeff2..fddb57ab4 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -106,7 +106,7 @@ build/ROMID/game/game_0b3350.o (section); \ build/ROMID/game/game_0b4950.o (section); \ build/ROMID/game/game_0b63b0.o (section); \ - build/ROMID/game/game_0b69d0.o (section); \ + build/ROMID/game/player.o (section); \ build/ROMID/game/game_0c33f0.o (section); \ build/ROMID/game/bondcutscene.o (section); \ build/ROMID/game/bondwalk.o (section); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index f189aeff2..fddb57ab4 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -106,7 +106,7 @@ build/ROMID/game/game_0b3350.o (section); \ build/ROMID/game/game_0b4950.o (section); \ build/ROMID/game/game_0b63b0.o (section); \ - build/ROMID/game/game_0b69d0.o (section); \ + build/ROMID/game/player.o (section); \ build/ROMID/game/game_0c33f0.o (section); \ build/ROMID/game/bondcutscene.o (section); \ build/ROMID/game/bondwalk.o (section); \ diff --git a/src/game/bg.c b/src/game/bg.c index 21c415d70..ae8302645 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -11,7 +11,7 @@ #include "game/bondgun.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_11f000.h" #include "game/sky.h" #include "game/game_13b670.h" @@ -2641,7 +2641,7 @@ Gfx *bgRenderScene(Gfx *gdl) gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1758()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = currentPlayerLoadMatrix(gdl); + gdl = playerLoadMatrix(gdl); gdl = gfxConsiderDisableFog(gdl); gdl = func0f13687c(gdl); gdl = func0f153780(gdl); @@ -3079,7 +3079,7 @@ glabel bgRenderScene /* f15513c: 0c013100 */ jal osVirtualToPhysical /* f155140: 00402025 */ or $a0,$v0,$zero /* f155144: ae020004 */ sw $v0,0x4($s0) -/* f155148: 0fc303b1 */ jal currentPlayerLoadMatrix +/* f155148: 0fc303b1 */ jal playerLoadMatrix /* f15514c: 02202025 */ or $a0,$s1,$zero /* f155150: 0fc583b2 */ jal gfxConsiderDisableFog /* f155154: 00402025 */ or $a0,$v0,$zero @@ -7980,7 +7980,7 @@ Gfx *bgRender(Gfx *gdl) gSPMatrix(gdl++, var80092870, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = currentPlayerLoadMatrix(gdl); + gdl = playerLoadMatrix(gdl); return gdl; } diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 3c5599a90..4229b5175 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -10,7 +10,7 @@ #include "game/game_096ca0.h" #include "game/bondgun.h" #include "game/game_0b3350.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/bondhead.h" #include "game/lv.h" #include "game/objectives.h" @@ -115,7 +115,7 @@ void bbikeTryDismountAngle(f32 relativeangle, f32 distance) bike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; angle = hoverpropGetTurnAngle(&bike->base); - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); distance += width + 10; @@ -1278,7 +1278,7 @@ void bbikeUpdateVertical(struct coord *arg0) g_Vars.currentplayer->vv_manground = g_Vars.currentplayer->prop->pos.y - g_Vars.currentplayer->vv_height; if (g_Vars.currentplayer->floorflags & TILEFLAG_DIE) { - currentPlayerDie(true); + playerDie(true); } bmoveUpdateVerta(); @@ -1766,7 +1766,7 @@ void bbikeTick(void) bgun0f09d8dc(breathing, 0, sp70, 0.0f, g_Vars.currentplayer->speedsideways); bgunSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f); - currentPlayerUpdatePerimInfo(); + playerUpdatePerimInfo(); bmove0f0cb8c4(g_Vars.currentplayer); objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]); doorsCheckAutomatic(); diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 2171e91c8..dc17232f8 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -6,7 +6,7 @@ #include "game/prop.h" #include "game/game_092610.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/hudmsg.h" #include "game/inventory/inventory.h" #include "game/mplayer/ingame.h" @@ -4529,7 +4529,7 @@ glabel var7f1adb00 /* f0ce8a0: 8d380314 */ lw $t8,0x314($t1) /* f0ce8a4: 17000008 */ bnez $t8,.NB0f0ce8c8 /* f0ce8a8: 00000000 */ sll $zero,$zero,0x0 -/* f0ce8ac: 0fc2e2f8 */ jal currentPlayerPause +/* f0ce8ac: 0fc2e2f8 */ jal playerPause /* f0ce8b0: 24040002 */ addiu $a0,$zero,0x2 /* f0ce8b4: 3c09800a */ lui $t1,0x800a /* f0ce8b8: 2529e6c0 */ addiu $t1,$t1,-6464 @@ -5777,7 +5777,7 @@ glabel var7f1adb00 // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED // && (c1buttons & START_BUTTON)) { // if (!g_Vars.normmplayerisrunning) { -// currentPlayerPause(MENUROOT_MAINMENU); +// playerPause(MENUROOT_MAINMENU); // } else { // mpPushPauseDialog(); // } diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 786a1415a..5481cbe79 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -8,7 +8,7 @@ #include "game/prop.h" #include "game/game_095320.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/bondhead.h" #include "game/propobj.h" #include "bss.h" @@ -804,7 +804,7 @@ bool bgrabTryMoveUpwards(f32 y) newpos.y = g_Vars.currentplayer->prop->pos.y + y; newpos.z = g_Vars.currentplayer->prop->pos.z; - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &newpos, rooms); bmove0f0cb79c(g_Vars.currentplayer, &newpos, rooms); propSetPerimEnabled(g_Vars.currentplayer->prop, false); @@ -874,7 +874,7 @@ glabel var7f1ad9c4 /* f0cd1e4: 27a600c4 */ addiu $a2,$sp,0xc4 /* f0cd1e8: 27a500bc */ addiu $a1,$sp,0xbc /* f0cd1ec: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f0cd1f0: 0fc3082e */ jal propPlayerGetBbox +/* f0cd1f0: 0fc3082e */ jal playerGetBbox /* f0cd1f4: 8de400bc */ lw $a0,0xbc($t7) /* f0cd1f8: 8e180284 */ lw $t8,0x284($s0) /* f0cd1fc: 00002825 */ or $a1,$zero,$zero @@ -1432,7 +1432,7 @@ glabel var7f1ad9c4 /* f0cd1e4: 27a600c4 */ addiu $a2,$sp,0xc4 /* f0cd1e8: 27a500bc */ addiu $a1,$sp,0xbc /* f0cd1ec: 27a700c0 */ addiu $a3,$sp,0xc0 -/* f0cd1f0: 0fc3082e */ jal propPlayerGetBbox +/* f0cd1f0: 0fc3082e */ jal playerGetBbox /* f0cd1f4: 8de400bc */ lw $a0,0xbc($t7) /* f0cd1f8: 8e180284 */ lw $t8,0x284($s0) /* f0cd1fc: 00002825 */ or $a1,$zero,$zero @@ -1989,7 +1989,7 @@ glabel var7f1ad9c4 /* f0caa10: 27a600bc */ addiu $a2,$sp,0xbc /* f0caa14: 27a500b4 */ addiu $a1,$sp,0xb4 /* f0caa18: 27a700b8 */ addiu $a3,$sp,0xb8 -/* f0caa1c: 0fc2ff20 */ jal propPlayerGetBbox +/* f0caa1c: 0fc2ff20 */ jal playerGetBbox /* f0caa20: 8de400bc */ lw $a0,0xbc($t7) /* f0caa24: 8e180284 */ lw $t8,0x284($s0) /* f0caa28: 00002825 */ or $a1,$zero,$zero @@ -3258,7 +3258,7 @@ void bgrabUpdateVertical(void) if ((g_Vars.currentplayer->floorflags & TILEFLAG_DIE) && g_Vars.currentplayer->vv_manground - 20.0f < g_Vars.currentplayer->vv_ground) { - currentPlayerDie(true); + playerDie(true); } } @@ -4217,7 +4217,7 @@ void bgrabTick(void) bmove0f0cb8c4(g_Vars.currentplayer); objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]); bmove0f0cc19c(&g_Vars.currentplayer->prop->pos); - currentPlayerUpdatePerimInfo(); + playerUpdatePerimInfo(); doorsCheckAutomatic(); if (g_Vars.currentplayer->grabbedprop) { diff --git a/src/game/bondgun.c b/src/game/bondgun.c index e99c2aded..f7bbfaad7 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -19,7 +19,7 @@ #include "game/game_0b28d0.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_0c33f0.h" #include "game/gfxmemory.h" #include "game/sight.h" @@ -9369,7 +9369,7 @@ bool bgun0f09e004(s32 newowner) if (newowner == GUNMEMOWNER_1 && var8009dfc0 != 0) { unlock = true; - func0f0b9538(); + player0f0b9538(); } break; case GUNMEMOWNER_3: @@ -9887,7 +9887,7 @@ glabel bgun0f09e4e0 /* f09e544: 14600142 */ bnez $v1,.L0f09ea50 /* f09e548: 246dffff */ addiu $t5,$v1,-1 /* f09e54c: afa200a4 */ sw $v0,0xa4($sp) -/* f09e550: 0fc2e1cb */ jal currentPlayerChooseBodyAndHead +/* f09e550: 0fc2e1cb */ jal playerChooseBodyAndHead /* f09e554: 00003025 */ or $a2,$zero,$zero /* f09e558: 8faf0068 */ lw $t7,0x68($sp) /* f09e55c: 3c198009 */ lui $t9,%hi(g_Is4Mb) @@ -10294,7 +10294,7 @@ glabel bgun0f09e4e0 /* f09c3f0: 1460013c */ bnez $v1,.NB0f09c8e4 /* f09c3f4: 246dffff */ addiu $t5,$v1,-1 /* f09c3f8: afa200a4 */ sw $v0,0xa4($sp) -/* f09c3fc: 0fc2d911 */ jal currentPlayerChooseBodyAndHead +/* f09c3fc: 0fc2d911 */ jal playerChooseBodyAndHead /* f09c400: 00003025 */ or $a2,$zero,$zero /* f09c404: 8faf0068 */ lw $t7,0x68($sp) /* f09c408: 3c198009 */ lui $t9,0x8009 @@ -12570,7 +12570,7 @@ glabel var7f1ac740 /* f0a0614: 31ac0800 */ andi $t4,$t5,0x800 /* f0a0618: 51800004 */ beqzl $t4,.PF0f0a062c /* f0a061c: 8e050048 */ lw $a1,0x48($s0) -/* f0a0620: 0fc2f689 */ jal currentPlayerLaunchSlayerRocket +/* f0a0620: 0fc2f689 */ jal playerLaunchSlayerRocket /* f0a0624: 02002025 */ move $a0,$s0 /* f0a0628: 8e050048 */ lw $a1,0x48($s0) .PF0f0a062c: @@ -13197,7 +13197,7 @@ glabel var7f1ac740 /* f0a02f0: 318b0800 */ andi $t3,$t4,0x800 /* f0a02f4: 51600004 */ beqzl $t3,.L0f0a0308 /* f0a02f8: 8e050048 */ lw $a1,0x48($s0) -/* f0a02fc: 0fc2f52a */ jal currentPlayerLaunchSlayerRocket +/* f0a02fc: 0fc2f52a */ jal playerLaunchSlayerRocket /* f0a0300: 02002025 */ or $a0,$s0,$zero /* f0a0304: 8e050048 */ lw $a1,0x48($s0) .L0f0a0308: @@ -13797,7 +13797,7 @@ glabel var7f1ac740 /* f09e0fc: 310a0800 */ andi $t2,$t0,0x800 /* f09e100: 51400004 */ beqzl $t2,.NB0f09e114 /* f09e104: 8e050048 */ lw $a1,0x48($s0) -/* f09e108: 0fc2ec44 */ jal currentPlayerLaunchSlayerRocket +/* f09e108: 0fc2ec44 */ jal playerLaunchSlayerRocket /* f09e10c: 02002025 */ or $a0,$s0,$zero /* f09e110: 8e050048 */ lw $a1,0x48($s0) .NB0f09e114: @@ -24790,7 +24790,7 @@ glabel var7f1aca90 /* f0a732c: 24010001 */ addiu $at,$zero,0x1 /* f0a7330: 14410008 */ bne $v0,$at,.L0f0a7354 /* f0a7334: 00000000 */ nop -/* f0a7338: 0fc2f4d6 */ jal func0f0bd358 +/* f0a7338: 0fc2f4d6 */ jal player0f0bd358 /* f0a733c: 00000000 */ nop /* f0a7340: 3c017f1b */ lui $at,%hi(var7f1aca8c) /* f0a7344: c430ca8c */ lwc1 $f16,%lo(var7f1aca8c)($at) @@ -24798,7 +24798,7 @@ glabel var7f1aca90 /* f0a734c: 10000005 */ b .L0f0a7364 /* f0a7350: 44061000 */ mfc1 $a2,$f2 .L0f0a7354: -/* f0a7354: 0fc2f4d6 */ jal func0f0bd358 +/* f0a7354: 0fc2f4d6 */ jal player0f0bd358 /* f0a7358: 00000000 */ nop /* f0a735c: 46000086 */ mov.s $f2,$f0 /* f0a7360: 44061000 */ mfc1 $a2,$f2 @@ -25631,7 +25631,7 @@ glabel var7f1aca90 /* f0a732c: 24010001 */ addiu $at,$zero,0x1 /* f0a7330: 14410008 */ bne $v0,$at,.L0f0a7354 /* f0a7334: 00000000 */ nop -/* f0a7338: 0fc2f4d6 */ jal func0f0bd358 +/* f0a7338: 0fc2f4d6 */ jal player0f0bd358 /* f0a733c: 00000000 */ nop /* f0a7340: 3c017f1b */ lui $at,%hi(var7f1aca8c) /* f0a7344: c430ca8c */ lwc1 $f16,%lo(var7f1aca8c)($at) @@ -25639,7 +25639,7 @@ glabel var7f1aca90 /* f0a734c: 10000005 */ b .L0f0a7364 /* f0a7350: 44061000 */ mfc1 $a2,$f2 .L0f0a7354: -/* f0a7354: 0fc2f4d6 */ jal func0f0bd358 +/* f0a7354: 0fc2f4d6 */ jal player0f0bd358 /* f0a7358: 00000000 */ nop /* f0a735c: 46000086 */ mov.s $f2,$f0 /* f0a7360: 44061000 */ mfc1 $a2,$f2 @@ -26472,7 +26472,7 @@ glabel var7f1aca90 /* f0a5078: 24010001 */ addiu $at,$zero,0x1 /* f0a507c: 14410008 */ bne $v0,$at,.NB0f0a50a0 /* f0a5080: 00000000 */ sll $zero,$zero,0x0 -/* f0a5084: 0fc2ebf0 */ jal func0f0bd358 +/* f0a5084: 0fc2ebf0 */ jal player0f0bd358 /* f0a5088: 00000000 */ sll $zero,$zero,0x0 /* f0a508c: 3c017f1a */ lui $at,0x7f1a /* f0a5090: c4306dd4 */ lwc1 $f16,0x6dd4($at) @@ -26480,7 +26480,7 @@ glabel var7f1aca90 /* f0a5098: 10000005 */ beqz $zero,.NB0f0a50b0 /* f0a509c: 44061000 */ mfc1 $a2,$f2 .NB0f0a50a0: -/* f0a50a0: 0fc2ebf0 */ jal func0f0bd358 +/* f0a50a0: 0fc2ebf0 */ jal player0f0bd358 /* f0a50a4: 00000000 */ sll $zero,$zero,0x0 /* f0a50a8: 46000086 */ mov.s $f2,$f0 /* f0a50ac: 44061000 */ mfc1 $a2,$f2 diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 342a96172..1a6ef03f0 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -15,7 +15,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/bondcutscene.h" #include "game/bondhead.h" #include "game/game_127910.h" @@ -412,7 +412,7 @@ f32 bmoveCalculateLookahead(void) return result; } - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); sp100.x = g_Vars.currentplayer->bond2.unk00.x; sp100.y = g_Vars.currentplayer->bond2.unk00.y; @@ -688,7 +688,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (c1buttonsthisframe & START_BUTTON)) { if (g_Vars.mplayerisrunning == false) { if (g_Vars.lvframenum > 15) { - currentPlayerPause(MENUROOT_MAINMENU); + playerPause(MENUROOT_MAINMENU); } } else { mpPushPauseDialog(); @@ -1530,8 +1530,8 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i zoomfov = 60; } - func0f0ba8b0(zoomfov); - currentPlayerUpdateZoom(); + playerTweenFovY(zoomfov); + playerUpdateZoom(); } bmoveApplyMoveData(&movedata); diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index e570f3463..147ce22c0 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -11,7 +11,7 @@ #include "game/game_092610.h" #include "game/game_095320.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/inventory/inventory.h" #include "game/bondhead.h" #include "game/game_127910.h" @@ -401,7 +401,7 @@ s32 bwalkTryMoveUpwards(f32 amount) types = g_Vars.bondcollisions ? CDTYPE_ALL : CDTYPE_BG; - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &newpos, rooms); bmove0f0cb79c(g_Vars.currentplayer, &newpos, rooms); propSetPerimEnabled(g_Vars.currentplayer->prop, false); @@ -465,7 +465,7 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, types = g_Vars.bondcollisions ? checktypes : CDTYPE_BG; - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); width += extrawidth; func0f065dfc(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, @@ -629,7 +629,7 @@ glabel var7f1a7ad8nb .NB0f0c1b0c: /* f0c1b0c: 8e0d0284 */ lw $t5,0x284($s0) /* f0c1b10: 27a70058 */ addiu $a3,$sp,0x58 -/* f0c1b14: 0fc2ff20 */ jal propPlayerGetBbox +/* f0c1b14: 0fc2ff20 */ jal playerGetBbox /* f0c1b18: 8da400bc */ lw $a0,0xbc($t5) /* f0c1b1c: c7a40054 */ lwc1 $f4,0x54($sp) /* f0c1b20: c7a600c4 */ lwc1 $f6,0xc4($sp) @@ -2118,7 +2118,7 @@ s32 bwalk0f0c4a5c(struct coord *arg0, struct coord *arg1, struct coord *arg2, s3 f32 tmp; f32 width; - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); sp34.x = arg1->x - (g_Vars.currentplayer->prop->pos.x + arg0->f[0]); sp34.z = arg1->z - (g_Vars.currentplayer->prop->pos.z + arg0->f[2]); @@ -2260,7 +2260,7 @@ void bwalkUpdateVertical(void) f32 newfallspeed; struct prop *prop; - propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); + playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); // Maybe reset counter-op's width - not sure why // Maybe it gets set to 0 when they die? @@ -2432,7 +2432,7 @@ void bwalkUpdateVertical(void) && g_Vars.currentplayer->vv_manground - 20.0f < g_Vars.currentplayer->vv_ground && g_Vars.currentplayer->onladder == false && onladder2 == false) { - currentPlayerDie(true); + playerDie(true); } } @@ -2475,7 +2475,7 @@ void bwalkUpdateVertical(void) } else { if (g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > PALDOWN(240)) { // Have been falling for 4 seconds - currentPlayerDie(true); + playerDie(true); } } } else { @@ -2498,7 +2498,7 @@ void bwalkUpdateVertical(void) setCurrentPlayerNum(propGetPlayerNum(prop)); if (g_Vars.currentplayer->inlift) { - currentPlayerDieByShooter(prevplayernum, true); + playerDieByShooter(prevplayernum, true); } setCurrentPlayerNum(prevplayernum); @@ -2513,7 +2513,7 @@ void bwalkUpdateVertical(void) } if (g_Vars.currentplayer->vv_manground <= -30000) { - currentPlayerDie(true); + playerDie(true); } } } else { @@ -2523,7 +2523,7 @@ void bwalkUpdateVertical(void) } if (g_Vars.currentplayer->vv_manground <= -30000) { - currentPlayerDie(true); + playerDie(true); } } @@ -2706,7 +2706,7 @@ glabel var7f1a7b20nb /* f0c2bf8: 27a500e4 */ addiu $a1,$sp,0xe4 /* f0c2bfc: 27a600e0 */ addiu $a2,$sp,0xe0 /* f0c2c00: 27a700dc */ addiu $a3,$sp,0xdc -/* f0c2c04: 0fc2ff20 */ jal propPlayerGetBbox +/* f0c2c04: 0fc2ff20 */ jal playerGetBbox /* f0c2c08: 8dc400bc */ lw $a0,0xbc($t6) /* f0c2c0c: 3c017f1a */ lui $at,0x7f1a /* f0c2c10: c4267adc */ lwc1 $f6,0x7adc($at) @@ -3087,7 +3087,7 @@ glabel var7f1a7b20nb /* f0c3194: 4602003c */ c.lt.s $f0,$f2 /* f0c3198: 57000007 */ bnezl $t8,.NB0f0c31b8 /* f0c319c: 4602003c */ c.lt.s $f0,$f2 -/* f0c31a0: 0fc2fbde */ jal currentPlayerDie +/* f0c31a0: 0fc2fbde */ jal playerDie /* f0c31a4: 24040001 */ addiu $a0,$zero,0x1 /* f0c31a8: 8e020284 */ lw $v0,0x284($s0) /* f0c31ac: c4420074 */ lwc1 $f2,0x74($v0) @@ -3201,7 +3201,7 @@ glabel var7f1a7b20nb /* f0c3348: 2b0100f1 */ slti $at,$t8,0xf1 /* f0c334c: 5420002c */ bnezl $at,.NB0f0c3400 /* f0c3350: c44e0080 */ lwc1 $f14,0x80($v0) -/* f0c3354: 0fc2fbde */ jal currentPlayerDie +/* f0c3354: 0fc2fbde */ jal playerDie /* f0c3358: afa300ec */ sw $v1,0xec($sp) /* f0c335c: 8fa300ec */ lw $v1,0xec($sp) /* f0c3360: 10000026 */ beqz $zero,.NB0f0c33fc @@ -3224,7 +3224,7 @@ glabel var7f1a7b20nb /* f0c339c: 00000000 */ sll $zero,$zero,0x0 /* f0c33a0: 45020017 */ bc1fl .NB0f0c3400 /* f0c33a4: c44e0080 */ lwc1 $f14,0x80($v0) -/* f0c33a8: 0fc2fbde */ jal currentPlayerDie +/* f0c33a8: 0fc2fbde */ jal playerDie /* f0c33ac: afa300ec */ sw $v1,0xec($sp) /* f0c33b0: 8fa300ec */ lw $v1,0xec($sp) /* f0c33b4: 10000011 */ beqz $zero,.NB0f0c33fc @@ -3243,7 +3243,7 @@ glabel var7f1a7b20nb /* f0c33e0: 00000000 */ sll $zero,$zero,0x0 /* f0c33e4: 45020006 */ bc1fl .NB0f0c3400 /* f0c33e8: c44e0080 */ lwc1 $f14,0x80($v0) -/* f0c33ec: 0fc2fbde */ jal currentPlayerDie +/* f0c33ec: 0fc2fbde */ jal playerDie /* f0c33f0: afa300ec */ sw $v1,0xec($sp) /* f0c33f4: 8fa300ec */ lw $v1,0xec($sp) /* f0c33f8: 8e020284 */ lw $v0,0x284($s0) @@ -4461,7 +4461,7 @@ glabel var7f1ad854 /* f0c77a8: e46a029c */ swc1 $f10,0x29c($v1) /* f0c77ac: 8c6400bc */ lw $a0,0xbc($v1) .PF0f0c77b0: -/* f0c77b0: 0fc30989 */ jal propPlayerGetBbox +/* f0c77b0: 0fc30989 */ jal playerGetBbox /* f0c77b4: e7a00074 */ swc1 $f0,0x74($sp) /* f0c77b8: 3c08800a */ lui $t0,0x800a /* f0c77bc: 3c017f1b */ lui $at,0x7f1b @@ -5512,7 +5512,7 @@ glabel var7f1ad854 /* f0c7210: e466029c */ swc1 $f6,0x29c($v1) /* f0c7214: 8c6400bc */ lw $a0,0xbc($v1) .L0f0c7218: -/* f0c7218: 0fc3082e */ jal propPlayerGetBbox +/* f0c7218: 0fc3082e */ jal playerGetBbox /* f0c721c: e7a00074 */ swc1 $f0,0x74($sp) /* f0c7220: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c7224: 3c017f1b */ lui $at,%hi(var7f1ad840) @@ -6515,7 +6515,7 @@ glabel var7f1ad854 /* f0c4adc: e466029c */ swc1 $f6,0x29c($v1) /* f0c4ae0: 8c6400bc */ lw $a0,0xbc($v1) .NB0f0c4ae4: -/* f0c4ae4: 0fc2ff20 */ jal propPlayerGetBbox +/* f0c4ae4: 0fc2ff20 */ jal playerGetBbox /* f0c4ae8: e7a00074 */ swc1 $f0,0x74($sp) /* f0c4aec: 3c08800a */ lui $t0,0x800a /* f0c4af0: 3c017f1a */ lui $at,0x7f1a @@ -7187,7 +7187,7 @@ u32 var80070e70 = 0x00000000; // spcc.z += sp74 * g_Vars.currentplayer->laddernormal.z; // g_Vars.currentplayer->ladderupdown = sp74 * 0.3f; // } else { -// propPlayerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); +// playerGetBbox(g_Vars.currentplayer->prop, &width, &ymax, &ymin); // // lVar2 = cd0002a13c(&g_Vars.currentplayer->prop->pos, // width * 1.1f, ymax - g_Vars.currentplayer->prop->pos.y, @@ -7381,6 +7381,6 @@ void bwalkTick(void) bmove0f0cc19c(&g_Vars.currentplayer->prop->pos); } - currentPlayerUpdatePerimInfo(); + playerUpdatePerimInfo(); doorsCheckAutomatic(); } diff --git a/src/game/bossfile.c b/src/game/bossfile.c index 0ff89bb48..79deaa90e 100644 --- a/src/game/bossfile.c +++ b/src/game/bossfile.c @@ -3,7 +3,7 @@ #include "constants.h" #include "game/camdraw.h" #include "game/cheats.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/bossfile.h" #include "game/bg.h" diff --git a/src/game/bot.c b/src/game/bot.c index e3cf79157..4b917a522 100644 --- a/src/game/bot.c +++ b/src/game/bot.c @@ -8,7 +8,7 @@ #include "game/atan2f.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_127910.h" #include "game/bg.h" #include "game/mplayer/setup.h" diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index a5dd25581..a7b664f1a 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -16,7 +16,7 @@ #include "game/game_0b28d0.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_0c33f0.h" #include "game/game_127910.h" #include "game/game_1291b0.h" diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index a38876b52..65d034428 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -19,7 +19,7 @@ #include "game/game_0b28d0.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/inventory/inventory.h" #include "game/game_127910.h" #include "game/explosions/explosions.h" @@ -4074,7 +4074,7 @@ void chrSetShield(struct chrdata *chr, f32 amount) if (playernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; setCurrentPlayerNum(playernum); - currentPlayerDisplayHealth(); + playerDisplayHealth(); g_Vars.currentplayerstats->armourcount += amount * 0.125f; setCurrentPlayerNum(prevplayernum); } @@ -4789,7 +4789,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } playerUpdateDamageStats(aprop, vprop, statsamount); - currentPlayerDisplayHealth(); + playerDisplayHealth(); if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_ONEHITKILLS)) { g_Vars.currentplayer->bondhealth = 0; @@ -4803,7 +4803,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (g_Vars.currentplayer->training == false && g_Vars.currentplayer->bondhealth <= 0) { - currentPlayerDieByShooter(aplayernum, false); + playerDieByShooter(aplayernum, false); chr->blurnumtimesdied++; } @@ -4827,15 +4827,15 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse g_Vars.currentplayer->bondshotspeed[2] += vector->z * boostscale; if (showdamage) { - currentPlayerDisplayDamage(); + playerDisplayDamage(); } if (showshield) { - currentPlayerDisplayShield(); + playerDisplayShield(); } if (g_Vars.normmplayerisrunning && aprop && aprop->type == PROPTYPE_PLAYER) { - currentPlayerCheckIfShotInBack(prevplayernum, vector->x, vector->z); + playerCheckIfShotInBack(prevplayernum, vector->x, vector->z); } } diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 7cfefff10..1f12bd1e7 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -19,7 +19,7 @@ #include "game/bondgun.h" #include "game/game_0b0fd0.h" #include "game/game_0b28d0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/hudmsg.h" #include "game/inventory/inventory.h" #include "game/game_127910.h" @@ -5269,7 +5269,7 @@ bool aiEndLevel(void) */ bool ai00dd(void) { - currentPlayerEndCutscene(); + playerEndCutscene(); g_Vars.aioffset += 2; return false; } @@ -5281,7 +5281,7 @@ bool aiWarpJoToPad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); - currentPlayerPrepareWarpToPad(pad_id); + playerPrepareWarpToPad(pad_id); g_Vars.aioffset += 4; @@ -5305,7 +5305,7 @@ bool aiSetCameraAnimation(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 anim_id = cmd[3] | (cmd[2] << 8); - cameraDoAnimation(anim_id); + playerStartCutscene(anim_id); if (g_Vars.currentplayer->haschrbody == false) { return true; @@ -5355,7 +5355,7 @@ bool aiIfCutsceneButtonPressed(void) bool ai0175(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - func0f0ba190(cmd[2]); + playerReorientForCutsceneStop(cmd[2]); g_Vars.aioffset += 3; return false; @@ -5541,7 +5541,7 @@ bool ai00df(void) if (cmdindex >= 0) { void *ptr = setupGetPtrToCommandByIndex(cmdindex + tag->cmdoffset); - currentPlayerPrepareWarpType2(ptr, cmd[4] | (cmd[3] << 8), cmd[6] | (cmd[5] << 8)); + playerPrepareWarpType2(ptr, cmd[4] | (cmd[3] << 8), cmd[6] | (cmd[5] << 8)); } } @@ -5736,8 +5736,8 @@ bool ai00e3(void) setCurrentPlayerNum(playernum); if (var8007074c != 2) { - currentPlayerSetFadeColour(0, 0, 0, 0); - currentPlayerSetFadeFrac(60, 1); + playerSetFadeColour(0, 0, 0, 0); + playerSetFadeFrac(60, 1); } setCurrentPlayerNum(prevplayernum); @@ -5760,8 +5760,8 @@ bool ai00e4(void) setCurrentPlayerNum(playernum); if (var8007074c != 2) { - currentPlayerSetFadeColour(0, 0, 0, 1); - currentPlayerSetFadeFrac(60, 0); + playerSetFadeColour(0, 0, 0, 1); + playerSetFadeFrac(60, 0); } } @@ -6017,7 +6017,7 @@ bool ai00f4(void) s16 e = cmd[11] | (cmd[10] << 8); s32 f = cmd[13] | (cmd[12] << 8); - currentPlayerPrepareWarpType3(f * M_BADTAU / 65536, c * M_BADTAU / 65536, a, b, e, d); + playerPrepareWarpType3(f * M_BADTAU / 65536, c * M_BADTAU / 65536, a, b, e, d); g_Vars.aioffset += 14; @@ -6206,7 +6206,7 @@ bool aiChrExplosions(void) u32 prevplayernum = g_Vars.currentplayernum; u32 playernum = propGetPlayerNum(chr->prop); setCurrentPlayerNum(playernum); - currentPlayerSurroundWithExplosions(0); + playerSurroundWithExplosions(0); setCurrentPlayerNum(prevplayernum); } @@ -10929,7 +10929,7 @@ bool aiPlayerAutoWalk(void) u32 prevplayernum = g_Vars.currentplayernum; u32 playernum = propGetPlayerNum(chr->prop); setCurrentPlayerNum(playernum); - currentPlayerAutoWalk(pad_id, cmd[5], cmd[6], cmd[7], cmd[8]); + playerAutoWalk(pad_id, cmd[5], cmd[6], cmd[7], cmd[8]); setCurrentPlayerNum(prevplayernum); } diff --git a/src/game/credits.c b/src/game/credits.c index 7dffd5ac0..b9b1bc986 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -3,7 +3,7 @@ #include "game/game_006900.h" #include "game/title.h" #include "game/game_0b3350.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/menugfx.h" #include "game/menu.h" @@ -6133,7 +6133,7 @@ void creditsInit(void) g_CreditsData->unk4204 = PALDOWN(1140); } - currentPlayerConfigureVi(); + playerConfigureVi(); } void creditsRequestAltTitle(void) diff --git a/src/game/dlights.c b/src/game/dlights.c index 75c346ef2..71c7ea0b6 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -5,7 +5,7 @@ #include "game/game_092610.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/smoke/smoke.h" #include "game/sparks/sparks.h" #include "game/bg.h" diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 7cef22566..12999e45d 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -7,7 +7,7 @@ #include "game/game_095320.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/menugfx.h" #include "game/menu.h" @@ -347,7 +347,7 @@ char *menuTitleStageFailed(struct menuitem *item) char *soloMenuTextMissionTime(struct menuitem *item) { - formatTime(g_StringPointer, getMissionTime(), 3); + formatTime(g_StringPointer, playerGetMissionTime(), 3); strcat(g_StringPointer, "\n"); return g_StringPointer; @@ -1239,7 +1239,7 @@ void endscreenPrepare(void) } // Update total mission time - secs = getMissionTime() / 60; + secs = playerGetMissionTime() / 60; if (secs != 0) { if (secs >= S32_MAX || S32_MAX - secs <= g_GameFile.totaltime) { @@ -1258,7 +1258,7 @@ void endscreenPrepare(void) && g_Vars.currentplayer->isdead == false && g_Vars.currentplayer->aborted == false && objectiveIsAllComplete()) { - secs = getMissionTime() / 60; + secs = playerGetMissionTime() / 60; // The save file allows 12 bits per time, which is up to // 1h 8m 16s. If the timer is higher than this, reduce it. @@ -1404,9 +1404,9 @@ glabel endscreenPrepare /* f108ff0: 000c7640 */ sll $t6,$t4,0x19 /* f108ff4: 05c00074 */ bltz $t6,.NB0f1091c8 /* f108ff8: 00000000 */ sll $zero,$zero,0x0 -/* f108ffc: 0fc2ff91 */ jal getMissionTime +/* f108ffc: 0fc2ff91 */ jal playerGetMissionTime /* f109000: 00000000 */ sll $zero,$zero,0x0 -/* f109004: 0fc2ff91 */ jal getMissionTime +/* f109004: 0fc2ff91 */ jal playerGetMissionTime /* f109008: 00000000 */ sll $zero,$zero,0x0 /* f10900c: 2401003c */ addiu $at,$zero,0x3c /* f109010: 0041001a */ div $zero,$v0,$at @@ -1464,7 +1464,7 @@ glabel endscreenPrepare /* f1090d4: 8d0866c4 */ lw $t0,0x66c4($t0) /* f1090d8: 1500003b */ bnez $t0,.NB0f1091c8 /* f1090dc: 00000000 */ sll $zero,$zero,0x0 -/* f1090e0: 0fc2ff91 */ jal getMissionTime +/* f1090e0: 0fc2ff91 */ jal playerGetMissionTime /* f1090e4: 00000000 */ sll $zero,$zero,0x0 /* f1090e8: 2401003c */ addiu $at,$zero,0x3c /* f1090ec: 0041001a */ div $zero,$v0,$at diff --git a/src/game/filelist.c b/src/game/filelist.c index a8222ab76..8bedaec9a 100644 --- a/src/game/filelist.c +++ b/src/game/filelist.c @@ -3,7 +3,7 @@ #include "constants.h" #include "game/camdraw.h" #include "game/cheats.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/filelist.h" #include "game/bg.h" diff --git a/src/game/game_011110.c b/src/game/game_011110.c index afdbcd148..adf78ccc3 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -10,7 +10,7 @@ #include "game/prop.h" #include "game/game_091e10.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/inventory/inventory.h" #include "game/game_1655c0.h" #include "game/mplayer/scenarios.h" @@ -513,7 +513,7 @@ glabel var7f1a827c /* f011950: afa00080 */ sw $zero,0x80($sp) /* f011954: 8e10d59c */ lw $s0,-0x2a64($s0) /* f011958: a3a0007b */ sb $zero,0x7b($sp) -/* f01195c: 0fc2f254 */ jal viResetLoResIf4Mb +/* f01195c: 0fc2f254 */ jal playerResetLoResIf4Mb /* f011960: e7a40088 */ swc1 $f4,0x88($sp) /* f011964: 0fc63d8b */ jal func0f18e558 /* f011968: 00000000 */ nop @@ -549,7 +549,7 @@ glabel var7f1a827c /* f0119e0: ac430004 */ sw $v1,0x4($v0) /* f0119e4: ac430008 */ sw $v1,0x8($v0) /* f0119e8: ac43000c */ sw $v1,0xc($v0) -/* f0119ec: 0fc2e6d7 */ jal setTickMode +/* f0119ec: 0fc2e6d7 */ jal playerSetTickMode /* f0119f0: ac200a40 */ sw $zero,0xa40($at) /* f0119f4: 3c018007 */ lui $at,0x8007 /* f0119f8: ac200a24 */ sw $zero,0xa24($at) @@ -1120,7 +1120,7 @@ glabel var7f1a827c /* f012210: 46109103 */ div.s $f4,$f18,$f16 /* f012214: e7240144 */ swc1 $f4,0x144($t9) /* f012218: 8e240284 */ lw $a0,0x284($s1) -/* f01221c: 0fc2e2b0 */ jal func0f0b85a0 +/* f01221c: 0fc2e2b0 */ jal playerResetBond /* f012220: 2484036c */ addiu $a0,$a0,0x36c /* f012224: 0c00685b */ jal sinf /* f012228: c7ac0088 */ lwc1 $f12,0x88($sp) @@ -1167,7 +1167,7 @@ glabel var7f1a827c /* f0122cc: 8e220284 */ lw $v0,0x284($s1) /* f0122d0: 87a7008c */ lh $a3,0x8c($sp) /* f0122d4: 24450394 */ addiu $a1,$v0,0x394 -/* f0122d8: 0fc30864 */ jal currentPlayerSetCamPropertiesWithRoom +/* f0122d8: 0fc30864 */ jal playerSetCamPropertiesWithRoom /* f0122dc: 24460388 */ addiu $a2,$v0,0x388 /* f0122e0: 0fc0797c */ jal chrsGetNumSlots /* f0122e4: 00000000 */ nop @@ -1225,7 +1225,7 @@ glabel var7f1a827c /* f0123a0: 10000003 */ b .PF0f0123b0 /* f0123a4: 00000000 */ nop .PF0f0123a8: -/* f0123a8: 0fc2e7d0 */ jal func0f0b9a20 +/* f0123a8: 0fc2e7d0 */ jal player0f0b9a20 /* f0123ac: 00000000 */ nop .PF0f0123b0: /* f0123b0: 3c048007 */ lui $a0,0x8007 @@ -1262,7 +1262,7 @@ glabel var7f1a827c /* f012420: ac4004b4 */ sw $zero,0x4b4($v0) /* f012424: 27a40048 */ addiu $a0,$sp,0x48 /* f012428: 27a50044 */ addiu $a1,$sp,0x44 -/* f01242c: 0fc2e313 */ jal currentPlayerChooseBodyAndHead +/* f01242c: 0fc2e313 */ jal playerChooseBodyAndHead /* f012430: 00003025 */ move $a2,$zero /* f012434: 8e2a0284 */ lw $t2,0x284($s1) /* f012438: 8faf0048 */ lw $t7,0x48($sp) @@ -1335,7 +1335,7 @@ glabel var7f1a827c /* f011930: afa00080 */ sw $zero,0x80($sp) /* f011934: 8e10d03c */ lw $s0,%lo(g_StageSetup+0xc)($s0) /* f011938: a3a0007b */ sb $zero,0x7b($sp) -/* f01193c: 0fc2f0fc */ jal viResetLoResIf4Mb +/* f01193c: 0fc2f0fc */ jal playerResetLoResIf4Mb /* f011940: e7a40088 */ swc1 $f4,0x88($sp) /* f011944: 0fc63956 */ jal func0f18e558 /* f011948: 00000000 */ nop @@ -1370,10 +1370,10 @@ glabel var7f1a827c /* f0119bc: ac430004 */ sw $v1,0x4($v0) /* f0119c0: ac430008 */ sw $v1,0x8($v0) /* f0119c4: ac43000c */ sw $v1,0xc($v0) -/* f0119c8: 0fc2e58f */ jal setTickMode +/* f0119c8: 0fc2e58f */ jal playerSetTickMode /* f0119cc: ac200760 */ sw $zero,%lo(g_PlayerInvincible)($at) -/* f0119d0: 3c018007 */ lui $at,%hi(var80070744) -/* f0119d4: ac200744 */ sw $zero,%lo(var80070744)($at) +/* f0119d0: 3c018007 */ lui $at,%hi(g_PlayerTriggerGeFadeIn) +/* f0119d4: ac200744 */ sw $zero,%lo(g_PlayerTriggerGeFadeIn)($at) /* f0119d8: 3c018007 */ lui $at,%hi(var80070748) /* f0119dc: ac200748 */ sw $zero,%lo(var80070748)($at) /* f0119e0: 3c018007 */ lui $at,%hi(var8007074c) @@ -1941,7 +1941,7 @@ glabel var7f1a827c /* f0121ec: 460a8483 */ div.s $f18,$f16,$f10 /* f0121f0: e7320144 */ swc1 $f18,0x144($t9) /* f0121f4: 8e240284 */ lw $a0,0x284($s1) -/* f0121f8: 0fc2e168 */ jal func0f0b85a0 +/* f0121f8: 0fc2e168 */ jal playerResetBond /* f0121fc: 2484036c */ addiu $a0,$a0,0x36c /* f012200: 0c0068f7 */ jal sinf /* f012204: c7ac0088 */ lwc1 $f12,0x88($sp) @@ -1988,7 +1988,7 @@ glabel var7f1a827c /* f0122a8: 8e220284 */ lw $v0,0x284($s1) /* f0122ac: 87a7008c */ lh $a3,0x8c($sp) /* f0122b0: 24450394 */ addiu $a1,$v0,0x394 -/* f0122b4: 0fc30709 */ jal currentPlayerSetCamPropertiesWithRoom +/* f0122b4: 0fc30709 */ jal playerSetCamPropertiesWithRoom /* f0122b8: 24460388 */ addiu $a2,$v0,0x388 /* f0122bc: 0fc07934 */ jal chrsGetNumSlots /* f0122c0: 00000000 */ nop @@ -2046,7 +2046,7 @@ glabel var7f1a827c /* f01237c: 10000003 */ b .L0f01238c /* f012380: 00000000 */ nop .L0f012384: -/* f012384: 0fc2e688 */ jal func0f0b9a20 +/* f012384: 0fc2e688 */ jal player0f0b9a20 /* f012388: 00000000 */ nop .L0f01238c: /* f01238c: 3c048007 */ lui $a0,%hi(g_DeathAnimations) @@ -2083,7 +2083,7 @@ glabel var7f1a827c /* f0123fc: ac4004b4 */ sw $zero,0x4b4($v0) /* f012400: 27a40048 */ addiu $a0,$sp,0x48 /* f012404: 27a50044 */ addiu $a1,$sp,0x44 -/* f012408: 0fc2e1cb */ jal currentPlayerChooseBodyAndHead +/* f012408: 0fc2e1cb */ jal playerChooseBodyAndHead /* f01240c: 00003025 */ or $a2,$zero,$zero /* f012410: 8e2a0284 */ lw $t2,0x284($s1) /* f012414: 8faf0048 */ lw $t7,0x48($sp) @@ -2156,7 +2156,7 @@ glabel var7f1a827c /* f011670: afa00080 */ sw $zero,0x80($sp) /* f011674: 8e10176c */ lw $s0,0x176c($s0) /* f011678: a3a0007b */ sb $zero,0x7b($sp) -/* f01167c: 0fc2e831 */ jal viResetLoResIf4Mb +/* f01167c: 0fc2e831 */ jal playerResetLoResIf4Mb /* f011680: e7a40088 */ swc1 $f4,0x88($sp) /* f011684: 0fc621c6 */ jal func0f18e558 /* f011688: 00000000 */ sll $zero,$zero,0x0 @@ -2191,7 +2191,7 @@ glabel var7f1a827c /* f0116fc: ac430004 */ sw $v1,0x4($v0) /* f011700: ac430008 */ sw $v1,0x8($v0) /* f011704: ac43000c */ sw $v1,0xc($v0) -/* f011708: 0fc2dcc6 */ jal setTickMode +/* f011708: 0fc2dcc6 */ jal playerSetTickMode /* f01170c: ac202e20 */ sw $zero,0x2e20($at) /* f011710: 3c018007 */ lui $at,0x8007 /* f011714: ac202e04 */ sw $zero,0x2e04($at) @@ -2754,7 +2754,7 @@ glabel var7f1a827c /* f011f10: 460a8483 */ div.s $f18,$f16,$f10 /* f011f14: e7320144 */ swc1 $f18,0x144($t9) /* f011f18: 8e240284 */ lw $a0,0x284($s1) -/* f011f1c: 0fc2d8ae */ jal func0f0b85a0 +/* f011f1c: 0fc2d8ae */ jal playerResetBond /* f011f20: 2484036c */ addiu $a0,$a0,0x36c /* f011f24: 0c006d55 */ jal sinf /* f011f28: c7ac0088 */ lwc1 $f12,0x88($sp) @@ -2801,7 +2801,7 @@ glabel var7f1a827c /* f011fcc: 8e220284 */ lw $v0,0x284($s1) /* f011fd0: 87a7008c */ lh $a3,0x8c($sp) /* f011fd4: 24450394 */ addiu $a1,$v0,0x394 -/* f011fd8: 0fc2fdfb */ jal currentPlayerSetCamPropertiesWithRoom +/* f011fd8: 0fc2fdfb */ jal playerSetCamPropertiesWithRoom /* f011fdc: 24460388 */ addiu $a2,$v0,0x388 /* f011fe0: 0fc0786c */ jal chrsGetNumSlots /* f011fe4: 00000000 */ sll $zero,$zero,0x0 @@ -2859,7 +2859,7 @@ glabel var7f1a827c /* f0120a0: 10000003 */ beqz $zero,.NB0f0120b0 /* f0120a4: 00000000 */ sll $zero,$zero,0x0 .NB0f0120a8: -/* f0120a8: 0fc2ddbf */ jal func0f0b9a20 +/* f0120a8: 0fc2ddbf */ jal player0f0b9a20 /* f0120ac: 00000000 */ sll $zero,$zero,0x0 .NB0f0120b0: /* f0120b0: 3c048007 */ lui $a0,0x8007 @@ -2896,7 +2896,7 @@ glabel var7f1a827c /* f012120: ac4004b4 */ sw $zero,0x4b4($v0) /* f012124: 27a40048 */ addiu $a0,$sp,0x48 /* f012128: 27a50044 */ addiu $a1,$sp,0x44 -/* f01212c: 0fc2d911 */ jal currentPlayerChooseBodyAndHead +/* f01212c: 0fc2d911 */ jal playerChooseBodyAndHead /* f012130: 00003025 */ or $a2,$zero,$zero /* f012134: 8e2a0284 */ lw $t2,0x284($s1) /* f012138: 8faf0048 */ lw $t7,0x48($sp) @@ -2934,7 +2934,7 @@ glabel var7f1a827c // s32 bodynum; // s32 headnum; // -// viResetLoResIf4Mb(); +// playerResetLoResIf4Mb(); // func0f18e558(); // // g_InCutscene = false; @@ -2954,9 +2954,9 @@ glabel var7f1a827c // g_PlayersWithControl[3] = true; // g_PlayerInvincible = false; // -// setTickMode(TICKMODE_0); +// playerSetTickMode(TICKMODE_GE_FADEIN); // -// var80070744 = 0; +// g_PlayerTriggerGeFadeIn = 0; // var80070748 = 0; // var8007074c = 0; // @@ -3214,7 +3214,7 @@ glabel var7f1a827c // g_Vars.currentplayer->vv_ground = groundy; // g_Vars.currentplayer->vv_theta = (turnanglerad * 360.0f) / M_BADTAU; // -// func0f0b85a0(&g_Vars.currentplayer->bond2, &pos); +// playerResetBond(&g_Vars.currentplayer->bond2, &pos); // // g_Vars.currentplayer->bond2.unk00.x = -sinf(turnanglerad); // g_Vars.currentplayer->bond2.unk00.y = 0; @@ -3232,7 +3232,7 @@ glabel var7f1a827c // g_Vars.currentplayer->prop->rooms[0] = rooms[0]; // g_Vars.currentplayer->prop->rooms[1] = -1; // -// currentPlayerSetCamPropertiesWithRoom(&pos, +// playerSetCamPropertiesWithRoom(&pos, // &g_Vars.currentplayer->bond2.unk28, // &g_Vars.currentplayer->bond2.unk1c, rooms[0]); // @@ -3249,7 +3249,7 @@ glabel var7f1a827c // if (g_Vars.normmplayerisrunning) { // playersBeginMpSwirl(); // } else { -// func0f0b9a20(); +// player0f0b9a20(); // } // // g_NumDeathAnimations = 0; @@ -3265,7 +3265,7 @@ glabel var7f1a827c // g_Vars.aibuddies[i] = 0; // } // -// currentPlayerChooseBodyAndHead(&bodynum, &headnum, 0); +// playerChooseBodyAndHead(&bodynum, &headnum, 0); // g_Vars.currentplayer->prop->chr->bodynum = bodynum; // g_Vars.currentplayer->prop->chr->headnum = headnum; //} diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 4655b5dc2..a6b76b944 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -5,7 +5,7 @@ #include "game/game_01b0a0.h" #include "game/game_01bea0.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/menugfx.h" #include "game/menu.h" #include "game/filelist.h" @@ -206,7 +206,7 @@ void menuTick(void) } if (var8009dfc0 && g_Vars.currentplayer->gunmem2) { - func0f0b9538(); + player0f0b9538(); if (g_Vars.currentplayer->gunmem2); } @@ -257,7 +257,7 @@ void menuTick(void) if (g_MpSetup.chrslots & 0xf) { sndStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1); - currentPlayerPause(IS4MB() ? MENUROOT_4MBMAINMENU : MENUROOT_MPSETUP); + playerPause(IS4MB() ? MENUROOT_4MBMAINMENU : MENUROOT_MPSETUP); } } @@ -279,7 +279,7 @@ void menuTick(void) g_Menus[2].openinhibit = 0; g_Menus[3].openinhibit = 0; g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; - currentPlayerPause(MENUROOT_FILEMGR); + playerPause(MENUROOT_FILEMGR); g_FileState = FILESTATE_SELECTED; } } diff --git a/src/game/game_0b0fd0.c b/src/game/game_0b0fd0.c index 37924173f..2b999b5cb 100644 --- a/src/game/game_0b0fd0.c +++ b/src/game/game_0b0fd0.c @@ -4,7 +4,7 @@ #include "game/inventory/items.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/hudmsg.h" #include "game/game_127910.h" #include "game/mplayer/setup.h" diff --git a/src/game/game_127910.c b/src/game/game_127910.c index 91d6637eb..19aadde5a 100644 --- a/src/game/game_127910.c +++ b/src/game/game_127910.c @@ -2,7 +2,7 @@ #include "constants.h" #include "game/cheats.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_127910.h" #include "game/propobj.h" #include "bss.h" @@ -72,12 +72,12 @@ void playersAllocate(s32 count) setCurrentPlayerNum(0); if (g_Vars.fourmeg2player) { - s16 a = viGetFbWidth(); - s16 b = viGetFbHeight(); + s16 a = playerGetFbWidth(); + s16 b = playerGetFbHeight(); currentPlayerSetViewSize(a, b << 1); } else { - s16 a = viGetFbWidth(); - s16 b = viGetFbHeight(); + s16 a = playerGetFbWidth(); + s16 b = playerGetFbHeight(); currentPlayerSetViewSize(a, b); } diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 8dd8c3057..ccb7e3d5d 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -1,7 +1,7 @@ #include #include "constants.h" #include "lib/sched.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_176080.h" #include "game/mplayer/mplayer.h" #include "game/options.h" @@ -103,7 +103,7 @@ Gfx *func0f1762ac(Gfx *gdl) if (g_Vars.normmplayerisrunning && (g_Vars.currentplayernum >= 2 || (PLAYERCOUNT() == 2 && g_Vars.currentplayernum == 1))) { - subamount = viGetFbWidth() * viGetFbHeight(); + subamount = playerGetFbWidth() * playerGetFbHeight(); if (IS4MB() || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { subamount = 0; @@ -131,20 +131,20 @@ Gfx *func0f1763f4(Gfx *gdl) gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), OS_PHYSICAL_TO_K0(var800844f4)); gDPSetCycleType(gdl++, G_CYC_FILL); gDPSetFillColor(gdl++, 0xfffcfffc); - gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetFbWidth() * 4.0f, viGetFbHeight() * 4.0f); + gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, playerGetFbWidth() * 4.0f, playerGetFbHeight() * 4.0f); if (PLAYERCOUNT() <= 2) { left = 0; - right = viGetFbWidth() - 1; + right = playerGetFbWidth() - 1; } else if (g_Vars.currentplayernum == 0 || g_Vars.currentplayernum == 2) { left = 0; - right = viGetFbWidth() / 2 - 1; + right = playerGetFbWidth() / 2 - 1; } else { - left = viGetFbWidth() / 2; - right = viGetFbWidth() - 1; + left = playerGetFbWidth() / 2; + right = playerGetFbWidth() - 1; } - gDPFillRectangle(gdl++, left, 0, right, viGetFbHeight() - 1); + gDPFillRectangle(gdl++, left, 0, right, playerGetFbHeight() - 1); gDPPipeSync(gdl++); return gdl; diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 6fc542b72..8ece1ac9a 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -3,7 +3,7 @@ #include "constants.h" #include "game/camdraw.h" #include "game/cheats.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/bg.h" #include "game/game_19aa80.h" @@ -255,17 +255,17 @@ glabel gamefileApplyOptions /* f10fea0: 24010001 */ li $at,0x1 /* f10fea4: 15210005 */ bne $t1,$at,.PF0f10febc /* f10fea8: 00000000 */ nop -/* f10feac: 0fc2f26f */ jal optionsSetHiRes +/* f10feac: 0fc2f26f */ jal playerSetHiResEnabled /* f10feb0: 00002025 */ move $a0,$zero /* f10feb4: 10000007 */ b .PF0f10fed4 /* f10feb8: 00000000 */ nop .PF0f10febc: -/* f10febc: 0fc2f26f */ jal optionsSetHiRes +/* f10febc: 0fc2f26f */ jal playerSetHiResEnabled /* f10fec0: 24040001 */ li $a0,0x1 /* f10fec4: 10000003 */ b .PF0f10fed4 /* f10fec8: 00000000 */ nop .PF0f10fecc: -/* f10fecc: 0fc2f26f */ jal optionsSetHiRes +/* f10fecc: 0fc2f26f */ jal playerSetHiResEnabled /* f10fed0: 00002025 */ move $a0,$zero .PF0f10fed4: /* f10fed4: 3c0a8009 */ lui $t2,0x8009 @@ -445,12 +445,12 @@ void gamefileApplyOptions(struct gamefile *file) if (pakHasBitflag(GAMEFILEFLAG_HIRES, file->flags)) { if (IS4MB()) { - optionsSetHiRes(false); + playerSetHiResEnabled(false); } else { - optionsSetHiRes(true); + playerSetHiResEnabled(true); } } else { - optionsSetHiRes(false); + playerSetHiResEnabled(false); } if (IS4MB()) { diff --git a/src/game/healthbar.c b/src/game/healthbar.c index 63f3dfa45..abf045309 100644 --- a/src/game/healthbar.c +++ b/src/game/healthbar.c @@ -1,6 +1,6 @@ #include #include "constants.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/healthbar.h" #include "game/game_1531a0.h" #include "game/file.h" @@ -486,7 +486,7 @@ glabel healthbarRender /* f0d6000: 00000000 */ nop /* f0d6004: 46064102 */ mul.s $f4,$f8,$f6 /* f0d6008: e7a40134 */ swc1 $f4,0x134($sp) -/* f0d600c: 0fc305bd */ jal currentPlayerGetHealthBarHeightFrac +/* f0d600c: 0fc305bd */ jal playerGetHealthBarHeightFrac /* f0d6010: e7aa0138 */ swc1 $f10,0x138($sp) /* f0d6014: 1000001c */ b .L0f0d6088 /* f0d6018: e7a0012c */ swc1 $f0,0x12c($sp) diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 86a01c0b4..b50fd3ee8 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -3,7 +3,7 @@ #include "constants.h" #include "game/game_092610.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/hudmsg.h" #include "game/menugfx.h" @@ -308,7 +308,7 @@ glabel hudmsgRenderMissionTimer /* f0dd1fc: 00007012 */ mflo $t6 /* f0dd200: 3c0100ff */ lui $at,0xff /* f0dd204: 01c17825 */ or $t7,$t6,$at -/* f0dd208: 0fc3089f */ jal getMissionTime +/* f0dd208: 0fc3089f */ jal playerGetMissionTime /* f0dd20c: afaf0064 */ sw $t7,0x64($sp) /* f0dd210: 27a40068 */ addiu $a0,$sp,0x68 /* f0dd214: 00402825 */ or $a1,$v0,$zero @@ -426,7 +426,7 @@ glabel hudmsgRenderMissionTimer // textcolour = alpha | 0x00ff0000; // // // 208 -// formatTime(buffer, getMissionTime(), 4); +// formatTime(buffer, playerGetMissionTime(), 4); // // return textRender(gdl, &sp8c, &sp88, buffer, g_CharsNumeric, g_FontNumeric, textcolour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); //} @@ -4176,11 +4176,11 @@ glabel var7f1af1e0 /* f0e03c0: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0e03c4: 55c10011 */ bnel $t6,$at,.PF0f0e040c /* f0e03c8: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e03cc: 0fc3074e */ jal currentPlayerIsHealthVisible +/* f0e03cc: 0fc3074e */ jal playerIsHealthVisible /* f0e03d0: 00000000 */ nop /* f0e03d4: 5040000d */ beqzl $v0,.PF0f0e040c /* f0e03d8: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0e03dc: 0fc30718 */ jal currentPlayerGetHealthBarHeightFrac +/* f0e03dc: 0fc30718 */ jal playerGetHealthBarHeightFrac /* f0e03e0: 00000000 */ nop /* f0e03e4: 3c014180 */ lui $at,0x4180 /* f0e03e8: 44818000 */ mtc1 $at,$f16 @@ -5034,11 +5034,11 @@ glabel var7f1adef4 /* f0dfd84: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0dfd88: 55c10011 */ bnel $t6,$at,.L0f0dfdd0 /* f0dfd8c: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0dfd90: 0fc305f3 */ jal currentPlayerIsHealthVisible +/* f0dfd90: 0fc305f3 */ jal playerIsHealthVisible /* f0dfd94: 00000000 */ nop /* f0dfd98: 5040000d */ beqzl $v0,.L0f0dfdd0 /* f0dfd9c: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0dfda0: 0fc305bd */ jal currentPlayerGetHealthBarHeightFrac +/* f0dfda0: 0fc305bd */ jal playerGetHealthBarHeightFrac /* f0dfda4: 00000000 */ nop /* f0dfda8: 3c014180 */ lui $at,0x4180 /* f0dfdac: 44818000 */ mtc1 $at,$f16 @@ -5892,11 +5892,11 @@ glabel var7f1adef4 /* f0dd164: 8e0e01b4 */ lw $t6,0x1b4($s0) /* f0dd168: 55c10011 */ bnel $t6,$at,.NB0f0dd1b0 /* f0dd16c: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0dd170: 0fc2fcea */ jal currentPlayerIsHealthVisible +/* f0dd170: 0fc2fcea */ jal playerIsHealthVisible /* f0dd174: 00000000 */ sll $zero,$zero,0x0 /* f0dd178: 5040000d */ beqzl $v0,.NB0f0dd1b0 /* f0dd17c: 8e0901b4 */ lw $t1,0x1b4($s0) -/* f0dd180: 0fc2fcb4 */ jal currentPlayerGetHealthBarHeightFrac +/* f0dd180: 0fc2fcb4 */ jal playerGetHealthBarHeightFrac /* f0dd184: 00000000 */ sll $zero,$zero,0x0 /* f0dd188: 3c014180 */ lui $at,0x4180 /* f0dd18c: 44818000 */ mtc1 $at,$f16 @@ -6631,8 +6631,8 @@ glabel var7f1adef4 // x = msg->x; // y = msg->y; // -// if (msg->type == HUDMSGTYPE_INGAMESUBTITLE && currentPlayerIsHealthVisible()) { -// y += (s32)(16.0f * currentPlayerGetHealthBarHeightFrac()); +// if (msg->type == HUDMSGTYPE_INGAMESUBTITLE && playerIsHealthVisible()) { +// y += (s32)(16.0f * playerGetHealthBarHeightFrac()); // } // // // dd0 diff --git a/src/game/lv.c b/src/game/lv.c index 2d145cbdf..4e2af9d96 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -56,7 +56,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b28d0.h" #include "game/game_0b63b0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/hudmsg.h" #include "game/menu.h" @@ -485,9 +485,9 @@ void lvInit(s32 stagenum) amInit(); invInitGunsHeld(); func0f010bb0(); - currentPlayerResetToDefault(); + playerLoadDefaults(); currentPlayerInit(); - currentPlayerSpawn(); + playerSpawn(); currentPlayerInitAnimation(); if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) { @@ -957,11 +957,11 @@ glabel var7f1b1f44nc /* f162ca0: 00000000 */ sll $zero,$zero,0x0 /* f162ca4: 0fc0423c */ jal func0f010bb0 /* f162ca8: 00000000 */ sll $zero,$zero,0x0 -/* f162cac: 0fc2d548 */ jal currentPlayerResetToDefault +/* f162cac: 0fc2d548 */ jal playerLoadDefaults /* f162cb0: 00000000 */ sll $zero,$zero,0x0 /* f162cb4: 0fc0458d */ jal currentPlayerInit /* f162cb8: 00000000 */ sll $zero,$zero,0x0 -/* f162cbc: 0fc2d75f */ jal currentPlayerSpawn +/* f162cbc: 0fc2d75f */ jal playerSpawn /* f162cc0: 00000000 */ sll $zero,$zero,0x0 /* f162cc4: 0fc048e9 */ jal currentPlayerInitAnimation /* f162cc8: 00000000 */ sll $zero,$zero,0x0 @@ -1791,27 +1791,27 @@ glabel var7f1b8e7cpf /* f16a69c: 86040634 */ lh $a0,0x634($s0) /* f16a6a0: 0c002e7b */ jal viSetViewPosition /* f16a6a4: 86050636 */ lh $a1,0x636($s0) -/* f16a6a8: 0fc2f272 */ jal viGetFbWidth +/* f16a6a8: 0fc2f272 */ jal playerGetFbWidth /* f16a6ac: 00000000 */ nop -/* f16a6b0: 0fc2f27d */ jal viGetFbHeight +/* f16a6b0: 0fc2f27d */ jal playerGetFbHeight /* f16a6b4: a7a20090 */ sh $v0,0x90($sp) /* f16a6b8: 00022c00 */ sll $a1,$v0,0x10 /* f16a6bc: 00055403 */ sra $t2,$a1,0x10 /* f16a6c0: 01402825 */ move $a1,$t2 /* f16a6c4: 0c002e4a */ jal viSetSize /* f16a6c8: 87a40090 */ lh $a0,0x90($sp) -/* f16a6cc: 0fc2f272 */ jal viGetFbWidth +/* f16a6cc: 0fc2f272 */ jal playerGetFbWidth /* f16a6d0: 00000000 */ nop -/* f16a6d4: 0fc2f27d */ jal viGetFbHeight +/* f16a6d4: 0fc2f27d */ jal playerGetFbHeight /* f16a6d8: a7a20090 */ sh $v0,0x90($sp) /* f16a6dc: 00022c00 */ sll $a1,$v0,0x10 /* f16a6e0: 00055c03 */ sra $t3,$a1,0x10 /* f16a6e4: 01602825 */ move $a1,$t3 /* f16a6e8: 0c002e39 */ jal viSetBufSize /* f16a6ec: 87a40090 */ lh $a0,0x90($sp) -/* f16a6f0: 0fc2f272 */ jal viGetFbWidth +/* f16a6f0: 0fc2f272 */ jal playerGetFbWidth /* f16a6f4: 00000000 */ nop -/* f16a6f8: 0fc2f27d */ jal viGetFbHeight +/* f16a6f8: 0fc2f27d */ jal playerGetFbHeight /* f16a6fc: a7a20090 */ sh $v0,0x90($sp) /* f16a700: 00022c00 */ sll $a1,$v0,0x10 /* f16a704: 00057403 */ sra $t6,$a1,0x10 @@ -1839,7 +1839,7 @@ glabel var7f1b8e7cpf /* f16a75c: 8d991a24 */ lw $t9,0x1a24($t4) /* f16a760: 53200544 */ beqzl $t9,.PF0f16bc74 /* f16a764: 824b04d3 */ lb $t3,0x4d3($s2) -/* f16a768: 0fc2ecb3 */ jal currentPlayerTickPauseMenu +/* f16a768: 0fc2ecb3 */ jal playerTickPauseMenu /* f16a76c: 00000000 */ nop /* f16a770: 10000540 */ b .PF0f16bc74 /* f16a774: 824b04d3 */ lb $t3,0x4d3($s2) @@ -1921,7 +1921,7 @@ glabel var7f1b8e7cpf /* f16a89c: 12000004 */ beqz $s0,.PF0f16a8b0 /* f16a8a0: 00000000 */ nop .PF0f16a8a4: -/* f16a8a4: 0fc2f28f */ jal is2PSharedViewport +/* f16a8a4: 0fc2f28f */ jal playerHasSharedViewport /* f16a8a8: 00000000 */ nop /* f16a8ac: 0002802b */ sltu $s0,$zero,$v0 .PF0f16a8b0: @@ -2228,7 +2228,7 @@ glabel var7f1b8e7cpf /* f16ad0c: 24010002 */ li $at,0x2 /* f16ad10: 15c10004 */ bne $t6,$at,.PF0f16ad24 /* f16ad14: 00000000 */ nop -/* f16ad18: 0fc3014e */ jal currentPlayerUpdateShootRot +/* f16ad18: 0fc3014e */ jal playerUpdateShootRot /* f16ad1c: 02602025 */ move $a0,$s3 /* f16ad20: 00409825 */ move $s3,$v0 .PF0f16ad24: @@ -2640,7 +2640,7 @@ glabel var7f1b8e7cpf /* f16b2f4: 24010002 */ li $at,0x2 /* f16b2f8: 17210005 */ bne $t9,$at,.PF0f16b310 /* f16b2fc: 00000000 */ nop -/* f16b300: 0fc3034d */ jal currentPlayerRenderHud +/* f16b300: 0fc3034d */ jal playerRenderHud /* f16b304: 02602025 */ move $a0,$s3 /* f16b308: 1000000b */ b .PF0f16b338 /* f16b30c: 00409825 */ move $s3,$v0 @@ -2954,7 +2954,7 @@ glabel var7f1b8e7cpf /* f16b784: 240600ff */ li $a2,0xff /* f16b788: 240700ff */ li $a3,0xff /* f16b78c: 46083282 */ mul.s $f10,$f6,$f8 -/* f16b790: 0fc2ed6b */ jal fadeDraw +/* f16b790: 0fc2ed6b */ jal playerDrawFade /* f16b794: e7aa0010 */ swc1 $f10,0x10($sp) /* f16b798: 10000029 */ b .PF0f16b840 /* f16b79c: 00409825 */ move $s3,$v0 @@ -2996,7 +2996,7 @@ glabel var7f1b8e7cpf /* f16b828: 240700ff */ li $a3,0xff /* f16b82c: 46125101 */ sub.s $f4,$f10,$f18 /* f16b830: 46062202 */ mul.s $f8,$f4,$f6 -/* f16b834: 0fc2ed6b */ jal fadeDraw +/* f16b834: 0fc2ed6b */ jal playerDrawFade /* f16b838: e7a80010 */ swc1 $f8,0x10($sp) /* f16b83c: 00409825 */ move $s3,$v0 .PF0f16b840: @@ -3051,7 +3051,7 @@ glabel var7f1b8e7cpf /* f16b8e0: 24010006 */ li $at,0x6 /* f16b8e4: 15c10031 */ bne $t6,$at,.PF0f16b9ac /* f16b8e8: 00000000 */ nop -/* f16b8ec: 0fc2eb66 */ jal cutsceneGetBlurFrac +/* f16b8ec: 0fc2eb66 */ jal playerGetCutsceneBlurFrac /* f16b8f0: 00000000 */ nop /* f16b8f4: 44808000 */ mtc1 $zero,$f16 /* f16b8f8: 3c01437f */ lui $at,0x437f @@ -3270,7 +3270,7 @@ glabel var7f1b8e7cpf /* f16bc0c: 932e19b3 */ lbu $t6,0x19b3($t9) /* f16bc10: 11c00003 */ beqz $t6,.PF0f16bc20 /* f16bc14: 00000000 */ nop -/* f16bc18: 0fc2ddff */ jal currentPlayerStartNewLife +/* f16bc18: 0fc2ddff */ jal playerStartNewLife /* f16bc1c: 00000000 */ nop .PF0f16bc20: /* f16bc20: 0fc4f42f */ jal func0f13c54c @@ -3282,7 +3282,7 @@ glabel var7f1b8e7cpf /* f16bc38: 0542000a */ bltzl $t2,.PF0f16bc64 /* f16bc3c: 8fb00064 */ lw $s0,0x64($sp) .PF0f16bc40: -/* f16bc40: 0fc2f28f */ jal is2PSharedViewport +/* f16bc40: 0fc2f28f */ jal playerHasSharedViewport /* f16bc44: 00000000 */ nop /* f16bc48: 50400006 */ beqzl $v0,.PF0f16bc64 /* f16bc4c: 8fb00064 */ lw $s0,0x64($sp) @@ -3522,7 +3522,7 @@ Gfx *lvRender(Gfx *gdl) gdl = menuRender(gdl); if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { - currentPlayerTickPauseMenu(); + playerTickPauseMenu(); } } else if (g_Vars.stagenum == STAGE_CREDITS) { gSPClipRatio(gdl++, FRUSTRATIO_2); @@ -3545,7 +3545,7 @@ Gfx *lvRender(Gfx *gdl) s32 playercount; Gfx *savedgdl; bool forcesingleplayer = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && is2PSharedViewport(); + && playerHasSharedViewport(); struct player *player; struct chrdata *chr; @@ -3647,7 +3647,7 @@ Gfx *lvRender(Gfx *gdl) } } else { if (var80075d60 == 2) { - gdl = currentPlayerUpdateShootRot(gdl); + gdl = playerUpdateShootRot(gdl); } gdl = viRenderViewportEdges(gdl); @@ -3777,7 +3777,7 @@ Gfx *lvRender(Gfx *gdl) } if (var80075d60 == 2) { - gdl = currentPlayerRenderHud(gdl); + gdl = playerRenderHud(gdl); } else { gdl = func0f0aeed8(gdl); @@ -3938,14 +3938,14 @@ Gfx *lvRender(Gfx *gdl) g_Vars.speedpillchange * 180 / 15, (f32)g_Vars.speedpillchange * 0.02000000141561f + 1.1f, (f32)g_Vars.speedpillchange * 0.02000000141561f + 1.1f); - gdl = fadeDraw(gdl, 0xff, 0xff, 0xff, + gdl = playerDrawFade(gdl, 0xff, 0xff, 0xff, g_Vars.speedpillchange * 0.0066666668280959f); } else { gdl = bviewRenderZoomBlur(gdl, 0xffffffff, (30 - g_Vars.speedpillchange) * 180 / 15, (f32)(30 - g_Vars.speedpillchange) * 0.02000000141561f + 1.1f, (f32)(30 - g_Vars.speedpillchange) * 0.02000000141561f + 1.1f); - gdl = fadeDraw(gdl, 0xff, 0xff, 0xff, + gdl = playerDrawFade(gdl, 0xff, 0xff, 0xff, (30.0f - g_Vars.speedpillchange) * 0.0066666668280959f); } @@ -3981,7 +3981,7 @@ Gfx *lvRender(Gfx *gdl) // Handle blur effect in cutscenes (Extraction intro?) if (g_Vars.tickmode == TICKMODE_CUTSCENE) { - f32 cutsceneblurfrac = cutsceneGetBlurFrac(); + f32 cutsceneblurfrac = playerGetCutsceneBlurFrac(); if (cutsceneblurfrac > 0) { u32 bluramount = cutsceneblurfrac * 255; @@ -4065,14 +4065,14 @@ Gfx *lvRender(Gfx *gdl) } if (g_Vars.currentplayer->dostartnewlife) { - currentPlayerStartNewLife(); + playerStartNewLife(); } } func0f13c54c(); if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && is2PSharedViewport() + && playerHasSharedViewport() && g_Vars.currentplayernum != 0) { gdl = savedgdl; } @@ -4410,7 +4410,7 @@ glabel var7f1b1fd4nb /* f164438: 8d591a24 */ lw $t9,0x1a24($t2) /* f16443c: 53200615 */ beqzl $t9,.NB0f165c94 /* f164440: 825904d3 */ lb $t9,0x4d3($s2) -/* f164444: 0fc2e290 */ jal currentPlayerTickPauseMenu +/* f164444: 0fc2e290 */ jal playerTickPauseMenu /* f164448: 00000000 */ sll $zero,$zero,0x0 /* f16444c: 10000611 */ beqz $zero,.NB0f165c94 /* f164450: 825904d3 */ lb $t9,0x4d3($s2) @@ -4811,7 +4811,7 @@ glabel var7f1b1fd4nb /* f164a14: 24010002 */ addiu $at,$zero,0x2 /* f164a18: 15610004 */ bne $t3,$at,.NB0f164a2c /* f164a1c: 00000000 */ sll $zero,$zero,0x0 -/* f164a20: 0fc2f6ee */ jal currentPlayerUpdateShootRot +/* f164a20: 0fc2f6ee */ jal playerUpdateShootRot /* f164a24: 02602025 */ or $a0,$s3,$zero /* f164a28: 00409825 */ or $s3,$v0,$zero .NB0f164a2c: @@ -5227,7 +5227,7 @@ glabel var7f1b1fd4nb /* f16500c: 24010002 */ addiu $at,$zero,0x2 /* f165010: 15e10007 */ bne $t7,$at,.NB0f165030 /* f165014: 00000000 */ sll $zero,$zero,0x0 -/* f165018: 0fc2f8ed */ jal currentPlayerRenderHud +/* f165018: 0fc2f8ed */ jal playerRenderHud /* f16501c: 02602025 */ or $a0,$s3,$zero /* f165020: 0fc58d05 */ jal lvRenderManPosIfEnabled /* f165024: 00402025 */ or $a0,$v0,$zero @@ -5687,7 +5687,7 @@ glabel var7f1b1fd4nb /* f1656cc: 240600ff */ addiu $a2,$zero,0xff /* f1656d0: 240700ff */ addiu $a3,$zero,0xff /* f1656d4: 46109102 */ mul.s $f4,$f18,$f16 -/* f1656d8: 0fc2e348 */ jal fadeDraw +/* f1656d8: 0fc2e348 */ jal playerDrawFade /* f1656dc: e7a40010 */ swc1 $f4,0x10($sp) /* f1656e0: 10000029 */ beqz $zero,.NB0f165788 /* f1656e4: 00409825 */ or $s3,$v0,$zero @@ -5729,7 +5729,7 @@ glabel var7f1b1fd4nb /* f165770: 240700ff */ addiu $a3,$zero,0xff /* f165774: 46082281 */ sub.s $f10,$f4,$f8 /* f165778: 46125402 */ mul.s $f16,$f10,$f18 -/* f16577c: 0fc2e348 */ jal fadeDraw +/* f16577c: 0fc2e348 */ jal playerDrawFade /* f165780: e7b00010 */ swc1 $f16,0x10($sp) /* f165784: 00409825 */ or $s3,$v0,$zero .NB0f165788: @@ -5785,7 +5785,7 @@ glabel var7f1b1fd4nb /* f165828: 24010006 */ addiu $at,$zero,0x6 /* f16582c: 15e10031 */ bne $t7,$at,.NB0f1658f4 /* f165830: 00000000 */ sll $zero,$zero,0x0 -/* f165834: 0fc2e143 */ jal cutsceneGetBlurFrac +/* f165834: 0fc2e143 */ jal playerGetCutsceneBlurFrac /* f165838: 00000000 */ sll $zero,$zero,0x0 /* f16583c: 44803000 */ mtc1 $zero,$f6 /* f165840: 3c01437f */ lui $at,0x437f @@ -6054,7 +6054,7 @@ glabel var7f1b1fd4nb /* f165c08: 932e19b3 */ lbu $t6,0x19b3($t9) /* f165c0c: 11c00003 */ beqz $t6,.NB0f165c1c /* f165c10: 00000000 */ sll $zero,$zero,0x0 -/* f165c14: 0fc2d40c */ jal currentPlayerStartNewLife +/* f165c14: 0fc2d40c */ jal playerStartNewLife /* f165c18: 00000000 */ sll $zero,$zero,0x0 .NB0f165c1c: /* f165c1c: 0fc4dc13 */ jal func0f13c54c @@ -6381,7 +6381,7 @@ void lvUpdateSoloHandicaps(void) f32 frac = 1; if (g_Vars.coopplayernum < 0 && g_Vars.antiplayernum < 0) { - totalhealth = currentPlayerGetHealthFrac() + currentPlayerGetShieldFrac(); + totalhealth = playerGetHealthFrac() + playerGetShieldFrac(); if (totalhealth <= 0.125f) { frac = 0.5f; @@ -7669,7 +7669,7 @@ glabel var7f1b8ed0pf /* f16d718: 2401005d */ li $at,0x5d /* f16d71c: 0fc4a4ff */ jal setCurrentPlayerNum /* f16d720: 00002025 */ move $a0,$zero -/* f16d724: 0fc2f738 */ jal currentPlayerConfigureVi +/* f16d724: 0fc2f738 */ jal playerConfigureVi /* f16d728: 00000000 */ nop /* f16d72c: 0fc07006 */ jal menuTick /* f16d730: 00000000 */ nop diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 5158c012c..cdf629123 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -9,7 +9,7 @@ #include "game/bondgun.h" #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/menu.h" #include "game/mainmenu.h" #include "game/filemgr.h" @@ -475,7 +475,7 @@ s32 menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *da case MENUOP_GET: return g_HiResEnabled == true; case MENUOP_SET: - optionsSetHiRes(data->checkbox.value ? 1 : 0); + playerSetHiResEnabled(data->checkbox.value ? 1 : 0); g_Vars.modifiedfiles |= MODFILE_GAME; } diff --git a/src/game/menu.c b/src/game/menu.c index 7eb364a99..a406a9fe5 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -9,7 +9,7 @@ #include "game/bondgun.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_1a7560.h" #include "game/savebuffer.h" #include "game/menugfx.h" @@ -14200,7 +14200,7 @@ void menuPushRootDialog(struct menudialogdef *dialogdef, s32 root) } if (menuIsSoloMissionOrMp()) { - currentPlayerDisplayHealth(); + playerDisplayHealth(); } } @@ -15133,7 +15133,7 @@ void func0f0fa6ac(void) case MENUROOT_FILEMGR: case MENUROOT_4MBMAINMENU: case MENUROOT_TRAINING: - currentPlayerUnpause(); + playerUnpause(); g_PlayersWithControl[0] = true; } } diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 7122a8d1c..63af07879 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -5,7 +5,7 @@ #include "game/game_01b0a0.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/menu.h" #include "game/game_127910.h" @@ -2162,7 +2162,7 @@ void mpCalculateAwards(void) playercount = PLAYERCOUNT(); - duration60 = getMissionTime(); + duration60 = playerGetMissionTime(); func00033dd8(); @@ -2626,7 +2626,7 @@ glabel var7f1b8db0 /* f1849a8: 0258c821 */ addu $t9,$s2,$t8 /* f1849ac: 032d7021 */ addu $t6,$t9,$t5 /* f1849b0: 01cf8021 */ addu $s0,$t6,$t7 -/* f1849b4: 0fc2ff91 */ jal getMissionTime +/* f1849b4: 0fc2ff91 */ jal playerGetMissionTime /* f1849b8: afb0020c */ sw $s0,0x20c($sp) /* f1849bc: 0c00d474 */ jal func00033dd8 /* f1849c0: afa201fc */ sw $v0,0x1fc($sp) diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index 45af0aac6..65ee95e7a 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -8,7 +8,7 @@ #include "game/game_092610.h" #include "game/atan2f.h" #include "game/bondgun.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/savebuffer.h" #include "game/hudmsg.h" #include "game/menu.h" diff --git a/src/game/mpstats.c b/src/game/mpstats.c index bd89cf8a5..3ffeca039 100644 --- a/src/game/mpstats.c +++ b/src/game/mpstats.c @@ -4,7 +4,7 @@ #include "game/inventory/items.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/hudmsg.h" #include "game/game_127910.h" #include "game/mplayer/setup.h" @@ -89,7 +89,7 @@ void mpstatsRecordPlayerKill(void) g_Vars.currentplayer->killsthislife++; if (g_Vars.normmplayerisrunning) { - time = getMissionTime(); + time = playerGetMissionTime(); // Show HUD message // "Kill count: %d" @@ -175,7 +175,7 @@ void mpstatsRecordPlayerSuicide(void) struct mpchrconfig *mpchr; if (g_Vars.normmplayerisrunning) { - time = getMissionTime(); + time = playerGetMissionTime(); mpindex = g_Vars.currentplayerstats->mpindex; mpchr = MPCHR(mpindex); diff --git a/src/game/game_0b69d0.c b/src/game/player.c similarity index 93% rename from src/game/game_0b69d0.c rename to src/game/player.c index b12627d2e..ac712e2a3 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/player.c @@ -21,7 +21,7 @@ #include "game/game_0b2150.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_1a7560.h" #include "game/healthbar.h" #include "game/hudmsg.h" @@ -165,7 +165,7 @@ u32 var80070734 = 0xffffffff; u32 var80070738 = 0; u32 var8007073c = 0; struct gecreditsdata *g_CurrentGeCreditsData = NULL; -u32 var80070744 = 0; +bool g_PlayerTriggerGeFadeIn = false; u32 var80070748 = 0; u32 var8007074c = 0; @@ -472,7 +472,7 @@ f32 playerChooseGeneralSpawnLocation(f32 chrwidth, struct coord *pos, s16 *rooms return playerChooseSpawnLocation(chrwidth, pos, rooms, prop, g_SpawnPoints, g_NumSpawnPoints); } -void currentPlayerStartNewLife(void) +void playerStartNewLife(void) { struct coord pos = {0, 0, 0}; s16 rooms[8]; @@ -500,7 +500,7 @@ void currentPlayerStartNewLife(void) } chrInitSplats(g_Vars.currentplayer->prop->chr); - currentPlayerResetToDefault(); + playerLoadDefaults(); g_Vars.currentplayer->isdead = false; g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7; g_Vars.currentplayer->damagetype = DAMAGETYPE_7; @@ -524,7 +524,7 @@ void currentPlayerStartNewLife(void) g_Vars.currentplayer->vv_theta = angle * 360.0f / M_BADTAU; g_Vars.currentplayer->vv_ground = groundy; - func0f0b85a0(&g_Vars.currentplayer->bond2, &pos); + playerResetBond(&g_Vars.currentplayer->bond2, &pos); g_Vars.currentplayer->bond2.unk00.x = -sinf(angle); g_Vars.currentplayer->bond2.unk00.y = 0; @@ -539,7 +539,7 @@ void currentPlayerStartNewLife(void) g_Vars.currentplayer->prop->rooms[0] = rooms[0]; g_Vars.currentplayer->prop->rooms[1] = -1; - currentPlayerSetCamPropertiesWithRoom(&pos, &g_Vars.currentplayer->bond2.unk28, + playerSetCamPropertiesWithRoom(&pos, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, rooms[0]); if (g_Vars.coopplayernum >= 0) { @@ -642,12 +642,12 @@ void currentPlayerStartNewLife(void) } bmove0f0cb8c4(g_Vars.currentplayer); - currentPlayerSpawn(); + playerSpawn(); if (g_Vars.normmplayerisrunning) { - currentPlayerStartChrFade(120, 1); + playerStartChrFade(120, 1); } else { - currentPlayerStartChrFade(0, 1); + playerStartChrFade(0, 1); } if (g_Vars.currentplayer->prop->chr) { @@ -655,7 +655,7 @@ void currentPlayerStartNewLife(void) } } -void currentPlayerResetToDefault(void) +void playerLoadDefaults(void) { if (!g_Vars.mplayerisrunning || g_Vars.currentplayer->model00d4 == NULL) { g_Vars.currentplayer->vv_eyeheight = 159; @@ -799,7 +799,7 @@ void currentPlayerResetToDefault(void) g_Vars.currentplayer->unk1c3c = 0; } -bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force) +bool playerSpawnAnti(struct chrdata *hostchr, bool force) { struct prop *hostprop; union modelrwdata *chrrootrwdata; @@ -916,7 +916,7 @@ bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force) return false; } -void currentPlayerSpawn(void) +void playerSpawn(void) { f32 xdiff; f32 ydiff; @@ -940,18 +940,18 @@ void currentPlayerSpawn(void) g_Vars.currentplayer->startnewbonddie = true; g_Vars.currentplayer->killsthislife = 0; - g_Vars.currentplayer->lifestarttime60 = getMissionTime(); + g_Vars.currentplayer->lifestarttime60 = playerGetMissionTime(); g_Vars.currentplayer->healthdisplaytime60 = 0; invGiveSingleWeapon(WEAPON_UNARMED); - currentPlayerSetShieldFrac(0); + playerSetShieldFrac(0); if (cheatIsActive(CHEAT_JOSHIELD)) { - currentPlayerSetShieldFrac(1); + playerSetShieldFrac(1); } if (cheatIsActive(CHEAT_SUPERSHIELD)) { - currentPlayerSetShieldFrac(1); + playerSetShieldFrac(1); g_Vars.currentplayer->armourscale = 2; } @@ -1060,7 +1060,7 @@ void currentPlayerSpawn(void) // If no chrs can be spawned into, iterate the list again but this // time allowing the spawn to happen on-screen (force = true). for (i = 0; i < numsqdists; i++) { - if (currentPlayerAssumeChrForAnti(sortedchrs[i], force)) { + if (playerSpawnAnti(sortedchrs[i], force)) { break; } @@ -1096,10 +1096,10 @@ void currentPlayerSpawn(void) } } - currentPlayerUpdatePerimInfo(); + playerUpdatePerimInfo(); } -void func0f0b85a0(struct playerbond *pb, struct coord *pos) +void playerResetBond(struct playerbond *pb, struct coord *pos) { pb->unk10.x = pos->x; pb->unk10.y = pos->y; @@ -1133,7 +1133,7 @@ void playersTickAllChrBodies(void) setCurrentPlayerNum(prevplayernum); } -void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2) +void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2) { s32 outfit; bool solo; @@ -1323,7 +1323,7 @@ void playerTickChrBody(void) u32 stack3[2]; g_Vars.currentplayer->haschrbody = true; - currentPlayerChooseBodyAndHead(&bodynum, &headnum, &sp60); + playerChooseBodyAndHead(&bodynum, &headnum, &sp60); if (g_Vars.tickmode == TICKMODE_CUTSCENE) { weaponnum = g_DefaultWeapons[0]; @@ -1520,7 +1520,7 @@ void playerTickChrBody(void) } } -void func0f0b9538(void) +void player0f0b9538(void) { if (g_Vars.currentplayer->haschrbody) { if (!g_Vars.mplayerisrunning || (IS4MB() && PLAYERCOUNT() == 1)) { @@ -1534,22 +1534,22 @@ void func0f0b9538(void) } } -void setTickMode(s32 tickmode) +void playerSetTickMode(s32 tickmode) { g_Vars.tickmode = tickmode; g_Vars.in_cutscene = false; } -void func0f0b9650(void) +void playerBeginGeFadeIn(void) { - setTickMode(TICKMODE_0); - var80070744 = 0; + playerSetTickMode(TICKMODE_GE_FADEIN); + g_PlayerTriggerGeFadeIn = false; } void playersBeginMpSwirl(void) { - setTickMode(TICKMODE_MPSWIRL); - var80070744 = 0; + playerSetTickMode(TICKMODE_MPSWIRL); + g_PlayerTriggerGeFadeIn = false; bmoveSetMode(MOVEMODE_WALK); g_MpSwirlRotateSpeed = 0; @@ -1560,7 +1560,7 @@ void playersBeginMpSwirl(void) skyChooseAndApply(mainGetStageNum(), false); } -void currentPlayerTickMpSwirl(void) +void playerTickMpSwirl(void) { f32 angle; struct coord pos = {0, 0, 0}; @@ -1568,7 +1568,7 @@ void currentPlayerTickMpSwirl(void) struct coord up = {0, 1, 0}; s32 i; - currentPlayerSetCameraMode(CAMERAMODE_THIRDPERSON); + playerSetCameraMode(CAMERAMODE_THIRDPERSON); // This function is called once for each player per frame, // but the swirl position should only be updated once per frame, @@ -1619,25 +1619,25 @@ void currentPlayerTickMpSwirl(void) look.y = g_Vars.currentplayer->bond2.unk10.y - pos.y; look.z = g_Vars.currentplayer->bond2.unk10.z - pos.z; - func0f0c1840(&pos, &up, &look, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms); + player0f0c1840(&pos, &up, &look, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms); if (g_MpSwirlDistance < 5.0f) { - currentPlayerEndCutscene(); + playerEndCutscene(); } } -void func0f0b9a20(void) +void player0f0b9a20(void) { - setTickMode(TICKMODE_NORMAL); - var80070744 = 0; + playerSetTickMode(TICKMODE_NORMAL); + g_PlayerTriggerGeFadeIn = false; bmoveSetMode(MOVEMODE_WALK); if (mainGetStageNum() == STAGE_TEST_LEN) { - currentPlayerSetFadeColour(0, 0, 0, 1); - currentPlayerSetFadeFrac(0, 1); + playerSetFadeColour(0, 0, 0, 1); + playerSetFadeFrac(0, 1); } else if (var80070748 != 0) { - currentPlayerSetFadeColour(0, 0, 0, 1); - currentPlayerSetFadeFrac(60, 0); + playerSetFadeColour(0, 0, 0, 1); + playerSetFadeFrac(60, 0); } skyChooseAndApply(mainGetStageNum(), false); @@ -1646,46 +1646,46 @@ void func0f0b9a20(void) var8007074c = 0; } -void currentPlayerEndCutscene(void) +void playerEndCutscene(void) { if (g_IsTitleDemo) { mainChangeToStage(STAGE_TITLE); } else if (g_Vars.autocutplaying) { g_Vars.autocutfinished = true; } else { - setTickMode(TICKMODE_NORMAL); - var80070744 = 0; + playerSetTickMode(TICKMODE_NORMAL); + g_PlayerTriggerGeFadeIn = false; bmoveSetModeForAllPlayers(MOVEMODE_WALK); } } -void currentPlayerPrepareWarpToPad(s16 pad) +void playerPrepareWarpToPad(s16 pad) { - setTickMode(TICKMODE_WARP); - var80070744 = 0; + playerSetTickMode(TICKMODE_WARP); + g_PlayerTriggerGeFadeIn = false; bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - allPlayersClearMemCamRoom(); + playersClearMemCamRoom(); g_WarpPadId = pad; } -void currentPlayerPrepareWarpType2(struct var8009ddec *cmd, s32 arg1, s32 arg2) +void playerPrepareWarpType2(struct var8009ddec *cmd, s32 arg1, s32 arg2) { - setTickMode(TICKMODE_WARP); - var80070744 = 0; + playerSetTickMode(TICKMODE_WARP); + g_PlayerTriggerGeFadeIn = false; bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - allPlayersClearMemCamRoom(); + playersClearMemCamRoom(); g_WarpPadId = -1; var8009ddec = cmd; var8009de08 = arg1; var8009de0c = arg2; } -void currentPlayerPrepareWarpType3(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) +void playerPrepareWarpType3(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { - setTickMode(TICKMODE_WARP); - var80070744 = 0; + playerSetTickMode(TICKMODE_WARP); + g_PlayerTriggerGeFadeIn = false; bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - allPlayersClearMemCamRoom(); + playersClearMemCamRoom(); g_WarpPadId = -1; var8009ddec = NULL; var8009ddf0 = arg0; @@ -1709,7 +1709,7 @@ u32 var8007083c = 0x00000000; u32 g_GlobalMenuRoot = 0; GLOBAL_ASM( -glabel currentPlayerExecutePreparedWarp +glabel playerExecutePreparedWarp .late_rodata glabel var7f1ad5cc .word 0x40c907a9 @@ -1744,7 +1744,7 @@ glabel var7f1ad5cc /* f0b9d28: 8f010008 */ lw $at,0x8($t8) /* f0b9d2c: 24040001 */ addiu $a0,$zero,0x1 /* f0b9d30: af280004 */ sw $t0,0x4($t9) -/* f0b9d34: 0fc3060c */ jal currentPlayerSetCameraMode +/* f0b9d34: 0fc3060c */ jal playerSetCameraMode /* f0b9d38: af210008 */ sw $at,0x8($t9) /* f0b9d3c: 3c04800a */ lui $a0,%hi(g_WarpPadId) /* f0b9d40: 8484dde8 */ lh $a0,%lo(g_WarpPadId)($a0) @@ -1927,7 +1927,7 @@ glabel var7f1ad5cc /* f0b9fe8: 27a50040 */ addiu $a1,$sp,0x40 /* f0b9fec: 27a6004c */ addiu $a2,$sp,0x4c /* f0b9ff0: 27a70030 */ addiu $a3,$sp,0x30 -/* f0b9ff4: 0fc306e9 */ jal func0f0c1ba4 +/* f0b9ff4: 0fc306e9 */ jal player0f0c1ba4 /* f0b9ff8: afa80010 */ sw $t0,0x10($sp) /* f0b9ffc: 8fbf0024 */ lw $ra,0x24($sp) /* f0ba000: 8fb00020 */ lw $s0,0x20($sp) @@ -1937,7 +1937,7 @@ glabel var7f1ad5cc ); // Mismatch: Can't match the last section's pos -//void currentPlayerExecutePreparedWarp(void) +//void playerExecutePreparedWarp(void) //{ // struct pad pad; // 64 // struct coord pos = {0, 0, 0}; // 58 @@ -1946,7 +1946,7 @@ glabel var7f1ad5cc // s32 room; // 3c // struct coord memcampos; // 30 // -// currentPlayerSetCameraMode(CAMERAMODE_THIRDPERSON); +// playerSetCameraMode(CAMERAMODE_THIRDPERSON); // // // d4c // if (g_WarpPadId >= 0) { @@ -2015,15 +2015,15 @@ glabel var7f1ad5cc // } // } // -// func0f0c1ba4(&pos, &up, &look, &memcampos, room); +// player0f0c1ba4(&pos, &up, &look, &memcampos, room); //} -void func0f0ba010(void) +void playerStartCutscene2(void) { - setTickMode(TICKMODE_CUTSCENE); - var80070744 = 0; + playerSetTickMode(TICKMODE_CUTSCENE); + g_PlayerTriggerGeFadeIn = false; bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - allPlayersClearMemCamRoom(); + playersClearMemCamRoom(); #if VERSION >= VERSION_PAL_FINAL g_CutsceneCurAnimFrame240 = var8009e388pf; @@ -2042,7 +2042,7 @@ void func0f0ba010(void) g_Vars.cutsceneskip60ths = 0; } -void cameraDoAnimation(s16 animnum) +void playerStartCutscene(s16 animnum) { if ((!g_IsTitleDemo && !g_Vars.autocutplaying) || !g_Vars.in_cutscene @@ -2061,12 +2061,12 @@ void cameraDoAnimation(s16 animnum) g_CutsceneAnimNum = animnum; if (g_Vars.currentplayer->haschrbody) { - func0f0ba010(); + playerStartCutscene2(); } } } -void func0f0ba190(u32 arg0) +void playerReorientForCutsceneStop(u32 arg0) { struct coord sp94; struct coord sp88; @@ -2092,7 +2092,7 @@ void func0f0ba190(u32 arg0) chrSetLookAngle(g_Vars.bond->prop->chr, (360 - theta) * 0.017450513318181f); } -void func0f0ba29c(bool arg0) +void playerTickCutscene(bool arg0) { struct coord pos; struct coord up; @@ -2227,8 +2227,8 @@ void func0f0ba29c(bool arg0) fovy += barfrac * (60 - fovy); } - currentPlayerSetCameraMode(CAMERAMODE_THIRDPERSON); - func0f0c1bd8(&pos, &up, &look); + playerSetCameraMode(CAMERAMODE_THIRDPERSON); + player0f0c1bd8(&pos, &up, &look); currentPlayerSetFovY(fovy); viSetFovY(fovy); @@ -2261,12 +2261,12 @@ void func0f0ba29c(bool arg0) #endif } -f32 cutsceneGetBlurFrac(void) +f32 playerGetCutsceneBlurFrac(void) { return g_CutsceneBlurFrac; } -void currentPlayerSetZoomFovY(f32 fovy, f32 timemax) +void playerSetZoomFovY(f32 fovy, f32 timemax) { g_Vars.currentplayer->zoomintime = 0; g_Vars.currentplayer->zoomintimemax = timemax; @@ -2274,7 +2274,7 @@ void currentPlayerSetZoomFovY(f32 fovy, f32 timemax) g_Vars.currentplayer->zoominfovynew = fovy; } -f32 currentPlayerGetZoomFovY(void) +f32 playerGetZoomFovY(void) { if (g_Vars.currentplayer->zoomintimemax > g_Vars.currentplayer->zoomintime) { return g_Vars.currentplayer->zoominfovynew; @@ -2283,18 +2283,18 @@ f32 currentPlayerGetZoomFovY(void) return g_Vars.currentplayer->zoominfovy; } -void func0f0ba8b0(f32 fovy) +void playerTweenFovY(f32 targetfovy) { - if (currentPlayerGetZoomFovY() != fovy) { - if (fovy < g_Vars.currentplayer->zoominfovy) { - currentPlayerSetZoomFovY(fovy, (g_Vars.currentplayer->zoominfovy - fovy) * 15.0f / 30.0f); + if (playerGetZoomFovY() != targetfovy) { + if (g_Vars.currentplayer->zoominfovy > targetfovy) { + playerSetZoomFovY(targetfovy, (g_Vars.currentplayer->zoominfovy - targetfovy) * 15.0f / 30.0f); } else { - currentPlayerSetZoomFovY(fovy, (fovy - g_Vars.currentplayer->zoominfovy) * 15.0f / 30.0f); + playerSetZoomFovY(targetfovy, (targetfovy - g_Vars.currentplayer->zoominfovy) * 15.0f / 30.0f); } } } -f32 currentPlayerGetTeleportFovY(void) +f32 playerGetTeleportFovY(void) { f32 time; u32 fovyoffset; @@ -2316,7 +2316,7 @@ f32 currentPlayerGetTeleportFovY(void) return fovyoffset + 60.0f; } -void currentPlayerUpdateZoom(void) +void playerUpdateZoom(void) { f32 scale; f32 fovy; @@ -2342,7 +2342,7 @@ void currentPlayerUpdateZoom(void) viSetFovY(g_Vars.currentplayer->zoominfovy); if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - fovy = currentPlayerGetTeleportFovY(); + fovy = playerGetTeleportFovY(); currentPlayerSetFovY(fovy); viSetFovY(fovy); } @@ -2363,7 +2363,7 @@ void currentPlayerUpdateZoom(void) currentPlayerSetScaleBg2Gfx((1 - (1 - stage->unk34) * (1 - scale) * (10.f / 9.0f)) * scale); } -void func0f0bace0(void) +void playerStopAudioForPause(void) { struct hand *hand; s32 i; @@ -2380,7 +2380,7 @@ void func0f0bace0(void) } } -void currentPlayerTickPauseMenu(void) +void playerTickPauseMenu(void) { bool opened = false; @@ -2439,7 +2439,7 @@ void currentPlayerTickPauseMenu(void) } } -void currentPlayerPause(s32 root) +void playerPause(s32 root) { g_GlobalMenuRoot = root; @@ -2448,7 +2448,7 @@ void currentPlayerPause(s32 root) } } -void currentPlayerUnpause(void) +void playerUnpause(void) { if (g_Vars.currentplayer->pausemode == PAUSEMODE_PAUSED) { lvSetPaused(false); @@ -2457,7 +2457,7 @@ void currentPlayerUnpause(void) } } -Gfx *func0f0baf84(Gfx *gdl) +Gfx *player0f0baf84(Gfx *gdl) { if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { Mtx *a = gfxAllocateMatrix(); @@ -2473,7 +2473,7 @@ Gfx *func0f0baf84(Gfx *gdl) return gdl; } -Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) +Gfx *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) { if (frac > 0) { gDPPipeSync(gdl++); @@ -2499,16 +2499,16 @@ Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) return gdl; } -Gfx *currentPlayerDrawFade(Gfx *gdl) +Gfx *playerDrawStoredFade(Gfx *gdl) { - return fadeDraw(gdl, + return playerDrawFade(gdl, g_Vars.currentplayer->colourscreenred, g_Vars.currentplayer->colourscreengreen, g_Vars.currentplayer->colourscreenblue, g_Vars.currentplayer->colourscreenfrac); } -void currentPlayerSetFadeColour(s32 r, s32 g, s32 b, f32 frac) +void playerSetFadeColour(s32 r, s32 g, s32 b, f32 frac) { g_Vars.currentplayer->colourscreenred = r; g_Vars.currentplayer->colourscreengreen = g; @@ -2516,7 +2516,7 @@ void currentPlayerSetFadeColour(s32 r, s32 g, s32 b, f32 frac) g_Vars.currentplayer->colourscreenfrac = frac; } -void currentPlayerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) +void playerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) { g_Vars.currentplayer->colourfadetime60 = 0; g_Vars.currentplayer->colourfadetimemax60 = maxfadetime; @@ -2530,21 +2530,21 @@ void currentPlayerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) g_Vars.currentplayer->colourfadefracnew = frac; } -void currentPlayerSetFadeFrac(f32 maxfadetime, f32 frac) +void playerSetFadeFrac(f32 maxfadetime, f32 frac) { - currentPlayerAdjustFade(maxfadetime, + playerAdjustFade(maxfadetime, g_Vars.currentplayer->colourscreenred, g_Vars.currentplayer->colourscreengreen, g_Vars.currentplayer->colourscreenblue, frac); } -bool currentPlayerIsFadeComplete(void) +bool playerIsFadeComplete(void) { return g_Vars.currentplayer->colourfadetimemax60 < 0; } -void currentPlayerUpdateColourScreenProperties(void) +void playerUpdateColourScreenProperties(void) { if (g_Vars.currentplayer->colourfadetimemax60 >= 0) { g_Vars.currentplayer->colourfadetime60 += g_Vars.lvupdate240freal; @@ -2566,7 +2566,7 @@ void currentPlayerUpdateColourScreenProperties(void) } } -void currentPlayerStartChrFade(f32 duration60, f32 targetfrac) +void playerStartChrFade(f32 duration60, f32 targetfrac) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; @@ -2578,7 +2578,7 @@ void currentPlayerStartChrFade(f32 duration60, f32 targetfrac) } } -void currentPlayerTickChrFade(void) +void playerTickChrFade(void) { if (g_Vars.currentplayer->bondfadetimemax60 >= 0) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; @@ -2642,12 +2642,12 @@ struct healthdamagetype g_HealthDamageTypes[] = { * Make the health bar appear. If called while the health bar is already open, * the health displayed will be updated and the show timer will be reset. */ -void currentPlayerDisplayHealth(void) +void playerDisplayHealth(void) { switch (g_Vars.currentplayer->healthshowmode) { case HEALTHSHOWMODE_HIDDEN: g_Vars.currentplayer->oldhealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->oldarmour = currentPlayerGetShieldFrac(); + g_Vars.currentplayer->oldarmour = playerGetShieldFrac(); break; case HEALTHSHOWMODE_OPENING: case HEALTHSHOWMODE_PREVIOUS: @@ -2659,7 +2659,7 @@ void currentPlayerDisplayHealth(void) break; case HEALTHSHOWMODE_CLOSING: g_Vars.currentplayer->oldhealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->oldarmour = currentPlayerGetShieldFrac(); + g_Vars.currentplayer->oldarmour = playerGetShieldFrac(); break; } @@ -2677,7 +2677,7 @@ void currentPlayerDisplayHealth(void) g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_UPDATING; break; case HEALTHSHOWMODE_CLOSING: - g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].openendframe * currentPlayerGetHealthBarHeightFrac(); + g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].openendframe * playerGetHealthBarHeightFrac(); g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_OPENING; break; } @@ -2686,7 +2686,7 @@ void currentPlayerDisplayHealth(void) /** * Update properties relating to the damage flash and health bar updating. */ -void currentPlayerTickDamageAndHealth(void) +void playerTickDamageAndHealth(void) { /** * Handle flash of red when the player is damaged. @@ -2703,7 +2703,7 @@ void currentPlayerTickDamageAndHealth(void) if (g_Vars.currentplayer->damageshowtime == 0) { // This is the first frame of damage bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, false); - g_Vars.currentplayer->damagetype = (s32)(currentPlayerGetHealthFrac() * 8.0f); + g_Vars.currentplayer->damagetype = (s32)(playerGetHealthFrac() * 8.0f); if (g_Vars.currentplayer->damagetype > DAMAGETYPE_7) { g_Vars.currentplayer->damagetype = DAMAGETYPE_7; @@ -2743,14 +2743,14 @@ void currentPlayerTickDamageAndHealth(void) alpha = g_DamageTypes[g_Vars.currentplayer->damagetype].maxalpha * (totalframes - flashdoneframes) / (totalframes - flashfullframe); } - currentPlayerSetFadeColour( + playerSetFadeColour( g_DamageTypes[g_Vars.currentplayer->damagetype].red, g_DamageTypes[g_Vars.currentplayer->damagetype].green, g_DamageTypes[g_Vars.currentplayer->damagetype].blue, alpha); } } else { g_Vars.currentplayer->damageshowtime = -1; - currentPlayerSetFadeColour(0xff, 0xff, 0xff, 0); + playerSetFadeColour(0xff, 0xff, 0xff, 0); if (!g_Vars.currentplayer->isdead) { bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, true); @@ -2764,9 +2764,9 @@ void currentPlayerTickDamageAndHealth(void) * This works similarly to the damage code above, in that the health bar is * split into 8 parts and the current part is used to look up settings. */ - if (currentPlayerIsHealthVisible()) { + if (playerIsHealthVisible()) { if (g_Vars.currentplayer->healthshowmode == HEALTHSHOWMODE_OPENING) { - g_Vars.currentplayer->healthdamagetype = (s32)((currentPlayerGetHealthFrac() + currentPlayerGetShieldFrac()) * 8.0f); + g_Vars.currentplayer->healthdamagetype = (s32)((playerGetHealthFrac() + playerGetShieldFrac()) * 8.0f); if (g_Vars.currentplayer->healthdamagetype > DAMAGETYPE_7) { g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7; @@ -2827,7 +2827,7 @@ void currentPlayerTickDamageAndHealth(void) } healthdiff = g_Vars.currentplayer->oldhealth - g_Vars.currentplayer->bondhealth; - armourdiff = g_Vars.currentplayer->oldarmour - currentPlayerGetShieldFrac(); + armourdiff = g_Vars.currentplayer->oldarmour - playerGetShieldFrac(); g_Vars.currentplayer->apparenthealth = g_Vars.currentplayer->oldhealth - frac * healthdiff; g_Vars.currentplayer->apparentarmour = g_Vars.currentplayer->oldarmour - frac * armourdiff; @@ -2838,7 +2838,7 @@ void currentPlayerTickDamageAndHealth(void) break; case HEALTHSHOWMODE_CURRENT: g_Vars.currentplayer->apparenthealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->apparentarmour = currentPlayerGetShieldFrac(); + g_Vars.currentplayer->apparentarmour = playerGetShieldFrac(); g_Vars.currentplayer->healthshowtime += g_Vars.diffframe60freal; if (currentPlayerIsMenuOpenInSoloOrMp()) { @@ -2867,7 +2867,7 @@ void currentPlayerTickDamageAndHealth(void) } } -bool currentPlayerIsDamageVisible(void) +bool playerIsDamageVisible(void) { return g_Vars.currentplayer->damageshowtime >= 0; } @@ -2878,7 +2878,7 @@ bool currentPlayerIsDamageVisible(void) * May be called while the red flash is already happening, which may result in * the fade being reset to the full alpha point. */ -void currentPlayerDisplayDamage(void) +void playerDisplayDamage(void) { /** * @bug: This should be using damagetype (not healthdamagetype) as the array @@ -2919,14 +2919,14 @@ Gfx *playerRenderHealthBar(Gfx *gdl) return gdl; } -void currentPlayerSurroundWithExplosions(s32 arg0) +void playerSurroundWithExplosions(s32 arg0) { g_Vars.currentplayer->bondexploding = true; g_Vars.currentplayer->bondnextexplode = arg0 + g_Vars.lvframe60; g_Vars.currentplayer->bondcurexplode = 0; } -void currentPlayerTickExplode(void) +void playerTickExplode(void) { g_Vars.currentplayer->bondcurexplode++; @@ -2953,7 +2953,7 @@ void currentPlayerTickExplode(void) } } -void viResetLoResIf4Mb(void) +void playerResetLoResIf4Mb(void) { if (IS4MB()) { #if PAL @@ -2977,18 +2977,18 @@ void viResetLoResIf4Mb(void) } } -void optionsSetHiRes(bool enable) +void playerSetHiResEnabled(bool enable) { g_HiResEnabled = enable; } -s16 viGetFbWidth(void) +s16 playerGetFbWidth(void) { s16 width = g_ViModes[g_ViRes].fbwidth; return width; } -s16 viGetFbHeight(void) +s16 playerGetFbHeight(void) { s16 height = g_ViModes[g_ViRes].fbheight; @@ -3000,7 +3000,7 @@ s16 viGetFbHeight(void) } #if VERSION >= VERSION_NTSC_1_0 -bool is2PSharedViewport(void) +bool playerHasSharedViewport(void) { if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && menuGetRoot() == MENUROOT_MPENDSCREEN @@ -3012,12 +3012,12 @@ bool is2PSharedViewport(void) } #endif -s16 currentPlayerGetViewportWidth(void) +s16 playerGetViewportWidth(void) { s16 width; #if VERSION >= VERSION_NTSC_1_0 - if (!is2PSharedViewport()) + if (!playerHasSharedViewport()) #else if ((!g_InCutscene || g_MainIsEndscreen) && menuGetRoot() != MENUROOT_COOPCONTINUE) #endif @@ -3053,10 +3053,10 @@ s16 currentPlayerGetViewportWidth(void) return width; } -s16 currentPlayerGetViewportLeft(void) +s16 playerGetViewportLeft(void) { #if VERSION >= VERSION_NTSC_1_0 - s32 something = !is2PSharedViewport(); + s32 something = !playerHasSharedViewport(); #else s32 something = !((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE); #endif @@ -3091,13 +3091,13 @@ s16 currentPlayerGetViewportLeft(void) return left; } -s16 currentPlayerGetViewportHeight(void) +s16 playerGetViewportHeight(void) { s16 height; if (PLAYERCOUNT() >= 2 #if VERSION >= VERSION_NTSC_1_0 - && !is2PSharedViewport() + && !playerHasSharedViewport() #else && !((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE) #endif @@ -3143,13 +3143,13 @@ s16 currentPlayerGetViewportHeight(void) } #if VERSION >= VERSION_NTSC_1_0 -s16 currentPlayerGetViewportTop(void) +s16 playerGetViewportTop(void) { s16 top; if (PLAYERCOUNT() >= 2 #if VERSION >= VERSION_NTSC_1_0 - && !is2PSharedViewport() + && !playerHasSharedViewport() #else && !((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE) #endif @@ -3207,7 +3207,7 @@ s16 currentPlayerGetViewportTop(void) } #else GLOBAL_ASM( -glabel currentPlayerGetViewportTop +glabel playerGetViewportTop /* f0baad4: 3c07800a */ lui $a3,0x800a /* f0baad8: 24e7e6c0 */ addiu $a3,$a3,-6464 /* f0baadc: 8cee006c */ lw $t6,0x6c($a3) @@ -3550,12 +3550,12 @@ glabel currentPlayerGetViewportTop ); #endif -f32 func0f0bd358(void) +f32 player0f0bd358(void) { f32 result; s16 stack; - s16 height = currentPlayerGetViewportHeight(); - s16 width = currentPlayerGetViewportWidth(); + s16 height = playerGetViewportHeight(); + s16 width = playerGetViewportWidth(); result = (f32)width / (f32)height; result = g_ViModes[g_ViRes].yscale * result; @@ -3563,7 +3563,7 @@ f32 func0f0bd358(void) return result; } -void func0f0bd3c4(void) +void playerUpdateShake(void) { struct coord coord = {0, 0, 0}; @@ -3574,9 +3574,10 @@ void func0f0bd3c4(void) } } -void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) +void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) { - setTickMode(TICKMODE_AUTOWALK); + playerSetTickMode(TICKMODE_AUTOWALK); + g_Vars.currentplayer->autocontrol_aimpad = aimpad; g_Vars.currentplayer->autocontrol_walkspeed = walkspeed; g_Vars.currentplayer->autocontrol_turnspeed = turnspeed; @@ -3584,7 +3585,7 @@ void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 g_Vars.currentplayer->autocontrol_dist = dist; } -void currentPlayerLaunchSlayerRocket(struct weaponobj *rocket) +void playerLaunchSlayerRocket(struct weaponobj *rocket) { g_Vars.currentplayer->slayerrocket = rocket; g_Vars.currentplayer->visionmode = VISIONMODE_SLAYERROCKET; @@ -3599,7 +3600,7 @@ void currentPlayerLaunchSlayerRocket(struct weaponobj *rocket) g_Vars.currentplayer->badrockettime = 0; } -void currentPlayerTickTeleport(f32 *aspectratio) +void playerTickTeleport(f32 *aspectratio) { if (g_Vars.currentplayer->teleportstate) { // empty @@ -3659,31 +3660,31 @@ void currentPlayerTickTeleport(f32 *aspectratio) } if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - f32 fovy = currentPlayerGetTeleportFovY(); + f32 fovy = playerGetTeleportFovY(); currentPlayerSetFovY(fovy); viSetFovY(fovy); } } -void currentPlayerConfigureVi(void) +void playerConfigureVi(void) { - f32 ratio = func0f0bd358(); + f32 ratio = player0f0bd358(); g_ViRes = VIRES_LO; func0f1531dc(false); currentPlayerSetFovY(60); currentPlayerSetAspectRatio(ratio); - currentPlayerSetViewSize(currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight()); - currentPlayerSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop()); + currentPlayerSetViewSize(playerGetViewportWidth(), playerGetViewportHeight()); + currentPlayerSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); viSetMode(g_ViModes[g_ViRes].xscale); - viSetFovAspectAndSize(60, ratio, currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight()); + viSetFovAspectAndSize(60, ratio, playerGetViewportWidth(), playerGetViewportHeight()); - viSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop()); - viSetSize(viGetFbWidth(), viGetFbHeight()); - viSetBufSize(viGetFbWidth(), viGetFbHeight()); + viSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); + viSetSize(playerGetFbWidth(), playerGetFbHeight()); + viSetBufSize(playerGetFbWidth(), playerGetFbHeight()); } void playerTick(bool arg0) @@ -3708,9 +3709,9 @@ void playerTick(bool arg0) #endif if (optionsGetScreenRatio() == SCREENRATIO_16_9) { - aspectratio = func0f0bd358() * 1.33333333f; + aspectratio = player0f0bd358() * 1.33333333f; } else { - aspectratio = func0f0bd358(); + aspectratio = player0f0bd358(); } #if PAL @@ -3726,7 +3727,7 @@ void playerTick(bool arg0) } if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - currentPlayerTickTeleport(&aspectratio); + playerTickTeleport(&aspectratio); } if (g_Vars.stagenum == STAGE_TEST_OLD && func0f01ad5c()) { @@ -3736,17 +3737,17 @@ void playerTick(bool arg0) currentPlayerSetFovY(60); currentPlayerSetAspectRatio(aspectratio); - currentPlayerSetViewSize(currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight()); - currentPlayerSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop()); + currentPlayerSetViewSize(playerGetViewportWidth(), playerGetViewportHeight()); + currentPlayerSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); viSetMode(g_ViModes[g_ViRes].xscale); - viSetFovAspectAndSize(60, aspectratio, currentPlayerGetViewportWidth(), currentPlayerGetViewportHeight()); - viSetViewPosition(currentPlayerGetViewportLeft(), currentPlayerGetViewportTop()); - viSetSize(viGetFbWidth(), viGetFbHeight()); - viSetBufSize(viGetFbWidth(), viGetFbHeight()); + viSetFovAspectAndSize(60, aspectratio, playerGetViewportWidth(), playerGetViewportHeight()); + viSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); + viSetSize(playerGetFbWidth(), playerGetFbHeight()); + viSetBufSize(playerGetFbWidth(), playerGetFbHeight()); - currentPlayerUpdateColourScreenProperties(); - currentPlayerTickChrFade(); + playerUpdateColourScreenProperties(); + playerTickChrFade(); bmoveSetAutoAimY(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex)); bmoveSetAutoAimX(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex)); @@ -3754,16 +3755,16 @@ void playerTick(bool arg0) bgunSetGunAmmoVisible(GUNAMMOREASON_OPTION, optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex)); bgunSetSightVisible(GUNSIGHTREASON_1, true); - if ((g_Vars.tickmode == TICKMODE_0 || g_Vars.tickmode == TICKMODE_NORMAL) && !g_InCutscene && !g_MainIsEndscreen) { + if ((g_Vars.tickmode == TICKMODE_GE_FADEIN || g_Vars.tickmode == TICKMODE_NORMAL) && !g_InCutscene && !g_MainIsEndscreen) { g_Vars.currentplayer->bondviewlevtime60 += g_Vars.lvupdate240_60; } if (g_Vars.currentplayer->devicesactive & DEVICE_SUICIDEPILL) { - currentPlayerDieByShooter(g_Vars.currentplayernum, true); + playerDieByShooter(g_Vars.currentplayernum, true); } - currentPlayerTickDamageAndHealth(); - currentPlayerTickExplode(); + playerTickDamageAndHealth(); + playerTickExplode(); if (g_Vars.currentplayer->eyespy) { // The stage uses an eyespy @@ -3793,7 +3794,7 @@ void playerTick(bool arg0) && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (buttons & START_BUTTON)) { if (g_Vars.mplayerisrunning == false) { - currentPlayerPause(MENUROOT_MAINMENU); + playerPause(MENUROOT_MAINMENU); } else { mpPushPauseDialog(); } @@ -3837,11 +3838,11 @@ void playerTick(bool arg0) } if (lvIsPaused()) { - func0f0bace0(); + playerStopAudioForPause(); } if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { - currentPlayerTickPauseMenu(); + playerTickPauseMenu(); } if (g_Vars.currentplayer->visionmode == VISIONMODE_SLAYERROCKET) { @@ -3868,7 +3869,7 @@ void playerTick(bool arg0) if (g_Vars.currentplayer->haschrbody) { g_Vars.currentplayer->invdowntime = PALDOWN(-40); bmoveTick(0, 0, 0, 1); - func0f0ba29c(arg0); + playerTickCutscene(arg0); g_Vars.currentplayer->invdowntime = PALDOWN(-40); } @@ -3887,14 +3888,14 @@ void playerTick(bool arg0) sp308.z = g_Vars.currentplayer->eyespy->prop->pos.z; playerTickChrBody(); bmoveTick(0, 0, 0, 1); - currentPlayerSetCameraMode(CAMERAMODE_EYESPY); - func0f0c1bd8(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look); + playerSetCameraMode(CAMERAMODE_EYESPY); + player0f0c1bd8(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look); } else if (g_Vars.currentplayer->teleportstate == TELEPORTSTATE_WHITE) { // Deep Sea teleport playerTickChrBody(); g_WarpPadId = g_Vars.currentplayer->teleportcamerapad; bmoveTick(0, 0, 0, 1); - currentPlayerExecutePreparedWarp(); + playerExecutePreparedWarp(); } else if (g_Vars.currentplayer->visionmode == (u32)VISIONMODE_SLAYERROCKET) { // Controlling a Slayer rocket struct coord sp2fc = {0, 0, 0}; @@ -3904,10 +3905,10 @@ void playerTick(bool arg0) bool rocketok = false; struct weaponobj *rocket = g_Vars.currentplayer->slayerrocket; - currentPlayerSetCameraMode(CAMERAMODE_THIRDPERSON); + playerSetCameraMode(CAMERAMODE_THIRDPERSON); playerTickChrBody(); bmoveTick(0, 0, 0, 1); - func0f0bd3c4(); + playerUpdateShake(); if (rocket && rocket->base.prop) { f32 sp2b8[3][3]; @@ -4059,7 +4060,7 @@ void playerTick(bool arg0) if (pause) { if (g_Vars.mplayerisrunning == false) { - currentPlayerPause(MENUROOT_MAINMENU); + playerPause(MENUROOT_MAINMENU); } else { mpPushPauseDialog(); } @@ -4183,9 +4184,9 @@ void playerTick(bool arg0) g_Vars.currentplayer->waitforzrelease = true; if (rocket && rocket->base.prop) { - func0f0c1840(&sp2fc, &sp2e4, &sp2f0, &rocket->base.prop->pos, rocket->base.prop->rooms); + player0f0c1840(&sp2fc, &sp2e4, &sp2f0, &rocket->base.prop->pos, rocket->base.prop->rooms); } else { - func0f0c1840(&sp2fc, &sp2e4, &sp2f0, NULL, NULL); + player0f0c1840(&sp2fc, &sp2e4, &sp2f0, NULL, NULL); } } else if (g_Vars.tickmode == TICKMODE_NORMAL) { // Normal movement @@ -4197,7 +4198,7 @@ void playerTick(bool arg0) struct chrdata *chr; s32 i; - func0f0b9538(); + player0f0b9538(); if (g_PlayersWithControl[g_Vars.currentplayernum]) { bmoveTick(1, 1, arg0, 0); @@ -4205,8 +4206,8 @@ void playerTick(bool arg0) bmoveTick(0, 0, 0, 1); } - func0f0bd3c4(); - currentPlayerSetCameraMode(CAMERAMODE_DEFAULT); + playerUpdateShake(); + playerSetCameraMode(CAMERAMODE_DEFAULT); spf4.x = g_Vars.currentplayer->bond2.unk10.x; spf4.y = g_Vars.currentplayer->bond2.unk10.y; @@ -4216,7 +4217,7 @@ void playerTick(bool arg0) spf4.y = b + spf4.y; spf4.z = c + spf4.z; - func0f0c1840(&spf4, + player0f0c1840(&spf4, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, @@ -4478,13 +4479,12 @@ void playerTick(bool arg0) g_Vars.aibuddies[i] = prop; } } - } else if (g_Vars.tickmode == TICKMODE_0 || g_Vars.tickmode == TICKMODE_5) { - // Unused? Suspect this is GE level fade in and GE level fade out - func0f0b9538(); + } else if (g_Vars.tickmode == TICKMODE_GE_FADEIN || g_Vars.tickmode == TICKMODE_GE_FADEOUT) { + player0f0b9538(); bmoveTick(1, 1, arg0, 0); - func0f0bd3c4(); - currentPlayerSetCameraMode(CAMERAMODE_DEFAULT); - func0f0c1840(&g_Vars.currentplayer->bond2.unk10, + playerUpdateShake(); + playerSetCameraMode(CAMERAMODE_DEFAULT); + player0f0c1840(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, @@ -4493,13 +4493,13 @@ void playerTick(bool arg0) // Start of an MP match where the camera circles around the player playerTickChrBody(); bmoveTick(0, 0, 0, 1); - currentPlayerTickMpSwirl(); + playerTickMpSwirl(); } else if (g_Vars.tickmode == TICKMODE_WARP) { // Eg. In CI training, warping from device hallways // to device room at the end of a training session playerTickChrBody(); bmoveTick(0, 0, 0, 1); - currentPlayerExecutePreparedWarp(); + playerExecutePreparedWarp(); } else if (g_Vars.tickmode == TICKMODE_AUTOWALK) { // Extraction bodyguard room and Duel f32 targetangle; @@ -4512,7 +4512,7 @@ void playerTick(bool arg0) struct pad pad; f32 speedfrac; - func0f0b9538(); + player0f0b9538(); padUnpack(g_Vars.currentplayer->autocontrol_aimpad, PADFIELD_POS, &pad); if (mainGetStageNum() == g_Stages[STAGEINDEX_EXTRACTION].id @@ -4573,11 +4573,11 @@ void playerTick(bool arg0) xdist = sqrtf(xdist * xdist + zdist * zdist); if (xdist < g_Vars.currentplayer->autocontrol_dist) { - setTickMode(TICKMODE_NORMAL); + playerSetTickMode(TICKMODE_NORMAL); } } else { if (diffangle >= -0.2f && diffangle <= 0.2f) { - setTickMode(TICKMODE_NORMAL); + playerSetTickMode(TICKMODE_NORMAL); } } @@ -4595,9 +4595,9 @@ void playerTick(bool arg0) g_Vars.currentplayer->autocontrol_y = g_Vars.currentplayer->autocontrol_walkspeed * speedfrac; bmoveTick(1, 1, 0, 1); - func0f0bd3c4(); - currentPlayerSetCameraMode(CAMERAMODE_DEFAULT); - func0f0c1840(&g_Vars.currentplayer->bond2.unk10, + playerUpdateShake(); + playerSetCameraMode(CAMERAMODE_DEFAULT); + player0f0c1840(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, @@ -4622,27 +4622,27 @@ void playerTick(bool arg0) && joyGetButtonsPressedThisFrame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) { var8007074c = 2; - if (currentPlayerIsFadeComplete()) { + if (playerIsFadeComplete()) { if (g_Vars.currentplayer->colourscreenfrac == 0) { - currentPlayerSetFadeColour(0, 0, 0, 0); - currentPlayerSetFadeFrac(60, 1); + playerSetFadeColour(0, 0, 0, 0); + playerSetFadeFrac(60, 1); } } else { if (g_Vars.currentplayer->colourfadefracnew == 0) { - currentPlayerSetFadeFrac(g_Vars.currentplayer->colourfadetime60, 1); + playerSetFadeFrac(g_Vars.currentplayer->colourfadetime60, 1); } } } if (var8007074c == 2 - && currentPlayerIsFadeComplete() + && playerIsFadeComplete() && g_Vars.currentplayer->colourscreenfrac == 1) { func0000e990(); } } - if (var80070744) { - func0f0b9650(); + if (g_PlayerTriggerGeFadeIn) { + playerBeginGeFadeIn(); } // Handle mission exit on death @@ -4669,7 +4669,7 @@ void playerTick(bool arg0) } } - if (g_Vars.tickmode == TICKMODE_5 && currentPlayerIsFadeComplete()) { + if (g_Vars.tickmode == TICKMODE_GE_FADEOUT && playerIsFadeComplete()) { mainEndStage(); } } @@ -4739,7 +4739,7 @@ struct var80070ba4 var80070ba4[4][7] = { // [wieldmode][turnmode] }, }; -void currentPlayerSetGlobalDrawWorldOffset(s32 room) +void playerSetGlobalDrawWorldOffset(s32 room) { func0f166df0(room, &g_Vars.currentplayer->globaldrawworldoffset); @@ -4750,7 +4750,7 @@ void currentPlayerSetGlobalDrawWorldOffset(s32 room) currentPlayerSetLastRoomForOffset(room); } -void currentPlayerSetGlobalDrawCameraOffset(void) +void playerSetGlobalDrawCameraOffset(void) { g_Vars.currentplayer->globaldrawcameraoffset.x = g_Vars.currentplayer->globaldrawworldoffset.x; g_Vars.currentplayer->globaldrawcameraoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y; @@ -4760,7 +4760,7 @@ void currentPlayerSetGlobalDrawCameraOffset(void) } GLOBAL_ASM( -glabel func0f0bfc7c +glabel player0f0bfc7c /* f0bfc7c: 27bdfef0 */ addiu $sp,$sp,-272 /* f0bfc80: afbf0044 */ sw $ra,0x44($sp) /* f0bfc84: afb1003c */ sw $s1,0x3c($sp) @@ -4774,7 +4774,7 @@ glabel func0f0bfc7c /* f0bfca4: 26529fc0 */ addiu $s2,$s2,%lo(g_Vars) /* f0bfca8: 8e4e0284 */ lw $t6,0x284($s2) /* f0bfcac: e7a00070 */ swc1 $f0,0x70($sp) -/* f0bfcb0: 0fc2feee */ jal currentPlayerSetGlobalDrawWorldOffset +/* f0bfcb0: 0fc2feee */ jal playerSetGlobalDrawWorldOffset /* f0bfcb4: 8dc41ba0 */ lw $a0,0x1ba0($t6) /* f0bfcb8: 0fc59e66 */ jal gfxAllocateMatrix /* f0bfcbc: 00000000 */ nop @@ -4969,7 +4969,7 @@ glabel func0f0bfc7c /* f0bffa0: 8fa400cc */ lw $a0,0xcc($sp) /* f0bffa4: 0fc2d60e */ jal func0f0b5838 /* f0bffa8: 00000000 */ nop -/* f0bffac: 0fc2ff07 */ jal currentPlayerSetGlobalDrawCameraOffset +/* f0bffac: 0fc2ff07 */ jal playerSetGlobalDrawCameraOffset /* f0bffb0: 00000000 */ nop /* f0bffb4: 8fbf0044 */ lw $ra,0x44($sp) /* f0bffb8: 8fb00038 */ lw $s0,0x38($sp) @@ -4983,7 +4983,7 @@ glabel func0f0bfc7c // - Goal seems to have less float registers available which causes it to // reload cam_look properties for the function call // - Because it has to reload, it then stores cam_look in a callee-save register -//void func0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up) +//void player0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up) //{ // f32 spd0[16]; // void *spcc; @@ -4997,7 +4997,7 @@ glabel func0f0bfc7c // s32 j; // // scale = currentPlayerGetScaleBg2Gfx(); -// currentPlayerSetGlobalDrawWorldOffset(g_Vars.currentplayer->cam_room); +// playerSetGlobalDrawWorldOffset(g_Vars.currentplayer->cam_room); // // g_Vars.currentplayer->matrix5c = gfxAllocateMatrix(); // g_Vars.currentplayer->matrix60 = gfxAllocateMatrix(); @@ -5060,10 +5060,10 @@ glabel func0f0bfc7c // currentPlayerSetUnk174c(g_Vars.currentplayer->matrix68); // currentPlayerSetUnk175c(spcc); // func0f0b5838(); -// currentPlayerSetGlobalDrawCameraOffset(); +// playerSetGlobalDrawCameraOffset(); //} -Gfx *currentPlayerUpdateShootRot(Gfx *gdl) +Gfx *playerUpdateShootRot(Gfx *gdl) { struct coord sp3c; struct coord sp30; @@ -5072,7 +5072,7 @@ Gfx *currentPlayerUpdateShootRot(Gfx *gdl) f32 rotx; f32 roty; - func0f0bfc7c(&g_Vars.currentplayer->cam_pos, + player0f0bfc7c(&g_Vars.currentplayer->cam_pos, &g_Vars.currentplayer->cam_look, &g_Vars.currentplayer->cam_up); bgun0f0a0c08(&sp30, &sp3c); @@ -5106,7 +5106,7 @@ Gfx *currentPlayerUpdateShootRot(Gfx *gdl) * May be called while the shield is already being displayed, in which case the * effect is restarted. */ -void currentPlayerDisplayShield(void) +void playerDisplayShield(void) { if (g_Vars.currentplayer->shieldshowtime < 0) { s32 rand = ((g_Vars.currentplayer->shieldshowrnd >> 16) % 200) * 4 + 800; @@ -5121,7 +5121,7 @@ void currentPlayerDisplayShield(void) /** * Render the current player's shield from the first person perspective. */ -Gfx *currentPlayerRenderShield(Gfx *gdl) +Gfx *playerRenderShield(Gfx *gdl) { f32 sp90[2]; f32 sp88[2]; @@ -5135,7 +5135,7 @@ Gfx *currentPlayerRenderShield(Gfx *gdl) s32 add; if (g_Vars.currentplayer->shieldshowtime >= 0) { - shield = currentPlayerGetShieldFrac() * 8; + shield = playerGetShieldFrac() * 8; maxrot = ((g_Vars.currentplayer->shieldshowrnd >> 16) % 200) * 4 + 800; maxrotf = maxrot; f20 = (60 - g_Vars.currentplayer->shieldshowtime) * (1.0f / 60.0f); @@ -5216,7 +5216,7 @@ Gfx *currentPlayerRenderShield(Gfx *gdl) return gdl; } -Gfx *currentPlayerRenderHud(Gfx *gdl) +Gfx *playerRenderHud(Gfx *gdl) { if (g_Vars.currentplayer->cameramode == CAMERAMODE_THIRDPERSON) { gdl = func0f0aeed8(gdl); @@ -5224,7 +5224,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) gdl = hudmsgsRender(gdl); if (g_Vars.currentplayer->isdead == false) { - gdl = currentPlayerDrawFade(gdl); + gdl = playerDrawStoredFade(gdl); } if (g_Vars.stagenum == STAGE_ESCAPE) { @@ -5244,7 +5244,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) gdl = func0f15b114(gdl); } - if (g_NbombsActive != 0) { + if (g_NbombsActive) { gdl = func0f00a490(gdl); } @@ -5252,7 +5252,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) gdl = gasRender(gdl); } - gdl = currentPlayerRenderShield(gdl); + gdl = playerRenderShield(gdl); // Adjust eyes shutting if (g_Vars.currentplayer->eyesshut) { @@ -5288,11 +5288,11 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) } if (g_Vars.currentplayer->eyesshutfrac > 0) { - gdl = fadeDraw(gdl, 0, 0, 0, g_Vars.currentplayer->eyesshutfrac); + gdl = playerDrawFade(gdl, 0, 0, 0, g_Vars.currentplayer->eyesshutfrac); } } - gdl = func0f0baf84(gdl); + gdl = player0f0baf84(gdl); // Draw menu if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->mpmenuon) { @@ -5307,7 +5307,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) } if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY - && currentPlayerIsHealthVisible() + && playerIsHealthVisible() && func0f0f0c68()) { gdl = playerRenderHealthBar(gdl); } @@ -5336,7 +5336,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) } } else { if (g_Vars.currentplayer->redbloodfinished) { - currentPlayerSetFadeColour(0x96, 0, 0, 0.70588237f); + playerSetFadeColour(0x96, 0, 0, 0.70588237f); } else { g_Vars.currentplayer->redbloodfinished = true; } @@ -5347,11 +5347,11 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) && g_Vars.currentplayer->redbloodfinished) { if (g_Vars.currentplayer->deathanimfinished == false) { g_Vars.currentplayer->deathanimfinished = true; - currentPlayerAdjustFade(60, 0, 0, 0, 1); - currentPlayerStartChrFade(120, 0); + playerAdjustFade(60, 0, 0, 0, 1); + playerStartChrFade(120, 0); } - if (currentPlayerIsFadeComplete()) { + if (playerIsFadeComplete()) { bool canrestart = false; if (g_Vars.mplayerisrunning) { @@ -5397,7 +5397,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) if (totalhealth > 0.125f && !(mainGetStageNum() == STAGE_DEEPSEA && chrHasStageFlag(NULL, 0x00000200))) { if (canrestart) { - currentPlayerDisplayHealth(); + playerDisplayHealth(); stealhealth = totalhealth * 0.5f; @@ -5427,7 +5427,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) } #else if (totalhealth > 0.125f && canrestart) { - currentPlayerDisplayHealth(); + playerDisplayHealth(); stealhealth = totalhealth * 0.5f; @@ -5519,7 +5519,7 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) gdl = radarRender(gdl); #endif - gdl = currentPlayerDrawFade(gdl); + gdl = playerDrawStoredFade(gdl); } else { gdl = func0f15b114(gdl); @@ -5557,13 +5557,13 @@ Gfx *currentPlayerRenderHud(Gfx *gdl) } gdl = hudmsgsRender(gdl); - gdl = currentPlayerDrawFade(gdl); + gdl = playerDrawStoredFade(gdl); } return gdl; } -void currentPlayerDie(bool force) +void playerDie(bool force) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; s32 shooter; @@ -5574,10 +5574,10 @@ void currentPlayerDie(bool force) shooter = g_Vars.currentplayernum; } - currentPlayerDieByShooter(shooter, force); + playerDieByShooter(shooter, force); } -void currentPlayerDieByShooter(u32 shooter, bool force) +void playerDieByShooter(u32 shooter, bool force) { #if VERSION >= VERSION_NTSC_1_0 if (!g_Vars.currentplayer->isdead && (force || !g_Vars.currentplayer->invincible)) @@ -5624,15 +5624,15 @@ void currentPlayerDieByShooter(u32 shooter, bool force) bmoveSetMode(MOVEMODE_WALK); bgun0f0a29c8(); - if (getMissionTime() - g_Vars.currentplayer->lifestarttime60 < g_Vars.currentplayerstats->shortestlife) { - g_Vars.currentplayerstats->shortestlife = getMissionTime() - g_Vars.currentplayer->lifestarttime60; + if (playerGetMissionTime() - g_Vars.currentplayer->lifestarttime60 < g_Vars.currentplayerstats->shortestlife) { + g_Vars.currentplayerstats->shortestlife = playerGetMissionTime() - g_Vars.currentplayer->lifestarttime60; } - g_Vars.currentplayer->lifestarttime60 = getMissionTime(); + g_Vars.currentplayer->lifestarttime60 = playerGetMissionTime(); } } -void currentPlayerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z) +void playerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z) { if (g_Vars.normmplayerisrunning) { s32 victimplayernum = g_Vars.currentplayernum; @@ -5655,7 +5655,7 @@ void currentPlayerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z) * * A return value of 0 means zero height, while 1 means full expanded height. */ -f32 currentPlayerGetHealthBarHeightFrac(void) +f32 playerGetHealthBarHeightFrac(void) { f32 done; f32 total; @@ -5676,13 +5676,13 @@ f32 currentPlayerGetHealthBarHeightFrac(void) return 1; } -bool currentPlayerIsHealthVisible(void) +bool playerIsHealthVisible(void) { return g_Vars.currentplayer->healthshowmode != HEALTHSHOWMODE_HIDDEN; } // Never called -void setInvincible(bool enable) +void playerSetInvincible(bool enable) { if (enable) { cheatActivate(CHEAT_INVINCIBLE); @@ -5691,22 +5691,22 @@ void setInvincible(bool enable) } } -void setBondVisible(bool visible) +void playerSetBondVisible(bool visible) { g_Vars.bondvisible = visible; } -void setBondCollisions(bool enabled) +void playerSetBondCollisionsEnabled(bool enabled) { g_Vars.bondcollisions = enabled; } -void currentPlayerSetCameraMode(s32 mode) +void playerSetCameraMode(s32 mode) { g_Vars.currentplayer->cameramode = mode; } -void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, s16 *rooms2) +void player0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, s16 *rooms2) { bool done = false; s32 room; @@ -5746,7 +5746,7 @@ void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struc } if (sp54[0] != -1 && sp54[1] == -1) { - currentPlayerSetCamPropertiesWithRoom(pos, up, look, sp54[0]); + playerSetCamPropertiesWithRoom(pos, up, look, sp54[0]); done = true; } @@ -5754,7 +5754,7 @@ void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struc for (i = 0; sp54[i] != -1; i++) { if ((g_Rooms[sp54[i]].flags & ROOMFLAG_0010) == 0) { if (func0f162128(pos, sp54[i])) { - currentPlayerSetCamPropertiesWithRoom(pos, up, look, sp54[i]); + playerSetCamPropertiesWithRoom(pos, up, look, sp54[i]); done = true; break; } @@ -5767,7 +5767,7 @@ void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struc for (i = 0; sp54[i] != -1; i++) { if (g_Rooms[sp54[i]].flags & ROOMFLAG_0010) { if (func0f162128(pos, sp54[i])) { - currentPlayerSetCamPropertiesWithRoom(pos, up, look, sp54[i]); + playerSetCamPropertiesWithRoom(pos, up, look, sp54[i]); done = true; break; } @@ -5783,64 +5783,66 @@ void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struc tmp = room = cd0002a400(pos, sp90); if (room > 0) { - currentPlayerSetCamPropertiesWithRoom(pos, up, look, tmp); + playerSetCamPropertiesWithRoom(pos, up, look, tmp); } else { - currentPlayerSetCamPropertiesWithRoom(pos, up, look, sp90[0]); + playerSetCamPropertiesWithRoom(pos, up, look, sp90[0]); } } else if (sp64[0] != -1) { tmp = room = cd0002a400(pos, sp64); if (room > 0) { - currentPlayerSetCamPropertiesWithoutRoom(pos, up, look, tmp); + playerSetCamPropertiesWithoutRoom(pos, up, look, tmp); } else { - currentPlayerSetCamPropertiesWithoutRoom(pos, up, look, sp64[0]); + playerSetCamPropertiesWithoutRoom(pos, up, look, sp64[0]); } } else { if (sp52 != -1) { - currentPlayerSetCamPropertiesWithoutRoom(pos, up, look, sp52); + playerSetCamPropertiesWithoutRoom(pos, up, look, sp52); } else { - currentPlayerSetCamPropertiesWithoutRoom(pos, up, look, 1); + playerSetCamPropertiesWithoutRoom(pos, up, look, 1); } } } } -void func0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom) +void player0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom) { s16 rooms[2]; rooms[0] = memcamroom; rooms[1] = -1; - func0f0c1840(pos, up, look, memcampos, rooms); + player0f0c1840(pos, up, look, memcampos, rooms); } -void func0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look) +void player0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look) { if (g_Vars.currentplayer->memcamroom >= 0) { - func0f0c1ba4(pos, up, look, &g_Vars.currentplayer->memcampos, g_Vars.currentplayer->memcamroom); + player0f0c1ba4(pos, up, look, &g_Vars.currentplayer->memcampos, g_Vars.currentplayer->memcamroom); } else { - func0f0c1840(pos, up, look, NULL, NULL); + player0f0c1840(pos, up, look, NULL, NULL); } } -void currentPlayerSetCamPropertiesWithRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room) +void playerSetCamPropertiesWithRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room) { g_Vars.currentplayer->memcampos.x = pos->x; g_Vars.currentplayer->memcampos.y = pos->y; g_Vars.currentplayer->memcampos.z = pos->z; g_Vars.currentplayer->memcamroom = room; - currentPlayerSetCamProperties(pos, up, look, room); + + playerSetCamProperties(pos, up, look, room); } -void currentPlayerSetCamPropertiesWithoutRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room) +void playerSetCamPropertiesWithoutRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room) { - currentPlayerClearMemCamRoom(); - currentPlayerSetCamProperties(pos, up, look, room); + playerClearMemCamRoom(); + playerSetCamProperties(pos, up, look, room); } -void currentPlayerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room) +void playerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room) { struct player *player = g_Vars.currentplayer; + player->cam_pos.x = pos->x; player->cam_pos.y = pos->y; player->cam_pos.z = pos->z; @@ -5853,19 +5855,19 @@ void currentPlayerSetCamProperties(struct coord *pos, struct coord *up, struct c player->cam_room = room; } -void currentPlayerClearMemCamRoom(void) +void playerClearMemCamRoom(void) { g_Vars.currentplayer->memcamroom = -1; } -void allPlayersClearMemCamRoom(void) +void playersClearMemCamRoom(void) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { setCurrentPlayerNum(i); - currentPlayerClearMemCamRoom(); + playerClearMemCamRoom(); } setCurrentPlayerNum(prevplayernum); @@ -5916,7 +5918,7 @@ bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end) return false; } -void currentPlayerUpdatePerimInfo(void) +void playerUpdatePerimInfo(void) { g_Vars.currentplayer->periminfo.header.type = TILETYPE_03; g_Vars.currentplayer->periminfo.header.flags = TILEFLAG_0004 | TILEFLAG_0010; @@ -5949,7 +5951,7 @@ void currentPlayerUpdatePerimInfo(void) * ymax is the top of the head, minus some if crouching, and always at least 80 * units above the feet. */ -void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin) +void playerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin) { s32 playernum = propGetPlayerNum(prop); @@ -5969,12 +5971,12 @@ void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin) } } -f32 currentPlayerGetHealthFrac(void) +f32 playerGetHealthFrac(void) { return g_Vars.currentplayer->bondhealth; } -f32 currentPlayerGetShieldFrac(void) +f32 playerGetShieldFrac(void) { f32 frac = chrGetShield(g_Vars.currentplayer->prop->chr) * 0.125f; @@ -5989,7 +5991,7 @@ f32 currentPlayerGetShieldFrac(void) return frac; } -void currentPlayerSetShieldFrac(f32 frac) +void playerSetShieldFrac(f32 frac) { if (frac < 0) { frac = 0; @@ -6002,7 +6004,7 @@ void currentPlayerSetShieldFrac(f32 frac) chrSetShield(g_Vars.currentplayer->prop->chr, frac * 8); } -s32 getMissionTime(void) +s32 playerGetMissionTime(void) { #if PAL return g_Vars.currentplayer->bondviewlevtime60 * 60 / 50; @@ -6473,14 +6475,14 @@ Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha) return gdl; } -Gfx *currentPlayerLoadMatrix(Gfx *gdl) +Gfx *playerLoadMatrix(Gfx *gdl) { gSPMatrix(gdl++, g_Vars.currentplayer->matrix5c, G_MTX_LOAD); return gdl; } GLOBAL_ASM( -glabel func0f0c3320 +glabel player0f0c3320 /* f0c3320: 27bdff80 */ addiu $sp,$sp,-128 /* f0c3324: afb50028 */ sw $s5,0x28($sp) /* f0c3328: afb40024 */ sw $s4,0x24($sp) @@ -6540,7 +6542,7 @@ glabel func0f0c3320 // &matrices[i], and calculates s5 + i * 0x40 for the second &matrices[i]. // The below stores matrices in s5, calculates s5 + i * 0x40 for the first // &matrices[i], then puts that value in s0 for the second &matrices[i]. -//void func0f0c3320(Mtxf *matrices, s32 count) +//void player0f0c3320(Mtxf *matrices, s32 count) //{ // Mtxf sp40; // s32 i; diff --git a/src/game/prop.c b/src/game/prop.c index 4fddc2b55..74c3f52ad 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -14,7 +14,7 @@ #include "game/game_0b0fd0.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_127910.h" #include "game/explosions/explosions.h" #include "game/smoke/smoke.h" @@ -6188,7 +6188,7 @@ void propGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin) if (prop->type == PROPTYPE_CHR) { chrGetBbox(prop, width, ymax, ymin); } else if (prop->type == PROPTYPE_PLAYER) { - propPlayerGetBbox(prop, width, ymax, ymin); + playerGetBbox(prop, width, ymax, ymin); } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) { propObjGetBbox(prop, width, ymax, ymin); } else { diff --git a/src/game/propobj.c b/src/game/propobj.c index de0d9f16d..719e34831 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -27,7 +27,7 @@ #include "game/game_0b3350.h" #include "game/game_0b4950.h" #include "game/game_0b63b0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/game_0c33f0.h" #include "game/hudmsg.h" #include "game/menu.h" @@ -33920,7 +33920,7 @@ glabel var7f1aa454 /* f077a14: 24050001 */ addiu $a1,$zero,0x1 /* f077a18: 0fc318ef */ jal bwalk0f0c63bc /* f077a1c: 24060020 */ addiu $a2,$zero,0x20 -/* f077a20: 0fc307fd */ jal currentPlayerUpdatePerimInfo +/* f077a20: 0fc307fd */ jal playerUpdatePerimInfo /* f077a24: 00000000 */ nop /* f077a28: 0fc32e31 */ jal bmove0f0cb8c4 /* f077a2c: 8e440064 */ lw $a0,0x64($s2) @@ -34014,7 +34014,7 @@ glabel var7f1aa454 /* f077b80: 46188203 */ div.s $f8,$f16,$f24 /* f077b84: e6080070 */ swc1 $f8,0x70($s0) .L0f077b88: -/* f077b88: 0fc307fd */ jal currentPlayerUpdatePerimInfo +/* f077b88: 0fc307fd */ jal playerUpdatePerimInfo /* f077b8c: 00000000 */ nop /* f077b90: 0fc32e31 */ jal bmove0f0cb8c4 /* f077b94: 8e440064 */ lw $a0,0x64($s2) @@ -34306,7 +34306,7 @@ glabel var7f1aa454 /* f077a14: 24050001 */ addiu $a1,$zero,0x1 /* f077a18: 0fc318ef */ jal bwalk0f0c63bc /* f077a1c: 24060020 */ addiu $a2,$zero,0x20 -/* f077a20: 0fc307fd */ jal currentPlayerUpdatePerimInfo +/* f077a20: 0fc307fd */ jal playerUpdatePerimInfo /* f077a24: 00000000 */ nop /* f077a28: 0fc32e31 */ jal bmove0f0cb8c4 /* f077a2c: 8e440064 */ lw $a0,0x64($s2) @@ -34400,7 +34400,7 @@ glabel var7f1aa454 /* f077b80: 46188203 */ div.s $f8,$f16,$f24 /* f077b84: e6080070 */ swc1 $f8,0x70($s0) .L0f077b88: -/* f077b88: 0fc307fd */ jal currentPlayerUpdatePerimInfo +/* f077b88: 0fc307fd */ jal playerUpdatePerimInfo /* f077b8c: 00000000 */ nop /* f077b90: 0fc32e31 */ jal bmove0f0cb8c4 /* f077b94: 8e440064 */ lw $a0,0x64($s2) @@ -34718,7 +34718,7 @@ glabel var7f1aa454 /* f076680: c4284774 */ lwc1 $f8,0x4774($at) /* f076684: c4500074 */ lwc1 $f16,0x74($v0) /* f076688: 46088283 */ div.s $f10,$f16,$f8 -/* f07668c: 0fc2feef */ jal currentPlayerUpdatePerimInfo +/* f07668c: 0fc2feef */ jal playerUpdatePerimInfo /* f076690: e44a0070 */ swc1 $f10,0x70($v0) /* f076694: 0fc3243d */ jal bmove0f0cb8c4 /* f076698: 8e040064 */ lw $a0,0x64($s0) @@ -52081,7 +52081,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool w if (withalpha) { if (sp6c) { - func0f0c3320(model->matrices, model->filedata->nummatrices); + player0f0c3320(model->matrices, model->filedata->nummatrices); } else { func0f0c33f0(model->matrices, model->filedata->nummatrices); } @@ -62950,7 +62950,7 @@ glabel var7f1aae70 .L0f088dc8: /* f088dc8: 10000076 */ b .L0f088fa4 /* f088dcc: 8fa20098 */ lw $v0,0x98($sp) -/* f088dd0: 0fc30884 */ jal currentPlayerSetShieldFrac +/* f088dd0: 0fc30884 */ jal playerSetShieldFrac /* f088dd4: c4cc0060 */ lwc1 $f12,0x60($a2) /* f088dd8: 3c0b800a */ lui $t3,%hi(g_Vars+0x4cc) /* f088ddc: 8d6ba48c */ lw $t3,%lo(g_Vars+0x4cc)($t3) @@ -63597,7 +63597,7 @@ glabel var7f1aae70 .L0f088dc8: /* f088dc8: 10000076 */ b .L0f088fa4 /* f088dcc: 8fa20098 */ lw $v0,0x98($sp) -/* f088dd0: 0fc30884 */ jal currentPlayerSetShieldFrac +/* f088dd0: 0fc30884 */ jal playerSetShieldFrac /* f088dd4: c4cc0060 */ lwc1 $f12,0x60($a2) /* f088dd8: 3c0b800a */ lui $t3,%hi(g_Vars+0x4cc) /* f088ddc: 8d6ba48c */ lw $t3,%lo(g_Vars+0x4cc)($t3) @@ -64244,7 +64244,7 @@ glabel var7f1aae70 .L0f088dc8: /* f088dc8: 10000076 */ b .L0f088fa4 /* f088dcc: 8fa20098 */ lw $v0,0x98($sp) -/* f088dd0: 0fc30884 */ jal currentPlayerSetShieldFrac +/* f088dd0: 0fc30884 */ jal playerSetShieldFrac /* f088dd4: c4cc0060 */ lwc1 $f12,0x60($a2) /* f088dd8: 3c0b800a */ lui $t3,%hi(g_Vars+0x4cc) /* f088ddc: 8d6ba48c */ lw $t3,%lo(g_Vars+0x4cc)($t3) @@ -64616,7 +64616,7 @@ glabel var7f1aae70 // case OBJTYPE_SHIELD: // f088dd0 - shield // { // struct shieldobj *shield = (struct shieldobj *)obj; -// currentPlayerSetShieldFrac(shield->amount); +// playerSetShieldFrac(shield->amount); // // if (g_Vars.in_cutscene == false) { // sndStart(var80095200, SFX_PICKUP_SHIELD, NULL, -1, -1, -1, -1, -1); @@ -64895,7 +64895,7 @@ s32 objTestForPickup(struct prop *prop) struct shieldobj *shield = (struct shieldobj *) prop->obj; bool ignore = false; - if (shield->amount <= currentPlayerGetShieldFrac()) { + if (shield->amount <= playerGetShieldFrac()) { ignore = true; } else if (g_Vars.normmplayerisrunning && g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE diff --git a/src/game/training/training.c b/src/game/training/training.c index fee1eef21..cc6761386 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -8,7 +8,7 @@ #include "game/atan2f.h" #include "game/bondgun.h" #include "game/game_0b0fd0.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/hudmsg.h" #include "game/menu.h" #include "game/filemgr.h" @@ -2732,7 +2732,7 @@ void frEndSession(bool hidetargets) } } - currentPlayerDisplayHealth(); + playerDisplayHealth(); g_Vars.currentplayer->bondhealth = 1; } @@ -7560,7 +7560,7 @@ void dtEnd(void) chrUnsetStageFlag(NULL, ciGetStageFlagByDeviceIndex(dtGetIndexBySlot(g_DtSlot))); g_Vars.currentplayer->training = false; chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); - currentPlayerDisplayHealth(); + playerDisplayHealth(); g_Vars.currentplayer->bondhealth = 1; } @@ -7878,7 +7878,7 @@ void htEnd(void) bgunSetPassiveMode(true); chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); - currentPlayerDisplayHealth(); + playerDisplayHealth(); g_Vars.currentplayer->bondhealth = 1; } diff --git a/src/include/constants.h b/src/include/constants.h index cf436f383..a8dc5406e 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -3900,13 +3900,13 @@ #define THREADPRI_FAULT 40 #define THREADPRI_RMON 250 -#define TICKMODE_0 0 -#define TICKMODE_NORMAL 1 -#define TICKMODE_WARP 3 -#define TICKMODE_MPSWIRL 4 -#define TICKMODE_5 5 -#define TICKMODE_CUTSCENE 6 -#define TICKMODE_AUTOWALK 7 +#define TICKMODE_GE_FADEIN 0 +#define TICKMODE_NORMAL 1 +#define TICKMODE_WARP 3 +#define TICKMODE_MPSWIRL 4 +#define TICKMODE_GE_FADEOUT 5 +#define TICKMODE_CUTSCENE 6 +#define TICKMODE_AUTOWALK 7 #define TICKOP_NONE 0 #define TICKOP_FREE 1 diff --git a/src/include/data.h b/src/include/data.h index 92c6ef453..686601828 100644 --- a/src/include/data.h +++ b/src/include/data.h @@ -262,7 +262,7 @@ extern s32 var8007072c; extern u32 var80070738; extern u32 var8007073c; extern struct gecreditsdata *g_CurrentGeCreditsData; -extern u32 var80070744; +extern bool g_PlayerTriggerGeFadeIn; extern u32 var80070748; extern u32 var8007074c; extern bool g_PlayersWithControl[]; diff --git a/src/include/game/game_0b69d0.h b/src/include/game/game_0b69d0.h deleted file mode 100644 index a488cf5fa..000000000 --- a/src/include/game/game_0b69d0.h +++ /dev/null @@ -1,110 +0,0 @@ -#ifndef _IN_GAME_GAME_0B69D0_H -#define _IN_GAME_GAME_0B69D0_H -#include -#include "data.h" -#include "types.h" - -f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms, struct prop *prop, s16 *spawnpads, s32 numspawnpads); -f32 playerChooseGeneralSpawnLocation(f32 chrwidth, struct coord *pos, s16 *rooms, struct prop *prop); -void currentPlayerStartNewLife(void); -void currentPlayerResetToDefault(void); -bool currentPlayerAssumeChrForAnti(struct chrdata *chr, s32 param_2); -void currentPlayerSpawn(void); -void func0f0b85a0(struct playerbond *pb, struct coord *pos); -void playersTickAllChrBodies(void); -void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2); -void playerTickChrBody(void); -void func0f0b9538(void); -void currentPlayerTickMpSwirl(void); -void currentPlayerExecutePreparedWarp(void); -void cameraDoAnimation(s16 anim_id); -void func0f0ba190(u32 arg0); -void func0f0ba29c(bool arg0); -f32 cutsceneGetBlurFrac(void); -void currentPlayerSetZoomFovY(f32 fovy, f32 timemax); -f32 currentPlayerGetZoomFovY(void); -void func0f0ba8b0(f32 value); -f32 currentPlayerGetTeleportFovY(void); -void currentPlayerUpdateZoom(void); -void func0f0bace0(void); -void currentPlayerTickPauseMenu(void); -void currentPlayerPause(s32 root); -void currentPlayerUnpause(void); -Gfx *func0f0baf84(Gfx *gdl); -Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac); -Gfx *currentPlayerDrawFade(Gfx *gdl); -void currentPlayerUpdateColourScreenProperties(void); -void currentPlayerTickChrFade(void); -void currentPlayerDisplayHealth(void); -void currentPlayerTickDamageAndHealth(void); -void currentPlayerDisplayDamage(void); -Gfx *playerRenderHealthBar(Gfx *gdl); -void currentPlayerSurroundWithExplosions(s32 arg0); -void currentPlayerTickExplode(void); -void viResetLoResIf4Mb(void); -s16 viGetFbWidth(void); -s16 viGetFbHeight(void); -bool is2PSharedViewport(void); -s16 currentPlayerGetViewportWidth(void); -s16 currentPlayerGetViewportLeft(void); -s16 currentPlayerGetViewportHeight(void); -s16 currentPlayerGetViewportTop(void); -f32 func0f0bd358(void); -void func0f0bd3c4(void); -void currentPlayerTickTeleport(f32 *arg0); -void currentPlayerConfigureVi(void); -void playerTick(bool arg0); -void func0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up); -Gfx *currentPlayerUpdateShootRot(Gfx *gdl); -void currentPlayerDisplayShield(void); -Gfx *currentPlayerRenderShield(Gfx *gdl); -Gfx *currentPlayerRenderHud(Gfx *gdl); -void currentPlayerDie(bool force); -void currentPlayerDieByShooter(u32 shooter, bool force); -void currentPlayerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z); -f32 currentPlayerGetHealthBarHeightFrac(void); -void func0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, s16 *rooms); -void func0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom); -void func0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look); -void allPlayersClearMemCamRoom(void); -void playerSetPerimEnabled(struct prop *prop, bool enable); -bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end); -void currentPlayerUpdatePerimInfo(void); -void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin); -f32 currentPlayerGetHealthFrac(void); -f32 currentPlayerGetShieldFrac(void); -void currentPlayerSetShieldFrac(f32 frac); -s32 getMissionTime(void); -s32 playerTickBeams(struct prop *prop); -s32 playerTickThirdPerson(struct prop *prop); -void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfg); -Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha); -Gfx *currentPlayerLoadMatrix(Gfx *gdl); -void func0f0c3320(Mtxf *matrices, s32 count); -void setTickMode(s32 tickmode); -void func0f0b9650(void); -void playersBeginMpSwirl(void); -void func0f0b9a20(void); -void currentPlayerEndCutscene(void); -void currentPlayerPrepareWarpToPad(s16 pad_id); -void currentPlayerPrepareWarpType2(struct var8009ddec *cmd, s32 arg1, s32 arg2); -void currentPlayerPrepareWarpType3(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); -void func0f0ba010(void); -void currentPlayerSetFadeColour(s32 r, s32 g, s32 b, f32 a); -void currentPlayerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac); -void currentPlayerSetFadeFrac(f32 maxfadetime, f32 frac); -bool currentPlayerIsFadeComplete(void); -void currentPlayerStartChrFade(f32 duration60, f32 targetfrac); -void optionsSetHiRes(bool enable); -void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist); -void currentPlayerLaunchSlayerRocket(struct weaponobj *rocket); -void currentPlayerSetGlobalDrawWorldOffset(s32 room); -void currentPlayerSetGlobalDrawCameraOffset(void); -bool currentPlayerIsHealthVisible(void); -void currentPlayerSetCameraMode(s32 mode); -void currentPlayerSetCamPropertiesWithRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void currentPlayerSetCamPropertiesWithoutRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void currentPlayerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void currentPlayerClearMemCamRoom(void); - -#endif diff --git a/src/include/game/player.h b/src/include/game/player.h new file mode 100644 index 000000000..5292bd169 --- /dev/null +++ b/src/include/game/player.h @@ -0,0 +1,110 @@ +#ifndef _IN_GAME_PLAYER_H +#define _IN_GAME_PLAYER_H +#include +#include "data.h" +#include "types.h" + +f32 playerChooseSpawnLocation(f32 chrwidth, struct coord *dstpos, s16 *dstrooms, struct prop *prop, s16 *spawnpads, s32 numspawnpads); +f32 playerChooseGeneralSpawnLocation(f32 chrwidth, struct coord *pos, s16 *rooms, struct prop *prop); +void playerStartNewLife(void); +void playerLoadDefaults(void); +bool playerSpawnAnti(struct chrdata *chr, s32 param_2); +void playerSpawn(void); +void playerResetBond(struct playerbond *pb, struct coord *pos); +void playersTickAllChrBodies(void); +void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2); +void playerTickChrBody(void); +void player0f0b9538(void); +void playerTickMpSwirl(void); +void playerExecutePreparedWarp(void); +void playerStartCutscene(s16 anim_id); +void playerReorientForCutsceneStop(u32 arg0); +void playerTickCutscene(bool arg0); +f32 playerGetCutsceneBlurFrac(void); +void playerSetZoomFovY(f32 fovy, f32 timemax); +f32 playerGetZoomFovY(void); +void playerTweenFovY(f32 targetfovy); +f32 playerGetTeleportFovY(void); +void playerUpdateZoom(void); +void playerStopAudioForPause(void); +void playerTickPauseMenu(void); +void playerPause(s32 root); +void playerUnpause(void); +Gfx *player0f0baf84(Gfx *gdl); +Gfx *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac); +Gfx *playerDrawStoredFade(Gfx *gdl); +void playerUpdateColourScreenProperties(void); +void playerTickChrFade(void); +void playerDisplayHealth(void); +void playerTickDamageAndHealth(void); +void playerDisplayDamage(void); +Gfx *playerRenderHealthBar(Gfx *gdl); +void playerSurroundWithExplosions(s32 arg0); +void playerTickExplode(void); +void playerResetLoResIf4Mb(void); +s16 playerGetFbWidth(void); +s16 playerGetFbHeight(void); +bool playerHasSharedViewport(void); +s16 playerGetViewportWidth(void); +s16 playerGetViewportLeft(void); +s16 playerGetViewportHeight(void); +s16 playerGetViewportTop(void); +f32 player0f0bd358(void); +void playerUpdateShake(void); +void playerTickTeleport(f32 *arg0); +void playerConfigureVi(void); +void playerTick(bool arg0); +void player0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up); +Gfx *playerUpdateShootRot(Gfx *gdl); +void playerDisplayShield(void); +Gfx *playerRenderShield(Gfx *gdl); +Gfx *playerRenderHud(Gfx *gdl); +void playerDie(bool force); +void playerDieByShooter(u32 shooter, bool force); +void playerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z); +f32 playerGetHealthBarHeightFrac(void); +void player0f0c1840(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, s16 *rooms); +void player0f0c1ba4(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom); +void player0f0c1bd8(struct coord *pos, struct coord *up, struct coord *look); +void playersClearMemCamRoom(void); +void playerSetPerimEnabled(struct prop *prop, bool enable); +bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end); +void playerUpdatePerimInfo(void); +void playerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin); +f32 playerGetHealthFrac(void); +f32 playerGetShieldFrac(void); +void playerSetShieldFrac(f32 frac); +s32 playerGetMissionTime(void); +s32 playerTickBeams(struct prop *prop); +s32 playerTickThirdPerson(struct prop *prop); +void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfg); +Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha); +Gfx *playerLoadMatrix(Gfx *gdl); +void player0f0c3320(Mtxf *matrices, s32 count); +void playerSetTickMode(s32 tickmode); +void playerBeginGeFadeIn(void); +void playersBeginMpSwirl(void); +void player0f0b9a20(void); +void playerEndCutscene(void); +void playerPrepareWarpToPad(s16 pad_id); +void playerPrepareWarpType2(struct var8009ddec *cmd, s32 arg1, s32 arg2); +void playerPrepareWarpType3(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); +void playerStartCutscene2(void); +void playerSetFadeColour(s32 r, s32 g, s32 b, f32 a); +void playerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac); +void playerSetFadeFrac(f32 maxfadetime, f32 frac); +bool playerIsFadeComplete(void); +void playerStartChrFade(f32 duration60, f32 targetfrac); +void playerSetHiResEnabled(bool enable); +void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist); +void playerLaunchSlayerRocket(struct weaponobj *rocket); +void playerSetGlobalDrawWorldOffset(s32 room); +void playerSetGlobalDrawCameraOffset(void); +bool playerIsHealthVisible(void); +void playerSetCameraMode(s32 mode); +void playerSetCamPropertiesWithRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room); +void playerSetCamPropertiesWithoutRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room); +void playerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room); +void playerClearMemCamRoom(void); + +#endif diff --git a/src/lib/gvars.c b/src/lib/gvars.c index 41e04cceb..51e17e794 100644 --- a/src/lib/gvars.c +++ b/src/lib/gvars.c @@ -46,7 +46,7 @@ void gvarsInit(void) g_Vars.numaibuddies = 0; g_Vars.bondvisible = true; g_Vars.bondcollisions = true; - g_Vars.tickmode = TICKMODE_0; + g_Vars.tickmode = TICKMODE_GE_FADEIN; g_Vars.roomcount = 350; g_Vars.mplayerisrunning = 0; g_Vars.normmplayerisrunning = 0; diff --git a/src/lib/vi.c b/src/lib/vi.c index c403515b2..337d50788 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -2,7 +2,7 @@ #include "constants.h" #include "game/game_0b3350.h" #include "game/game_0b4950.h" -#include "game/game_0b69d0.h" +#include "game/player.h" #include "game/file.h" #include "game/game_176080.h" #include "game/gfxmemory.h" @@ -158,7 +158,7 @@ void viConfigureForLegal(void) g_Vars.fourmeg2player = false; #if VERSION >= VERSION_PAL_FINAL - viResetLoResIf4Mb(); + playerResetLoResIf4Mb(); #endif } @@ -1949,7 +1949,7 @@ Gfx *viRenderViewportEdges(Gfx *gdl) #if VERSION >= VERSION_NTSC_1_0 if (PLAYERCOUNT() == 1 || ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && is2PSharedViewport() && g_Vars.currentplayernum == 0)) + && playerHasSharedViewport() && g_Vars.currentplayernum == 0)) #else if (PLAYERCOUNT() == 1 || ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0)