falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename dozens of game files and functions

This commit is contained in:
Ryan Dwyer 2021-02-02 21:04:11 +10:00
parent 2633ee5d10
commit b71b3570a8
130 changed files with 5072 additions and 4932 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ld/gamefiles.inc
View File

@ -15,6 +15,7 @@
build/ROMID/game/dlights.o (section); \
build/ROMID/game/game_005fd0.o (section); \
build/ROMID/game/game_006bd0.o (section); \
build/ROMID/game/nbomb.o (section); \
build/ROMID/game/stubs/game_00b180.o (section); \
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
@ -25,7 +26,7 @@
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/game_0109d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/game_010b20.o (section); \
build/ROMID/game/game_011110.o (section); \
@ -45,11 +46,11 @@
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/game_0151f0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/free.o (section); \
build/ROMID/game/smoke/free.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/stubs/game_0153f0.o (section); \
build/ROMID/game/stubs/game_015400.o (section); \
build/ROMID/game/stubs/game_015410.o (section); \
@ -72,13 +73,13 @@
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/game_0601b0.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/data/data_00e460.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/game_095320.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/game_096750.o (section); \
@ -108,9 +109,9 @@
build/ROMID/game/bondeyespy.o (section); \
build/ROMID/game/bondbike.o (section); \
build/ROMID/game/game_0d4690.o (section); \
build/ROMID/game/game_0d5a90.o (section); \
build/ROMID/game/game_0d7070.o (section); \
build/ROMID/game/game_0dcdb0.o (section); \
build/ROMID/game/healthbar.o (section); \
build/ROMID/game/sight.o (section); \
build/ROMID/game/hudmsg.o (section); \
build/ROMID/game/game_0e0770.o (section); \
build/ROMID/game/menu/items.o (section); \
build/ROMID/game/game_0f09f0.o (section); \
@ -150,22 +151,22 @@
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/game_150820.o (section); \
build/ROMID/game/pdoptions.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
build/ROMID/game/game_157db0.o (section); \
build/ROMID/game/room.o (section); \
build/ROMID/game/game_165360.o (section); \
build/ROMID/game/game_1655c0.o (section); \
build/ROMID/game/game_165670.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/game_166e40.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.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); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/game_16e810.o (section); \
build/ROMID/game/texture.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \

4
src/game/activemenu/activemenu.c
View File

@ -18,14 +18,14 @@
#include "game/game_0f09f0.h"
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/game_190260.h"
#include "game/game_197600.h"
#include "game/gfxmemory.h"
#include "game/training/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

2
src/game/activemenu/tick.c
View File

@ -13,7 +13,7 @@
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/controller.h"
#include "types.h"

4
src/game/bondbike.c
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_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
@ -20,7 +20,7 @@
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
#include "game/core.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_159b0.h"

6
src/game/bondeyespy.c
View File

@ -10,16 +10,16 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_097ba0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/game_1655c0.h"
#include "game/lang.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/main.h"

2
src/game/bondgrab.c
View File

@ -12,7 +12,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/debug.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/game_0b69d0.h"

6
src/game/bondmove.c
View File

@ -15,7 +15,7 @@
#include "game/data/data_02da90.h"
#include "game/game_005fd0.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_096750.h"
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
@ -25,11 +25,11 @@
#include "game/bondcutscene.h"
#include "game/bondhead.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/core.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/bondview.c
View File

@ -16,7 +16,7 @@
#include "game/game_1531a0.h"
#include "game/gfxmemory.h"
#include "game/lang.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

2
src/game/bondwalk.c
View File

@ -14,7 +14,7 @@
#include "game/debug.h"
#include "game/game_005fd0.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"

2
src/game/camdraw.c
View File

@ -11,7 +11,7 @@
#include "game/game_0b3350.h"
#include "game/game_0f09f0.h"
#include "game/stubs/game_102230.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/lang.h"
#include "game/pak/pak.h"
#include "game/splat.h"

6
src/game/chr/chr.c
View File

@ -13,7 +13,7 @@
#include "game/data/data_02da90.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096360.h"
@ -30,9 +30,9 @@
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_165670.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/mplayer/setup.h"
#include "game/game_190260.h"
#include "game/game_1999b0.h"

4
src/game/chr/chraction.c
View File

@ -15,7 +15,7 @@
#include "game/game_01b0a0.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096750.h"
@ -30,7 +30,7 @@
#include "game/game_127910.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/core.h"

8
src/game/chr/chraicommands.c
View File

@ -19,7 +19,7 @@
#include "game/game_011110.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
@ -28,13 +28,13 @@
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/weather/weather.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/core.h"
@ -43,7 +43,7 @@
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/pad.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/mpstats.h"
#include "gvars/gvars.h"

53
src/game/core.c
View File

@ -17,13 +17,13 @@
#include "game/debug.h"
#include "game/dlights.h"
#include "game/game_005fd0.h"
#include "game/game_006bd0.h"
#include "game/nbomb.h"
#include "game/game_00b480.h"
#include "game/game_00b820.h"
#include "game/game_00c240.h"
#include "game/game_00c490.h"
#include "game/game_0108d0.h"
#include "game/game_0109d0.h"
#include "game/objectives.h"
#include "game/casing.h"
#include "game/game_011110.h"
#include "game/inventory/init.h"
@ -40,11 +40,10 @@
#include "game/game_014f10.h"
#include "game/game_015010.h"
#include "game/game_0150a0.h"
#include "game/game_0151f0.h"
#include "game/stubs/game_015260.h"
#include "game/stubs/game_015270.h"
#include "game/explosions/free.h"
#include "game/smoke/free.h"
#include "game/explosions/reset.h"
#include "game/smoke/reset.h"
#include "game/stubs/game_0153f0.h"
#include "game/stubs/game_015400.h"
#include "game/stubs/game_015410.h"
@ -58,7 +57,7 @@
#include "game/game_01d990.h"
#include "game/game_01de30.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/game_0abe70.h"
@ -67,7 +66,7 @@
#include "game/game_0b63b0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"
#include "game/game_10c9c0.h"
@ -83,11 +82,11 @@
#include "game/bondview.h"
#include "game/game_150820.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_165670.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/game_176080.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
@ -292,7 +291,7 @@ void coreLoadStage(s32 stagenum)
func0f013b80();
texturesLoadConfigs();
fontsLoadForCurrentStage();
hudmsgSystemInit();
hudmsgsInit();
if (stagenum == STAGE_TEST_OLD) {
func0f00b480();
@ -355,7 +354,7 @@ void coreLoadStage(s32 stagenum)
mpSetDefaultNamesIfEmpty();
func0002373c();
setupResetObjectives();
objectivesReset();
func0f013ba0();
func0f011110();
func0f0108d0();
@ -1206,11 +1205,11 @@ Gfx *coreRender(Gfx *gdl)
}
func0f0641f4();
gdl = func0f15cae0(gdl);
gdl = bgRender(gdl);
func0f028498(var80075d68 == 15 || var8005f020);
gdl = propsRenderBulletTails(gdl);
gdl = func0f1526e4(gdl);
gdl = func0f130044(gdl);
gdl = sparksRender(gdl);
gdl = weatherRender(gdl);
if (g_NbombsActive) {
@ -1502,11 +1501,11 @@ Gfx *coreRender(Gfx *gdl)
func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
if (g_Vars.mplayerisrunning) {
gdl = func0f18973c(gdl);
gdl = mpRenderModalText(gdl);
}
if (g_Vars.currentplayer->dostartnewlife) {
func0f0b72dc();
currentPlayerStartNewLife();
}
}
@ -2000,7 +1999,7 @@ void coreTick(void)
g_Vars.lvupdate240freal = g_Vars.lvupdate240f;
speedpillTick();
func0f0df364();
hudmsgsTick();
if ((contGetButtonsPressedThisFrame(0, 0xffff) != 0
|| contGetStickX(0) > 10
@ -2145,7 +2144,7 @@ void coreTick(void)
viSetUseZBuf(true);
if (g_Vars.stagenum == STAGE_TEST_OLD) {
func0f01ae30();
titleTickOld();
func00011d84();
}
@ -2190,12 +2189,12 @@ void coreTick(void)
coreUpdateMiscSfx();
func0000fe88();
pakExecuteDebugOperations();
func0f0033b0();
lightingTick();
func0f0b2904();
func0f0aefb8();
amTick();
menuTickAll();
scenarioCallback10();
scenarioTick();
if (var8005d9d0 == 0) {
func0f01e250();
@ -2257,21 +2256,21 @@ void coreUnloadStage(void)
stub0f015270();
}
func0f014f10();
explosionsFree();
smokeFree();
chrsReset();
explosionsReset();
smokeReset();
stub0f015400();
stub0f015410();
func0f015420();
stub0f0153f0();
func0f014fe0();
func0f015010();
weatherFree();
func0f0151f0();
alarmReset();
func0f015010(); // props/setup related
weatherReset();
objectivesAutocomplete();
stub0f015260();
func0f015470();
func0f0150a0();
func0f16d9fc();
musicReset();
hudmsgsReset();
if (g_Vars.stagenum < NUM_STAGES) {

2
src/game/credits.c
View File

@ -16,7 +16,7 @@
#include "game/game_0f09f0.h"
#include "game/credits.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/music.h"

2
src/game/data/ailists.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/data/ailists.h"
#include "stagesetup.h"
#include "types.h"

4
src/game/data/data_000000.c
View File

@ -1,9 +1,9 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_015470.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/data/data_000000.h"
#include "game/data/data_00e460.h"
#include "lib/lib_0c000.h"

4
src/game/data/data_003dc0.c
View File

@ -1,9 +1,9 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_015470.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/data/data_000000.h"
#include "game/data/data_00e460.h"
#include "lib/lib_0c000.h"

4
src/game/data/data_0083d0.c
View File

@ -1,9 +1,9 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_015470.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "stagesetup.h"

4
src/game/data/data_00e460.c
View File

@ -1,9 +1,9 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_015470.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "stagesetup.h"

81
src/game/data/data_02a0e0.c
View File

@ -1984,14 +1984,81 @@ struct menudialog g_MpPopacapOptionsMenuDialog = {
NULL,
};
// 2cfb8
struct mpscenario g_MpScenarios[] = {
{ &g_MpCombatOptionsMenuDialog, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
{ &g_MpBriefcaseOptionsMenuDialog, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbKill, scenarioHtbRadar, scenarioHtbRadar2, scenarioHtbHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
{ &g_MpHackerOptionsMenuDialog, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmKill, scenarioHtmRadar, scenarioHtmRadar2, scenarioHtmHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
{ &g_MpPopacapOptionsMenuDialog, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacKill, scenarioPacRadar, scenarioPacRadar2, scenarioPacHighlight, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
{ &g_MpHillOptionsMenuDialog, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohKill, scenarioKohRadar, NULL, NULL, NULL, NULL, scenarioKohIsRoomHighlighted, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 },
{ &g_MpCaptureOptionsMenuDialog, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcKill, scenarioCtcRadar, scenarioCtcRadar2, scenarioCtcHighlight, scenarioCtcCallback2c, scenarioCtcGetMaxTeams, scenarioCtcIsRoomHighlighted, scenarioCtcCallback38, NULL, NULL, NULL },
{
&g_MpCombatOptionsMenuDialog,
}, {
&g_MpBriefcaseOptionsMenuDialog,
scenarioHtbInit,
scenarioHtbCallback08,
scenarioHtbReset,
scenarioHtbTick,
scenarioHtbCallback14,
scenarioHtbCallback18,
scenarioHtbKill,
scenarioHtbRadar,
scenarioHtbRadar2,
scenarioHtbHighlight,
}, {
&g_MpHackerOptionsMenuDialog,
scenarioHtmInit,
scenarioHtmCallback08,
scenarioHtmReset,
scenarioHtmTick,
scenarioHtmCallback14,
scenarioHtmCallback18,
scenarioHtmKill,
scenarioHtmRadar,
scenarioHtmRadar2,
scenarioHtmHighlight,
}, {
&g_MpPopacapOptionsMenuDialog,
scenarioPacInit,
NULL,
scenarioPacReset,
scenarioPacTick,
NULL,
scenarioPacCallback18,
scenarioPacKill,
scenarioPacRadar,
scenarioPacRadar2,
scenarioPacHighlight,
}, {
&g_MpHillOptionsMenuDialog,
scenarioKohInit,
NULL,
scenarioKohReset,
scenarioKohTick,
NULL,
scenarioKohCallback18,
scenarioKohKill,
scenarioKohRadar,
NULL,
NULL,
NULL,
NULL,
scenarioKohIsRoomHighlighted,
scenarioKohCallback38,
NULL,
scenarioKohCallback40,
scenarioKohCallback44
}, {
&g_MpCaptureOptionsMenuDialog,
scenarioCtcInit,
scenarioCtcCallback08,
scenarioCtcReset,
scenarioCtcTick,
scenarioCtcCallback14,
NULL,
scenarioCtcKill,
scenarioCtcRadar,
scenarioCtcRadar2,
scenarioCtcHighlight,
scenarioCtcChooseSpawnLocation,
scenarioCtcGetMaxTeams,
scenarioCtcIsRoomHighlighted,
scenarioCtcCallback38,
},
};
// 2d168

8
src/game/dlights.c
View File

@ -14,8 +14,8 @@
#include "game/game_0b69d0.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "game/room.h"
#include "game/file.h"
#include "game/core.h"
#include "game/game_176080.h"
#include "game/mplayer/scenarios.h"
@ -1162,7 +1162,7 @@ glabel func0f001c0c
/* f0020c8: 24130001 */ addiu $s3,$zero,0x1
.L0f0020cc:
/* f0020cc: 3c10800a */ lui $s0,%hi(g_Rooms)
/* f0020d0: 0fc00cec */ jal func0f0033b0
/* f0020d0: 0fc00cec */ jal lightingTick
/* f0020d4: 26104928 */ addiu $s0,$s0,%lo(g_Rooms)
/* f0020d8: 3c0d800a */ lui $t5,%hi(g_Vars+0x2bc)
/* f0020dc: 8dada27c */ lw $t5,%lo(g_Vars+0x2bc)($t5)
@ -2227,7 +2227,7 @@ glabel func0f002ef8
/* f0033ac: 00000000 */ nop
);
void func0f0033b0(void)
void lightingTick(void)
{
s32 i;

2
src/game/endscreen.c
View File

@ -27,7 +27,7 @@
#include "game/game_19aa80.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/mpstats.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

6
src/game/explosions/explosions.c
View File

@ -10,15 +10,15 @@
#include "game/data/data_02da90.h"
#include "game/dlights.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/game_0b3350.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "game/mplayer/mplayer.h"
#include "game/propobj.h"

4
src/game/explosions/free.c → src/game/explosions/reset.c
View File

@ -7,12 +7,12 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "types.h"
void explosionsFree(void)
void explosionsReset(void)
{
s32 i;

2
src/game/game_166e40.c → src/game/file.c
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_166e40.h"
#include "game/file.h"
#include "game/stubs/game_175f50.h"
#include "gvars/gvars.h"
#include "lib/lib_074f0.h"

4508
src/game/game_006bd0.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/game_00b320.c
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_166e40.h"
#include "game/file.h"
#include "game/lang.h"
#include "gvars/gvars.h"
#include "lib/memory.h"

2
src/game/game_00c240.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_00c240.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "gvars/gvars.h"
#include "lib/memory.h"
#include "types.h"

8
src/game/game_00c490.c
View File

@ -13,7 +13,7 @@
#include "game/game_00b480.h"
#include "game/game_00b820.h"
#include "game/game_00c490.h"
#include "game/game_0109d0.h"
#include "game/objectives.h"
#include "game/game_011110.h"
#include "game/inventory/init.h"
#include "game/game_0125a0.h"
@ -21,14 +21,14 @@
#include "game/game_0147d0.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_096750.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/core.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"

14
src/game/game_011110.c
View File

@ -14,7 +14,7 @@
#include "game/game_011110.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_097ba0.h"
#include "game/game_0b69d0.h"
@ -1049,7 +1049,7 @@ glabel var7f1a827c
/* f0120d4: 27a6008c */ addiu $a2,$sp,0x8c
/* f0120d8: 8e380284 */ lw $t8,0x284($s1)
/* f0120dc: 44816000 */ mtc1 $at,$f12
/* f0120e0: 0fc6185f */ jal scenarioCallback2c
/* f0120e0: 0fc6185f */ jal scenarioChooseSpawnLocation
/* f0120e4: 8f0700bc */ lw $a3,0xbc($t8)
/* f0120e8: 3c017f1b */ lui $at,%hi(var7f1a8270)
/* f0120ec: c4328270 */ lwc1 $f18,%lo(var7f1a8270)($at)
@ -1066,7 +1066,7 @@ glabel var7f1a827c
/* f012114: 44816000 */ mtc1 $at,$f12
/* f012118: 27a5009c */ addiu $a1,$sp,0x9c
/* f01211c: 27a6008c */ addiu $a2,$sp,0x8c
/* f012120: 0fc6185f */ jal scenarioCallback2c
/* f012120: 0fc6185f */ jal scenarioChooseSpawnLocation
/* f012124: 8de700bc */ lw $a3,0xbc($t7)
/* f012128: 3c017f1b */ lui $at,%hi(var7f1a8274)
/* f01212c: c4288274 */ lwc1 $f8,%lo(var7f1a8274)($at)
@ -1084,7 +1084,7 @@ glabel var7f1a827c
.L0f012158:
/* f012158: 3c0141f0 */ lui $at,0x41f0
/* f01215c: 44816000 */ mtc1 $at,$f12
/* f012160: 0fc6185f */ jal scenarioCallback2c
/* f012160: 0fc6185f */ jal scenarioChooseSpawnLocation
/* f012164: 8d6700bc */ lw $a3,0xbc($t3)
/* f012168: 3c017f1b */ lui $at,%hi(var7f1a8278)
/* f01216c: c4308278 */ lwc1 $f16,%lo(var7f1a8278)($at)
@ -1560,15 +1560,15 @@ glabel var7f1a827c
//
// if (g_NumSpawnPoints > 0) {
// if (g_Vars.coopplayernum >= 0) {
// turnanglerad = M_BADTAU - scenarioCallback2c(30, &pos, rooms, g_Vars.currentplayer->prop);
// turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop);
// } else if (g_Vars.antiplayernum >= 0) {
// turnanglerad = M_BADTAU - scenarioCallback2c(30, &pos, rooms, g_Vars.currentplayer->prop);
// turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop);
// } else {
// if (g_Vars.mplayerisrunning == 0) {
// g_NumSpawnPoints = 1;
// }
//
// turnanglerad = M_BADTAU - scenarioCallback2c(30, &pos, rooms, g_Vars.currentplayer->prop);
// turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop);
// }
// }
//

2
src/game/game_0125a0.c
View File

@ -10,7 +10,7 @@
#include "game/game_0125a0.h"
#include "game/game_013ee0.h"
#include "game/bondhead.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/lib_159b0.h"

4
src/game/game_013cf0.c
View File

@ -8,8 +8,8 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_013cf0.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "game/room.h"
#include "game/file.h"
#include "gvars/gvars.h"
#include "types.h"

2
src/game/game_013ee0.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_013ee0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/pad.h"
#include "gvars/gvars.h"
#include "lib/memory.h"

2
src/game/game_0147d0.c
View File

@ -10,7 +10,7 @@
#include "game/game_0147d0.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_197600.h"
#include "game/mplayer/mplayer.h"
#include "gvars/gvars.h"

6
src/game/game_014f10.c
View File

@ -9,12 +9,12 @@
#include "game/data/data_02da90.h"
#include "game/game_014f10.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "types.h"
void func0f014f10(void)
void chrsReset(void)
{
s32 i;
@ -30,7 +30,7 @@ void func0f014f10(void)
}
}
void func0f014fe0(void)
void alarmReset(void)
{
alarmDeactivate();
func0f0904e0();

2
src/game/game_01b0a0.c
View File

@ -12,7 +12,7 @@
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "types.h"

2
src/game/game_02cde0.c
View File

@ -11,7 +11,7 @@
#include "game/data/data_02da90.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_096750.h"
#include "game/game_0b28d0.h"
#include "game/core.h"

4
src/game/game_091e10.c
View File

@ -7,10 +7,10 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_0b28d0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1a7560.h"
#include "game/propobj.h"
#include "gvars/gvars.h"

4
src/game/game_092610.c
View File

@ -11,8 +11,8 @@
#include "game/dlights.h"
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_0dcdb0.h"
#include "game/game_166e40.h"
#include "game/hudmsg.h"
#include "game/file.h"
#include "game/core.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"

50
src/game/game_096360.c
View File

@ -31,56 +31,6 @@ const u32 var7f1ab824[] = {0x3fd55555};
const u32 var7f1ab828[] = {0x40555555};
const u32 var7f1ab82c[] = {0x3e8e38e4};
// Too much stack usage and unknown functions to decompile this accurately
// at the moment.
//void objectiveCheckHolograph(s32 arg0)
//{
// struct criteria_holograph *criteria = g_HolographCriterias;
//
// while (criteria) {
// if (g_Vars.stagenum == STAGE_CITRAINING) {
// criteria->status = OBJECTIVE_INCOMPLETE;
// }
//
// if (criteria->status == OBJECTIVE_INCOMPLETE) {
// struct defaultobj *obj = objFindByTagId(criteria->obj);
//
// if (obj && obj->prop && obj->prop->flags & 2 && obj->prop->z > 0 && func0f0869a8(obj)) {
// f32 fVar11 = arg0;
// s32 a[2];
// s32 b[2];
// s32 c[2];
//
// if (fVar11 != 0.00000000) {
// float xdiff = obj->prop->pos.x - g_Vars.currentplayer->cam_pos.x;
// float zdiff = obj->prop->pos.z - g_Vars.currentplayer->cam_pos.z;
// pass = xdiff * xdiff + zdiff * zdiff < fVar11 * fVar11;
// } else {
// pass = fVar11 > -1;
// }
//
// if (pass && func0f0899dc(obj->prop, a, b, c)) {
// func0f06803c(a, b, c, &fStack56);
//
// if (currentPlayerGetScreenLeft() < fStack56 && fStack56 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() &&
// currentPlayerGetScreenLeft() < fStack64 && fStack64 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() &&
// currentPlayerGetScreenTop() < fStack52 && fStack52 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop() &&
// currentPlayerGetScreenTop() < fStack60 && fStack60 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop()) {
// criteria->status = OBJECTIVE_COMPLETE;
//
// if (g_Vars.stagenum == STAGE_CITRAINING) {
// struct trainingdata *data = dtGetData();
// data->holographedpc = true;
// }
// }
// }
// }
// }
//
// criteria = criteria->next;
// }
//}
GLOBAL_ASM(
glabel func0f096360
/* f096360: 27bdffd8 */ addiu $sp,$sp,-40

10
src/game/game_097ba0.c
View File

@ -13,7 +13,7 @@
#include "game/inventory/items.h"
#include "game/game_005fd0.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_096360.h"
#include "game/game_0969d0.h"
@ -27,21 +27,21 @@
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
#include "game/game_0c33f0.h"
#include "game/game_0d7070.h"
#include "game/sight.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/smoke/smoke.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/core.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/game_176080.h"
#include "game/training/training.h"
#include "game/training/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/game_0abe70.c
View File

@ -13,7 +13,7 @@
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0c33f0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "lib/rng.h"

4
src/game/game_0b0fd0.c
View File

@ -12,13 +12,13 @@
#include "game/game_097ba0.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_127910.h"
#include "game/mplayer/setup.h"
#include "game/game_197600.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "types.h"

4
src/game/game_0b3350.c
View File

@ -10,8 +10,8 @@
#include "game/game_096750.h"
#include "game/game_0b3350.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/game_16e810.h"
#include "game/room.h"
#include "game/texture.h"
#include "game/game_173a00.h"
#include "gvars/gvars.h"
#include "lib/lib_16110.h"

14
src/game/game_0b63b0.c
View File

@ -12,11 +12,11 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/inventory/items.h"
#include "game/game_006bd0.h"
#include "game/nbomb.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096750.h"
@ -27,8 +27,8 @@
#include "game/game_0b2150.h"
#include "game/game_0b3350.h"
#include "game/game_0b63b0.h"
#include "game/game_0d5a90.h"
#include "game/game_0dcdb0.h"
#include "game/healthbar.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_107fb0.h"
@ -37,14 +37,14 @@
#include "game/explosions/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
@ -53,7 +53,7 @@
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/splat.h"
#include "gvars/gvars.h"

60
src/game/game_0b69d0.c
View File

@ -12,11 +12,11 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/inventory/items.h"
#include "game/game_006bd0.h"
#include "game/nbomb.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/game_02cde0.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096750.h"
@ -27,8 +27,8 @@
#include "game/game_0b2150.h"
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
#include "game/game_0d5a90.h"
#include "game/game_0dcdb0.h"
#include "game/healthbar.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/game_102240.h"
#include "game/game_107fb0.h"
@ -37,14 +37,14 @@
#include "game/explosions/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/gfxmemory.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
@ -53,7 +53,7 @@
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/splat.h"
#include "game/mpstats.h"
@ -160,7 +160,7 @@ struct healthdamagetype g_HealthDamageTypes[] = {
};
GLOBAL_ASM(
glabel func0f0b69d0
glabel playerChooseSpawnLocation
/* f0b69d0: 27bdfd78 */ addiu $sp,$sp,-648
/* f0b69d4: 3c02800a */ lui $v0,%hi(g_Vars)
/* f0b69d8: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars)
@ -776,38 +776,38 @@ glabel func0f0b69d0
/* f0b72a4: 46001006 */ mov.s $f0,$f2
);
f32 func0f0b72a8(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop)
f32 playerChooseGeneralSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop)
{
return func0f0b69d0(arg0, pos, rooms, prop, g_SpawnPoints, g_NumSpawnPoints);
return playerChooseSpawnLocation(arg0, pos, rooms, prop, g_SpawnPoints, g_NumSpawnPoints);
}
GLOBAL_ASM(
glabel func0f0b72dc
glabel currentPlayerStartNewLife
.late_rodata
glabel var7f1ad53c
.word func0f0b72dc+0x374 # f0b7650
.word currentPlayerStartNewLife+0x374 # f0b7650
glabel var7f1ad540
.word func0f0b72dc+0x38c # f0b7668
.word currentPlayerStartNewLife+0x38c # f0b7668
glabel var7f1ad544
.word func0f0b72dc+0x3c4 # f0b76a0
.word currentPlayerStartNewLife+0x3c4 # f0b76a0
glabel var7f1ad548
.word func0f0b72dc+0x3e4 # f0b76c0
.word currentPlayerStartNewLife+0x3e4 # f0b76c0
glabel var7f1ad54c
.word func0f0b72dc+0x3ec # f0b76c8
.word currentPlayerStartNewLife+0x3ec # f0b76c8
glabel var7f1ad550
.word func0f0b72dc+0x3f4 # f0b76d0
.word currentPlayerStartNewLife+0x3f4 # f0b76d0
glabel var7f1ad554
.word func0f0b72dc+0x3fc # f0b76d8
.word currentPlayerStartNewLife+0x3fc # f0b76d8
glabel var7f1ad558
.word func0f0b72dc+0x404 # f0b76e0
.word currentPlayerStartNewLife+0x404 # f0b76e0
glabel var7f1ad55c
.word func0f0b72dc+0x404 # f0b76e0
.word currentPlayerStartNewLife+0x404 # f0b76e0
glabel var7f1ad560
.word func0f0b72dc+0x37c # f0b7658
.word currentPlayerStartNewLife+0x37c # f0b7658
glabel var7f1ad564
.word func0f0b72dc+0x37c # f0b7658
.word currentPlayerStartNewLife+0x37c # f0b7658
glabel var7f1ad568
.word func0f0b72dc+0x384 # f0b7660
.word currentPlayerStartNewLife+0x384 # f0b7660
.text
/* f0b72dc: 27bdfee8 */ addiu $sp,$sp,-280
/* f0b72e0: 3c0f8007 */ lui $t7,%hi(var80070780)
@ -876,7 +876,7 @@ glabel var7f1ad568
/* f0b73d0: 44816000 */ mtc1 $at,$f12
/* f0b73d4: 27a5010c */ addiu $a1,$sp,0x10c
/* f0b73d8: 27a600fc */ addiu $a2,$sp,0xfc
/* f0b73dc: 0fc6185f */ jal scenarioCallback2c
/* f0b73dc: 0fc6185f */ jal scenarioChooseSpawnLocation
/* f0b73e0: 8da700bc */ lw $a3,0xbc($t5)
/* f0b73e4: 3c017f1b */ lui $at,%hi(var7f1ad534)
/* f0b73e8: c424d534 */ lwc1 $f4,%lo(var7f1ad534)($at)
@ -1153,7 +1153,7 @@ glabel var7f1ad568
// Mismatch: assigns to bondprevpos and player->prop->pos have extra loads
// from pos.
//void func0f0b72dc(void)
//void currentPlayerStartNewLife(void)
//{
// struct coord pos = {0, 0, 0}; // 10c
// s16 rooms[8]; // fc
@ -1192,7 +1192,7 @@ glabel var7f1ad568
//
// currentPlayerUnsetFlag(0xffffffff);
//
// angle = M_BADTAU - scenarioCallback2c(30, &pos, rooms, g_Vars.currentplayer->prop); // var7f1ad534
// angle = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop); // var7f1ad534
//
// groundy = cdFindGroundY(&pos, 30, rooms,
// &g_Vars.currentplayer->floorcol,
@ -4479,7 +4479,7 @@ Gfx *hudRenderHealthBar(Gfx *gdl)
gDPSetPrimColorViaWord(gdl++, 0, 0, 0xe6e6e600);
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
gdl = func0f0d5d8c(gdl, 0, 0, 0);
gdl = healthbarRender(gdl, 0, 0, 0);
gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@ -9373,7 +9373,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
if (g_Vars.currentplayer->cameramode == CAMERAMODE_THIRDPERSON) {
gdl = func0f0aeed8(gdl);
gdl = func0f15b114(gdl);
gdl = hudRenderMessages(gdl);
gdl = hudmsgsRender(gdl);
if (g_Vars.currentplayer->isdead == false) {
gdl = currentPlayerDrawFade(gdl);
@ -9664,7 +9664,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
}
gdl = radarRender(gdl);
gdl = hudRenderMessages(gdl);
gdl = hudmsgsRender(gdl);
gdl = currentPlayerDrawFade(gdl);
} else {
gdl = func0f15b114(gdl);
@ -9702,7 +9702,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
gdl = func0f153780(gdl);
}
gdl = hudRenderMessages(gdl);
gdl = hudmsgsRender(gdl);
gdl = currentPlayerDrawFade(gdl);
}

2
src/game/game_0d4690.c
View File

@ -9,7 +9,7 @@
#include "game/data/data_02da90.h"
#include "game/game_0b3350.h"
#include "game/game_0d4690.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/utils.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/game_0e0770.c
View File

@ -13,7 +13,7 @@
#include "game/game_0d4690.h"
#include "game/game_0e0770.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/utils.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

6
src/game/game_0f09f0.c
View File

@ -23,10 +23,10 @@
#include "game/game_107fb0.h"
#include "game/credits.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/core.h"
#include "game/music.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
@ -35,7 +35,7 @@
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/game_102240.c
View File

@ -31,7 +31,7 @@
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

2
src/game/game_13c510.c
View File

@ -13,7 +13,7 @@
#include "game/game_0b3350.h"
#include "game/game_11f000.h"
#include "game/game_13c510.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"

2
src/game/game_150820.c
View File

@ -12,7 +12,7 @@
#include "game/game_096750.h"
#include "game/game_0b3350.h"
#include "game/game_150820.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "gvars/gvars.h"
#include "lib/rng.h"
#include "lib/lib_159b0.h"

2
src/game/game_1531a0.c
View File

@ -11,7 +11,7 @@
#include "game/game_005fd0.h"
#include "game/game_0d4690.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/lang.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/game_165670.c
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_157db0.h"
#include "game/room.h"
#include "game/game_165670.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

2
src/game/game_173a00.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_13b670.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/game_173a00.h"
#include "gvars/gvars.h"
#include "types.h"

2
src/game/game_175f90.c
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_166e40.h"
#include "game/file.h"
#include "game/game_175f90.h"
#include "gvars/gvars.h"
#include "lib/memory.h"

2
src/game/game_176080.c
View File

@ -11,7 +11,7 @@
#include "game/game_0b69d0.h"
#include "game/game_176080.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/memory.h"

6
src/game/game_190260.c
View File

@ -10,14 +10,14 @@
#include "game/data/data_02da90.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
@ -439,7 +439,7 @@ void mpInitSimulant(struct chrdata *chr, u8 full)
if (aibot) {
mpChrReset(chr, full);
chrInitSplats(chr);
thing = scenarioCallback2c(chr->chrwidth, &pos, rooms, chr->prop);
thing = scenarioChooseSpawnLocation(chr->chrwidth, &pos, rooms, chr->prop);
chr->hidden |= CHRHFLAG_00100000;
chrMoveToPos(chr, &pos, rooms, thing, true);
chr->aibot->unk0a4 = func0001ae44(chr->model);

2
src/game/game_19aa80.c
View File

@ -10,7 +10,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02a0e0.h"
#include "game/data/data_02da90.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_096750.h"
#include "game/game_127910.h"
#include "game/mplayer/setup.h"

6
src/game/game_1a7560.c
View File

@ -18,13 +18,13 @@
#include "game/game_102240.h"
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_16e810.h"
#include "game/file.h"
#include "game/texture.h"
#include "game/game_173a00.h"
#include "game/game_1a7560.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

4
src/game/gamefile.c
View File

@ -12,13 +12,13 @@
#include "game/data/data_02da90.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/utils.h"
#include "gvars/gvars.h"
#include "lib/lib_0bfb0.h"

6
src/game/game_0d5a90.c → src/game/healthbar.c
View File

@ -8,9 +8,9 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0b69d0.h"
#include "game/game_0d5a90.h"
#include "game/healthbar.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "types.h"
@ -330,7 +330,7 @@ glabel func0f0d5c60
);
GLOBAL_ASM(
glabel func0f0d5d8c
glabel healthbarRender
/* f0d5d8c: 27bdfbd8 */ addiu $sp,$sp,-1064
/* f0d5d90: afbf0044 */ sw $ra,0x44($sp)
/* f0d5d94: afb10024 */ sw $s1,0x24($sp)

36
src/game/game_0dcdb0.c → src/game/hudmsg.c
View File

@ -12,13 +12,13 @@
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0e0770.h"
#include "game/game_127910.h"
#include "game/game_1531a0.h"
#include "game/core.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
@ -1583,7 +1583,7 @@ void func0f0ddd44(s32 value)
}
}
void hudmsgSystemInit(void)
void hudmsgsInit(void)
{
s32 i;
@ -3149,20 +3149,20 @@ glabel hudmsgCreate
//}
GLOBAL_ASM(
glabel func0f0df364
glabel hudmsgsTick
.late_rodata
glabel var7f1adec4
.word func0f0df364+0x680 # f0df9e4
.word hudmsgsTick+0x680 # f0df9e4
glabel var7f1adec8
.word func0f0df364+0x1e4 # f0df548
.word hudmsgsTick+0x1e4 # f0df548
glabel var7f1adecc
.word func0f0df364+0x39c # f0df700
.word hudmsgsTick+0x39c # f0df700
glabel var7f1aded0
.word func0f0df364+0x3dc # f0df740
.word hudmsgsTick+0x3dc # f0df740
glabel var7f1aded4
.word func0f0df364+0x564 # f0df8c8
.word hudmsgsTick+0x564 # f0df8c8
glabel var7f1aded8
.word func0f0df364+0x604 # f0df968
.word hudmsgsTick+0x604 # f0df968
.text
/* f0df364: 27bdff90 */ addiu $sp,$sp,-112
/* f0df368: 3c0e8007 */ lui $t6,%hi(g_ViMode)
@ -3656,22 +3656,22 @@ void hudmsgRemoveForDeadPlayer(s32 playernum)
}
GLOBAL_ASM(
glabel hudRenderMessages
glabel hudmsgsRender
.late_rodata
glabel var7f1adedc
.word 0x40490fdb
glabel var7f1adee0
.word hudRenderMessages+0xa34 # f0e0504
.word hudmsgsRender+0xa34 # f0e0504
glabel var7f1adee4
.word hudRenderMessages+0xa34 # f0e0504
.word hudmsgsRender+0xa34 # f0e0504
glabel var7f1adee8
.word hudRenderMessages+0xa34 # f0e0504
.word hudmsgsRender+0xa34 # f0e0504
glabel var7f1adeec
.word hudRenderMessages+0x3ec # f0dfebc
.word hudmsgsRender+0x3ec # f0dfebc
glabel var7f1adef0
.word hudRenderMessages+0x644 # f0e0114
.word hudmsgsRender+0x644 # f0e0114
glabel var7f1adef4
.word hudRenderMessages+0x7c8 # f0e0298
.word hudmsgsRender+0x7c8 # f0e0298
.text
/* f0dfad0: 27bdff00 */ addiu $sp,$sp,-256
/* f0dfad4: 3c0f8007 */ lui $t7,%hi(g_ViMode)
@ -4514,7 +4514,7 @@ glabel var7f1adef4
);
// Mismatch most likely due to variable re-use.
//Gfx *hudRenderMessages(Gfx *gdl)
//Gfx *hudmsgsRender(Gfx *gdl)
//{
// s32 i;
// u32 textcolour; // s3

2
src/game/inventory/items.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/game_000000.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/inventory/items.h"
#include "stagesetup.h"
#include "types.h"

2
src/game/lang.c
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_166e40.h"
#include "game/file.h"
#include "game/lang.h"
#include "gvars/gvars.h"
#include "lib/lib_0d0a0.h"

2
src/game/menu/items.c
View File

@ -21,7 +21,7 @@
#include "game/training/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

2
src/game/mplayer/ingame.c
View File

@ -20,7 +20,7 @@
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/main.h"
#include "types.h"

6
src/game/mplayer/mplayer.c
View File

@ -1922,8 +1922,12 @@ void mpSetPaused(u8 mode)
g_MpSetup.paused = mode;
}
/**
* Render "Paused" in the middle of the viewport if paused,
* or "Press START" if player has finished their death animation.
*/
GLOBAL_ASM(
glabel func0f18973c
glabel mpRenderModalText
/* f18973c: 3c02800b */ lui $v0,%hi(g_MpSetup+0x1e)
/* f189740: 9042cba6 */ lbu $v0,%lo(g_MpSetup+0x1e)($v0)
/* f189744: 27bdff60 */ addiu $sp,$sp,-160

18
src/game/mplayer/options.c
View File

@ -12,13 +12,13 @@
#include "game/dlights.h"
#include "game/game_005fd0.h"
#include "game/game_00c490.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
@ -184,15 +184,15 @@ glabel func0f185568
/* f1856a8: 27bd00c0 */ addiu $sp,$sp,0xc0
);
void scenarioCallback10(void)
void scenarioTick(void)
{
if (g_Vars.normmplayerisrunning) {
if (g_Vars.lvframenum == 5) {
func0f185568();
}
if (g_MpScenarios[g_MpSetup.scenario].unk10) {
g_MpScenarios[g_MpSetup.scenario].unk10();
if (g_MpScenarios[g_MpSetup.scenario].tickfunc) {
g_MpScenarios[g_MpSetup.scenario].tickfunc();
}
}
}
@ -894,16 +894,16 @@ glabel var7f1b89b8
/* f186178: 00000000 */ nop
);
f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop)
f32 scenarioChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop)
{
f32 result;
if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].unk2c &&
g_MpScenarios[g_MpSetup.scenario].unk2c(arg0, pos, rooms, prop, &result)) {
if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].spawnfunc &&
g_MpScenarios[g_MpSetup.scenario].spawnfunc(arg0, pos, rooms, prop, &result)) {
return result;
}
return func0f0b72a8(arg0, pos, rooms, prop);
return playerChooseGeneralSpawnLocation(arg0, pos, rooms, prop);
}
void mpPrepareScenario(void)

20
src/game/mplayer/scenarios.c
View File

@ -12,13 +12,13 @@
#include "game/dlights.h"
#include "game/game_005fd0.h"
#include "game/game_00c490.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
@ -486,7 +486,7 @@ void scenarioHtbReset(void)
func0f1800a8();
}
void scenarioHtbCallback10(void)
void scenarioHtbTick(void)
{
s32 i;
u32 prevplayernum = g_Vars.currentplayernum;
@ -841,7 +841,7 @@ s32 scenarioCtcCallback08(void)
return 4;
}
void scenarioCtcCallback10(void)
void scenarioCtcTick(void)
{
// empty
}
@ -1402,13 +1402,13 @@ void mpCtcAddPad(s32 *cmd)
}
}
bool scenarioCtcCallback2c(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4)
bool scenarioCtcChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4)
{
struct chrdata *chr = prop->chr;
s32 index = radarGetTeamIndex(chr->team);
if (g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].numspawnpads > 0) {
*arg4 = func0f0b69d0(arg0, pos, rooms, prop,
*arg4 = playerChooseSpawnLocation(arg0, pos, rooms, prop,
g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].spawnpads,
g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].numspawnpads);
return true;
@ -1579,7 +1579,7 @@ void scenarioKohReset(void)
}
GLOBAL_ASM(
glabel scenarioKohCallback10
glabel scenarioKohTick
.late_rodata
glabel var7f1b893c
.word 0x3f733333
@ -2919,7 +2919,7 @@ glabel var7f1b8954
/* f1830a0: 27bd0048 */ addiu $sp,$sp,0x48
);
void scenarioHtmCallback10(void)
void scenarioHtmTick(void)
{
u8 stack[8];
s32 i;
@ -4412,7 +4412,7 @@ glabel func0f1847b8
);
GLOBAL_ASM(
glabel scenarioPacCallback10
glabel scenarioPacTick
/* f1848c0: 3c09800b */ lui $t1,%hi(g_ScenarioData)
/* f1848c4: 2529c110 */ addiu $t1,$t1,%lo(g_ScenarioData)
/* f1848c8: 8d2e0004 */ lw $t6,0x4($t1)
@ -4509,7 +4509,7 @@ glabel scenarioPacCallback10
/* f184a14: 00000000 */ nop
);
//void scenarioPacCallback10(void)
//void scenarioPacTick(void)
//{
// if (g_ScenarioData.pac.victimindex == -1) {
// func0f1845bc();

2
src/game/mplayer/setup.c
View File

@ -20,7 +20,7 @@
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/rng.h"

4
src/game/mpstats.c
View File

@ -12,13 +12,13 @@
#include "game/game_097ba0.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_127910.h"
#include "game/mplayer/setup.h"
#include "game/game_197600.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "types.h"

2
src/game/music.c
View File

@ -315,7 +315,7 @@ void musicSetStage(s32 stagenum)
g_MusicStageNum = stagenum;
}
void func0f16d9fc(void)
void musicReset(void)
{
func0f16d430();
func0f16d3d0();

4531
src/game/nbomb.c Normal file
View File

File diff suppressed because it is too large Load Diff

8
src/game/game_0151f0.c → src/game/objectives/autocomplete.c
View File

@ -10,13 +10,15 @@
#include "gvars/gvars.h"
#include "types.h"
void func0f0151f0(void)
void objectivesAutocomplete(void)
{
s32 i;
for (i = 0; i < ARRAYCOUNT(g_Objectives); i++) {
if (g_Objectives[i] && (g_Objectives[i]->unk0e & 1) && g_ObjectiveStatuses[i] != 2) {
g_ObjectiveStatuses[i] = 1;
if (g_Objectives[i]
&& (g_Objectives[i]->flags & OBJECTIVEFLAG_AUTOCOMPLETE)
&& g_ObjectiveStatuses[i] != OBJECTIVE_FAILED) {
g_ObjectiveStatuses[i] = OBJECTIVE_COMPLETE;
}
}
}

54
src/game/game_095320.c → src/game/objectives/objectives.c
View File

@ -9,11 +9,11 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/debug.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_095320.h"
#include "game/game_0b3350.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
#include "game/core.h"
@ -500,3 +500,53 @@ void objectiveCheckHolograph(f32 maxdist)
criteria = criteria->next;
}
}
// Too much stack usage and unknown functions to decompile this accurately
// at the moment.
//void objectiveCheckHolograph(s32 arg0)
//{
// struct criteria_holograph *criteria = g_HolographCriterias;
//
// while (criteria) {
// if (g_Vars.stagenum == STAGE_CITRAINING) {
// criteria->status = OBJECTIVE_INCOMPLETE;
// }
//
// if (criteria->status == OBJECTIVE_INCOMPLETE) {
// struct defaultobj *obj = objFindByTagId(criteria->obj);
//
// if (obj && obj->prop && obj->prop->flags & 2 && obj->prop->z > 0 && func0f0869a8(obj)) {
// f32 fVar11 = arg0;
// s32 a[2];
// s32 b[2];
// s32 c[2];
//
// if (fVar11 != 0.00000000) {
// float xdiff = obj->prop->pos.x - g_Vars.currentplayer->cam_pos.x;
// float zdiff = obj->prop->pos.z - g_Vars.currentplayer->cam_pos.z;
// pass = xdiff * xdiff + zdiff * zdiff < fVar11 * fVar11;
// } else {
// pass = fVar11 > -1;
// }
//
// if (pass && func0f0899dc(obj->prop, a, b, c)) {
// func0f06803c(a, b, c, &fStack56);
//
// if (currentPlayerGetScreenLeft() < fStack56 && fStack56 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() &&
// currentPlayerGetScreenLeft() < fStack64 && fStack64 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() &&
// currentPlayerGetScreenTop() < fStack52 && fStack52 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop() &&
// currentPlayerGetScreenTop() < fStack60 && fStack60 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop()) {
// criteria->status = OBJECTIVE_COMPLETE;
//
// if (g_Vars.stagenum == STAGE_CITRAINING) {
// struct trainingdata *data = dtGetData();
// data->holographedpc = true;
// }
// }
// }
// }
// }
//
// criteria = criteria->next;
// }
//}

2
src/game/game_0109d0.c → src/game/objectives/setup.c
View File

@ -12,7 +12,7 @@
#include "lib/main.h"
#include "types.h"
void setupResetObjectives(void)
void objectivesReset(void)
{
s32 i;

2
src/game/pdoptions.c → src/game/options.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/music.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "types.h"

4
src/game/padhalllv.c
View File

@ -7,8 +7,8 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0601b0.h"
#include "game/game_157db0.h"
#include "game/prop.h"
#include "game/room.h"
#include "game/pad.h"
#include "game/padhalllv.h"
#include "gvars/gvars.h"

4
src/game/game_0601b0.c → src/game/prop.c
View File

@ -12,7 +12,7 @@
#include "game/data/data_02da90.h"
#include "game/dlights.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/floor.h"
@ -25,7 +25,7 @@
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_190260.h"
#include "game/training/training.h"
#include "game/pad.h"

10
src/game/propobj.c
View File

@ -16,10 +16,10 @@
#include "game/data/data_02e820.h"
#include "game/debug.h"
#include "game/dlights.h"
#include "game/game_006bd0.h"
#include "game/nbomb.h"
#include "game/game_011110.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
@ -36,7 +36,7 @@
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
#include "game/game_0c33f0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
@ -47,7 +47,7 @@
#include "game/sparks/sparks.h"
#include "game/game_150820.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/gfxmemory.h"
@ -61,7 +61,7 @@
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/wallhit.h"
#include "gvars/gvars.h"

2
src/game/radar.c
View File

@ -16,7 +16,7 @@
#include "game/game_1531a0.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/lib_16110.h"

10
src/game/game_157db0.c → src/game/room.c
View File

@ -12,7 +12,7 @@
#include "game/game_013550.h"
#include "game/game_013ee0.h"
#include "game/chr/chr.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/game_0b3350.h"
@ -22,14 +22,14 @@
#include "game/game_13b670.h"
#include "game/game_13c510.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_165360.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/core.h"
#include "game/game_16e810.h"
#include "game/texture.h"
#include "game/game_173a00.h"
#include "game/wallhit.h"
#include "gvars/gvars.h"
@ -6667,7 +6667,7 @@ void func0f15ca00(void)
func0f163e34();
}
Gfx *func0f15cae0(Gfx *gdl)
Gfx *bgRender(Gfx *gdl)
{
gdl = func0f001300(gdl);

6
src/game/game_0d7070.c → src/game/sight.c
View File

@ -13,12 +13,12 @@
#include "game/game_0b2150.h"
#include "game/game_0b3350.h"
#include "game/game_0d4690.h"
#include "game/game_0d7070.h"
#include "game/sight.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/gfxmemory.h"
#include "game/lang.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"

4
src/game/smoke/free.c → src/game/smoke/reset.c
View File

@ -7,11 +7,11 @@
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "gvars/gvars.h"
#include "types.h"
void smokeFree(void)
void smokeReset(void)
{
s32 i;

6
src/game/smoke/smoke.c
View File

@ -8,12 +8,12 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/dlights.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_0b3350.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/propobj.h"
#include "gvars/gvars.h"
#include "lib/rng.h"

4
src/game/sparks/sparks.c
View File

@ -11,7 +11,7 @@
#include "game/chr/chr.h"
#include "game/game_0b3350.h"
#include "game/sparks/sparks.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/rng.h"
@ -709,7 +709,7 @@ glabel sparksCreate
);
GLOBAL_ASM(
glabel func0f130044
glabel sparksRender
/* f130044: 27bdfe90 */ addiu $sp,$sp,-368
/* f130048: 3c0e8008 */ lui $t6,%hi(g_SparksAreActive)
/* f13004c: 8dcef0b8 */ lw $t6,%lo(g_SparksAreActive)($t6)

2
src/game/splat.c
View File

@ -8,7 +8,7 @@
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "game/smoke/smoke.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/propobj.h"
#include "game/splat.h"
#include "game/utils.h"

2
src/game/game_16e810.c → src/game/texture.c
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_16e810.h"
#include "game/texture.h"
#include "gvars/gvars.h"
#include "lib/lib_074f0.h"
#include "lib/lib_0d0a0.h"

4
src/game/title.c
View File

@ -17,7 +17,7 @@
#include "game/credits.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/file.h"
#include "game/core.h"
#include "game/music.h"
#include "game/training/training.h"
@ -4967,7 +4967,7 @@ void func0f01adb8(void)
viSetViewPosition(0, 0);
}
void func0f01ae30(void)
void titleTickOld(void)
{
if (titleIsKeepingMode()) {
func00014810(false);

6
src/game/training/menus.c
View File

@ -18,14 +18,14 @@
#include "game/game_102240.h"
#include "game/inventory/inventory.h"
#include "game/game_1531a0.h"
#include "game/game_166e40.h"
#include "game/game_16e810.h"
#include "game/file.h"
#include "game/texture.h"
#include "game/game_173a00.h"
#include "game/training/menus.h"
#include "game/training/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pdoptions.h"
#include "game/options.h"
#include "gvars/gvars.h"
#include "lib/lib_09660.h"
#include "lib/main.h"

6
src/game/training/training.c
View File

@ -10,21 +10,21 @@
#include "game/data/data_02da90.h"
#include "game/data/data_02e820.h"
#include "game/dlights.h"
#include "game/game_0601b0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096750.h"
#include "game/game_097ba0.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0dcdb0.h"
#include "game/hudmsg.h"
#include "game/game_0f09f0.h"
#include "game/game_107fb0.h"
#include "game/inventory/inventory.h"
#include "game/explosions/explosions.h"
#include "game/game_150820.h"
#include "game/game_1531a0.h"
#include "game/game_157db0.h"
#include "game/room.h"
#include "game/training/menus.h"
#include "game/training/training.h"
#include "game/gamefile.h"

4
src/game/wallhit.c
View File

@ -13,8 +13,8 @@
#include "game/game_0b3350.h"
#include "game/game_127910.h"
#include "game/game_1668e0.h"
#include "game/game_166e40.h"
#include "game/pdoptions.h"
#include "game/file.h"
#include "game/options.h"
#include "game/utils.h"
#include "game/wallhit.h"
#include "gvars/gvars.h"

6
src/game/weather/weather.c
View File

@ -11,8 +11,8 @@
#include "game/game_0b3350.h"
#include "game/sparks/sparks.h"
#include "game/weather/weather.h"
#include "game/game_157db0.h"
#include "game/game_166e40.h"
#include "game/room.h"
#include "game/file.h"
#include "game/core.h"
#include "gvars/gvars.h"
#include "lib/main.h"
@ -4074,7 +4074,7 @@ glabel var7f1b5790
/* f135bd4: 27bd1398 */ addiu $sp,$sp,0x1398
);
void weatherFree(void)
void weatherReset(void)
{
if (g_WeatherData) {
if (g_WeatherData->audiohandles[0]) {

2
src/include/constants.h
View File

@ -2342,6 +2342,8 @@
#define OBJECTIVE_COMPLETE 1
#define OBJECTIVE_FAILED 2
#define OBJECTIVEFLAG_AUTOCOMPLETE 0x01
// obj->flags
#define OBJFLAG_00000001 0x00000001 // Editor: "Fall to Ground"
#define OBJFLAG_00000002 0x00000002 // Editor: "In Air Rotated 90 Deg Upside-Down"

2
src/include/game/dlights.h
View File

@ -34,7 +34,7 @@ void func0f002a98(void);
void roomSetLightsOn(s32 roomnum, s32 enable);
void roomSetLighting(s32 roomnum, s32 operation, u8 arg2, u8 arg3, u8 arg4);
u32 func0f002ef8(void);
void func0f0033b0(void);
void lightingTick(void);
void func0f003444(void);
void func0f0035c0(void);
void func0f00372c(void);

8
src/include/game/explosions/free.h
View File

@ -1,8 +0,0 @@
#ifndef IN_GAME_EXPLOSIONS_FREE_H
#define IN_GAME_EXPLOSIONS_FREE_H
#include <ultra64.h>
#include "types.h"
void explosionsFree(void);
#endif

8
src/include/game/explosions/reset.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef IN_GAME_EXPLOSIONS_RESET_H
#define IN_GAME_EXPLOSIONS_RESET_H
#include <ultra64.h>
#include "types.h"
void explosionsReset(void);
#endif

0
src/include/game/game_166e40.h → src/include/game/file.h
View File

Some files were not shown because too many files have changed in this diff Show More