mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-04 20:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tidy lv.c

Browse Source
This commit is contained in:
Ryan Dwyer
2025-10-11 22:42:16 +07:00
parent 235551a1b2
commit 961fabdc33
12 changed files with 133 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bg.c
+7 -7
View File
@@ -966,7 +966,7 @@ Gfx *bg_render_scene_in_xray(Gfx *gdl)
gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
if (debug_is_prop_rendering_enabled() && get_var80084040()) {
if (debug_is_prop_rendering_enabled() && lv_is_scene_rendering_enabled()) {
if (thing->roomnum == -1) {
gdl = props_render(gdl, 0, RENDERPASS_XLU, roomnumsbyprop);
}
@@ -1145,7 +1145,7 @@ Gfx *bg_render_scene(Gfx *gdl)
gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gdl = env_stop_fog(gdl);
if (debug_is_prop_rendering_enabled() && get_var80084040()) {
if (debug_is_prop_rendering_enabled() && lv_is_scene_rendering_enabled()) {
if (firstroomnum == thing->roomnum) {
gdl = props_render(gdl, 0, RENDERPASS_OPA_PREBG, roomnumsbyprop);
}
@@ -1159,7 +1159,7 @@ Gfx *bg_render_scene(Gfx *gdl)
gdl = bg_scissor_within_viewport_f(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax);
gdl = env_start_fog(gdl, false);
if (debug_is_bg_rendering_enabled() && get_var80084040()) {
if (debug_is_bg_rendering_enabled() && lv_is_scene_rendering_enabled()) {
if (g_StageIndex != STAGEINDEX_TEST_OLD) {
gdl = bg_render_room_opaque(gdl, thing->roomnum);
}
@@ -1170,7 +1170,7 @@ Gfx *bg_render_scene(Gfx *gdl)
gdl = env_stop_fog(gdl);
if (debug_is_prop_rendering_enabled() && get_var80084040()) {
if (debug_is_prop_rendering_enabled() && lv_is_scene_rendering_enabled()) {
if (firstroomnum == thing->roomnum) {
gdl = props_render(gdl, 0, RENDERPASS_OPA_POSTBG, roomnumsbyprop);
}
@@ -1185,7 +1185,7 @@ Gfx *bg_render_scene(Gfx *gdl)
// Render wall hits
gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
if (get_var80084040() && g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) {
if (lv_is_scene_rendering_enabled() && g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) {
for (i = 0; i < g_BgNumDrawSlots; i++) {
roomnum = roomnums[i];
gdl = wallhit_render_bg_hits(g_BgDrawSlots[roomnum].roomnum, gdl);
@@ -1205,7 +1205,7 @@ Gfx *bg_render_scene(Gfx *gdl)
gdl = bg_scissor_within_viewport_f(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax);
gdl = env_start_fog(gdl, true);
if (debug_is_bg_rendering_enabled() && get_var80084040()) {
if (debug_is_bg_rendering_enabled() && lv_is_scene_rendering_enabled()) {
gdl = bg_render_room_xlu(gdl, thing->roomnum);
}
@@ -1214,7 +1214,7 @@ Gfx *bg_render_scene(Gfx *gdl)
gdl = env_stop_fog(gdl);
// Render prop translucent components
if (debug_is_prop_rendering_enabled() && get_var80084040()) {
if (debug_is_prop_rendering_enabled() && lv_is_scene_rendering_enabled()) {
if (firstroomnum == thing->roomnum) {
gdl = props_render(gdl, 0, RENDERPASS_XLU, roomnumsbyprop);
}
src/game/bondmove.c
+2 -2
View File
@@ -702,8 +702,8 @@ void bmove_process_input(bool allowc1x, bool allowc1y, bool allowc1buttons, bool
} else {
if (g_Vars.mplayerisrunning) {
if (PLAYERCOUNT() == 1) {
if (mp_is_paused() && (c1buttonsthisframe & START_BUTTON) && g_MpSetup.paused != MPPAUSEMODE_GAMEOVER) {
mp_set_paused(MPPAUSEMODE_UNPAUSED);
if (mp_is_paused() && (c1buttonsthisframe & START_BUTTON) && g_MpSetup.pausemode != MPPAUSEMODE_GAMEOVER) {
mp_set_pausemode(MPPAUSEMODE_UNPAUSED);
}
} else {
if (mp_is_paused() && (c1buttonsthisframe & START_BUTTON)) {
src/game/lv.c
+96 -95
View File
@@ -96,14 +96,20 @@
#include "lib/vi.h"
#include "types.h"
struct sndstate *g_MiscSfxAudioHandles[3];
u32 var800aa5bc;
s32 g_MiscSfxActiveTypes[3];
typedef enum {
MISCSFX_BOOSTHEARTBEAT,
MISCSFX_SLAYERROCKETHUM,
MISCSFX_SLAYERROCKETBEEP,
NUM_MISCSFX
} MiscSfxType;
u32 var80084010 = 0;
bool var80084014 = false;
f32 var80084018 = 1;
u32 var8008401c = 0x00000001;
struct sndstate *g_MiscSfxAudioHandles[NUM_MISCSFX];
MiscSfxType g_MiscSfxActiveTypes[NUM_MISCSFX];
s32 g_LvMpPausedPrev = 0;
bool g_LvIsPaused = false;
f32 var80084018 = 1; // unused
s32 var8008401c = 1; // unused
s32 g_Difficulty = DIFF_A;
@@ -111,36 +117,27 @@ s32 g_StageTimeElapsed60 = 0;
s32 g_MpTimeLimit60 = SECSTOTIME60(60 * 10); // 10 minutes
s32 g_MpScoreLimit = 10;
s32 g_MpTeamScoreLimit = 20;
struct sndstate *g_MiscAudioHandle = NULL;
struct sndstate *g_MpAlarmAudioHandle = NULL;
s32 g_NumReasonsToEndMpMatch = 0;
f32 g_StageTimeElapsed1f = 0;
bool var80084040 = true;
u32 g_MiscSfxSounds[] = {
SFXNUM_05C8_HEARTBEAT,
SFXMAP_8068_SLAYER_WHIR,
SFXNUM_01C8_SLAYER_BEEP,
};
s32 var80084050 = 0;
s16 g_FadeNumFrames = 0;
f32 g_FadeFrac = -1;
u32 g_FadePrevColour = 0;
u32 g_FadeColour = 0;
s16 g_FadeDelay = 0;
bool g_LvSceneRenderingEnabled = true;
void lv_fade_reset(void);
void lv_check_pause_state_changed(void);
void lv_handle_mppause_rumble(void);
u32 get_var80084040(void)
/**
* The scene rendering enabled functions are carried over from GoldenEye.
* In GE, scene rendering is disabled when paused because the watch takes up
* the full screen.
*/
bool lv_is_scene_rendering_enabled(void)
{
return var80084040;
return g_LvSceneRenderingEnabled;
}
void set_var80084040(u32 value)
void lv_set_scene_rendering_enabled(u32 value)
{
var80084040 = value;
g_LvSceneRenderingEnabled = value;
}
void lv_init(void)
@@ -153,17 +150,17 @@ void lv_reset_misc_sfx(void)
{
s32 i;
for (i = 0; i != ARRAYCOUNT(g_MiscSfxAudioHandles); i++) {
for (i = 0; i < NUM_MISCSFX; i++) {
g_MiscSfxAudioHandles[i] = NULL;
g_MiscSfxActiveTypes[i] = -1;
}
}
s32 lv_get_misc_sfx_index(u32 type)
s32 lv_get_misc_sfx_index(MiscSfxType type)
{
s32 i;
for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) {
for (i = 0; i < NUM_MISCSFX; i++) {
if (g_MiscSfxActiveTypes[i] == type) {
return i;
}
@@ -172,8 +169,14 @@ s32 lv_get_misc_sfx_index(u32 type)
return -1;
}
void lv_set_misc_sfx_state(u32 type, bool play)
void lv_set_misc_sfx_state(MiscSfxType type, bool play)
{
static s32 sfxnums[NUM_MISCSFX] = {
SFXNUM_05C8_HEARTBEAT,
SFXMAP_8068_SLAYER_WHIR,
SFXNUM_01C8_SLAYER_BEEP,
};
if (play) {
if (lv_get_misc_sfx_index(type) == -1) {
s32 index = lv_get_misc_sfx_index(-1);
@@ -184,18 +187,18 @@ void lv_set_misc_sfx_state(u32 type, bool play)
if (index != -1)
#endif
{
snd_start(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1);
snd_start(var80095200, sfxnums[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1);
g_MiscSfxActiveTypes[index] = type;
}
}
} else {
u32 stack;
s32 stack;
s32 index = lv_get_misc_sfx_index(type);
if (index != -1) {
sndp_stop_sound(g_MiscSfxAudioHandles[index]);
#if VERSION < VERSION_NTSC_1_0
g_MiscSfxAudioHandles[index] = 0;
g_MiscSfxAudioHandles[index] = NULL;
#endif
g_MiscSfxActiveTypes[index] = -1;
}
@@ -207,40 +210,45 @@ void lv_update_misc_sfx(void)
s32 i;
if (g_Vars.lvupdate240 == 0) {
for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) {
for (i = 0; i < NUM_MISCSFX; i++) {
lv_set_misc_sfx_state(i, false);
}
} else {
bool usingboost = g_Vars.speedpillon
&& lv_get_slow_motion_type() == SLOWMOTION_OFF
&& g_Vars.in_cutscene == false;
bool usingrocket;
{
bool usingboost = g_Vars.speedpillon
&& lv_get_slow_motion_type() == SLOWMOTION_OFF
&& g_Vars.in_cutscene == false;
lv_set_misc_sfx_state(MISCSFX_BOOSTHEARTBEAT, usingboost);
usingrocket = false;
for (i = 0; i < PLAYERCOUNT(); i++) {
if (g_Vars.players[i]->visionmode == VISIONMODE_SLAYERROCKET) {
usingrocket = true;
}
lv_set_misc_sfx_state(MISCSFX_BOOSTHEARTBEAT, usingboost);
}
lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETHUM, usingrocket);
lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETBEEP, usingrocket);
{
bool usingrocket = false;
for (i = 0; i < PLAYERCOUNT(); i++) {
if (g_Vars.players[i]->visionmode == VISIONMODE_SLAYERROCKET) {
usingrocket = true;
}
}
lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETHUM, usingrocket);
lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETBEEP, usingrocket);
}
}
if (g_Vars.lvupdate240 == 0 && g_MiscAudioHandle && sndp_get_state(g_MiscAudioHandle) != AL_STOPPED) {
sndp_stop_sound(g_MiscAudioHandle);
if (g_Vars.lvupdate240 == 0 && g_MpAlarmAudioHandle && sndp_get_state(g_MpAlarmAudioHandle) != AL_STOPPED) {
sndp_stop_sound(g_MpAlarmAudioHandle);
}
}
s32 g_LvLockscreenFrameNum = 0;
void lv_reset(s32 stagenum)
{
lv_fade_reset();
var80084014 = false;
var80084010 = 0;
g_LvIsPaused = false;
g_LvMpPausedPrev = 0;
#if VERSION >= VERSION_NTSC_1_0
joy_lock_cyclic_polling();
@@ -260,9 +268,9 @@ void lv_reset(s32 stagenum)
cheats_reset();
var80084040 = true;
g_LvSceneRenderingEnabled = true;
g_Vars.lvframenum = 0;
var80084050 = 0;
g_LvLockscreenFrameNum = 0;
g_Vars.lvframe60 = 0;
g_Vars.lvupdate240 = 4;
@@ -296,7 +304,7 @@ void lv_reset(s32 stagenum)
g_Vars.autocutfinished = false;
g_Vars.autocutgroupskip = false;
g_MiscAudioHandle = NULL;
g_MpAlarmAudioHandle = NULL;
music_reset();
modelmgr_set_lv_resetting(true);
@@ -465,7 +473,7 @@ void lv_reset(s32 stagenum)
modelmgr_set_lv_resetting(false);
var80084018 = 1;
sched_reset_artifacts();
lv_set_paused(0);
lv_set_paused(false);
#if PIRACYCHECKS
{
@@ -496,6 +504,12 @@ void lv_reset(s32 stagenum)
#endif
}
s16 g_FadeNumFrames = 0;
f32 g_FadeFrac = -1;
u32 g_FadePrevColour = 0;
u32 g_FadeColour = 0;
s16 g_FadeDelay = 0;
void lv_configure_fade(u32 color, s16 num_frames)
{
g_FadeNumFrames = num_frames;
@@ -1158,11 +1172,11 @@ Gfx *lv_render(Gfx *gdl)
&& g_Vars.lvframenum <= 5
&& !g_Vars.normmplayerisrunning
&& g_Vars.tickmode != TICKMODE_CUTSCENE) {
if (var80084050 < 6) {
if (g_LvLockscreenFrameNum < 6) {
g_Vars.lockscreen = 1;
}
var80084050++;
g_LvLockscreenFrameNum++;
} else if (g_Vars.currentplayer->gunctrl.loadall
&& var80075d60 == 2
&& g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON
@@ -1731,23 +1745,6 @@ Gfx *lv_render(Gfx *gdl)
return gdl;
}
const char var7f1b7730[] = "fr: %d\n";
u32 g_CutsceneTime240_60 = 0;
#if VERSION >= VERSION_NTSC_1_0
u32 var800840a8 = 0;
u32 var800840ac = 0;
u32 var800840b0 = 0;
#else
u32 var80086930nb = 0;
u32 var800840a8 = 0;
u32 var800840ac = 0;
u32 var800840b0 = 0;
#endif
u32 var800840b4 = 0;
void lv_update_solo_handicaps(void)
{
if (g_Vars.antiplayernum >= 0) {
@@ -1932,10 +1929,13 @@ s32 sub54321(s32 value)
}
#endif
s32 g_CutsceneTime240_60 = 0;
void lv_update_cutscene_time(void)
{
if (g_Vars.in_cutscene) {
g_CutsceneTime240_60 += g_Vars.lvupdate60;
osSyncPrintf("fr: %d\n", g_CutsceneTime240_60);
return;
}
@@ -1995,7 +1995,7 @@ void lv_tick(void)
s32 j;
s32 i;
lv_check_pause_state_changed();
lv_handle_mppause_rumble();
#if VERSION >= VERSION_NTSC_1_0
if (g_Vars.pakstocheck) {
@@ -2205,10 +2205,10 @@ void lv_tick(void)
// Sound alarm at 10 seconds remaining
if (nexttime >= TICKS(g_MpTimeLimit60) - TICKS(600)
&& g_MiscAudioHandle == NULL
&& g_MpAlarmAudioHandle == NULL
&& !lv_is_paused()
&& nexttime < TICKS(g_MpTimeLimit60)) {
snd_start_extra(&g_MiscAudioHandle, false, AL_VOL_FULL, AL_PAN_CENTER, SFXNUM_00A3_ALARM_DEFAULT, 1, 1, -1, true);
snd_start_extra(&g_MpAlarmAudioHandle, false, AL_VOL_FULL, AL_PAN_CENTER, SFXNUM_00A3_ALARM_DEFAULT, 1, 1, -1, true);
}
}
@@ -2292,6 +2292,7 @@ void lv_tick(void)
lang_tick();
} else {
lv_update_cutscene_time();
osSyncPrintf("cutsceneframe: %d\n", g_CutsceneTime240_60);
vtxstore_tick();
lv_update_solo_handicaps();
rooms_tick();
@@ -2347,11 +2348,6 @@ void lv_tick(void)
}
}
const char var7f1b7738[] = "cutsceneframe: %d\n";
const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n";
const char var7f1b7768[] = "";
const char var7f1b776c[] = "";
void lv_tick_player(void)
{
f32 xdiff;
@@ -2365,6 +2361,11 @@ void lv_tick_player(void)
}
}
osSyncPrintf("pos:%s%s %.2f %.2f %.2f\n", "", "",
g_Vars.currentplayer->prop->pos.x,
g_Vars.currentplayer->prop->pos.y,
g_Vars.currentplayer->prop->pos.z);
xdiff = g_Vars.currentplayer->prop->pos.x - g_Vars.currentplayer->bondprevpos.x;
zdiff = g_Vars.currentplayer->prop->pos.z - g_Vars.currentplayer->bondprevpos.z;
@@ -2375,8 +2376,8 @@ void lv_stop(void)
{
paks_stop(true);
if (g_MiscAudioHandle && sndp_get_state(g_MiscAudioHandle) != AL_STOPPED) {
sndp_stop_sound(g_MiscAudioHandle);
if (g_MpAlarmAudioHandle && sndp_get_state(g_MpAlarmAudioHandle) != AL_STOPPED) {
sndp_stop_sound(g_MpAlarmAudioHandle);
}
if (g_Vars.stagenum < STAGE_TITLE) {
@@ -2418,11 +2419,11 @@ void lv_stop(void)
#endif
}
void lv_check_pause_state_changed(void)
void lv_handle_mppause_rumble(void)
{
u32 paused = mp_is_paused();
bool paused = mp_is_paused();
if (paused != var80084010) {
if (paused != g_LvMpPausedPrev) {
if (paused) {
pak_disable_rumble_for_all_players();
} else {
@@ -2430,7 +2431,7 @@ void lv_check_pause_state_changed(void)
}
}
var80084010 = paused;
g_LvMpPausedPrev = paused;
}
void lv_set_paused(bool paused)
@@ -2443,12 +2444,12 @@ void lv_set_paused(bool paused)
pak_enable_rumble_for_all_players();
}
var80084014 = paused;
g_LvIsPaused = paused;
}
bool lv_is_paused(void)
{
return var80084014;
return g_LvIsPaused;
}
s32 lv_get_difficulty(void)
@@ -2490,7 +2491,7 @@ s32 lv_get_stage_time60(void)
return g_StageTimeElapsed60;
}
u32 func0f16ce04(u32 arg0)
Gfx *func0f16ce04(Gfx *gdl)
{
return arg0;
return gdl;
}
src/game/menutick.c
+2 -2
View File
@@ -634,7 +634,7 @@ void menu_tick(void)
} else if (g_Vars.restartlevel) {
main_change_to_stage(main_get_stage_num());
} else {
mp_set_paused(MPPAUSEMODE_UNPAUSED);
mp_set_pausemode(MPPAUSEMODE_UNPAUSED);
g_Vars.mplayerisrunning = false;
g_Vars.normmplayerisrunning = false;
g_Vars.lvmpbotlevel = 0;
@@ -658,7 +658,7 @@ void menu_tick(void)
break;
case MENUROOT_COOPCONTINUE:
if (g_Vars.coopplayernum >= 0) {
mp_set_paused(MPPAUSEMODE_UNPAUSED);
mp_set_pausemode(MPPAUSEMODE_UNPAUSED);
g_Vars.mplayerisrunning = false;
g_Vars.normmplayerisrunning = false;
g_Vars.lvmpbotlevel = 0;
src/game/mplayer/ingame.c
+3 -3
View File
@@ -158,9 +158,9 @@ MenuItemHandlerResult menuhandler_mp_pause(s32 operation, struct menuitem *item,
{
if (operation == MENUOP_CONFIRM) {
if (mp_is_paused()) {
mp_set_paused(MPPAUSEMODE_UNPAUSED);
mp_set_pausemode(MPPAUSEMODE_UNPAUSED);
} else {
mp_set_paused(MPPAUSEMODE_PAUSED);
mp_set_pausemode(MPPAUSEMODE_PAUSED);
}
}
@@ -772,7 +772,7 @@ void mp_push_pause_dialog(void)
u32 prevplayernum = g_MpPlayerNum;
#if VERSION >= VERSION_NTSC_1_0
if (g_MpSetup.paused != MPPAUSEMODE_GAMEOVER && g_MainIsEndscreen == 0)
if (g_MpSetup.pausemode != MPPAUSEMODE_GAMEOVER && g_MainIsEndscreen == 0)
#endif
{
g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
src/game/mplayer/mplayer.c
+7 -7
View File
@@ -259,7 +259,7 @@ void mp_reset(void)
#endif
}
g_MpSetup.paused = false;
g_MpSetup.pausemode = MPPAUSEMODE_UNPAUSED;
g_MpEnableMusicSwitching = false;
@@ -1172,16 +1172,16 @@ bool mp_is_paused(void)
return true;
}
if (g_MpSetup.paused == PAUSEMODE_UNPAUSED) {
if (g_MpSetup.pausemode == PAUSEMODE_UNPAUSED) {
return false;
}
return true;
}
void mp_set_paused(u8 mode)
void mp_set_pausemode(u8 mode)
{
g_MpSetup.paused = mode;
g_MpSetup.pausemode = mode;
}
/**
@@ -1206,7 +1206,7 @@ Gfx *mp_render_modal_text(Gfx *gdl)
g_UiScaleX = g_ViRes == VIRES_HI ? 2 : 1;
#endif
if (g_MpSetup.paused == MPPAUSEMODE_PAUSED) {
if (g_MpSetup.pausemode == MPPAUSEMODE_PAUSED) {
s32 red = (s32) ((1.0f - g_20SecIntervalFrac) * 20.0f * 255.0f) % 255;
s32 stack2;
@@ -1247,7 +1247,7 @@ Gfx *mp_render_modal_text(Gfx *gdl)
gdl = text_end(gdl);
} else if (!g_MainIsEndscreen
&& g_MpSetup.paused == MPPAUSEMODE_UNPAUSED
&& g_MpSetup.pausemode == MPPAUSEMODE_UNPAUSED
&& g_Vars.currentplayer->isdead
&& g_Vars.currentplayer->redbloodfinished
&& g_Vars.currentplayer->deathanimfinished
@@ -2431,7 +2431,7 @@ void mp_end_match(void)
s32 i;
music_start_menu();
mp_set_paused(MPPAUSEMODE_GAMEOVER);
mp_set_pausemode(MPPAUSEMODE_GAMEOVER);
prevplayernum = g_Vars.currentplayernum;
src/game/mplayer/scenarios.c
+1 -1
View File
@@ -568,7 +568,7 @@ Gfx *scenario_render_hud(Gfx *gdl)
if (g_Vars.normmplayerisrunning) {
if (g_MpScenarios[g_MpSetup.scenario].hudfunc) {
#if VERSION >= VERSION_NTSC_1_0
if (g_MpSetup.paused != MPPAUSEMODE_GAMEOVER && g_NumReasonsToEndMpMatch == 0) {
if (g_MpSetup.pausemode != MPPAUSEMODE_GAMEOVER && g_NumReasonsToEndMpMatch == 0) {
gDPSetTextureFilter(gdl++, G_TF_POINT);
gDPSetColorDither(gdl++, G_CD_DISABLE);
gSPClearGeometryMode(gdl++, G_ZBUFFER);
src/game/timing.c
+2
View File
@@ -5,6 +5,8 @@
#include "data.h"
#include "types.h"
u32 var800840b0 = 0;
void frametime_init(void)
{
g_Vars.thisframestartt = osGetCount();
src/include/constants.h
-4
View File
@@ -1814,10 +1814,6 @@
#define MISCBIO_BACKGROUND 2
#define MISCBIO_STORY 3
#define MISCSFX_BOOSTHEARTBEAT 0
#define MISCSFX_SLAYERROCKETHUM 1
#define MISCSFX_SLAYERROCKETBEEP 2
// Models
#define MODEL_ROOFGUN 0x0000
#define MODEL_GROUNDGUN 0x0001
src/include/game/lv.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
u32 get_var80084040(void);
bool lv_is_scene_rendering_enabled(void);
void lv_init(void);
void lv_reset(s32 stagenum);
Gfx *lv_render(Gfx *gdl);
src/include/game/mplayer/mplayer.h
+1 -1
View File
@@ -32,7 +32,7 @@ void mp_set_weaponset_slotnum(s32 weaponsetnum);
void mp_apply_weaponset_if_standard(void);
s32 mp_get_weaponset_slotnum(void);
bool mp_is_paused(void);
void mp_set_paused(u8 mode);
void mp_set_pausemode(u8 mode);
Gfx *mp_render_modal_text(Gfx *gdl);
void mp_end_match(void);
s32 mp_get_num_heads2(void);
src/include/types.h
+11 -11
View File
@@ -4037,13 +4037,13 @@ struct missionconfig {
};
struct mpsetup {
/*0x800acb88*/ char name[MAX_USERSTRING_LEN + 2];
/*0x800acb94*/ u32 options;
/*0x800acb98*/ u8 scenario;
/*0x800acb99*/ u8 stagenum;
/*0x800acb9a*/ u8 timelimit;
/*0x800acb9b*/ u8 scorelimit;
/*0x800acb9c*/ u16 teamscorelimit;
/*0x00*/ char name[MAX_USERSTRING_LEN + 2];
/*0x0c*/ u32 options;
/*0x10*/ u8 scenario;
/*0x11*/ u8 stagenum;
/*0x12*/ u8 timelimit;
/*0x13*/ u8 scorelimit;
/*0x14*/ u16 teamscorelimit;
/**
* Each bit signifies that a player or sim is participating.
@@ -4052,10 +4052,10 @@ struct mpsetup {
* Bits 0x0ff0 are for sims
* Bits 0xf000 are probably not used
*/
/*0x800acb9e*/ u16 chrslots;
/*0x800acba0*/ u8 weapons[NUM_MPWEAPONSLOTS];
/*0x800acba6*/ u8 paused;
/*0x800acba8*/ struct fileguid fileguid;
/*0x16*/ u16 chrslots;
/*0x18*/ u8 weapons[NUM_MPWEAPONSLOTS];
/*0x1e*/ u8 pausemode;
/*0x20*/ struct fileguid fileguid;
};
struct bossfile {