Split game_0b63b0.c into game_0b69d0.c

This commit is contained in:
Ryan Dwyer 2021-01-16 21:09:59 +10:00
parent 7054c1c0a4
commit 77156f1a7b
37 changed files with 11707 additions and 11624 deletions

View File

@ -96,6 +96,7 @@
build/ROMID/game/game_0b28d0.o (section); \
build/ROMID/game/game_0b3350.o (section); \
build/ROMID/game/game_0b63b0.o (section); \
build/ROMID/game/game_0b69d0.o (section); \
build/ROMID/game/game_0c33f0.o (section); \
build/ROMID/game/bondcutscene.o (section); \
build/ROMID/game/bondwalk.o (section); \

View File

@ -17,7 +17,7 @@
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
#include "game/core.h"
#include "game/pdoptions.h"

View File

@ -13,7 +13,7 @@
#include "game/game_0601b0.h"
#include "game/game_092610.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"

View File

@ -15,7 +15,7 @@
#include "game/game_0601b0.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
#include "game/propobj.h"
#include "gvars/gvars.h"

View File

@ -21,7 +21,7 @@
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/bondcutscene.h"
#include "game/bondhead.h"
#include "game/game_127910.h"

View File

@ -18,7 +18,7 @@
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/inventory/inventory.h"
#include "game/bondhead.h"
#include "game/game_127910.h"

View File

@ -22,7 +22,7 @@
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0c33f0.h"
#include "game/game_127910.h"
#include "game/game_128f30.h"

View File

@ -25,7 +25,7 @@
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/explosions/explosions.h"

View File

@ -27,7 +27,7 @@
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"

View File

@ -66,6 +66,7 @@
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/game_0f09f0.h"

View File

@ -10,7 +10,7 @@
#include "game/game_005fd0.h"
#include "game/title.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0e0770.h"
#include "game/game_0f09f0.h"

View File

@ -11,7 +11,7 @@
#include "game/dlights.h"
#include "game/game_092610.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"

View File

@ -14,7 +14,7 @@
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0e0770.h"
#include "game/game_0f09f0.h"

View File

@ -17,7 +17,7 @@
#include "game/game_0601b0.h"
#include "game/game_091e10.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/inventory/inventory.h"
#include "game/game_1655c0.h"
#include "game/mplayer/scenarios.h"

View File

@ -13,7 +13,7 @@
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0e0770.h"
#include "game/game_0f09f0.h"
#include "game/game_102240.h"

View File

@ -20,7 +20,7 @@
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"

View File

@ -25,7 +25,7 @@
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0c33f0.h"
#include "game/game_0d7070.h"
#include "game/inventory/inventory.h"

View File

@ -11,7 +11,7 @@
#include "game/inventory/items.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/game_127910.h"
#include "game/mplayer/setup.h"

File diff suppressed because it is too large Load Diff

11565
src/game/game_0b69d0.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d5a90.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"

View File

@ -10,7 +10,7 @@
#include "game/data/data_02da90.h"
#include "game/game_092610.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/game_0e0770.h"

View File

@ -15,7 +15,7 @@
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0e0770.h"
#include "game/menu/items.h"

View File

@ -18,7 +18,7 @@
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_107fb0.h"

View File

@ -9,7 +9,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/propobj.h"
#include "gvars/gvars.h"

View File

@ -16,7 +16,7 @@
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_11f000.h"
#include "game/sky.h"
#include "game/game_13b670.h"

View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02a0e0.h"
#include "game/data/data_02da90.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_176080.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"

View File

@ -15,7 +15,7 @@
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/mplayer/setup.h"

View File

@ -10,7 +10,7 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_157db0.h"
#include "game/game_19aa80.h"

View File

@ -13,7 +13,7 @@
#include "game/game_01b0a0.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0f09f0.h"
#include "game/game_127910.h"

View File

@ -16,7 +16,7 @@
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/game_0f09f0.h"

View File

@ -16,7 +16,7 @@
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/game_0f09f0.h"

View File

@ -34,7 +34,7 @@
#include "game/game_0b0420.h"
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0c33f0.h"
#include "game/game_0dcdb0.h"
#include "game/game_0f09f0.h"

View File

@ -16,7 +16,7 @@
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b0420.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"

View File

@ -10,107 +10,5 @@ void func0f0b656c(s32 arg0);
u32 func0f0b65a8(void);
void func0f0b65f8(void);
void acousticReset(void);
f32 func0f0b69d0(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, s16 *spawnpads, s16 numspawnpads);
f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
void func0f0b72dc(void);
void currentPlayerResetToDefault(void);
bool currentPlayerAssumeChrForAnti(struct chrdata *chr, s32 param_2);
void currentPlayerSpawn(void);
void func0f0b85a0(struct playerbond *pb, struct coord *pos);
void func0f0b85f8(void);
void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2);
void func0f0b8ba0(void);
void func0f0b9538(void);
void func0f0b96e8(void);
void func0f0b9cbc(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 func0f0baf38(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 func0f0bb69c(void);
void func0f0bb814(void);
void func0f0bbf14(void);
Gfx *hudRenderHealthBar(Gfx *gdl);
void currentPlayerSurroundWithExplosions(s32 arg0);
void currentPlayerTickExplode(void);
void viResetDefaultModeIf4Mb(void);
s16 viGetFbWidth(void);
s16 viGetFbHeight(void);
bool func0f0bc4c0(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 func0f0bd904(bool arg0);
void func0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up);
Gfx *currentPlayerUpdateShootRot(Gfx *gdl);
void currentPlayerUpdateShieldShow(void);
Gfx *func0f0c0190(Gfx *gdl);
Gfx *func0f0c07c8(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 func0f0c1e54(struct prop *prop, bool enable);
bool playerUpdateGeometry(struct prop *prop, struct geo **arg1, struct geo **arg2);
void currentPlayerUpdatePerimInfo(void);
void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
f32 currentPlayerGetHealthFrac(void);
f32 currentPlayerGetShieldFrac(void);
void currentPlayerSetShieldFrac(f32 shield);
s32 getMissionTime(void);
s32 func0f0c228c(struct prop *prop);
u32 func0f0c2364(void);
u32 func0f0c2a58(void);
Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha);
Gfx *currentPlayerLoadMatrix(Gfx *gdl);
u32 func0f0c3320(void);
void setTickMode(s32 tickmode);
void func0f0b9650(void);
void func0f0b9674(void);
void func0f0b9a20(void);
void func0f0b9afc(void);
void warpBondToPad(s16 pad_id);
void func0f0b9bac(u32 *cmd, s32 arg1, s32 arg2);
void func0f0b9c1c(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

View File

@ -0,0 +1,109 @@
#ifndef _IN_GAME_GAME_0B69D0_H
#define _IN_GAME_GAME_0B69D0_H
#include <ultra64.h>
#include "types.h"
f32 func0f0b69d0(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, s16 *spawnpads, s16 numspawnpads);
f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
void func0f0b72dc(void);
void currentPlayerResetToDefault(void);
bool currentPlayerAssumeChrForAnti(struct chrdata *chr, s32 param_2);
void currentPlayerSpawn(void);
void func0f0b85a0(struct playerbond *pb, struct coord *pos);
void func0f0b85f8(void);
void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2);
void func0f0b8ba0(void);
void func0f0b9538(void);
void func0f0b96e8(void);
void func0f0b9cbc(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 func0f0baf38(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 func0f0bb69c(void);
void func0f0bb814(void);
void func0f0bbf14(void);
Gfx *hudRenderHealthBar(Gfx *gdl);
void currentPlayerSurroundWithExplosions(s32 arg0);
void currentPlayerTickExplode(void);
void viResetDefaultModeIf4Mb(void);
s16 viGetFbWidth(void);
s16 viGetFbHeight(void);
bool func0f0bc4c0(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 func0f0bd904(bool arg0);
void func0f0bfc7c(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up);
Gfx *currentPlayerUpdateShootRot(Gfx *gdl);
void currentPlayerUpdateShieldShow(void);
Gfx *func0f0c0190(Gfx *gdl);
Gfx *func0f0c07c8(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 func0f0c1e54(struct prop *prop, bool enable);
bool playerUpdateGeometry(struct prop *prop, struct geo **arg1, struct geo **arg2);
void currentPlayerUpdatePerimInfo(void);
void propPlayerGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin);
f32 currentPlayerGetHealthFrac(void);
f32 currentPlayerGetShieldFrac(void);
void currentPlayerSetShieldFrac(f32 shield);
s32 getMissionTime(void);
s32 func0f0c228c(struct prop *prop);
u32 func0f0c2364(void);
u32 func0f0c2a58(void);
Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha);
Gfx *currentPlayerLoadMatrix(Gfx *gdl);
u32 func0f0c3320(void);
void setTickMode(s32 tickmode);
void func0f0b9650(void);
void func0f0b9674(void);
void func0f0b9a20(void);
void func0f0b9afc(void);
void warpBondToPad(s16 pad_id);
void func0f0b9bac(u32 *cmd, s32 arg1, s32 arg2);
void func0f0b9c1c(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

View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_166e40.h"
#include "game/game_176080.h"
#include "game/pdoptions.h"