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

Rename game_167ae0.c to core.c and rename associated symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2021-01-02 11:01:02 +10:00
parent f9975ecd48
commit 85515d4d1d
39 changed files with 311 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld/gamefiles.inc
+1 -1
View File
@@ -155,7 +155,7 @@
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/game_166e40.o (section); \
build/ROMID/game/gfxmemory.o (section); \
build/ROMID/game/game_167ae0.o (section); \
build/ROMID/game/core.o (section); \
build/ROMID/game/data/data_02a0e0.o (section); \
build/ROMID/game/timing.o (section); \
build/ROMID/game/music.o (section); \
src/game/bondbike.c
+3 -3
View File
@@ -19,7 +19,7 @@
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/bondhead.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
@@ -271,7 +271,7 @@ glabel var7f1adb74
/* f0d2738: 14400011 */ bnez $v0,.L0f0d2780
/* f0d273c: 8fa70060 */ lw $a3,0x60($sp)
.L0f0d2740:
/* f0d2740: 0fc5b364 */ jal soloIsPaused
/* f0d2740: 0fc5b364 */ jal coreIsPaused
/* f0d2744: 00000000 */ nop
/* f0d2748: 1440000d */ bnez $v0,.L0f0d2780
/* f0d274c: 8fa70060 */ lw $a3,0x60($sp)
@@ -574,7 +574,7 @@ glabel var7f1adb74
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_14
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_13
// || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_11)
// && !soloIsPaused()) {
// && !coreIsPaused()) {
// data->stepleft = contCountButtonsOnSpecificSamples(0, contnum, L_JPAD | L_CBUTTONS);
// data->stepright = contCountButtonsOnSpecificSamples(0, contnum, R_JPAD | R_CBUTTONS);
// }
src/game/bondmove.c
+5 -5
View File
@@ -26,7 +26,7 @@
#include "game/bondhead.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/mplayer.h"
#include "game/pdoptions.h"
@@ -1257,7 +1257,7 @@ glabel var7f1ad8e4
/* f0c91f4: 8e4c0284 */ lw $t4,0x284($s2)
/* f0c91f8: ad8b0120 */ sw $t3,0x120($t4)
.L0f0c91fc:
/* f0c91fc: 0fc5b364 */ jal soloIsPaused
/* f0c91fc: 0fc5b364 */ jal coreIsPaused
/* f0c9200: 00000000 */ nop
/* f0c9204: 54400243 */ bnezl $v0,.L0f0c9b14
/* f0c9208: 8e450284 */ lw $a1,0x284($s2)
@@ -2043,7 +2043,7 @@ glabel var7f1ad8e4
/* f0c9cec: 8e480284 */ lw $t0,0x284($s2)
/* f0c9cf0: ad190120 */ sw $t9,0x120($t0)
.L0f0c9cf4:
/* f0c9cf4: 0fc5b364 */ jal soloIsPaused
/* f0c9cf4: 0fc5b364 */ jal coreIsPaused
/* f0c9cf8: 00000000 */ nop
/* f0c9cfc: 544002ba */ bnezl $v0,.L0f0ca7e8
/* f0c9d00: 8e450284 */ lw $a1,0x284($s2)
@@ -4181,7 +4181,7 @@ glabel var7f1ad8e4
// }
//
// // 91fc
// if (soloIsPaused() == false) {
// if (coreIsPaused() == false) {
// // 920c
// if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) {
// for (i = 0; i < numsamples; i++) {
@@ -4502,7 +4502,7 @@ glabel var7f1ad8e4
// }
//
// // 9cf4
// if (soloIsPaused() == false) {
// if (coreIsPaused() == false) {
// // 9d04
// if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) {
// for (i = 0; i < numsamples; i++) {
src/game/chr/chraction.c
+5 -5
View File
@@ -33,7 +33,7 @@
#include "game/game_157db0.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/game_1999b0.h"
@@ -2869,14 +2869,14 @@ glabel var7f1a8d44
/* f031c60: 10000010 */ b .L0f031ca4
/* f031c64: afa000d4 */ sw $zero,0xd4($sp)
.L0f031c68:
/* f031c68: 0fc5b367 */ jal getDifficulty
/* f031c68: 0fc5b367 */ jal coreGetDifficulty
/* f031c6c: 00000000 */ nop
/* f031c70: 14400003 */ bnez $v0,.L0f031c80
/* f031c74: 24190002 */ addiu $t9,$zero,0x2
/* f031c78: 1000000a */ b .L0f031ca4
/* f031c7c: afb900d4 */ sw $t9,0xd4($sp)
.L0f031c80:
/* f031c80: 0fc5b367 */ jal getDifficulty
/* f031c80: 0fc5b367 */ jal coreGetDifficulty
/* f031c84: 00000000 */ nop
/* f031c88: 24010001 */ addiu $at,$zero,0x1
/* f031c8c: 14410004 */ bne $v0,$at,.L0f031ca0
@@ -7107,7 +7107,7 @@ glabel var7f1a8d98
/* f0359fc: 25f80001 */ addiu $t8,$t7,0x1
/* f035a00: a21802ff */ sb $t8,0x2ff($s0)
.L0f035a04:
/* f035a04: 0fc5b364 */ jal soloIsPaused
/* f035a04: 0fc5b364 */ jal coreIsPaused
/* f035a08: 00000000 */ nop
/* f035a0c: 14400005 */ bnez $v0,.L0f035a24
/* f035a10: 8fad00f4 */ lw $t5,0xf4($sp)
@@ -18414,7 +18414,7 @@ glabel var7f1a91a0
/* f042884: adac0008 */ sw $t4,0x8($t5)
/* f042888: 8e0e0348 */ lw $t6,0x348($s0)
/* f04288c: c4249194 */ lwc1 $f4,%lo(var7f1a9194)($at)
/* f042890: 0fc5b367 */ jal getDifficulty
/* f042890: 0fc5b367 */ jal coreGetDifficulty
/* f042894: e5c4000c */ swc1 $f4,0xc($t6)
/* f042898: 384f0002 */ xori $t7,$v0,0x2
/* f04289c: 2def0001 */ sltiu $t7,$t7,0x1
src/game/chr/chrai.c
+2 -2
View File
@@ -139,8 +139,8 @@ bool (*g_CommandPointers[])(void) = {
/*0x0076*/ aiSetPadPresetToTargetQuadrant,
/*0x0077*/ aiIfDifficultyLessThan,
/*0x0078*/ aiIfDifficultyGreaterThan,
/*0x0079*/ aiIfUptimeLessThan,
/*0x007a*/ aiIfUptimeGreaterThan,
/*0x0079*/ aiIfStageTimerLessThan,
/*0x007a*/ aiIfStageTimerGreaterThan,
/*0x007b*/ aiIfStageIdLessThan,
/*0x007c*/ aiIfStageIdGreaterThan,
/*0x007d*/ aiIfNumArghsLessThan,
src/game/chr/chraicommands.c
+14 -16
View File
@@ -37,7 +37,7 @@
#include "game/game_157db0.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/training.h"
#include "game/gamefile.h"
@@ -2567,7 +2567,7 @@ bool aiIfObjectiveComplete(void)
if (cmd[2] < objectiveGetCount() &&
objectiveCheck(cmd[2]) == OBJECTIVE_COMPLETE &&
objectiveGetDifficultyBits(cmd[2]) & (1 << getDifficulty())) {
objectiveGetDifficultyBits(cmd[2]) & (1 << coreGetDifficulty())) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2585,7 +2585,7 @@ bool aiIfObjectiveFailed(void)
if (cmd[2] < objectiveGetCount() &&
objectiveCheck(cmd[2]) == OBJECTIVE_FAILED &&
objectiveGetDifficultyBits(cmd[2]) & (1 << getDifficulty())) {
objectiveGetDifficultyBits(cmd[2]) & (1 << coreGetDifficulty())) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2827,7 +2827,7 @@ bool aiIfDifficultyLessThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (getDifficulty() < cmd[2]) {
if (coreGetDifficulty() < cmd[2]) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2843,7 +2843,7 @@ bool aiIfDifficultyGreaterThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (getDifficulty() > cmd[2]) {
if (coreGetDifficulty() > cmd[2]) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]);
} else {
g_Vars.aioffset += 4;
@@ -2852,18 +2852,16 @@ bool aiIfDifficultyGreaterThan(void)
return false;
}
f32 getUptime(void);
/**
* @cmd 0079
*/
bool aiIfUptimeLessThan(void)
bool aiIfStageTimerLessThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
f32 target = (f32)(cmd[3] | (cmd[2] << 8));
f32 uptime = getUptime();
f32 time = coreGetStageTimeInSeconds();
if (uptime < target) {
if (time < target) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
} else {
g_Vars.aioffset += 5;
@@ -2875,13 +2873,13 @@ bool aiIfUptimeLessThan(void)
/**
* @cmd 007a
*/
bool aiIfUptimeGreaterThan(void)
bool aiIfStageTimerGreaterThan(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
f32 target = (f32)(cmd[3] | (cmd[2] << 8));
f32 uptime = getUptime();
f32 time = coreGetStageTimeInSeconds();
if (uptime > target) {
if (time > target) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
} else {
g_Vars.aioffset += 5;
@@ -4248,7 +4246,7 @@ bool aiTryEquipWeapon(void)
prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags);
break;
case WEAPON_K7AVENGER:
if (g_Vars.stagenum == STAGE_INVESTIGATION && getDifficulty() == DIFF_PA) {
if (g_Vars.stagenum == STAGE_INVESTIGATION && coreGetDifficulty() == DIFF_PA) {
prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags);
} else {
prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags);
@@ -10693,7 +10691,7 @@ bool aiFadeScreen(void)
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
u32 color = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24);
s16 num_frames = (cmd[7] | (cmd[6] << 8));
fadeConfigure(color, num_frames);
coreConfigureFade(color, num_frames);
g_Vars.aioffset += 8;
return false;
@@ -10706,7 +10704,7 @@ bool aiIfFadeComplete(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
if (fadeIsActive() == false) {
if (coreIsFadeActive() == false) {
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
} else {
g_Vars.aioffset += 3;
src/game/game_167ae0.c → src/game/core.c
+121 -121
View File
@@ -84,7 +84,7 @@
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/game_165670.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_176080.h"
@@ -125,17 +125,17 @@ bool var80084014 = false;
f32 var80084018 = 1;
u32 var8008401c = 0x00000001;
s32 g_Difficulty = 0;
s32 g_Difficulty = DIFF_A;
s32 g_StageTimeElapsed = 0;
s32 g_MpTimeLimit = 36000;
s32 g_StageTimeElapsed60 = 0;
s32 g_MpTimeLimit60 = SECSTOTIME60(60 * 10); // 10 minutes
s32 g_MpScoreLimit = 10;
s32 g_MpTeamScoreLimit = 20;
struct audiohandle *g_MiscAudioHandle = NULL;
s32 g_NumReasonsToEndMpMatch = 0;
f32 g_StageTimeElapsed60f = 0;
f32 g_StageTimeElapsed1f = 0;
bool var80084040 = true;
u32 g_BoostAndSlayerSounds[] = {0x05c8, 0x8068, 0x01c8};
u32 g_MiscSfxSounds[] = {0x05c8, 0x8068, 0x01c8};
s32 var80084050 = 0;
s16 g_FadeNumFrames = 0;
@@ -160,22 +160,22 @@ void func0f167af8(void)
g_Vars.unk0004d8 = -1;
}
void boostAndSlayerSfxStopAll(void)
void coreStopAllMiscSfx(void)
{
s32 i;
for (i = 0; i != 3; i++) {
g_BoostAndSlayerAudioHandles[i] = NULL;
g_BoostAndSlayerActiveTypes[i] = -1;
for (i = 0; i != ARRAYCOUNT(g_MiscSfxAudioHandles); i++) {
g_MiscSfxAudioHandles[i] = NULL;
g_MiscSfxActiveTypes[i] = -1;
}
}
s32 boostAndSlayerSfxGetIndex(u32 type)
s32 coreGetMiscSfxIndex(u32 type)
{
s32 i;
for (i = 0; i != 3; i++) {
if (g_BoostAndSlayerActiveTypes[i] == type) {
for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) {
if (g_MiscSfxActiveTypes[i] == type) {
return i;
}
}
@@ -183,43 +183,43 @@ s32 boostAndSlayerSfxGetIndex(u32 type)
return -1;
}
void boostAndSlayerSfxSetEnabled(u32 type, bool enable)
void coreSetMiscSfxState(u32 type, bool play)
{
if (enable) {
if (boostAndSlayerSfxGetIndex(type) == -1) {
s32 index = boostAndSlayerSfxGetIndex(-1);
if (play) {
if (coreGetMiscSfxIndex(type) == -1) {
s32 index = coreGetMiscSfxIndex(-1);
if (index != -1 && g_BoostAndSlayerAudioHandles[index] == NULL) {
audioStart(var80095200, g_BoostAndSlayerSounds[type], &g_BoostAndSlayerAudioHandles[index], -1, -1, -1, -1, -1);
g_BoostAndSlayerActiveTypes[index] = type;
if (index != -1 && g_MiscSfxAudioHandles[index] == NULL) {
audioStart(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1);
g_MiscSfxActiveTypes[index] = type;
}
}
} else {
u32 stack;
s32 index = boostAndSlayerSfxGetIndex(type);
s32 index = coreGetMiscSfxIndex(type);
if (index != -1) {
audioStop(g_BoostAndSlayerAudioHandles[index]);
g_BoostAndSlayerActiveTypes[index] = -1;
audioStop(g_MiscSfxAudioHandles[index]);
g_MiscSfxActiveTypes[index] = -1;
}
}
}
void boostAndSlayerSfxUpdate(void)
void coreUpdateMiscSfx(void)
{
s32 i;
if (g_Vars.lvupdate240 == 0) {
for (i = 0; i != 3; i++) {
boostAndSlayerSfxSetEnabled(i, false);
for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) {
coreSetMiscSfxState(i, false);
}
} else {
bool usingboost = g_Vars.speedpillon
&& getEffectiveSlowMotion() == SLOWMOTION_OFF
&& coreGetEffectiveSlowMotion() == SLOWMOTION_OFF
&& g_Vars.in_cutscene == false;
bool usingrocket;
boostAndSlayerSfxSetEnabled(0, usingboost);
coreSetMiscSfxState(MISCSFX_BOOSTHEARTBEAT, usingboost);
usingrocket = false;
@@ -229,8 +229,8 @@ void boostAndSlayerSfxUpdate(void)
}
}
boostAndSlayerSfxSetEnabled(1, usingrocket);
boostAndSlayerSfxSetEnabled(2, usingrocket);
coreSetMiscSfxState(MISCSFX_SLAYERROCKETHUM, usingrocket);
coreSetMiscSfxState(MISCSFX_SLAYERROCKETBEEP, usingrocket);
}
if (g_Vars.lvupdate240 == 0 && g_MiscAudioHandle && audioIsPlaying(g_MiscAudioHandle)) {
@@ -238,9 +238,9 @@ void boostAndSlayerSfxUpdate(void)
}
}
void func0f167e7c(s32 stagenum)
void coreLoadStage(s32 stagenum)
{
fadeCancel();
coreCancelFade();
var80084014 = false;
var80084010 = 0;
@@ -265,8 +265,8 @@ void func0f167e7c(s32 stagenum)
g_Vars.lvupdate240frealprev = 1.0f;
g_Vars.lvupdate240freal = g_Vars.lvupdate240frealprev;
g_StageTimeElapsed = 0;
g_StageTimeElapsed60f = 0;
g_StageTimeElapsed60 = 0;
g_StageTimeElapsed1f = 0;
g_Vars.speedpilltime = 0;
g_Vars.speedpillchange = 0;
@@ -330,23 +330,23 @@ void func0f167e7c(s32 stagenum)
g_MpPlayers[4].base.unk46 = 1;
}
for (i = 0; i != 4; i++) {
for (i = 0; i != ARRAYCOUNT(g_Vars.playerstats); i++) {
g_Vars.playerstats[i].damagescale = 1;
g_Vars.playerstats[i].drawplayercount = 0;
g_Vars.playerstats[i].distance = 0;
g_Vars.playerstats[i].backshotcount = 0;
g_Vars.playerstats[i].armourcount = 0;
g_Vars.playerstats[i].fastest2kills = 0x7fffffff;
g_Vars.playerstats[i].fastest2kills = S32_MAX;
g_Vars.playerstats[i].slowest2kills = 0;
g_Vars.playerstats[i].maxkills = 0;
g_Vars.playerstats[i].maxsimulkills = 0;
g_Vars.playerstats[i].longestlife = 0;
g_Vars.playerstats[i].shortestlife = 0x7fffffff;
g_Vars.playerstats[i].shortestlife = S32_MAX;
g_Vars.playerstats[i].tokenheldtime = 0;
g_Vars.playerstats[i].damreceived = 0;
g_Vars.playerstats[i].damtransmitted = 0;
for (j = 0; j != 4; j++) {
for (j = 0; j != ARRAYCOUNT(g_Vars.playerstats[i].kills); j++) {
g_Vars.playerstats[i].kills[j] = 0;
}
}
@@ -370,7 +370,7 @@ void func0f167e7c(s32 stagenum)
func0f013130();
sparksReset();
weatherAllocate();
boostAndSlayerSfxStopAll();
coreStopAllMiscSfx();
switch (g_Vars.stagenum) {
case STAGE_ESCAPE:
@@ -453,13 +453,13 @@ void func0f167e7c(s32 stagenum)
func0f011124(false);
var80084018 = 1;
func00002560();
soloSetPaused(0);
coreSetPaused(0);
#if PIRACYCHECKS
{
u32 checksum = 0;
s32 *i = (s32 *)&getEffectiveSlowMotion;
s32 *end = (s32 *)&func0f16b96c;
s32 *i = (s32 *)&coreGetEffectiveSlowMotion;
s32 *end = (s32 *)&coreTick;
while (i < end) {
checksum += *i;
@@ -480,7 +480,7 @@ void func0f167e7c(s32 stagenum)
#endif
}
void fadeConfigure(u32 color, s16 num_frames)
void coreConfigureFade(u32 color, s16 num_frames)
{
g_FadeNumFrames = num_frames;
g_FadePrevColour = g_FadeColour;
@@ -496,7 +496,7 @@ void fadeConfigure(u32 color, s16 num_frames)
g_FadeDelay = 2;
}
Gfx *fadeRender(Gfx *gdl)
Gfx *coreRenderFade(Gfx *gdl)
{
u32 colour = g_FadeColour;
u32 inset = 0;
@@ -543,12 +543,12 @@ Gfx *fadeRender(Gfx *gdl)
return func0f153838(gdl);
}
bool fadeIsActive(void)
bool coreIsFadeActive(void)
{
return g_FadeFrac >= 0;
}
void fadeCancel(void)
void coreCancelFade(void)
{
g_FadeNumFrames = 0;
g_FadeFrac = -1;
@@ -557,7 +557,7 @@ void fadeCancel(void)
g_FadeDelay = 0;
}
bool threatCheckCmpFollow(struct threat *threat, s32 index)
bool coreCheckCmpFollowThreat(struct threat *threat, s32 index)
{
f32 sp76;
f32 sp72;
@@ -642,48 +642,48 @@ bool threatCheckCmpFollow(struct threat *threat, s32 index)
}
GLOBAL_ASM(
glabel propFindThreats
glabel coreFindThreatsForProp
.late_rodata
glabel var7f1b7800
.word propFindThreats+0x124 # f168c70
.word coreFindThreatsForProp+0x124 # f168c70
glabel var7f1b7804
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7808
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b780c
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7810
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7814
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7818
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b781c
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7820
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7824
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7828
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b782c
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7830
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7834
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b7838
.word propFindThreats+0x138 # f168c84
.word coreFindThreatsForProp+0x138 # f168c84
glabel var7f1b783c
.word propFindThreats+0x11c # f168c68
.word coreFindThreatsForProp+0x11c # f168c68
glabel var7f1b7840
.word propFindThreats+0x11c # f168c68
.word coreFindThreatsForProp+0x11c # f168c68
glabel var7f1b7844
.word propFindThreats+0x11c # f168c68
.word coreFindThreatsForProp+0x11c # f168c68
glabel var7f1b7848
.word propFindThreats+0x11c # f168c68
.word coreFindThreatsForProp+0x11c # f168c68
glabel var7f1b784c
.word propFindThreats+0x11c # f168c68
.word coreFindThreatsForProp+0x11c # f168c68
.text
/* f168b4c: 27bdff98 */ addiu $sp,$sp,-104
/* f168b50: afb00020 */ sw $s0,0x20($sp)
@@ -932,7 +932,7 @@ glabel var7f1b784c
/* f168ed0: 10800004 */ beqz $a0,.L0f168ee4
/* f168ed4: 8fb80078 */ lw $t8,0x78($sp)
/* f168ed8: 8fa70074 */ lw $a3,0x74($sp)
/* f168edc: 0fc5a2d3 */ jal propFindThreats
/* f168edc: 0fc5a2d3 */ jal coreFindThreatsForProp
/* f168ee0: afb80010 */ sw $t8,0x10($sp)
.L0f168ee4:
/* f168ee4: 8fb9006c */ lw $t9,0x6c($sp)
@@ -944,7 +944,7 @@ glabel var7f1b784c
/* f168efc: 10800004 */ beqz $a0,.L0f168f10
/* f168f00: 8faa0078 */ lw $t2,0x78($sp)
/* f168f04: 8fa70074 */ lw $a3,0x74($sp)
/* f168f08: 0fc5a2d3 */ jal propFindThreats
/* f168f08: 0fc5a2d3 */ jal coreFindThreatsForProp
/* f168f0c: afaa0010 */ sw $t2,0x10($sp)
.L0f168f10:
/* f168f10: 8fbf0024 */ lw $ra,0x24($sp)
@@ -955,7 +955,7 @@ glabel var7f1b784c
/* f168f20: 00000000 */ nop
);
//void propFindThreats(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances)
//void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances)
//{
// bool condition = true;
// struct defaultobj *obj;
@@ -1084,11 +1084,11 @@ glabel var7f1b784c
// }
//
// if (prop->child) {
// propFindThreats(prop->child, true, playerpos, activeslots, distances);
// coreFindThreatsForProp(prop->child, true, playerpos, activeslots, distances);
// }
//
// if (inchild && prop->next) {
// propFindThreats(prop->next, inchild, playerpos, activeslots, distances);
// coreFindThreatsForProp(prop->next, inchild, playerpos, activeslots, distances);
// }
//}
@@ -1332,7 +1332,7 @@ glabel func0f168f24
// }
//}
void func0f1691c0(void)
void coreFindThreats(void)
{
s32 i;
struct prop *prop;
@@ -1355,7 +1355,7 @@ void func0f1691c0(void)
propptr--;
}
for (i = 0; i != 4; i++) {
for (i = 0; i != ARRAYCOUNT(activeslots); i++) {
if (!activeslots[i]) {
g_Vars.currentplayer->cmpfollowprops[i].prop = NULL;
g_Vars.currentplayer->cmpfollowprops[i].unk04 = -1;
@@ -1369,7 +1369,7 @@ void func0f1691c0(void)
prop = *propptr;
if (prop) {
propFindThreats(prop, false, &campos, activeslots, distances);
coreFindThreatsForProp(prop, false, &campos, activeslots, distances);
}
propptr--;
@@ -1406,7 +1406,7 @@ void func0f1691c0(void)
* - random static in the Infiltration intro cutscene
* - combat boost activation and reverting
*/
Gfx *renderFrame(Gfx *gdl)
Gfx *coreRender(Gfx *gdl)
{
gSPSegment(gdl++, 0x00, 0x00000000);
@@ -1431,7 +1431,7 @@ Gfx *renderFrame(Gfx *gdl)
(viGetViewTop() + viGetViewHeight()) * 4.0f);
gdl = titleRender(gdl);
gdl = fadeRender(gdl);
gdl = coreRenderFade(gdl);
} else if (g_Vars.stagenum == STAGE_BOOTPAKMENU) {
gSPClipRatio(gdl++, FRUSTRATIO_2);
gSPDisplayList(gdl++, &var800613a0);
@@ -1643,7 +1643,7 @@ Gfx *renderFrame(Gfx *gdl)
}
if (handHasFunctionFlags(g_Vars.currentplayer->hands, FUNCFLAG_00080000)) {
func0f1691c0();
coreFindThreats();
} else if (weaponHasFlag(getCurrentPlayerWeaponId(0), WEAPONFLAG_AIMTRACK)) {
s32 j;
@@ -1651,12 +1651,12 @@ Gfx *renderFrame(Gfx *gdl)
&& g_Vars.currentplayer->lookingatprop.prop
&& currentPlayerIsInSightAimMode()) {
func0f1a0924(g_Vars.currentplayer->lookingatprop.prop);
} else if (threatCheckCmpFollow(&g_Vars.currentplayer->lookingatprop, -1) == 0) {
} else if (coreCheckCmpFollowThreat(&g_Vars.currentplayer->lookingatprop, -1) == 0) {
g_Vars.currentplayer->lookingatprop.prop = NULL;
}
for (j = 0; j < 4; j++) {
if (!threatCheckCmpFollow(&g_Vars.currentplayer->cmpfollowprops[j], j)) {
for (j = 0; j < ARRAYCOUNT(g_Vars.currentplayer->cmpfollowprops); j++) {
if (!coreCheckCmpFollowThreat(&g_Vars.currentplayer->cmpfollowprops[j], j)) {
g_Vars.currentplayer->cmpfollowprops[j].unk04 = -1;
g_Vars.currentplayer->cmpfollowprops[j].unk08 = -2;
}
@@ -1876,7 +1876,7 @@ Gfx *renderFrame(Gfx *gdl)
|| (g_Vars.speedpillwant && !g_Vars.speedpillon)
|| (!g_Vars.speedpillwant && g_Vars.speedpillon)) {
if (g_Vars.speedpillchange == 30 && !g_Vars.speedpillwant) {
audioStart(var80095200, getEffectiveSlowMotion() ? 0x5c9 : 0x2ad, 0, -1, -1, -1, -1, -1);
audioStart(var80095200, coreGetEffectiveSlowMotion() ? 0x5c9 : 0x2ad, 0, -1, -1, -1, -1, -1);
}
if (g_Vars.speedpillchange < 15) {
@@ -1982,7 +1982,7 @@ Gfx *renderFrame(Gfx *gdl)
}
gdl = func0f185774(gdl);
gdl = fadeRender(gdl);
gdl = coreRenderFade(gdl);
if (g_FrIsValidWeapon) {
gdl = frRenderHud(gdl);
@@ -2055,7 +2055,7 @@ Gfx *renderFrame(Gfx *gdl)
setNumPlayers(1);
titleSetNextMode(TITLEMODE_SKIP);
g_MissionConfig.difficulty = DIFF_A;
setDifficulty(DIFF_A);
coreSetDifficulty(DIFF_A);
g_MissionConfig.stageindex = g_Cutscenes[g_Vars.unk0004d4].mission;
g_MissionConfig.stagenum = g_Cutscenes[g_Vars.unk0004d4].stage;
titleSetNextStage(g_Cutscenes[g_Vars.unk0004d4].stage);
@@ -2083,7 +2083,7 @@ u32 var800840b4 = 0x00000000;
u32 var800840b8 = 0x00000000;
u32 var800840bc = 0x00000000;
void updateSoloHandicaps(void)
void coreUpdateSoloHandicaps(void)
{
if (g_Vars.antiplayernum >= 0) {
if (g_Difficulty == DIFF_A) {
@@ -2246,7 +2246,7 @@ s32 sub54321(s32 value)
return value - 54321;
}
void updateCutsceneTime(void)
void coreUpdateCutsceneTime(void)
{
if (g_Vars.in_cutscene) {
g_CutsceneTime240_60 += g_Vars.lvupdate240_60;
@@ -2257,7 +2257,7 @@ void updateCutsceneTime(void)
}
GLOBAL_ASM(
glabel getEffectiveSlowMotion
glabel coreGetEffectiveSlowMotion
/* f16b854: 27bdffd0 */ addiu $sp,$sp,-48
/* f16b858: afbf0014 */ sw $ra,0x14($sp)
/* f16b85c: 3c04b000 */ lui $a0,0xb000
@@ -2338,7 +2338,7 @@ glabel getEffectiveSlowMotion
);
// Can't match the antipiracy part
//u32 getEffectiveSlowMotion(void)
//u32 coreGetEffectiveSlowMotion(void)
//{
//#if PIRACYCHECKS
// u32 addr = sub54321(0xb000de8d);
@@ -2383,12 +2383,12 @@ glabel getEffectiveSlowMotion
// return SLOWMOTION_OFF;
//}
void func0f16b96c(void)
void coreTick(void)
{
s32 j;
s32 i;
func0f16cce4();
coreCheckPauseStateChanged();
if (g_Vars.unk0004e4) {
func0f11c54c();
@@ -2421,7 +2421,7 @@ void func0f16b96c(void)
g_Vars.players[j]->hands[HAND_RIGHT].unk0cec = 0;
}
if (soloIsPaused()) {
if (coreIsPaused()) {
g_Vars.lvupdate240 = 0;
} else if (mpIsPaused()) {
g_Vars.lvupdate240 = 0;
@@ -2430,7 +2430,7 @@ void func0f16b96c(void)
g_Vars.players[j]->joybutinhibit = 0xefffefff;
}
} else {
s32 slowmo = getEffectiveSlowMotion();
s32 slowmo = coreGetEffectiveSlowMotion();
g_Vars.lvupdate240 = g_Vars.diffframe240;
if (slowmo == SLOWMOTION_ON) {
@@ -2568,10 +2568,10 @@ void func0f16b96c(void)
// Handle MP match ending
if (g_Vars.normmplayerisrunning && g_Vars.stagenum < STAGE_TITLE) {
if (g_MpTimeLimit > 0) {
s32 elapsed = g_StageTimeElapsed;
s32 nexttime = g_Vars.lvupdate240_60 + g_StageTimeElapsed;
s32 warntime = g_MpTimeLimit - 3600;
if (g_MpTimeLimit60 > 0) {
s32 elapsed = g_StageTimeElapsed60;
s32 nexttime = g_Vars.lvupdate240_60 + g_StageTimeElapsed60;
s32 warntime = g_MpTimeLimit60 - 3600;
// Show HUD message at one minute remaining
if (elapsed < warntime && nexttime >= warntime) {
@@ -2583,16 +2583,16 @@ void func0f16b96c(void)
}
}
if (elapsed < g_MpTimeLimit && nexttime >= g_MpTimeLimit) {
if (elapsed < g_MpTimeLimit60 && nexttime >= g_MpTimeLimit60) {
// Match is ending due to time limit reached
mainEndStage();
}
// Sound alarm at 10 seconds remaining
if (nexttime >= g_MpTimeLimit - 600
if (nexttime >= g_MpTimeLimit60 - 600
&& g_MiscAudioHandle == NULL
&& !soloIsPaused()
&& nexttime < g_MpTimeLimit) {
&& !coreIsPaused()
&& nexttime < g_MpTimeLimit60) {
func00010718(&g_MiscAudioHandle, 0, 0x7fff, 0x40, 163, 1, 1, -1, 1);
}
}
@@ -2644,8 +2644,8 @@ void func0f16b96c(void)
}
}
g_StageTimeElapsed += g_Vars.lvupdate240_60;
g_StageTimeElapsed60f = g_StageTimeElapsed / 60.0f;
g_StageTimeElapsed60 += g_Vars.lvupdate240_60;
g_StageTimeElapsed1f = g_StageTimeElapsed60 / 60.0f;
viSetUseZBuf(true);
@@ -2673,9 +2673,9 @@ void func0f16b96c(void)
func00011d84();
func0f01d860();
} else {
updateCutsceneTime();
coreUpdateCutsceneTime();
func0f12939c();
updateSoloHandicaps();
coreUpdateSoloHandicaps();
func0f01d8c0();
func0f01d990();
func0f01dd6c();
@@ -2692,7 +2692,7 @@ void func0f16b96c(void)
func0f009eac();
}
boostAndSlayerSfxUpdate();
coreUpdateMiscSfx();
func0000fe88();
pakExecuteDebugOperations();
func0f0033b0();
@@ -2729,7 +2729,7 @@ void func0f16b96c(void)
}
}
void currentPlayerRecordDistanceMoved(void)
void coreRecordDistanceMoved(void)
{
f32 xdiff;
f32 zdiff;
@@ -2748,7 +2748,7 @@ void currentPlayerRecordDistanceMoved(void)
g_Vars.currentplayerstats->distance += sqrtf(xdiff * xdiff + zdiff * zdiff);
}
void stageLoad(void)
void coreUnloadStage(void)
{
func0f11dcb0(1);
@@ -2793,7 +2793,7 @@ void stageLoad(void)
func0f01bea0();
}
void func0f16cce4(void)
void coreCheckPauseStateChanged(void)
{
u32 paused = mpIsPaused();
@@ -2808,7 +2808,7 @@ void func0f16cce4(void)
var80084010 = paused;
}
void soloSetPaused(bool paused)
void coreSetPaused(bool paused)
{
if (paused) {
func0f11deb8();
@@ -2821,17 +2821,17 @@ void soloSetPaused(bool paused)
var80084014 = paused;
}
bool soloIsPaused(void)
bool coreIsPaused(void)
{
return var80084014;
}
s32 getDifficulty(void)
s32 coreGetDifficulty(void)
{
return g_Difficulty;
}
void setDifficulty(s32 difficulty)
void coreSetDifficulty(s32 difficulty)
{
if (difficulty < DIFF_A || difficulty > DIFF_PD) {
difficulty = DIFF_A;
@@ -2840,29 +2840,29 @@ void setDifficulty(s32 difficulty)
g_Difficulty = difficulty;
}
void mpSetTimeLimit(u32 limit)
void coreSetMpTimeLimit60(u32 limit)
{
g_MpTimeLimit = limit;
g_MpTimeLimit60 = limit;
}
void mpSetScoreLimit(u32 limit)
void coreSetMpScoreLimit(u32 limit)
{
g_MpScoreLimit = limit;
}
void mpSetTeamScoreLimit(u32 limit)
void coreSetMpTeamScoreLimit(u32 limit)
{
g_MpTeamScoreLimit = limit;
}
f32 getUptime(void)
f32 coreGetStageTimeInSeconds(void)
{
return g_StageTimeElapsed60f;
return g_StageTimeElapsed1f;
}
u32 mpGetTimeElapsed(void)
u32 coreGetStageTime60(void)
{
return g_StageTimeElapsed;
return g_StageTimeElapsed60;
}
u32 func0f16ce04(u32 arg0)
src/game/dlights.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include "game/game_12f6c0.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_176080.h"
#include "game/game_17f930.h"
#include "game/propobj.h"
@@ -4927,7 +4927,7 @@ glabel func0f005bb0
/* f005e5c: 31ae0001 */ andi $t6,$t5,0x1
/* f005e60: 11c0003c */ beqz $t6,.L0f005f54
/* f005e64: 00000000 */ nop
/* f005e68: 0fc5b364 */ jal soloIsPaused
/* f005e68: 0fc5b364 */ jal coreIsPaused
/* f005e6c: 00000000 */ nop
/* f005e70: 14400038 */ bnez $v0,.L0f005f54
/* f005e74: 3c08800a */ lui $t0,%hi(g_Vars+0x284)
src/game/endscreen.c
+7 -7
View File
@@ -22,7 +22,7 @@
#include "game/game_107fb0.h"
#include "game/endscreen.h"
#include "game/game_1655c0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/game_19aa80.h"
#include "game/gamefile.h"
@@ -509,7 +509,7 @@ void endscreenHandleContinue(s32 context)
setNumPlayers(1);
}
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
func00009ec4(true);
@@ -518,7 +518,7 @@ void endscreenHandleContinue(s32 context)
// Commit to starting credits
g_MissionConfig.stagenum = STAGE_CREDITS;
titleSetNextStage(g_MissionConfig.stagenum);
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
func00009ec4(true);
@@ -1325,7 +1325,7 @@ glabel endscreenPrepare
.L0f10ec84:
/* f10ec84: 54610008 */ bnel $v1,$at,.L0f10eca8
/* f10ec88: 8fbf0014 */ lw $ra,0x14($sp)
/* f10ec8c: 0fc5b350 */ jal soloSetPaused
/* f10ec8c: 0fc5b350 */ jal coreSetPaused
/* f10ec90: 24040001 */ addiu $a0,$zero,0x1
/* f10ec94: 3c18800a */ lui $t8,%hi(g_Vars+0x284)
/* f10ec98: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8)
@@ -1498,7 +1498,7 @@ glabel endscreenPrepare
// }
//
// if (g_MenuData.root == MENUROOT_ENDSCREEN) {
// soloSetPaused(true);
// coreSetPaused(true);
// g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
// }
//}
@@ -1543,7 +1543,7 @@ void soloPushCoopModeEndscreen(void)
{
u32 prevplayernum = g_MpPlayerNum;
soloSetPaused(true);
coreSetPaused(true);
g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
@@ -1613,7 +1613,7 @@ void soloPushAntiModeEndscreen(void)
{
u32 prevplayernum = g_MpPlayerNum;
soloSetPaused(true);
coreSetPaused(true);
g_MpPlayerNum = g_Vars.currentplayerstats->mpindex;
src/game/game_00c490.c
+7 -7
View File
@@ -29,7 +29,7 @@
#include "game/game_157db0.h"
#include "game/game_1655c0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_17f930.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
@@ -1337,7 +1337,7 @@ void weaponAssignToHome(struct weaponobj *weapon, s32 cmdindex)
case WEAPON_K7AVENGER:
// Don't replace the K7 guard's weapon in Investigation
// because it would make an objective impossible
if (g_Vars.stagenum != STAGE_INVESTIGATION || getDifficulty() != DIFF_PA) {
if (g_Vars.stagenum != STAGE_INVESTIGATION || coreGetDifficulty() != DIFF_PA) {
weapon->weaponnum = WEAPON_ROCKETLAUNCHER;
weapon->base.modelnum = MODEL_CHRDYROCKET;
weapon->base.extrascale = 256;
@@ -2295,13 +2295,13 @@ glabel func0f00e980
/* f00ea38: 02589821 */ addu $s3,$s2,$t8
/* f00ea3c: 52600040 */ beqzl $s3,.L0f00eb40
/* f00ea40: 8fbf0034 */ lw $ra,0x34($sp)
/* f00ea44: 0fc5b367 */ jal getDifficulty
/* f00ea44: 0fc5b367 */ jal coreGetDifficulty
/* f00ea48: 24160001 */ addiu $s6,$zero,0x1
/* f00ea4c: 14400002 */ bnez $v0,.L0f00ea58
/* f00ea50: 00000000 */ nop
/* f00ea54: 24160003 */ addiu $s6,$zero,0x3
.L0f00ea58:
/* f00ea58: 0fc5b367 */ jal getDifficulty
/* f00ea58: 0fc5b367 */ jal coreGetDifficulty
/* f00ea5c: 00000000 */ nop
/* f00ea60: 24010001 */ addiu $at,$zero,0x1
/* f00ea64: 14410002 */ bne $v0,$at,.L0f00ea70
@@ -2854,7 +2854,7 @@ void setupParseObjects(s32 stagenum)
u32 diffflag = 0;
s32 index;
diffflag |= 1 << (getDifficulty() + 4);
diffflag |= 1 << (coreGetDifficulty() + 4);
if (g_Vars.mplayerisrunning) {
if (PLAYERCOUNT() == 2) {
@@ -3309,11 +3309,11 @@ void setupParseObjects(s32 stagenum)
briefingInsert(briefing);
if (getDifficulty() == DIFF_A) {
if (coreGetDifficulty() == DIFF_A) {
wanttype = BRIEFINGTYPE_TEXT_A;
}
if (getDifficulty() == DIFF_SA) {
if (coreGetDifficulty() == DIFF_SA) {
wanttype = BRIEFINGTYPE_TEXT_SA;
}
src/game/game_01bea0.c
+3 -3
View File
@@ -19,7 +19,7 @@
#include "game/game_102240.h"
#include "game/endscreen.h"
#include "game/game_127910.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_177e00.h"
#include "game/game_179060.h"
@@ -1152,7 +1152,7 @@ glabel var7f1a863c
/* f01cdbc: 31a400ff */ andi $a0,$t5,0xff
/* f01cdc0: 8e440000 */ lw $a0,0x0($s2)
/* f01cdc4: 0004ce42 */ srl $t9,$a0,0x19
/* f01cdc8: 0fc5b36a */ jal setDifficulty
/* f01cdc8: 0fc5b36a */ jal coreSetDifficulty
/* f01cdcc: 03202025 */ or $a0,$t9,$zero
/* f01cdd0: 0fc069f9 */ jal titleSetNextMode
/* f01cdd4: 24040005 */ addiu $a0,$zero,0x5
@@ -2351,7 +2351,7 @@ glabel var7f1a863c
// g_MissionConfig.stageindex++;
// g_MissionConfig.stagenum = g_StageNames[g_MissionConfig.stageindex].stagenum;
// titleSetNextStage(g_MissionConfig.stagenum);
// setDifficulty(g_MissionConfig.difficulty);
// coreSetDifficulty(g_MissionConfig.difficulty);
// titleSetNextMode(TITLEMODE_SKIP);
// mainSetStageNum(g_MissionConfig.stagenum);
// } else {
src/game/game_02cde0.c
+6 -6
View File
@@ -14,7 +14,7 @@
#include "game/game_0601b0.h"
#include "game/game_096750.h"
#include "game/game_0b28d0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_1a3340.h"
#include "game/mplayer.h"
#include "game/pad.h"
@@ -503,7 +503,7 @@ glabel chrUnpack
/* f02d5a4: 304a0020 */ andi $t2,$v0,0x20
/* f02d5a8: 51400007 */ beqzl $t2,.L0f02d5c8
/* f02d5ac: 304b0040 */ andi $t3,$v0,0x40
/* f02d5b0: 0fc5b367 */ jal getDifficulty
/* f02d5b0: 0fc5b367 */ jal coreGetDifficulty
/* f02d5b4: 00000000 */ nop
/* f02d5b8: 50400013 */ beqzl $v0,.L0f02d608
/* f02d5bc: 3c0dffff */ lui $t5,0xffff
@@ -512,7 +512,7 @@ glabel chrUnpack
.L0f02d5c8:
/* f02d5c8: 51600008 */ beqzl $t3,.L0f02d5ec
/* f02d5cc: 304c0080 */ andi $t4,$v0,0x80
/* f02d5d0: 0fc5b367 */ jal getDifficulty
/* f02d5d0: 0fc5b367 */ jal coreGetDifficulty
/* f02d5d4: 00000000 */ nop
/* f02d5d8: 24010001 */ addiu $at,$zero,0x1
/* f02d5dc: 5041000a */ beql $v0,$at,.L0f02d608
@@ -522,7 +522,7 @@ glabel chrUnpack
.L0f02d5ec:
/* f02d5ec: 5180016b */ beqzl $t4,.L0f02db9c
/* f02d5f0: 8fbf002c */ lw $ra,0x2c($sp)
/* f02d5f4: 0fc5b367 */ jal getDifficulty
/* f02d5f4: 0fc5b367 */ jal coreGetDifficulty
/* f02d5f8: 00000000 */ nop
/* f02d5fc: 24010002 */ addiu $at,$zero,0x2
/* f02d600: 14410165 */ bne $v0,$at,.L0f02db98
@@ -939,8 +939,8 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
#if PIRACYCHECKS
{
u32 checksum = 0;
s32 *ptr = (s32 *)&func0f167e7c;
s32 *end = (s32 *)&fadeConfigure;
s32 *ptr = (s32 *)&coreLoadStage;
s32 *end = (s32 *)&coreConfigureFade;
while (ptr < end) {
checksum <<= 1;
src/game/game_092610.c
+2 -2
View File
@@ -13,7 +13,7 @@
#include "game/game_096750.h"
#include "game/game_0dcdb0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/mplayer.h"
#include "game/pad.h"
#include "gvars/gvars.h"
@@ -822,7 +822,7 @@ glabel func0f092c04
/* f093034: afa50048 */ sw $a1,0x48($sp)
.L0f093038:
/* f093038: afa80040 */ sw $t0,0x40($sp)
/* f09303c: 0fc5b364 */ jal soloIsPaused
/* f09303c: 0fc5b364 */ jal coreIsPaused
/* f093040: e7b2003c */ swc1 $f18,0x3c($sp)
/* f093044: 3c09800a */ lui $t1,%hi(g_Vars)
/* f093048: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars)
src/game/game_095320.c
+4 -4
View File
@@ -16,7 +16,7 @@
#include "game/game_0dcdb0.h"
#include "game/game_111600.h"
#include "game/game_127910.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/propobj.h"
@@ -339,7 +339,7 @@ bool objectiveIsAllComplete(void)
for (i = 0; i < objectiveGetCount(); i++) {
u32 diffbits = objectiveGetDifficultyBits(i);
if ((1 << getDifficulty() & diffbits) &&
if ((1 << coreGetDifficulty() & diffbits) &&
objectiveCheck(i) != OBJECTIVE_COMPLETE) {
return false;
}
@@ -382,7 +382,7 @@ void objectivesCheckAll(void)
if (g_ObjectiveStatuses[i] != status) {
g_ObjectiveStatuses[i] = status;
if (objectiveGetDifficultyBits(i) & (1 << getDifficulty())) {
if (objectiveGetDifficultyBits(i) & (1 << coreGetDifficulty())) {
sprintf(buffer, "%s %d: ", langGet(L_MISC(44)), availableindex + 1); // "Objective"
if (status == OBJECTIVE_COMPLETE) {
@@ -398,7 +398,7 @@ void objectivesCheckAll(void)
}
}
if (objectiveGetDifficultyBits(i) & (1 << getDifficulty())) {
if (objectiveGetDifficultyBits(i) & (1 << coreGetDifficulty())) {
availableindex++;
}
}
src/game/game_097ba0.c
+4 -4
View File
@@ -33,7 +33,7 @@
#include "game/smoke.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_16e810.h"
#include "game/game_176080.h"
#include "game/training.h"
@@ -23284,7 +23284,7 @@ void speedpillAddBoost(s32 amount)
}
if (!g_Vars.speedpillwant) {
u32 sound = getEffectiveSlowMotion() ? 0x2ad : 0x5c9;
u32 sound = coreGetEffectiveSlowMotion() ? 0x2ad : 0x5c9;
audioStart(var80095200, sound, 0, -1, -1, -1, -1, -1);
}
@@ -23304,7 +23304,7 @@ void speedpillRevert(s32 amount)
void func0f0abba8(void)
{
if (getEffectiveSlowMotion()) {
if (coreGetEffectiveSlowMotion()) {
speedpillRevert(SECSTOTIME60(20));
} else {
speedpillAddBoost(SECSTOTIME60(10));
@@ -23313,7 +23313,7 @@ void func0f0abba8(void)
void func0f0abbe8(void)
{
if (getEffectiveSlowMotion()) {
if (coreGetEffectiveSlowMotion()) {
speedpillAddBoost(SECSTOTIME60(20));
} else {
speedpillRevert(SECSTOTIME60(10));
src/game/game_0b63b0.c
+9 -9
View File
@@ -42,7 +42,7 @@
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/gfxmemory.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_177e00.h"
@@ -2327,7 +2327,7 @@ void currentPlayerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2)
return;
}
if (g_Vars.stagenum == STAGE_VILLA && getDifficulty() >= DIFF_PA) {
if (g_Vars.stagenum == STAGE_VILLA && coreGetDifficulty() >= DIFF_PA) {
outfit = OUTFIT_NEGOTIATOR;
}
@@ -4221,7 +4221,7 @@ void currentPlayerTickPauseMenu(void)
if (opened) {
struct trainingdata *data = dtGetData();
soloSetPaused(true);
coreSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
if ((g_GlobalMenuRoot == MENUROOT_MAINMENU || g_GlobalMenuRoot == MENUROOT_TRAINING)
@@ -4247,7 +4247,7 @@ void currentPlayerTickPauseMenu(void)
g_Vars.currentplayer->pausetime60 += g_Vars.diffframe60;
if (g_Vars.currentplayer->pausetime60 >= 20) {
soloSetPaused(false);
coreSetPaused(false);
g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
musicResumeAfterUnpause();
}
@@ -4267,7 +4267,7 @@ void currentPlayerPause(s32 root)
void func0f0baf38(void)
{
if (g_Vars.currentplayer->pausemode == PAUSEMODE_PAUSED) {
soloSetPaused(false);
coreSetPaused(false);
musicResumeAfterUnpause();
g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
}
@@ -5835,7 +5835,7 @@ glabel var7f1ad6ac
/* f0bdf40: 2411ffd8 */ addiu $s1,$zero,-40
/* f0bdf44: a611024c */ sh $s1,0x24c($s0)
.L0f0bdf48:
/* f0bdf48: 0fc5b364 */ jal soloIsPaused
/* f0bdf48: 0fc5b364 */ jal coreIsPaused
/* f0bdf4c: 2411ffd8 */ addiu $s1,$zero,-40
/* f0bdf50: 50400004 */ beqzl $v0,.L0f0bdf64
/* f0bdf54: 8e700284 */ lw $s0,0x284($s3)
@@ -7620,7 +7620,7 @@ glabel var7f1ad6ac
/* f0bf960: 8d440070 */ lw $a0,0x70($t2)
/* f0bf964: 00028600 */ sll $s0,$v0,0x18
/* f0bf968: 00105e03 */ sra $t3,$s0,0x18
/* f0bf96c: 0fc5b364 */ jal soloIsPaused
/* f0bf96c: 0fc5b364 */ jal coreIsPaused
/* f0bf970: 01608025 */ or $s0,$t3,$zero
/* f0bf974: 1440002c */ bnez $v0,.L0f0bfa28
/* f0bf978: 8fad0330 */ lw $t5,0x330($sp)
@@ -7930,7 +7930,7 @@ glabel var7f1ad6ac
// }
//
// // df48
// if (soloIsPaused()) {
// if (coreIsPaused()) {
// func0f0bace0();
// }
//
@@ -8693,7 +8693,7 @@ glabel var7f1ad6ac
// if (var8007074c != 0) {
// u32 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex);
//
// if (soloIsPaused() == false
// if (coreIsPaused() == false
// && param_1
// && contGetButtonsPressedThisFrame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) {
// var8007074c = 2;
src/game/game_0dcdb0.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include "game/game_0e0770.h"
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/mplayer.h"
#include "game/pdoptions.h"
#include "game/propobj.h"
@@ -3445,7 +3445,7 @@ glabel var7f1aded8
.L0f0df75c:
/* f0df75c: 55600038 */ bnezl $t3,.L0f0df840
/* f0df760: 9602001c */ lhu $v0,0x1c($s0)
/* f0df764: 0fc5b364 */ jal soloIsPaused
/* f0df764: 0fc5b364 */ jal coreIsPaused
/* f0df768: 00000000 */ nop
/* f0df76c: 54400034 */ bnezl $v0,.L0f0df840
/* f0df770: 9602001c */ lhu $v0,0x1c($s0)
src/game/game_0f09f0.c
+4 -4
View File
@@ -24,7 +24,7 @@
#include "game/game_1371b0.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/game_179060.h"
@@ -1272,7 +1272,7 @@ glabel var7f1b28c0
/* f0f1c08: 11a0000d */ beqz $t5,.L0f0f1c40
/* f0f1c0c: 00000000 */ nop
/* f0f1c10: afa30034 */ sw $v1,0x34($sp)
/* f0f1c14: 0fc5b367 */ jal getDifficulty
/* f0f1c14: 0fc5b367 */ jal coreGetDifficulty
/* f0f1c18: afa40038 */ sw $a0,0x38($sp)
/* f0f1c1c: 8fa30034 */ lw $v1,0x34($sp)
/* f0f1c20: 240e0001 */ addiu $t6,$zero,0x1
@@ -8474,7 +8474,7 @@ void func0f0f85e0(struct menudialog *dialog, s32 root)
}
menuPushRootDialog(dialog, root);
soloSetPaused(true);
coreSetPaused(true);
g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED;
}
@@ -13618,7 +13618,7 @@ glabel func0f0fce8c
/* f0fcf58: 00e02025 */ or $a0,$a3,$zero
/* f0fcf5c: 0fc3e0cc */ jal menuPushRootDialog
/* f0fcf60: 24050002 */ addiu $a1,$zero,0x2
/* f0fcf64: 0fc5b350 */ jal soloSetPaused
/* f0fcf64: 0fc5b350 */ jal coreSetPaused
/* f0fcf68: 24040001 */ addiu $a0,$zero,0x1
/* f0fcf6c: 3c06800a */ lui $a2,%hi(g_Vars)
/* f0fcf70: 24c69fc0 */ addiu $a2,$a2,%lo(g_Vars)
src/game/game_102240.c
+9 -9
View File
@@ -24,7 +24,7 @@
#include "game/game_107fb0.h"
#include "game/game_111600.h"
#include "game/game_1531a0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/game_19aa80.h"
#include "game/training.h"
@@ -687,7 +687,7 @@ s32 menuhandlerAcceptMission(u32 operation, struct menuitem *item, union handler
setNumPlayers(1);
}
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
titleSetNextMode(TITLEMODE_SKIP);
mainSetStageNum(g_MissionConfig.stagenum);
func00009ec4(1);
@@ -792,7 +792,7 @@ s32 menuhandlerAcceptPdModeSettings(u32 operation, struct menuitem *item, union
g_MissionConfig.pdmodedamagef = func0f1036ac(g_MissionConfig.pdmodedamage, PDMODEPROP_DAMAGE);
g_MissionConfig.pdmodeaccuracyf = func0f1036ac(g_MissionConfig.pdmodeaccuracy, PDMODEPROP_ACCURACY);
g_MissionConfig.difficulty = DIFF_PA;
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPopDialog();
menuPushDialog(&g_ObjectivesMenuDialog);
@@ -1137,7 +1137,7 @@ s32 menuhandlerSoloDifficulty(u32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_ObjectivesMenuDialog);
break;
@@ -1497,7 +1497,7 @@ s32 menuhandlerCoopDifficulty(u32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_CoopOptionsMenuDialog);
break;
@@ -1534,7 +1534,7 @@ s32 menuhandlerAntiDifficulty(u32 operation, struct menuitem *item, union handle
case MENUOP_SET:
g_MissionConfig.pdmode = false;
g_MissionConfig.difficulty = item->param;
setDifficulty(g_MissionConfig.difficulty);
coreSetDifficulty(g_MissionConfig.difficulty);
menuPopDialog();
menuPushDialog(&g_AntiOptionsMenuDialog);
}
@@ -3434,7 +3434,7 @@ char *invMenuTextWeaponDescription(struct menuitem *item)
if (g_InventoryWeapon == WEAPON_NECKLACE
&& g_Vars.stagenum == STAGE_ATTACKSHIP
&& getDifficulty() >= DIFF_PA) {
&& coreGetDifficulty() >= DIFF_PA) {
u8 username[] = {
'C' + 9,
'D' + 18,
@@ -3900,11 +3900,11 @@ s32 soloMenuDialogPauseStatus(u32 operation, struct menudialog *dialog, union ha
s32 wanttype = BRIEFINGTYPE_TEXT_PA;
s32 i;
if (getDifficulty() == DIFF_A) {
if (coreGetDifficulty() == DIFF_A) {
wanttype = BRIEFINGTYPE_TEXT_A;
}
if (getDifficulty() == DIFF_SA) {
if (coreGetDifficulty() == DIFF_SA) {
wanttype = BRIEFINGTYPE_TEXT_SA;
}
src/game/game_1371b0.c
+2 -2
View File
@@ -17,7 +17,7 @@
#include "game/game_1371b0.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/lang.h"
#include "gvars/gvars.h"
@@ -4844,7 +4844,7 @@ glabel var7f1b5948
/* f13b494: ac22a258 */ sw $v0,%lo(g_Vars+0x298)($at)
/* f13b498: 3c01800a */ lui $at,%hi(g_Vars+0x29c)
/* f13b49c: ac22a25c */ sw $v0,%lo(g_Vars+0x29c)($at)
/* f13b4a0: 0fc5b36a */ jal setDifficulty
/* f13b4a0: 0fc5b36a */ jal coreSetDifficulty
/* f13b4a4: 00002025 */ or $a0,$zero,$zero
/* f13b4a8: 0c0027b1 */ jal func00009ec4
/* f13b4ac: 24040001 */ addiu $a0,$zero,0x1
src/game/game_157db0.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_16e810.h"
#include "game/game_173a00.h"
#include "game/wallhit.h"
src/game/game_177e00.c
+2 -2
View File
@@ -15,7 +15,7 @@
#include "game/game_0d4690.h"
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_177e00.h"
#include "game/game_19aa80.h"
#include "game/lang.h"
@@ -258,7 +258,7 @@ char *menutextPauseOrUnpause(s32 arg0)
char *menutextMatchTime(s32 arg0)
{
formatTime(g_StringPointer, mpGetTimeElapsed(), 3);
formatTime(g_StringPointer, coreGetStageTime60(), 3);
return g_StringPointer;
}
src/game/menu/items.c
+2 -2
View File
@@ -16,7 +16,7 @@
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_1531a0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/lang.h"
@@ -3895,7 +3895,7 @@ Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context)
for (i = 0; i < 6; i++) {
if (g_Briefing.objectivenames[i]
&& g_Briefing.objectivedifficulties[i] & (1 << getDifficulty())) {
&& g_Briefing.objectivedifficulties[i] & (1 << coreGetDifficulty())) {
gdl = menuRenderObjective(gdl,
context->frame,
i, position, context->x, y, context->width, context->height,
src/game/mplayer.c
+7 -7
View File
@@ -18,7 +18,7 @@
#include "game/game_0f09f0.h"
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
@@ -914,7 +914,7 @@ glabel func0f188530
/* f188540: 2841003c */ slti $at,$v0,0x3c
/* f188544: 14200005 */ bnez $at,.L0f18855c
/* f188548: 000220c0 */ sll $a0,$v0,0x3
/* f18854c: 0fc5b372 */ jal mpSetTimeLimit
/* f18854c: 0fc5b372 */ jal coreSetMpTimeLimit60
/* f188550: 00002025 */ or $a0,$zero,$zero
/* f188554: 10000007 */ b .L0f188574
/* f188558: 00000000 */ nop
@@ -923,7 +923,7 @@ glabel func0f188530
/* f188560: 00042140 */ sll $a0,$a0,0x5
/* f188564: 00822021 */ addu $a0,$a0,$v0
/* f188568: 00042100 */ sll $a0,$a0,0x4
/* f18856c: 0fc5b372 */ jal mpSetTimeLimit
/* f18856c: 0fc5b372 */ jal coreSetMpTimeLimit60
/* f188570: 24840e10 */ addiu $a0,$a0,0xe10
.L0f188574:
/* f188574: 3c02800b */ lui $v0,%hi(g_MpSetup+0x13)
@@ -931,12 +931,12 @@ glabel func0f188530
/* f18857c: 28410064 */ slti $at,$v0,0x64
/* f188580: 14200005 */ bnez $at,.L0f188598
/* f188584: 00000000 */ nop
/* f188588: 0fc5b375 */ jal mpSetScoreLimit
/* f188588: 0fc5b375 */ jal coreSetMpScoreLimit
/* f18858c: 00002025 */ or $a0,$zero,$zero
/* f188590: 10000003 */ b .L0f1885a0
/* f188594: 00000000 */ nop
.L0f188598:
/* f188598: 0fc5b375 */ jal mpSetScoreLimit
/* f188598: 0fc5b375 */ jal coreSetMpScoreLimit
/* f18859c: 24440001 */ addiu $a0,$v0,0x1
.L0f1885a0:
/* f1885a0: 3c0e800b */ lui $t6,%hi(g_MpSetup+0x14)
@@ -944,14 +944,14 @@ glabel func0f188530
/* f1885a8: 29c10190 */ slti $at,$t6,0x190
/* f1885ac: 14200005 */ bnez $at,.L0f1885c4
/* f1885b0: 00000000 */ nop
/* f1885b4: 0fc5b378 */ jal mpSetTeamScoreLimit
/* f1885b4: 0fc5b378 */ jal coreSetMpTeamScoreLimit
/* f1885b8: 00002025 */ or $a0,$zero,$zero
/* f1885bc: 10000006 */ b .L0f1885d8
/* f1885c0: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1885c4:
/* f1885c4: 0fc62113 */ jal func0f18844c
/* f1885c8: 00000000 */ nop
/* f1885cc: 0fc5b378 */ jal mpSetTeamScoreLimit
/* f1885cc: 0fc5b378 */ jal coreSetMpTeamScoreLimit
/* f1885d0: 24440001 */ addiu $a0,$v0,0x1
/* f1885d4: 8fbf0014 */ lw $ra,0x14($sp)
.L0f1885d8:
src/game/music.c
+2 -2
View File
@@ -9,7 +9,7 @@
#include "game/data/data_02a0e0.h"
#include "game/data/data_02da90.h"
#include "game/game_0f09f0.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_176080.h"
#include "gvars/gvars.h"
@@ -242,7 +242,7 @@ bool musicIsAnyPlayerInAmbientRoom(void)
return false;
}
if (soloIsPaused()) {
if (coreIsPaused()) {
return false;
}
src/game/propobj.c
+7 -7
View File
@@ -51,7 +51,7 @@
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/gfxmemory.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/game_179060.h"
#include "game/game_17f930.h"
#include "game/game_190260.h"
@@ -9832,7 +9832,7 @@ glabel func0f06e87c
/* f06e924: 3406ffff */ dli $a2,0xffff
/* f06e928: 0fc249af */ jal func0f0926bc
/* f06e92c: 8e040014 */ lw $a0,0x14($s0)
/* f06e930: 0fc5b364 */ jal soloIsPaused
/* f06e930: 0fc5b364 */ jal coreIsPaused
/* f06e934: 00000000 */ nop
/* f06e938: 1440001f */ bnez $v0,.L0f06e9b8
/* f06e93c: 3c01bf80 */ lui $at,0xbf80
@@ -22814,7 +22814,7 @@ glabel var7f1aa5a8
.text
/* f079f1c: 27bdfe68 */ addiu $sp,$sp,-408
/* f079f20: afbf0044 */ sw $ra,0x44($sp)
/* f079f24: 0fc5b364 */ jal soloIsPaused
/* f079f24: 0fc5b364 */ jal coreIsPaused
/* f079f28: afa40198 */ sw $a0,0x198($sp)
/* f079f2c: 14400363 */ bnez $v0,.L0f07acbc
/* f079f30: 8fae0198 */ lw $t6,0x198($sp)
@@ -28366,7 +28366,7 @@ s32 objTick(struct prop *prop)
struct chopperobj *chopper = (struct chopperobj *)obj;
if (!chopper->dead) {
if (!soloIsPaused()) {
if (!coreIsPaused()) {
if (chopper->attackmode == 3) {
// empty
} else if (chopper->attackmode == 2) {
@@ -46989,7 +46989,7 @@ glabel var7f1ab19c
/* f090714: 8d089900 */ lw $t0,%lo(var80069900)($t0)
/* f090718: 15000016 */ bnez $t0,.L0f090774
/* f09071c: 00000000 */ nop
/* f090720: 0fc5b364 */ jal soloIsPaused
/* f090720: 0fc5b364 */ jal coreIsPaused
/* f090724: 00000000 */ nop
/* f090728: 14400012 */ bnez $v0,.L0f090774
/* f09072c: 24090037 */ addiu $t1,$zero,0x37
@@ -47465,7 +47465,7 @@ void alarmTick(void)
default: sound = 0x00a3; break;
}
if (!soloIsPaused()) {
if (!coreIsPaused()) {
if (g_AlarmAudioHandle) {
// The sound is currently playing. Cycle between the left/right
// speaker for stereo or headphone mode.
@@ -47724,7 +47724,7 @@ glabel var7f1ab214
/* f0912e4: afa40200 */ sw $a0,0x200($sp)
/* f0912e8: afa50204 */ sw $a1,0x204($sp)
/* f0912ec: afa60208 */ sw $a2,0x208($sp)
/* f0912f0: 0fc5b364 */ jal soloIsPaused
/* f0912f0: 0fc5b364 */ jal coreIsPaused
/* f0912f4: afa7020c */ sw $a3,0x20c($sp)
/* f0912f8: 1440029e */ bnez $v0,.L0f091d74
/* f0912fc: 8fa30208 */ lw $v1,0x208($sp)
src/game/title.c
+3 -3
View File
@@ -18,7 +18,7 @@
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_1a3340.h"
#include "game/lang.h"
@@ -1327,7 +1327,7 @@ void titleTickPdLogo(void)
g_Vars.coopplayernum = -1;
g_Vars.antiplayernum = -1;
setDifficulty(DIFF_A);
coreSetDifficulty(DIFF_A);
func00009ec4(true);
} else {
titleSetNextMode(TITLEMODE_SKIP);
@@ -4458,7 +4458,7 @@ void titleInitSkip(void)
g_Vars.coopplayernum = -1;
g_Vars.antiplayernum = -1;
setDifficulty(DIFF_A);
coreSetDifficulty(DIFF_A);
func00009ec4(true);
}
src/game/weather.c
+3 -3
View File
@@ -13,7 +13,7 @@
#include "game/weather.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/lib_0e9d0.h"
@@ -499,7 +499,7 @@ glabel var7f1b56f4
/* f131b9c: 46083282 */ mul.s $f10,$f6,$f8
/* f131ba0: 4600540d */ trunc.w.s $f16,$f10
/* f131ba4: 44118000 */ mfc1 $s1,$f16
/* f131ba8: 0fc5b364 */ jal soloIsPaused
/* f131ba8: 0fc5b364 */ jal coreIsPaused
/* f131bac: 00000000 */ nop
/* f131bb0: 10400002 */ beqz $v0,.L0f131bbc
/* f131bb4: 00000000 */ nop
@@ -968,7 +968,7 @@ const char var7f1b5620[] = "rainspeedxtra";
//
// iVar10 = weather->unk58[i].unk00 * 32767.0f * weather->unk88;
//
// if (soloIsPaused()) {
// if (coreIsPaused()) {
// iVar10 = 0;
// }
//
src/gvars/gvars.c
+2 -2
View File
@@ -15706,9 +15706,9 @@ u8 g_GfxActiveBufferIndex = 0;
u32 g_GfxRequestedDisplayList = 0;
u32 var800aa5a8 = 0;
u32 var800aa5ac = 0;
struct audiohandle *g_BoostAndSlayerAudioHandles[3] = {NULL};
struct audiohandle *g_MiscSfxAudioHandles[3] = {NULL};
u32 var800aa5bc = 0;
s32 g_BoostAndSlayerActiveTypes[3] = {0};
s32 g_MiscSfxActiveTypes[3] = {0};
u32 var800aa5cc = 0;
s32 g_MusicStageNum = 0;
u32 var800aa5d4 = 0;
src/include/commands.h
+6 -10
View File
@@ -1112,23 +1112,19 @@
label,
/**
* Checks if the N64 uptime is less than the given value.
*
* The units used are not known.
* Checks if the stage timer is less than the given number of seconds.
*/
#define if_uptime_lt(value, label) \
#define if_stage_timer_lt(seconds, label) \
mkshort(0x0079), \
mkshort(value), \
mkshort(seconds), \
label,
/**
* Checks if the N64 uptime is greater than the given value.
*
* The units used are not known.
* Checks if the stage timer is greater than the given number of seconds.
*/
#define if_uptime_gt(value, label) \
#define if_stage_timer_gt(seconds, label) \
mkshort(0x007a), \
mkshort(value), \
mkshort(seconds), \
label,
/**
src/include/constants.h
+4
View File
@@ -1223,6 +1223,10 @@
#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/chr/chraicommands.h
+2 -2
View File
@@ -123,8 +123,8 @@
/*0x0076*/ bool aiSetPadPresetToTargetQuadrant(void);
/*0x0077*/ bool aiIfDifficultyLessThan(void);
/*0x0078*/ bool aiIfDifficultyGreaterThan(void);
/*0x0079*/ bool aiIfUptimeLessThan(void);
/*0x007a*/ bool aiIfUptimeGreaterThan(void);
/*0x0079*/ bool aiIfStageTimerLessThan(void);
/*0x007a*/ bool aiIfStageTimerGreaterThan(void);
/*0x007b*/ bool aiIfStageIdLessThan(void);
/*0x007c*/ bool aiIfStageIdGreaterThan(void);
/*0x007d*/ bool aiIfNumArghsLessThan(void);
src/include/game/core.h
+40
View File
@@ -0,0 +1,40 @@
#ifndef _IN_GAME_CORE_H
#define _IN_GAME_CORE_H
#include <ultra64.h>
#include "types.h"
u32 getVar80084040(void);
void func0f167af8(void);
void coreStopAllMiscSfx(void);
s32 coreGetMiscSfxIndex(u32 arg0);
void coreSetMiscSfxState(u32 type, bool play);
void coreUpdateMiscSfx(void);
void coreLoadStage(s32 stagenum);
Gfx *coreRenderFade(Gfx *gdl);
void coreCancelFade(void);
bool coreCheckCmpFollowThreat(struct threat *threat, s32 index);
void coreFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
void coreFindThreats(void);
Gfx *coreRender(Gfx *gdl);
void coreUpdateSoloHandicaps(void);
s32 sub54321(s32 value);
void coreUpdateCutsceneTime(void);
s32 coreGetEffectiveSlowMotion(void);
void coreTick(void);
void coreRecordDistanceMoved(void);
void coreCheckPauseStateChanged(void);
void coreSetPaused(bool paused);
void coreConfigureFade(u32 color, s16 num_frames);
bool coreIsFadeActive(void);
void coreUnloadStage(void);
bool coreIsPaused(void);
s32 coreGetDifficulty(void);
void coreSetDifficulty(s32 difficulty);
void coreSetMpTimeLimit60(u32 limit);
void coreSetMpScoreLimit(u32 limit);
void coreSetMpTeamScoreLimit(u32 limit);
f32 coreGetStageTimeInSeconds(void);
u32 coreGetStageTime60(void);
#endif
src/include/game/data/data_020df0.h
+4 -4
View File
@@ -294,15 +294,15 @@ extern u32 g_GfxNumSwaps;
extern u32 var80084010;
extern bool var80084014;
extern f32 var80084018;
extern s32 g_StageTimeElapsed;
extern s32 g_MpTimeLimit;
extern s32 g_StageTimeElapsed60;
extern s32 g_MpTimeLimit60;
extern s32 g_MpScoreLimit;
extern s32 g_MpTeamScoreLimit;
extern struct audiohandle *g_MiscAudioHandle;
extern s32 g_NumReasonsToEndMpMatch;
extern f32 g_StageTimeElapsed60f;
extern f32 g_StageTimeElapsed1f;
extern bool var80084040;
extern u32 g_BoostAndSlayerSounds[3];
extern u32 g_MiscSfxSounds[3];
extern s32 var80084050;
extern u32 var80084068;
extern u32 var80084078;
src/include/game/game_167ae0.h
-40
View File
@@ -1,40 +0,0 @@
#ifndef _IN_GAME_GAME_167AE0_H
#define _IN_GAME_GAME_167AE0_H
#include <ultra64.h>
#include "types.h"
u32 getVar80084040(void);
void func0f167af8(void);
void boostAndSlayerSfxStopAll(void);
s32 boostAndSlayerSfxGetIndex(u32 arg0);
void boostAndSlayerSfxSetEnabled(u32 arg0, bool arg1);
void boostAndSlayerSfxUpdate(void);
void func0f167e7c(s32 stagenum);
Gfx *fadeRender(Gfx *gdl);
void fadeCancel(void);
bool threatCheckCmpFollow(struct threat *threat, s32 index);
void propFindThreats(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5);
void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *distances);
void func0f1691c0(void);
Gfx *renderFrame(Gfx *gdl);
void updateSoloHandicaps(void);
s32 sub54321(s32 value);
void updateCutsceneTime(void);
s32 getEffectiveSlowMotion(void);
void func0f16b96c(void);
void currentPlayerRecordDistanceMoved(void);
void func0f16cce4(void);
void soloSetPaused(bool paused);
void fadeConfigure(u32 color, s16 num_frames);
bool fadeIsActive(void);
void stageLoad(void);
bool soloIsPaused(void);
s32 getDifficulty(void);
void setDifficulty(s32 difficulty);
void mpSetTimeLimit(u32 limit);
void mpSetScoreLimit(u32 limit);
void mpSetTeamScoreLimit(u32 limit);
f32 getUptime(void);
u32 mpGetTimeElapsed(void);
#endif
src/include/gvars/gvars.h
+2 -2
View File
@@ -761,8 +761,8 @@ extern u8 *g_VtxBuffers[3];
extern u8 *g_GfxMemPos;
extern u8 g_GfxActiveBufferIndex;
extern u32 g_GfxRequestedDisplayList;
extern struct audiohandle *g_BoostAndSlayerAudioHandles[3];
extern s32 g_BoostAndSlayerActiveTypes[3];
extern struct audiohandle *g_MiscSfxAudioHandles[3];
extern s32 g_MiscSfxActiveTypes[3];
extern u32 var800aa5cc;
extern s32 g_MusicStageNum; // stage number
extern struct var800aa5d8 var800aa5d8[40];
src/lib/lib_0e9d0.c
+3 -3
View File
@@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_166e40.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/music.h"
#include "gvars/gvars.h"
#include "lib/lib_074f0.h"
@@ -3362,7 +3362,7 @@ glabel func00010e10
/* 10e7c: 8c460000 */ lw $a2,0x0($v0)
/* 10e80: c4323c84 */ lwc1 $f18,%lo(var70053c84)($at)
/* 10e84: 46120000 */ add.s $f0,$f0,$f18
/* 10e88: 0fc5b364 */ jal soloIsPaused
/* 10e88: 0fc5b364 */ jal coreIsPaused
/* 10e8c: e7a00034 */ swc1 $f0,0x34($sp)
/* 10e90: 3c08800a */ lui $t0,%hi(g_Vars)
/* 10e94: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
@@ -3601,7 +3601,7 @@ glabel func0001111c
/* 111d8: 46128102 */ mul.s $f4,$f16,$f18
/* 111dc: 460c2000 */ add.s $f0,$f4,$f12
.L000111e0:
/* 111e0: 0fc5b364 */ jal soloIsPaused
/* 111e0: 0fc5b364 */ jal coreIsPaused
/* 111e4: e7a00034 */ swc1 $f0,0x34($sp)
/* 111e8: 3c08800a */ lui $t0,%hi(g_Vars)
/* 111ec: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
src/lib/main.c
+7 -7
View File
@@ -35,7 +35,7 @@
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/gfxmemory.h"
#include "game/game_167ae0.h"
#include "game/core.h"
#include "game/timing.h"
#include "game/music.h"
#include "game/game_175f50.h"
@@ -869,7 +869,7 @@ void mainLoop(void)
func0f01b148(0);
if (func00013010(1, "-hard")) {
setDifficulty(func00013010(1, "-hard")[0] - '0');
coreSetDifficulty(func00013010(1, "-hard")[0] - '0');
}
}
}
@@ -1035,7 +1035,7 @@ void mainLoop(void)
func00013dfc();
func00013798();
func0f17608c(g_StageNum);
func0f167e7c(g_StageNum);
coreLoadStage(g_StageNum);
func00009c3c(g_StageNum);
frametimeCalculate();
func00009a90();
@@ -1064,7 +1064,7 @@ void mainLoop(void)
}
}
stageLoad();
coreUnloadStage();
memDisablePool(4);
memDisablePool(7);
func0f1672f0(4);
@@ -1101,7 +1101,7 @@ void mainTick(void)
gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, 6, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);
func0f16b96c();
coreTick();
randomisePlayerOrder();
if (g_StageNum < STAGE_TITLE) {
@@ -1115,11 +1115,11 @@ void mainTick(void)
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
}
currentPlayerRecordDistanceMoved();
coreRecordDistanceMoved();
}
}
gdl = renderFrame(gdl);
gdl = coreRender(gdl);
func000034e0(&gdl);
if (debug0f11ed70() >= 2) {
tools/patchpiracysums
+2 -2
View File
@@ -190,8 +190,8 @@ class Tool:
self.patch(algo03, 'propobjHandlePickupByAibot', 'func0f08e2ac')
self.patch(algo04, 'chrUncloak', 'propobjHandlePickupByAibot')
self.patch(algo05, 'func0f028590', 'func00002078')
self.patch(algo06, 'func0f167e7c', 'getEffectiveSlowMotion')
self.patch(algo07, 'propAllocateEyespy', 'func0f167e7c')
self.patch(algo06, 'coreLoadStage', 'coreGetEffectiveSlowMotion')
self.patch(algo07, 'propAllocateEyespy', 'coreLoadStage')
self.patch(algo08, 'chrConsiderGrenadeThrow', 'func0f15b534')
self.patch(algo09, 'func0f09e144', 'tagsAllocatePtrs')
self.patch(algo10, 'explosionAlertChrs', 'func0f084cf0')