mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-25 07:24:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename many lifecycle functions to use consistent names and rename many files

Browse Source
This commit is contained in:
Ryan Dwyer
2022-03-20 13:27:27 +10:00
parent d113083cc4
commit e97273fb37
239 changed files with 1270 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/piracychecks.md
+7 -7
View File
@@ -78,7 +78,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**Payload:** Corrupts the rspboot microcode, causing a crash.
### lvInit
### lvReset
**When Called:** When loading any stage (including title screen).
@@ -90,13 +90,13 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**When Called:** When loading any stage that uses the eyespy.
**What It Checks:** Checksums `lvInit` to make sure it hasn't been modified.
**What It Checks:** Checksums `lvReset` to make sure it hasn't been modified.
**Payload:** Nops `_memaFree` entirely, so any time that function is called it'll flow into the following function, which just returns. The effect this has is that the system is unable to free individual mema allocations which makes it more likely to run out of memory.
---
### bgInit
### bgReset
**When Called:** When loading a normal stage (eg. CI Training).
@@ -108,7 +108,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**When Called:** When a chr decides to throw a grenade.
**What It Checks:** Checksums `bgInit` to make sure it hasn't been modified.
**What It Checks:** Checksums `bgReset` to make sure it hasn't been modified.
**Payload:** Surrounds the player in infinite explosions.
@@ -126,9 +126,9 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**When Called:** Unknown.
**What It Checks:** Checksums `tagsAllocatePtrs` to make sure it hasn't been modified.
**What It Checks:** Checksums `tagsReset` to make sure it hasn't been modified.
**Payload:** Corrupts `tagsAllocatePtrs` by writing 28 bytes of 0xff.
**Payload:** Corrupts `tagsReset` by writing 28 bytes of 0xff.
---
@@ -138,7 +138,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**What It Checks:** Checksums `func00015fd0` to make sure it hasn't been modified.
**Payload:** Corrupts `bgInit` by writing 16 bytes of 0x12 to a random address within that function.
**Payload:** Corrupts `bgReset` by writing 16 bytes of 0x12 to a random address within that function.
### func0f15c920
ld/gamefiles.jpn-final.inc
+55 -50
View File
@@ -21,71 +21,76 @@
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
build/ROMID/game/game_00b210.o (section); \
build/ROMID/game/game_00b320.o (section); \
build/ROMID/game/langreset.o (section); \
build/ROMID/game/game_00b420.o (section); \
build/ROMID/game/game_00b480.o (section); \
build/ROMID/game/titlereset.o (section); \
build/ROMID/game/chrmgr.o (section); \
build/ROMID/game/game_00b820.o (section); \
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/varsreset.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/propsndreset.o (section); \
build/ROMID/game/objectivesreset.o (section); \
build/ROMID/game/casingreset.o (section); \
build/ROMID/game/bondgunreset.o (section); \
build/ROMID/game/playerreset.o (section); \
build/ROMID/game/invreset.o (section); \
build/ROMID/game/bondheadreset.o (section); \
build/ROMID/game/game_012aa0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/game_013550.o (section); \
build/ROMID/game/shards/init.o (section); \
build/ROMID/game/shardsreset.o (section); \
build/ROMID/game/game_013b80.o (section); \
build/ROMID/game/game_013cf0.o (section); \
build/ROMID/game/vtxstorereset.o (section); \
build/ROMID/game/tilesreset.o (section); \
build/ROMID/game/game_013ee0.o (section); \
build/ROMID/game/game_0147a0.o (section); \
build/ROMID/game/game_0147d0.o (section); \
build/ROMID/game/lasersightsreset.o (section); \
build/ROMID/game/botmgr.o (section); \
build/ROMID/game/botinvinit.o (section); \
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/chrmgrstop.o (section); \
build/ROMID/game/propsstop.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/propsndstop.o (section); \
build/ROMID/game/objectivesstop.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/explosionsstop.o (section); \
build/ROMID/game/smokestop.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); \
build/ROMID/game/shards/reset.o (section); \
build/ROMID/game/game_015470.o (section); \
build/ROMID/game/shardsstop.o (section); \
build/ROMID/game/bondgunstop.o (section); \
build/ROMID/game/getitle.o (section); \
build/ROMID/game/title.o (section); \
build/ROMID/game/game_01afc0.o (section); \
build/ROMID/game/game_01b0a0.o (section); \
build/ROMID/game/activemenu/tick.o (section); \
build/ROMID/game/game_01bea0.o (section); \
build/ROMID/game/weather/tick.o (section); \
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/game_01d8c0.o (section); \
build/ROMID/game/game_01d990.o (section); \
build/ROMID/game/casing/tick.o (section); \
build/ROMID/game/shards/tick.o (section); \
build/ROMID/game/sparks/tick.o (section); \
build/ROMID/game/chr/chr.o (section); \
build/ROMID/game/casingtick.o (section); \
build/ROMID/game/shardstick.o (section); \
build/ROMID/game/sparkstick.o (section); \
build/ROMID/game/chr.o (section); \
build/ROMID/game/game_02cde0.o (section); \
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/chraction.o (section); \
build/ROMID/game/chrai.o (section); \
build/ROMID/game/chraicommands.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/propobjbss.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/propsnd.o (section); \
build/ROMID/game/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/atan2f.o (section); \
@@ -97,7 +102,7 @@
build/ROMID/game/ceil.o (section); \
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/invitems.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
@@ -122,7 +127,7 @@
build/ROMID/game/menugfx.o (section); \
build/ROMID/game/menuitem.o (section); \
build/ROMID/game/menu.o (section); \
build/ROMID/game/activemenu/activemenu.o (section); \
build/ROMID/game/activemenu.o (section); \
build/ROMID/game/stubs/game_102230.o (section); \
build/ROMID/game/mainmenu.o (section); \
build/ROMID/game/cheats.o (section); \
@@ -132,11 +137,11 @@
build/ROMID/game/gamefile.o (section); \
build/ROMID/game/bossfile.o (section); \
build/ROMID/game/filelist.o (section); \
build/ROMID/game/inventory/inventory.o (section); \
build/ROMID/game/inv.o (section); \
build/ROMID/game/bondhead.o (section); \
build/ROMID/game/padhalllv.o (section); \
build/ROMID/game/pad.o (section); \
build/ROMID/game/pak/pak.o (section); \
build/ROMID/game/pak.o (section); \
build/ROMID/game/debug.o (section); \
build/ROMID/game/debug3.o (section); \
build/ROMID/game/stubs/game_11eff0.o (section); \
@@ -160,11 +165,11 @@
build/ROMID/game/playermgr.o (section); \
build/ROMID/game/crc.o (section); \
build/ROMID/game/rng2.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/vtxstore.o (section); \
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/sky.o (section); \
build/ROMID/game/credits.o (section); \
build/ROMID/game/game_13b670.o (section); \
@@ -173,7 +178,7 @@
build/ROMID/game/bondview.o (section); \
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/shards/shards.o (section); \
build/ROMID/game/shards.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
@@ -183,7 +188,7 @@
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_1657c0.o (section); \
build/ROMID/game/env.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.o (section); \
@@ -192,7 +197,7 @@
build/ROMID/game/music.o (section); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/texdecompress.o (section); \
build/ROMID/game/game_173520.o (section); \
build/ROMID/game/texreset.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \
@@ -211,7 +216,7 @@
build/ROMID/game/mplayer/mpaicommands.o (section); \
build/ROMID/game/vmstats.o (section); \
build/ROMID/game/game_19aa80.o (section); \
build/ROMID/game/training/training.o (section); \
build/ROMID/game/training/menus.o (section); \
build/ROMID/game/training.o (section); \
build/ROMID/game/trainingmenus.o (section); \
build/ROMID/game/game_1a7560.o (section); \
build/ROMID/game/game_1a78b0.o (section);
ld/gamefiles.ntsc-beta.inc
+55 -50
View File
@@ -21,71 +21,76 @@
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
build/ROMID/game/game_00b210.o (section); \
build/ROMID/game/game_00b320.o (section); \
build/ROMID/game/langreset.o (section); \
build/ROMID/game/game_00b420.o (section); \
build/ROMID/game/game_00b480.o (section); \
build/ROMID/game/titlereset.o (section); \
build/ROMID/game/chrmgr.o (section); \
build/ROMID/game/game_00b820.o (section); \
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/varsreset.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/propsndreset.o (section); \
build/ROMID/game/objectivesreset.o (section); \
build/ROMID/game/casingreset.o (section); \
build/ROMID/game/bondgunreset.o (section); \
build/ROMID/game/playerreset.o (section); \
build/ROMID/game/invreset.o (section); \
build/ROMID/game/bondheadreset.o (section); \
build/ROMID/game/game_012aa0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/game_013550.o (section); \
build/ROMID/game/shards/init.o (section); \
build/ROMID/game/shardsreset.o (section); \
build/ROMID/game/game_013b80.o (section); \
build/ROMID/game/game_013cf0.o (section); \
build/ROMID/game/vtxstorereset.o (section); \
build/ROMID/game/tilesreset.o (section); \
build/ROMID/game/game_013ee0.o (section); \
build/ROMID/game/game_0147a0.o (section); \
build/ROMID/game/game_0147d0.o (section); \
build/ROMID/game/lasersightsreset.o (section); \
build/ROMID/game/botmgr.o (section); \
build/ROMID/game/botinvinit.o (section); \
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/chrmgrstop.o (section); \
build/ROMID/game/propsstop.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/propsndstop.o (section); \
build/ROMID/game/objectivesstop.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/explosionsstop.o (section); \
build/ROMID/game/smokestop.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); \
build/ROMID/game/shards/reset.o (section); \
build/ROMID/game/game_015470.o (section); \
build/ROMID/game/shardsstop.o (section); \
build/ROMID/game/bondgunstop.o (section); \
build/ROMID/game/getitle.o (section); \
build/ROMID/game/title.o (section); \
build/ROMID/game/game_01afc0.o (section); \
build/ROMID/game/game_01b0a0.o (section); \
build/ROMID/game/activemenu/tick.o (section); \
build/ROMID/game/game_01bea0.o (section); \
build/ROMID/game/weather/tick.o (section); \
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/game_01d8c0.o (section); \
build/ROMID/game/game_01d990.o (section); \
build/ROMID/game/casing/tick.o (section); \
build/ROMID/game/shards/tick.o (section); \
build/ROMID/game/sparks/tick.o (section); \
build/ROMID/game/chr/chr.o (section); \
build/ROMID/game/casingtick.o (section); \
build/ROMID/game/shardstick.o (section); \
build/ROMID/game/sparkstick.o (section); \
build/ROMID/game/chr.o (section); \
build/ROMID/game/game_02cde0.o (section); \
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/chraction.o (section); \
build/ROMID/game/chrai.o (section); \
build/ROMID/game/chraicommands.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/propobjbss.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/propsnd.o (section); \
build/ROMID/game/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/atan2f.o (section); \
@@ -97,7 +102,7 @@
build/ROMID/game/ceil.o (section); \
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/invitems.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
@@ -122,7 +127,7 @@
build/ROMID/game/menugfx.o (section); \
build/ROMID/game/menuitem.o (section); \
build/ROMID/game/menu.o (section); \
build/ROMID/game/activemenu/activemenu.o (section); \
build/ROMID/game/activemenu.o (section); \
build/ROMID/game/stubs/game_102230.o (section); \
build/ROMID/game/mainmenu.o (section); \
build/ROMID/game/cheats.o (section); \
@@ -132,11 +137,11 @@
build/ROMID/game/gamefile.o (section); \
build/ROMID/game/bossfile.o (section); \
build/ROMID/game/filelist.o (section); \
build/ROMID/game/inventory/inventory.o (section); \
build/ROMID/game/inv.o (section); \
build/ROMID/game/bondhead.o (section); \
build/ROMID/game/padhalllv.o (section); \
build/ROMID/game/pad.o (section); \
build/ROMID/game/pak/pak.o (section); \
build/ROMID/game/pak.o (section); \
build/ROMID/game/debug1.o (section); \
build/ROMID/game/debug2.o (section); \
build/ROMID/game/debug3.o (section); \
@@ -161,11 +166,11 @@
build/ROMID/game/playermgr.o (section); \
build/ROMID/game/crc.o (section); \
build/ROMID/game/rng2.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/vtxstore.o (section); \
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/sky.o (section); \
build/ROMID/game/credits.o (section); \
build/ROMID/game/game_13b670.o (section); \
@@ -174,7 +179,7 @@
build/ROMID/game/bondview.o (section); \
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/shards/shards.o (section); \
build/ROMID/game/shards.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
@@ -184,7 +189,7 @@
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_1657c0.o (section); \
build/ROMID/game/env.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.o (section); \
@@ -193,7 +198,7 @@
build/ROMID/game/music.o (section); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/texdecompress.o (section); \
build/ROMID/game/game_173520.o (section); \
build/ROMID/game/texreset.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \
@@ -212,6 +217,6 @@
build/ROMID/game/mplayer/mpaicommands.o (section); \
build/ROMID/game/vmstats.o (section); \
build/ROMID/game/game_19aa80.o (section); \
build/ROMID/game/training/training.o (section); \
build/ROMID/game/training/menus.o (section); \
build/ROMID/game/training.o (section); \
build/ROMID/game/trainingmenus.o (section); \
build/ROMID/game/game_1a78b0.o (section);
ld/gamefiles.ntsc-final.inc
+55 -50
View File
@@ -21,71 +21,76 @@
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
build/ROMID/game/game_00b210.o (section); \
build/ROMID/game/game_00b320.o (section); \
build/ROMID/game/langreset.o (section); \
build/ROMID/game/game_00b420.o (section); \
build/ROMID/game/game_00b480.o (section); \
build/ROMID/game/titlereset.o (section); \
build/ROMID/game/chrmgr.o (section); \
build/ROMID/game/game_00b820.o (section); \
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/varsreset.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/propsndreset.o (section); \
build/ROMID/game/objectivesreset.o (section); \
build/ROMID/game/casingreset.o (section); \
build/ROMID/game/bondgunreset.o (section); \
build/ROMID/game/playerreset.o (section); \
build/ROMID/game/invreset.o (section); \
build/ROMID/game/bondheadreset.o (section); \
build/ROMID/game/game_012aa0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/game_013550.o (section); \
build/ROMID/game/shards/init.o (section); \
build/ROMID/game/shardsreset.o (section); \
build/ROMID/game/game_013b80.o (section); \
build/ROMID/game/game_013cf0.o (section); \
build/ROMID/game/vtxstorereset.o (section); \
build/ROMID/game/tilesreset.o (section); \
build/ROMID/game/game_013ee0.o (section); \
build/ROMID/game/game_0147a0.o (section); \
build/ROMID/game/game_0147d0.o (section); \
build/ROMID/game/lasersightsreset.o (section); \
build/ROMID/game/botmgr.o (section); \
build/ROMID/game/botinvinit.o (section); \
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/chrmgrstop.o (section); \
build/ROMID/game/propsstop.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/propsndstop.o (section); \
build/ROMID/game/objectivesstop.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/explosionsstop.o (section); \
build/ROMID/game/smokestop.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); \
build/ROMID/game/shards/reset.o (section); \
build/ROMID/game/game_015470.o (section); \
build/ROMID/game/shardsstop.o (section); \
build/ROMID/game/bondgunstop.o (section); \
build/ROMID/game/getitle.o (section); \
build/ROMID/game/title.o (section); \
build/ROMID/game/game_01afc0.o (section); \
build/ROMID/game/game_01b0a0.o (section); \
build/ROMID/game/activemenu/tick.o (section); \
build/ROMID/game/game_01bea0.o (section); \
build/ROMID/game/weather/tick.o (section); \
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/game_01d8c0.o (section); \
build/ROMID/game/game_01d990.o (section); \
build/ROMID/game/casing/tick.o (section); \
build/ROMID/game/shards/tick.o (section); \
build/ROMID/game/sparks/tick.o (section); \
build/ROMID/game/chr/chr.o (section); \
build/ROMID/game/casingtick.o (section); \
build/ROMID/game/shardstick.o (section); \
build/ROMID/game/sparkstick.o (section); \
build/ROMID/game/chr.o (section); \
build/ROMID/game/game_02cde0.o (section); \
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/chraction.o (section); \
build/ROMID/game/chrai.o (section); \
build/ROMID/game/chraicommands.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/propobjbss.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/propsnd.o (section); \
build/ROMID/game/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/atan2f.o (section); \
@@ -97,7 +102,7 @@
build/ROMID/game/ceil.o (section); \
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/invitems.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
@@ -122,7 +127,7 @@
build/ROMID/game/menugfx.o (section); \
build/ROMID/game/menuitem.o (section); \
build/ROMID/game/menu.o (section); \
build/ROMID/game/activemenu/activemenu.o (section); \
build/ROMID/game/activemenu.o (section); \
build/ROMID/game/stubs/game_102230.o (section); \
build/ROMID/game/mainmenu.o (section); \
build/ROMID/game/cheats.o (section); \
@@ -132,11 +137,11 @@
build/ROMID/game/gamefile.o (section); \
build/ROMID/game/bossfile.o (section); \
build/ROMID/game/filelist.o (section); \
build/ROMID/game/inventory/inventory.o (section); \
build/ROMID/game/inv.o (section); \
build/ROMID/game/bondhead.o (section); \
build/ROMID/game/padhalllv.o (section); \
build/ROMID/game/pad.o (section); \
build/ROMID/game/pak/pak.o (section); \
build/ROMID/game/pak.o (section); \
build/ROMID/game/debug.o (section); \
build/ROMID/game/debug3.o (section); \
build/ROMID/game/stubs/game_11eff0.o (section); \
@@ -160,11 +165,11 @@
build/ROMID/game/playermgr.o (section); \
build/ROMID/game/crc.o (section); \
build/ROMID/game/rng2.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/vtxstore.o (section); \
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/sky.o (section); \
build/ROMID/game/credits.o (section); \
build/ROMID/game/game_13b670.o (section); \
@@ -173,7 +178,7 @@
build/ROMID/game/bondview.o (section); \
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/shards/shards.o (section); \
build/ROMID/game/shards.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
@@ -183,7 +188,7 @@
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_1657c0.o (section); \
build/ROMID/game/env.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.o (section); \
@@ -192,7 +197,7 @@
build/ROMID/game/music.o (section); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/texdecompress.o (section); \
build/ROMID/game/game_173520.o (section); \
build/ROMID/game/texreset.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \
@@ -211,7 +216,7 @@
build/ROMID/game/mplayer/mpaicommands.o (section); \
build/ROMID/game/vmstats.o (section); \
build/ROMID/game/game_19aa80.o (section); \
build/ROMID/game/training/training.o (section); \
build/ROMID/game/training/menus.o (section); \
build/ROMID/game/training.o (section); \
build/ROMID/game/trainingmenus.o (section); \
build/ROMID/game/game_1a7560.o (section); \
build/ROMID/game/game_1a78b0.o (section);
ld/gamefiles.pal-beta.inc
+55 -50
View File
@@ -21,71 +21,76 @@
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
build/ROMID/game/game_00b210.o (section); \
build/ROMID/game/game_00b320.o (section); \
build/ROMID/game/langreset.o (section); \
build/ROMID/game/game_00b420.o (section); \
build/ROMID/game/game_00b480.o (section); \
build/ROMID/game/titlereset.o (section); \
build/ROMID/game/chrmgr.o (section); \
build/ROMID/game/game_00b820.o (section); \
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/varsreset.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/propsndreset.o (section); \
build/ROMID/game/objectivesreset.o (section); \
build/ROMID/game/casingreset.o (section); \
build/ROMID/game/bondgunreset.o (section); \
build/ROMID/game/playerreset.o (section); \
build/ROMID/game/invreset.o (section); \
build/ROMID/game/bondheadreset.o (section); \
build/ROMID/game/game_012aa0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/game_013550.o (section); \
build/ROMID/game/shards/init.o (section); \
build/ROMID/game/shardsreset.o (section); \
build/ROMID/game/game_013b80.o (section); \
build/ROMID/game/game_013cf0.o (section); \
build/ROMID/game/vtxstorereset.o (section); \
build/ROMID/game/tilesreset.o (section); \
build/ROMID/game/game_013ee0.o (section); \
build/ROMID/game/game_0147a0.o (section); \
build/ROMID/game/game_0147d0.o (section); \
build/ROMID/game/lasersightsreset.o (section); \
build/ROMID/game/botmgr.o (section); \
build/ROMID/game/botinvinit.o (section); \
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/chrmgrstop.o (section); \
build/ROMID/game/propsstop.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/propsndstop.o (section); \
build/ROMID/game/objectivesstop.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/explosionsstop.o (section); \
build/ROMID/game/smokestop.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); \
build/ROMID/game/shards/reset.o (section); \
build/ROMID/game/game_015470.o (section); \
build/ROMID/game/shardsstop.o (section); \
build/ROMID/game/bondgunstop.o (section); \
build/ROMID/game/getitle.o (section); \
build/ROMID/game/title.o (section); \
build/ROMID/game/game_01afc0.o (section); \
build/ROMID/game/game_01b0a0.o (section); \
build/ROMID/game/activemenu/tick.o (section); \
build/ROMID/game/game_01bea0.o (section); \
build/ROMID/game/weather/tick.o (section); \
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/game_01d8c0.o (section); \
build/ROMID/game/game_01d990.o (section); \
build/ROMID/game/casing/tick.o (section); \
build/ROMID/game/shards/tick.o (section); \
build/ROMID/game/sparks/tick.o (section); \
build/ROMID/game/chr/chr.o (section); \
build/ROMID/game/casingtick.o (section); \
build/ROMID/game/shardstick.o (section); \
build/ROMID/game/sparkstick.o (section); \
build/ROMID/game/chr.o (section); \
build/ROMID/game/game_02cde0.o (section); \
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/chraction.o (section); \
build/ROMID/game/chrai.o (section); \
build/ROMID/game/chraicommands.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/propobjbss.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/propsnd.o (section); \
build/ROMID/game/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/atan2f.o (section); \
@@ -97,7 +102,7 @@
build/ROMID/game/ceil.o (section); \
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/invitems.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
@@ -122,7 +127,7 @@
build/ROMID/game/menugfx.o (section); \
build/ROMID/game/menuitem.o (section); \
build/ROMID/game/menu.o (section); \
build/ROMID/game/activemenu/activemenu.o (section); \
build/ROMID/game/activemenu.o (section); \
build/ROMID/game/stubs/game_102230.o (section); \
build/ROMID/game/mainmenu.o (section); \
build/ROMID/game/cheats.o (section); \
@@ -132,11 +137,11 @@
build/ROMID/game/gamefile.o (section); \
build/ROMID/game/bossfile.o (section); \
build/ROMID/game/filelist.o (section); \
build/ROMID/game/inventory/inventory.o (section); \
build/ROMID/game/inv.o (section); \
build/ROMID/game/bondhead.o (section); \
build/ROMID/game/padhalllv.o (section); \
build/ROMID/game/pad.o (section); \
build/ROMID/game/pak/pak.o (section); \
build/ROMID/game/pak.o (section); \
build/ROMID/game/debug1.o (section); \
build/ROMID/game/debug2.o (section); \
build/ROMID/game/debug3.o (section); \
@@ -161,11 +166,11 @@
build/ROMID/game/playermgr.o (section); \
build/ROMID/game/crc.o (section); \
build/ROMID/game/rng2.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/vtxstore.o (section); \
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/sky.o (section); \
build/ROMID/game/credits.o (section); \
build/ROMID/game/game_13b670.o (section); \
@@ -174,7 +179,7 @@
build/ROMID/game/bondview.o (section); \
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/shards/shards.o (section); \
build/ROMID/game/shards.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
@@ -184,7 +189,7 @@
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_1657c0.o (section); \
build/ROMID/game/env.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.o (section); \
@@ -193,7 +198,7 @@
build/ROMID/game/music.o (section); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/texdecompress.o (section); \
build/ROMID/game/game_173520.o (section); \
build/ROMID/game/texreset.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \
@@ -212,7 +217,7 @@
build/ROMID/game/mplayer/mpaicommands.o (section); \
build/ROMID/game/vmstats.o (section); \
build/ROMID/game/game_19aa80.o (section); \
build/ROMID/game/training/training.o (section); \
build/ROMID/game/training/menus.o (section); \
build/ROMID/game/training.o (section); \
build/ROMID/game/trainingmenus.o (section); \
build/ROMID/game/game_1a7560.o (section); \
build/ROMID/game/game_1a78b0.o (section);
ld/gamefiles.pal-final.inc
+55 -50
View File
@@ -21,71 +21,76 @@
build/ROMID/game/game_00b190.o (section); \
build/ROMID/game/stubs/game_00b200.o (section); \
build/ROMID/game/game_00b210.o (section); \
build/ROMID/game/game_00b320.o (section); \
build/ROMID/game/langreset.o (section); \
build/ROMID/game/game_00b420.o (section); \
build/ROMID/game/game_00b480.o (section); \
build/ROMID/game/titlereset.o (section); \
build/ROMID/game/chrmgr.o (section); \
build/ROMID/game/game_00b820.o (section); \
build/ROMID/game/game_00c240.o (section); \
build/ROMID/game/varsreset.o (section); \
build/ROMID/game/game_00c490.o (section); \
build/ROMID/game/game_0108d0.o (section); \
build/ROMID/game/objectives/setup.o (section); \
build/ROMID/game/casing/reset.o (section); \
build/ROMID/game/bondguninit.o (section); \
build/ROMID/game/playerinit.o (section); \
build/ROMID/game/inventory/init.o (section); \
build/ROMID/game/game_0125a0.o (section); \
build/ROMID/game/propsndreset.o (section); \
build/ROMID/game/objectivesreset.o (section); \
build/ROMID/game/casingreset.o (section); \
build/ROMID/game/bondgunreset.o (section); \
build/ROMID/game/playerreset.o (section); \
build/ROMID/game/invreset.o (section); \
build/ROMID/game/bondheadreset.o (section); \
build/ROMID/game/game_012aa0.o (section); \
build/ROMID/game/game_012d50.o (section); \
build/ROMID/game/explosions/init.o (section); \
build/ROMID/game/smoke/init.o (section); \
build/ROMID/game/sparks/init.o (section); \
build/ROMID/game/weather/init.o (section); \
build/ROMID/game/explosionsreset.o (section); \
build/ROMID/game/smokereset.o (section); \
build/ROMID/game/sparksreset.o (section); \
build/ROMID/game/weatherreset.o (section); \
build/ROMID/game/stubs/game_013540.o (section); \
build/ROMID/game/game_013550.o (section); \
build/ROMID/game/shards/init.o (section); \
build/ROMID/game/shardsreset.o (section); \
build/ROMID/game/game_013b80.o (section); \
build/ROMID/game/game_013cf0.o (section); \
build/ROMID/game/vtxstorereset.o (section); \
build/ROMID/game/tilesreset.o (section); \
build/ROMID/game/game_013ee0.o (section); \
build/ROMID/game/game_0147a0.o (section); \
build/ROMID/game/game_0147d0.o (section); \
build/ROMID/game/lasersightsreset.o (section); \
build/ROMID/game/botmgr.o (section); \
build/ROMID/game/botinvinit.o (section); \
build/ROMID/game/game_014f10.o (section); \
build/ROMID/game/chrmgrstop.o (section); \
build/ROMID/game/propsstop.o (section); \
build/ROMID/game/game_015010.o (section); \
build/ROMID/game/game_0150a0.o (section); \
build/ROMID/game/objectives/autocomplete.o (section); \
build/ROMID/game/propsndstop.o (section); \
build/ROMID/game/objectivesstop.o (section); \
build/ROMID/game/stubs/game_015260.o (section); \
build/ROMID/game/stubs/game_015270.o (section); \
build/ROMID/game/explosions/reset.o (section); \
build/ROMID/game/smoke/reset.o (section); \
build/ROMID/game/explosionsstop.o (section); \
build/ROMID/game/smokestop.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); \
build/ROMID/game/shards/reset.o (section); \
build/ROMID/game/game_015470.o (section); \
build/ROMID/game/shardsstop.o (section); \
build/ROMID/game/bondgunstop.o (section); \
build/ROMID/game/getitle.o (section); \
build/ROMID/game/title.o (section); \
build/ROMID/game/game_01afc0.o (section); \
build/ROMID/game/game_01b0a0.o (section); \
build/ROMID/game/activemenu/tick.o (section); \
build/ROMID/game/game_01bea0.o (section); \
build/ROMID/game/weather/tick.o (section); \
build/ROMID/game/activemenutick.o (section); \
build/ROMID/game/menustop.o (section); \
build/ROMID/game/menutick.o (section); \
build/ROMID/game/weathertick.o (section); \
build/ROMID/game/langtick.o (section); \
build/ROMID/game/game_01d8c0.o (section); \
build/ROMID/game/game_01d990.o (section); \
build/ROMID/game/casing/tick.o (section); \
build/ROMID/game/shards/tick.o (section); \
build/ROMID/game/sparks/tick.o (section); \
build/ROMID/game/chr/chr.o (section); \
build/ROMID/game/casingtick.o (section); \
build/ROMID/game/shardstick.o (section); \
build/ROMID/game/sparkstick.o (section); \
build/ROMID/game/chr.o (section); \
build/ROMID/game/game_02cde0.o (section); \
build/ROMID/game/chr/chraction.o (section); \
build/ROMID/game/chr/chrai.o (section); \
build/ROMID/game/chr/chraicommands.o (section); \
build/ROMID/game/chraction.o (section); \
build/ROMID/game/chrai.o (section); \
build/ROMID/game/chraicommands.o (section); \
build/ROMID/game/prop.o (section); \
build/ROMID/game/propobj.o (section); \
build/ROMID/game/propobjbss.o (section); \
build/ROMID/game/game_091e10.o (section); \
build/ROMID/game/game_092610.o (section); \
build/ROMID/game/objectives/objectives.o (section); \
build/ROMID/game/propsnd.o (section); \
build/ROMID/game/objectives.o (section); \
build/ROMID/game/game_096360.o (section); \
build/ROMID/game/game_096700.o (section); \
build/ROMID/game/atan2f.o (section); \
@@ -97,7 +102,7 @@
build/ROMID/game/ceil.o (section); \
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/invitems.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
@@ -122,7 +127,7 @@
build/ROMID/game/menugfx.o (section); \
build/ROMID/game/menuitem.o (section); \
build/ROMID/game/menu.o (section); \
build/ROMID/game/activemenu/activemenu.o (section); \
build/ROMID/game/activemenu.o (section); \
build/ROMID/game/stubs/game_102230.o (section); \
build/ROMID/game/mainmenu.o (section); \
build/ROMID/game/cheats.o (section); \
@@ -132,11 +137,11 @@
build/ROMID/game/gamefile.o (section); \
build/ROMID/game/bossfile.o (section); \
build/ROMID/game/filelist.o (section); \
build/ROMID/game/inventory/inventory.o (section); \
build/ROMID/game/inv.o (section); \
build/ROMID/game/bondhead.o (section); \
build/ROMID/game/padhalllv.o (section); \
build/ROMID/game/pad.o (section); \
build/ROMID/game/pak/pak.o (section); \
build/ROMID/game/pak.o (section); \
build/ROMID/game/debug.o (section); \
build/ROMID/game/debug3.o (section); \
build/ROMID/game/stubs/game_11eff0.o (section); \
@@ -160,11 +165,11 @@
build/ROMID/game/playermgr.o (section); \
build/ROMID/game/crc.o (section); \
build/ROMID/game/rng2.o (section); \
build/ROMID/game/game_129210.o (section); \
build/ROMID/game/explosions/explosions.o (section); \
build/ROMID/game/smoke/smoke.o (section); \
build/ROMID/game/sparks/sparks.o (section); \
build/ROMID/game/weather/weather.o (section); \
build/ROMID/game/vtxstore.o (section); \
build/ROMID/game/explosions.o (section); \
build/ROMID/game/smoke.o (section); \
build/ROMID/game/sparks.o (section); \
build/ROMID/game/weather.o (section); \
build/ROMID/game/sky.o (section); \
build/ROMID/game/credits.o (section); \
build/ROMID/game/game_13b670.o (section); \
@@ -173,7 +178,7 @@
build/ROMID/game/bondview.o (section); \
build/ROMID/game/splat.o (section); \
build/ROMID/game/camdraw.o (section); \
build/ROMID/game/shards/shards.o (section); \
build/ROMID/game/shards.o (section); \
build/ROMID/game/options.o (section); \
build/ROMID/game/game_152fa0.o (section); \
build/ROMID/game/game_1531a0.o (section); \
@@ -183,7 +188,7 @@
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_1657c0.o (section); \
build/ROMID/game/env.o (section); \
build/ROMID/game/game_1668e0.o (section); \
build/ROMID/game/file.o (section); \
build/ROMID/game/gfxmemory.o (section); \
@@ -192,7 +197,7 @@
build/ROMID/game/music.o (section); \
build/ROMID/game/lang.o (section); \
build/ROMID/game/texdecompress.o (section); \
build/ROMID/game/game_173520.o (section); \
build/ROMID/game/texreset.o (section); \
build/ROMID/game/game_173a00.o (section); \
build/ROMID/game/stubs/game_175f50.o (section); \
build/ROMID/game/game_175f90.o (section); \
@@ -211,7 +216,7 @@
build/ROMID/game/mplayer/mpaicommands.o (section); \
build/ROMID/game/vmstats.o (section); \
build/ROMID/game/game_19aa80.o (section); \
build/ROMID/game/training/training.o (section); \
build/ROMID/game/training/menus.o (section); \
build/ROMID/game/training.o (section); \
build/ROMID/game/trainingmenus.o (section); \
build/ROMID/game/game_1a7560.o (section); \
build/ROMID/game/game_1a78b0.o (section);
ld/libfiles.jpn-final.inc
+1 -1
View File
@@ -50,7 +50,7 @@
build/ROMID/lib/base.o (section); \
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/varsinit.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
ld/libfiles.ntsc-beta.inc
+1 -1
View File
@@ -52,7 +52,7 @@
build/ROMID/lib/base.o (section); \
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/varsinit.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
ld/libfiles.ntsc-final.inc
+1 -1
View File
@@ -50,7 +50,7 @@
build/ROMID/lib/base.o (section); \
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/varsinit.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
ld/libfiles.pal-beta.inc
+1 -1
View File
@@ -50,7 +50,7 @@
build/ROMID/lib/base.o (section); \
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/varsinit.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
ld/libfiles.pal-final.inc
+1 -1
View File
@@ -50,7 +50,7 @@
build/ROMID/lib/base.o (section); \
build/ROMID/lib/joy.o (section); \
build/ROMID/lib/lib_15850.o (section); \
build/ROMID/lib/gvars.o (section); \
build/ROMID/lib/varsinit.o (section); \
build/ROMID/lib/mtxasm.o (section); \
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
src/game/activemenu/activemenu.c → src/game/activemenu.c
+4 -4
View File
@@ -1,19 +1,19 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/game_006900.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/savebuffer.h"
#include "game/menu.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/bot.h"
#include "game/botcmd.h"
#include "game/gfxmemory.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/options.h"
@@ -512,7 +512,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label)
}
}
void amInit(void)
void amReset(void)
{
s32 i;
s32 j;
src/game/activemenu/tick.c → src/game/activemenutick.c
+2 -2
View File
@@ -1,10 +1,10 @@
#include <ultra64.h>
#include "constants.h"
#include "game/activemenu/activemenu.h"
#include "game/activemenu.h"
#include "game/game_01b0a0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/options.h"
#include "bss.h"
src/game/bg.c
+5 -5
View File
@@ -5,7 +5,7 @@
#include "game/game_006900.h"
#include "game/game_013550.h"
#include "game/game_013ee0.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/ceil.h"
#include "game/bondgun.h"
@@ -20,7 +20,7 @@
#include "game/bg.h"
#include "game/game_165360.h"
#include "game/game_1655c0.h"
#include "game/game_1657c0.h"
#include "game/env.h"
#include "game/game_1668e0.h"
#include "game/file.h"
#include "game/lv.h"
@@ -3862,7 +3862,7 @@ glabel func7f155c10nb
* - 4 bytes pointer to light table
* - 4 bytes null
*/
void bgInit(s32 stagenum)
void bgReset(s32 stagenum)
{
u8 *header;
u8 headerbuffer[0x50];
@@ -4016,7 +4016,7 @@ void bgInit(s32 stagenum)
}
#else
GLOBAL_ASM(
glabel bgInit
glabel bgReset
/* f155d14: 3c0f8009 */ lui $t7,0x8009
/* f155d18: 91ef30e0 */ lbu $t7,0x30e0($t7)
/* f155d1c: 27bdff48 */ addiu $sp,$sp,-184
@@ -7852,7 +7852,7 @@ glabel var7f1b75d0
// func0f001c0c();
//}
void bgReset(void)
void bgStop(void)
{
bgUnloadAllRooms();
mtx00016748(1);
src/game/bondbike.c
+2 -2
View File
@@ -2,10 +2,10 @@
#include "constants.h"
#include "game/bondbike.h"
#include "game/bondmove.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/game_096ca0.h"
#include "game/bondgun.h"
src/game/bondeyespy.c
+4 -4
View File
@@ -1,14 +1,14 @@
#include <ultra64.h>
#include "constants.h"
#include "game/bondeyespy.h"
#include "game/chr/chraction.h"
#include "game/chr/chr.h"
#include "game/chraction.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/bondgun.h"
#include "game/player.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/mplayer/ingame.h"
#include "game/playermgr.h"
#include "game/game_1655c0.h"
src/game/bondgrab.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/bondgrab.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/prop.h"
#include "game/objectives.h"
src/game/bondgun.c
+11 -12
View File
@@ -2,12 +2,12 @@
#include "constants.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/inventory/items.h"
#include "game/chraction.h"
#include "game/inv.h"
#include "game/game_006900.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/game_096360.h"
#include "game/acosfasinf.h"
#include "game/game_096b20.h"
@@ -23,19 +23,18 @@
#include "game/game_0c33f0.h"
#include "game/gfxmemory.h"
#include "game/sight.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/smoke/smoke.h"
#include "game/smoke.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/lv.h"
#include "game/texdecompress.h"
#include "game/game_176080.h"
#include "game/training/training.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/propobj.h"
#include "bss.h"
@@ -12099,7 +12098,7 @@ bool bgun0f09e004(s32 newowner)
if (newowner == GUNMEMOWNER_1 && var8009dfc0 != 0) {
unlock = true;
player0f0b9538();
playerRemoveChrBody();
}
break;
case GUNMEMOWNER_3:
@@ -12322,10 +12321,10 @@ glabel bgun0f09e144
/* f09e438: 3b2f003f */ xori $t7,$t9,0x3f
/* f09e43c: accf0000 */ sw $t7,0x0($a2)
/* f09e440: 8e4a15bc */ lw $t2,0x15bc($s2)
/* f09e444: 3c097f09 */ lui $t1,%hi(tagsAllocatePtrs)
/* f09e444: 3c097f09 */ lui $t1,%hi(tagsReset)
/* f09e448: 3c087f09 */ lui $t0,%hi(tagFindById)
/* f09e44c: 01ee6023 */ subu $t4,$t7,$t6
/* f09e450: 252953cc */ addiu $t1,$t1,%lo(tagsAllocatePtrs)
/* f09e450: 252953cc */ addiu $t1,$t1,%lo(tagsReset)
/* f09e454: 25055528 */ addiu $a1,$t0,%lo(tagFindById)
/* f09e458: 020c8023 */ subu $s0,$s0,$t4
/* f09e45c: 240d0004 */ addiu $t5,$zero,0x4
src/game/bondguninit.c → src/game/bondgunreset.c
+2 -2
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "game/bondgun.h"
#include "game/game_1655c0.h"
#include "bss.h"
@@ -10,7 +10,7 @@
extern u32 var800700ac;
void bgunInit(void)
void bgunReset(void)
{
s32 i;
src/game/bondgunstop.c
+25
View File
@@ -0,0 +1,25 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_01afc0.h"
#include "bss.h"
#include "lib/vi.h"
#include "lib/dma.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "types.h"
void bgunStop(void)
{
s32 i;
s32 j;
for (i = 0; i < PLAYERCOUNT(); i++) {
for (j = 0; j < 2; j++) {
struct hand *hand = &g_Vars.players[i]->hands[j];
if (hand->audiohandle2 && sndGetState(hand->audiohandle2) != AL_STOPPED) {
audioStop(hand->audiohandle2);
}
}
}
}
src/game/game_0125a0.c → src/game/bondheadreset.c
+1 -2
View File
@@ -1,6 +1,5 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0125a0.h"
#include "game/game_013ee0.h"
#include "game/bondhead.h"
#include "game/bg.h"
@@ -32,7 +31,7 @@ void func0f0125a0(s16 animnum, s32 loopframe, s32 endframe, s32 *arg3)
}
}
void currentPlayerInitAnimation(void)
void bheadReset(void)
{
s32 i;
src/game/bondmove.c
+2 -2
View File
@@ -5,9 +5,9 @@
#include "game/bondmove.h"
#include "game/bondwalk.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/game_006900.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/atan2f.h"
#include "game/game_096ca0.h"
src/game/bondwalk.c
+4 -4
View File
@@ -3,16 +3,16 @@
#include "game/bondmove.h"
#include "game/bondwalk.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/game_006900.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/bondgun.h"
#include "game/player.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/bondhead.h"
#include "game/playermgr.h"
#include "game/propobj.h"
src/game/bossfile.c
+2 -2
View File
@@ -8,10 +8,10 @@
#include "game/bossfile.h"
#include "game/bg.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/utils.h"
#include "bss.h"
src/game/bot.c
+3 -3
View File
@@ -1,10 +1,10 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/atan2f.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
src/game/botact.c
+3 -3
View File
@@ -1,9 +1,9 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/game_092610.h"
#include "game/chr.h"
#include "game/propsnd.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/playermgr.h"
src/game/botcmd.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/ceil.h"
#include "game/game_0b0fd0.h"
#include "game/playermgr.h"
src/game/botinv.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/ceil.h"
#include "game/game_0b0fd0.h"
#include "game/playermgr.h"
src/game/botmgr.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0147d0.h"
#include "game/chr/chr.h"
#include "game/botmgr.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/botcmd.h"
src/game/camdraw.c
+4 -4
View File
@@ -6,7 +6,7 @@
#include "game/stubs/game_102230.h"
#include "game/bg.h"
#include "game/lang.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/splat.h"
#include "game/utils.h"
#include "bss.h"
@@ -494,7 +494,7 @@ bool func0f14a2fc(s32 index, u32 line, char *file)
return thing->unk3f4_00;
}
void phAllocate(void)
void pheadInit(void)
{
s32 i;
@@ -513,12 +513,12 @@ void phAllocate(void)
}
}
void func0f14a3bc(void)
void pheadInit2(void)
{
// empty
}
void func0f14a3c4(void)
void pheadReset(void)
{
s32 i;
src/game/casing/reset.c → src/game/casingreset.c
View File
src/game/casing/tick.c → src/game/casingtick.c
View File
src/game/cheats.c
+11 -5
View File
@@ -3,12 +3,12 @@
#include "lib/sched.h"
#include "game/camdraw.h"
#include "game/cheats.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "bss.h"
#include "data.h"
#include "types.h"
@@ -218,7 +218,7 @@ void cheatDeactivate(s32 cheat_id)
}
}
void cheatsDisableAll(void)
void cheatsInit(void)
{
g_CheatsActiveBank0 = 0;
g_CheatsActiveBank1 = 0;
@@ -226,10 +226,15 @@ void cheatsDisableAll(void)
g_CheatsEnabledBank1 = 0;
}
void cheatsActivate(void)
/**
* Apply cheats at level startup.
*/
void cheatsReset(void)
{
s32 cheat_id;
// Copy enabled cheats to active cheats, unless in CI training
// or weapon cheats not in solo
if (g_Vars.stagenum != STAGE_CITRAINING) {
g_CheatsActiveBank0 = g_CheatsEnabledBank0;
g_CheatsActiveBank1 = g_CheatsEnabledBank1;
@@ -263,6 +268,7 @@ void cheatsActivate(void)
g_CheatsActiveBank1 = 0;
}
// Set any "always on" cheats to active and properly activate all active cheats
for (cheat_id = 0; cheat_id != NUM_CHEATS; cheat_id++) {
if (g_Cheats[cheat_id].flags & CHEATFLAG_ALWAYSON) {
if (cheatIsUnlocked(cheat_id)) {
src/game/chr/chr.c → src/game/chr.c
+11 -11
View File
@@ -3,11 +3,11 @@
#include "constants.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/game_096360.h"
#include "game/bondgun.h"
@@ -20,11 +20,11 @@
#include "game/game_0c33f0.h"
#include "game/playermgr.h"
#include "game/game_1291b0.h"
#include "game/game_129210.h"
#include "game/vtxstore.h"
#include "game/gfxmemory.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/explosions.h"
#include "game/smoke.h"
#include "game/sparks.h"
#include "game/bg.h"
#include "game/game_165670.h"
#include "game/file.h"
@@ -1411,9 +1411,9 @@ struct prop *chrAllocate(struct model *model, struct coord *pos, s16 *rooms, f32
}
/**
* Appears to hide a chr. If removechr is true, deallocates the chr completely.
* Removes a chr. If delete is true, deallocates the chr completely.
*/
void chr0f020d44(struct prop *prop, bool removechr)
void chrRemove(struct prop *prop, bool delete)
{
struct chrdata *chr = prop->chr;
struct model *model = chr->model;
@@ -1459,7 +1459,7 @@ void chr0f020d44(struct prop *prop, bool removechr)
modelFree(model);
chr->model = NULL;
if (removechr) {
if (delete) {
chrDeregister(chr->chrnum);
if (chr->cover != -1) {
@@ -2698,7 +2698,7 @@ s32 chrTick(struct prop *prop)
objDropRecursively(prop, true);
}
chr0f020d44(prop, true);
chrRemove(prop, true);
return TICKOP_FREE;
}
}
src/game/chr/chraction.c → src/game/chraction.c
+10 -10
View File
@@ -1,15 +1,15 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chr/chrai.h"
#include "game/chraction.h"
#include "game/chrai.h"
#include "game/debug.h"
#include "game/dlights.h"
#include "game/game_006900.h"
#include "game/game_01b0a0.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/atan2f.h"
#include "game/acosfasinf.h"
@@ -20,15 +20,15 @@
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/player.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/explosions.h"
#include "game/sparks.h"
#include "game/bg.h"
#include "game/game_1531a0.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1657c0.h"
#include "game/env.h"
#include "game/lv.h"
#include "game/bot.h"
#include "game/botact.h"
@@ -37,7 +37,7 @@
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/padhalllv.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/propobj.h"
#include "game/wallhit.h"
#include "game/mpstats.h"
@@ -7617,7 +7617,7 @@ s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid)
#if PIRACYCHECKS
{
u32 checksum = 0;
s32 *i = (s32 *)&bgInit;
s32 *i = (s32 *)&bgReset;
s32 *end = (s32 *)&bgBuildTables;
u32 stackpadding[1];
src/game/chr/chrai.c → src/game/chrai.c
+3 -3
View File
@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chr/chrai.h"
#include "game/chr/chraicommands.h"
#include "game/chraction.h"
#include "game/chrai.h"
#include "game/chraicommands.h"
#include "bss.h"
#include "lib/rng.h"
#include "lib/ailist.h"
src/game/chr/chraicommands.c → src/game/chraicommands.c
+12 -12
View File
@@ -3,17 +3,17 @@
#include "constants.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chr/chrai.h"
#include "game/chr/chraicommands.h"
#include "game/chraction.h"
#include "game/chrai.h"
#include "game/chraicommands.h"
#include "game/debug.h"
#include "game/dlights.h"
#include "game/playerinit.h"
#include "game/playerreset.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/atan2f.h"
#include "game/bondgun.h"
@@ -21,18 +21,18 @@
#include "game/game_0b28d0.h"
#include "game/player.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/weather/weather.h"
#include "game/explosions.h"
#include "game/smoke.h"
#include "game/weather.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
#include "game/game_165670.h"
#include "game/game_1657c0.h"
#include "game/env.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/pad.h"
src/game/game_00b480.c → src/game/chrmgr.c
+2 -22
View File
@@ -1,6 +1,5 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_00b320.h"
#include "game/game_00b820.h"
#include "game/title.h"
#include "bss.h"
@@ -8,26 +7,7 @@
#include "data.h"
#include "types.h"
void func0f00b480(void)
{
g_TitleMode = -1;
var800624d4 = 0;
var800624d8 = 0;
var800624dc = 0;
g_TitleDelayedTimer = 2;
g_TitleDelayedMode = -1;
var800624f4 = 1;
if (var800624f0) {
g_TitleNextMode = TITLEMODE_SKIP;
}
var8009cca0 = mempAlloc(0x47800, MEMPOOL_STAGE);
func0f00b420();
}
void func0f00b510(void)
void chrmgrReset(void)
{
s32 i;
@@ -61,7 +41,7 @@ void func0f00b510(void)
resetSomeStageThings();
}
void func0f00b62c(s32 numchrs)
void chrmgrConfigure(s32 numchrs)
{
s32 i;
src/game/game_014f10.c → src/game/chrmgrstop.c
+3 -10
View File
@@ -1,14 +1,13 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_014f10.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/propobj.h"
#include "bss.h"
#include "data.h"
#include "types.h"
void chrsReset(void)
void chrmgrStop(void)
{
s32 i;
@@ -16,16 +15,10 @@ void chrsReset(void)
if (g_ChrSlots[i].chrnum >= 0
&& g_ChrSlots[i].prop
&& g_ChrSlots[i].prop->type == PROPTYPE_CHR) {
chr0f020d44(g_ChrSlots[i].prop, true);
chrRemove(g_ChrSlots[i].prop, true);
propDelist(g_ChrSlots[i].prop);
propDisable(g_ChrSlots[i].prop);
propFree(g_ChrSlots[i].prop);
}
}
}
void alarmReset(void)
{
alarmDeactivate();
gasStopAudio();
}
src/game/credits.c
+1 -1
View File
@@ -5930,7 +5930,7 @@ Gfx *creditsRender(Gfx *gdl)
return gdl;
}
void creditsInit(void)
void creditsReset(void)
{
var800a4164 = 0;
var800a416c = 0;
src/game/debug2.c
+3 -3
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "lib/rmon.h"
#include "lib/vi.h"
@@ -572,7 +572,7 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe)
if (dmenuGetSelectedOption() == 0) {
// Selected "main" from cutscene menu
g_DebugCurMenu = DEBUGMENU_MAIN;
dhudReset();
dhudClear();
debugUpdateMenu();
} else {
cutsceneStart(0xc00 + dmenuGetSelectedOption() - 1);
@@ -694,7 +694,7 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe)
if (buttonsthisframe & START_BUTTON) {
if (g_DebugIsMenuOpen == true) {
dhudReset();
dhudClear();
}
g_DebugIsMenuOpen = false;
src/game/dlights.c
+5 -5
View File
@@ -2,12 +2,12 @@
#include "constants.h"
#include "game/cheats.h"
#include "game/dlights.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/player.h"
#include "game/smoke/smoke.h"
#include "game/sparks/sparks.h"
#include "game/smoke.h"
#include "game/sparks.h"
#include "game/bg.h"
#include "game/file.h"
#include "game/lv.h"
@@ -1101,7 +1101,7 @@ void roomSetLightBroken(s32 roomnum, s32 lightnum)
g_Rooms[roomnum].flags |= ROOMFLAG_DIRTY;
}
void func0f001bdc(void)
void lightsReset(void)
{
if (var80061444) {
func0f004c6c();
@@ -4561,7 +4561,7 @@ glabel var7f1a7dd4
);
#endif
void func0f004314(void)
void lightsTick(void)
{
struct hand *hand1 = &g_Vars.currentplayer->hands[0];
struct hand *hand2 = &g_Vars.currentplayer->hands[1];
src/game/game_1657c0.c → src/game/env.c
View File
src/game/explosions/explosions.c → src/game/explosions.c
+5 -5
View File
@@ -1,15 +1,15 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/dlights.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/explosions/explosions.h"
#include "game/smoke/smoke.h"
#include "game/explosions.h"
#include "game/smoke.h"
#include "game/bg.h"
#include "game/game_1668e0.h"
#include "game/file.h"
src/game/explosions/init.c → src/game/explosionsreset.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "data.h"
#include "types.h"
void explosionsInit(void)
void explosionsReset(void)
{
s32 i;
s32 j;
src/game/explosions/reset.c → src/game/explosionsstop.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "data.h"
#include "types.h"
void explosionsReset(void)
void explosionsStop(void)
{
s32 i;
src/game/file.c
+6 -6
View File
@@ -4175,7 +4175,7 @@ const char var7f1b1dd8nb[] = "ob.c";
#if VERSION >= VERSION_JPN_FINAL
GLOBAL_ASM(
glabel filesResetAndPrint
glabel filesInit
/* f166f74: 27bdffd0 */ addiu $sp,$sp,-48
/* f166f78: afb20020 */ sw $s2,0x20($sp)
/* f166f7c: afb1001c */ sw $s1,0x1c($sp)
@@ -4211,7 +4211,7 @@ glabel filesResetAndPrint
);
#elif VERSION >= VERSION_NTSC_1_0
GLOBAL_ASM(
glabel filesResetAndPrint
glabel filesInit
/* f166f74: 27bdffd0 */ addiu $sp,$sp,-48
/* f166f78: afb20020 */ sw $s2,0x20($sp)
/* f166f7c: afb1001c */ sw $s1,0x1c($sp)
@@ -4247,7 +4247,7 @@ glabel filesResetAndPrint
);
#else
GLOBAL_ASM(
glabel filesResetAndPrint
glabel filesInit
/* f166f74: 27bdffd0 */ addiu $sp,$sp,-48
/* f166f78: afb20020 */ sw $s2,0x20($sp)
/* f166f7c: afb1001c */ sw $s1,0x1c($sp)
@@ -4283,7 +4283,7 @@ glabel filesResetAndPrint
);
#endif
//void filesResetAndPrint(void)
//void filesInit(void)
//{
// s32 i;
//
@@ -4545,7 +4545,7 @@ void fileSetSize(s32 filenum, void *ptr, u32 size, bool reallocate)
}
}
void filesReset(u8 arg0)
void filesStop(u8 arg0)
{
s32 i;
@@ -4559,5 +4559,5 @@ void filesReset(u8 arg0)
void func0f167330(void)
{
filesReset(5);
filesStop(5);
}
src/game/filelist.c
+2 -2
View File
@@ -8,10 +8,10 @@
#include "game/filelist.h"
#include "game/bg.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/utils.h"
#include "bss.h"
src/game/filemgr.c
+3 -3
View File
@@ -10,7 +10,7 @@
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/utils.h"
#include "bss.h"
#include "lib/vi.h"
@@ -3315,7 +3315,7 @@ s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union
g_Menus[g_MpPlayerNum].fm.filetypeplusone = 0;
filelistCreate(0, FILETYPE_GAME);
mpSetDefaultSetup();
mpInit();
// Set MP player names to "Player 1" through 4 if blank
for (i = 0; i < 4; i++) {
@@ -3436,7 +3436,7 @@ bool filemgrConsiderPushingFileSelectDialog(void)
}
#endif
void pakPushPakMenuDialog(void)
void bootmenuReset(void)
{
s32 prevplayernum = g_MpPlayerNum;
g_MpPlayerNum = 0;
src/game/gailists.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/chraicommands.h"
#include "game/prop.h"
#include "stagesetup.h"
#include "data.h"
src/game/game_000100.c
+2 -2
View File
@@ -1,12 +1,12 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_000130.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "bss.h"
#include "data.h"
#include "types.h"
void func0f000100(void)
void racesInit(void)
{
modelSetVtxAllocatorFunc(&chrAllocateVertices);
func0f000648();
src/game/game_000130.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "data.h"
#include "types.h"
void func0f000130(void)
void bodiesInit(void)
{
g_NumBondBodies = 0;
src/game/game_005fd0.c
+1 -1
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/debug.h"
#include "game/game_006900.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
src/game/game_006900.c
+2 -2
View File
@@ -2,7 +2,7 @@
#include "constants.h"
#include "game/debug.h"
#include "game/game_006900.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/bg.h"
#include "bss.h"
#include "lib/rng.h"
@@ -64,7 +64,7 @@ void func0f0069dc(void)
}
if (checksum != CHECKSUM_PLACEHOLDER) {
u32 *ptr = (u32 *)&bgInit;
u32 *ptr = (u32 *)&bgReset;
ptr += random() % 0x40;
end = &ptr[4];
src/game/game_006bd0.c
+3 -3
View File
@@ -1,11 +1,11 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/dlights.h"
#include "game/game_006900.h"
#include "game/nbomb.h"
#include "game/chr/chr.h"
#include "game/chr/chraction.h"
#include "game/chr.h"
#include "game/chraction.h"
#include "game/prop.h"
#include "game/objectives.h"
#include "game/atan2f.h"
src/game/game_00b190.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "data.h"
#include "types.h"
void loadTextureList(void)
void texInit(void)
{
extern u8 _textureslistSegmentRomStart;
extern u8 _textureslistSegmentRomEnd;
src/game/game_00b210.c
+1 -1
View File
@@ -6,7 +6,7 @@
#include "data.h"
#include "types.h"
void mpInitPresetFeatures(void)
void challengesInit(void)
{
struct mpconfigfull *mpconfig;
u8 buffer[0x1ca];
src/game/game_00b820.c
+4 -4
View File
@@ -1,9 +1,9 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/chr/chrai.h"
#include "game/chrai.h"
#include "game/game_00b820.h"
#include "game/playerinit.h"
#include "game/playerreset.h"
#include "game/game_02cde0.h"
#include "game/game_091e10.h"
#include "bss.h"
@@ -24,7 +24,7 @@ u32 var80061708 = 0x00000000;
u32 var8006170c = 0x00000000;
GLOBAL_ASM(
glabel stageChooseActiveHeads
glabel headsReset
/* f00b820: 27bdffd0 */ addiu $sp,$sp,-48
/* f00b824: 3c0e8008 */ lui $t6,%hi(g_HeadsAndBodies+0x2)
/* f00b828: 95cecf06 */ lhu $t6,%lo(g_HeadsAndBodies+0x2)($t6)
@@ -275,7 +275,7 @@ glabel stageChooseActiveHeads
// - PLAYERCOUNT() calculation is more spread out
// (does other register preparation during calculation)
// - Loop at 950 is calculated differently
//void stageChooseActiveHeads(s32 stagenum)
//void headsReset(s32 stagenum)
//{
// s32 *headsavailablelist;
// s32 headsavailablelen;
src/game/game_00c490.c
+10 -13
View File
@@ -1,21 +1,18 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/game_00b480.h"
#include "game/game_00b820.h"
#include "game/game_00c490.h"
#include "game/objectives.h"
#include "game/playerinit.h"
#include "game/inventory/init.h"
#include "game/game_0125a0.h"
#include "game/playerreset.h"
#include "game/game_012d50.h"
#include "game/game_0147d0.h"
#include "game/chr/chr.h"
#include "game/botmgr.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/atan2f.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/bg.h"
#include "game/game_1655c0.h"
@@ -175,7 +172,7 @@ u32 var80061be4 = 0x00000000;
u32 var80061be8 = 0x00000000;
u32 var80061bec = 0x00000000;
void setupInit(void)
void propsReset(void)
{
s32 i;
@@ -3533,7 +3530,7 @@ glabel setupLoadBriefing
// }
//}
void setupLoadFiles(s32 stagenum)
void setupReset(s32 stagenum)
{
s32 i;
s32 j;
@@ -3702,7 +3699,7 @@ void setupLoadFiles(s32 stagenum)
g_Vars.maxprops = total + numchrs + extra + 40;
}
void setupParseObjects(s32 stagenum)
void propsCreate(s32 stagenum)
{
s32 withchrs = !argFindByPrefix(1, "-nochr") && !argFindByPrefix(1, "-noprop");
s32 withobjs = !argFindByPrefix(1, "-noobj") && !argFindByPrefix(1, "-noprop");
@@ -3745,9 +3742,9 @@ void setupParseObjects(s32 stagenum)
numchrs += g_Vars.numaibuddies;
}
func0f00b62c(numchrs);
chrmgrConfigure(numchrs);
} else {
func0f00b62c(0);
chrmgrConfigure(0);
}
for (j = 0; j < PLAYERCOUNT(); j++) {
@@ -4505,7 +4502,7 @@ void setupParseObjects(s32 stagenum)
}
}
} else {
func0f00b62c(0);
chrmgrConfigure(0);
}
stageAllocateBgChrs();
src/game/game_012aa0.c
-1
View File
@@ -1,6 +1,5 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0125a0.h"
#include "game/game_013ee0.h"
#include "game/bondhead.h"
#include "game/bg.h"
src/game/game_013b80.c
-33
View File
@@ -12,36 +12,3 @@ void func0f013b80(void)
var800aabc8.unk04 = NULL;
var800aabc8.unk0c = NULL;
}
void func0f013ba0(void)
{
s32 i;
s32 j;
s32 num;
s32 val;
for (i = 0; i < 4; i++) {
if (PLAYERCOUNT() >= 2) {
val = var8007e3d0[i].valifmp;
num = var8007e3d0[i].numifmp;
} else if (g_Vars.stagenum >= STAGE_TITLE) {
val = var8007e3d0[i].valifspecial;
num = var8007e3d0[i].numifspecial;
} else {
val = var8007e3d0[i].valifsp;
num = var8007e3d0[i].numifsp;
}
if (num > 0) {
var8007e3d0[i].unk24 = mempAlloc(num * sizeof(struct var8007e3d0_data), MEMPOOL_STAGE);
}
for (j = 0; j < num; j++) {
var8007e3d0[i].unk24[j].unk0e = 0;
}
var8007e3d0[i].numallocated = num;
var8007e3d0[i].val1 = val;
var8007e3d0[i].val2 = val;
}
}
src/game/game_015010.c
+1 -1
View File
@@ -7,7 +7,7 @@
#include "data.h"
#include "types.h"
void objsReset(void)
void objsStop(void)
{
u32 *ptr = g_StageSetup.props;
src/game/game_01b0a0.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/game_01b0a0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/options.h"
#include "bss.h"
src/game/game_02cde0.c
+3 -3
View File
@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chr/chr.h"
#include "game/chraction.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/atan2f.h"
@@ -888,7 +888,7 @@ struct prop *propAllocateEyespy(struct pad *pad, s16 room)
{
u32 stack[2];
u32 checksum = 0;
s32 *ptr = (s32 *)&lvInit;
s32 *ptr = (s32 *)&lvReset;
s32 *end = (s32 *)&lvConfigureFade;
while (ptr < end) {
src/game/game_096360.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "game/objectives.h"
#include "game/game_096360.h"
#include "game/game_0b3350.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/propobj.h"
#include "bss.h"
#include "lib/rng.h"
src/game/game_0b0fd0.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/player.h"
src/game/game_0b63b0.c
+8 -9
View File
@@ -3,14 +3,14 @@
#include "game/bondeyespy.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/inventory/items.h"
#include "game/chraction.h"
#include "game/inv.h"
#include "game/nbomb.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/atan2f.h"
#include "game/game_096ca0.h"
@@ -25,9 +25,9 @@
#include "game/menu.h"
#include "game/mainmenu.h"
#include "game/filemgr.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/explosions/explosions.h"
#include "game/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/bg.h"
@@ -41,11 +41,10 @@
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/training/training.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/splat.h"
src/game/game_10c9c0.c
+1 -1
View File
@@ -58,7 +58,7 @@ s32 menuhandler0010cabc(s32 operation, struct menuitem *item, union handlerdata
return 0;
}
void func0f10cb2c(void)
void fmbmenuReset(void)
{
s32 i;
u32 prevplayernum = g_MpPlayerNum;
src/game/game_11f000.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "game/game_0b4950.h"
#include "game/game_11f000.h"
#include "game/game_152fa0.h"
#include "game/game_1657c0.h"
#include "game/env.h"
#include "game/pad.h"
#include "bss.h"
#include "lib/vi.h"
src/game/game_13b670.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/game_13b670.h"
#include "bss.h"
#include "lib/main.h"
src/game/game_1531a0.c
+2 -2
View File
@@ -365,7 +365,7 @@ void fontLoad(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar *
#if VERSION >= VERSION_JPN_FINAL
GLOBAL_ASM(
glabel fontsLoadForCurrentStage
glabel fontsReset
/* f1529d4: 3c018008 */ lui $at,0x8008
/* f1529d8: ac200128 */ sw $zero,0x128($at)
/* f1529dc: 3c018008 */ lui $at,0x8008
@@ -601,7 +601,7 @@ glabel fontsLoadForCurrentStage
/* f152d50: 00000000 */ nop
);
#else
void fontsLoadForCurrentStage(void)
void fontsReset(void)
{
extern u8 _fontbankgothicSegmentRomStart, _fontbankgothicSegmentRomEnd;
extern u8 _fontzurichSegmentRomStart, _fontzurichSegmentRomEnd;
src/game/game_175f90.c
+2 -2
View File
@@ -16,13 +16,13 @@ void func0f175f98(void)
{
func0f167330();
mempResetPool(MEMPOOL_5);
filesReset(5);
filesStop(5);
}
void func0f175fc8(void)
{
mempDisablePool(MEMPOOL_5);
filesReset(5);
filesStop(5);
}
char *func0f175ff0(void)
src/game/game_19aa80.c
+3 -3
View File
@@ -1,14 +1,14 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chrai.h"
#include "game/chr/chraicommands.h"
#include "game/chrai.h"
#include "game/chraicommands.h"
#include "game/prop.h"
#include "game/atan2f.h"
#include "game/playermgr.h"
#include "game/mplayer/setup.h"
#include "game/bot.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/mplayer/scenarios.h"
src/game/game_1a7560.c
+2 -2
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/ceil.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
@@ -8,7 +8,7 @@
#include "game/menugfx.h"
#include "game/menu.h"
#include "game/mainmenu.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/game_1531a0.h"
#include "game/file.h"
#include "game/texdecompress.h"
src/game/gamefile.c
+3 -3
View File
@@ -7,10 +7,10 @@
#include "game/savebuffer.h"
#include "game/bg.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/utils.h"
#include "bss.h"
@@ -284,7 +284,7 @@ s32 gamefileLoad(s32 device)
g_FilemgrLastPakError = ret;
if (ret == 0) {
cheatsDisableAll();
cheatsInit();
savebufferReadString(&buffer, g_GameFile.name, 0);
g_GameFile.thumbnail = savebufferReadBits(&buffer, 5);
g_GameFile.totaltime = savebufferReadBits(&buffer, 32);
src/game/game_015470.c → src/game/getitle.c
+6 -23
View File
@@ -1,6 +1,5 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_015470.h"
#include "game/game_01afc0.h"
#include "bss.h"
#include "lib/vi.h"
@@ -41,24 +40,8 @@ u32 var80062494 = 0x00000001;
s32 var80062498 = 0;
u32 var8006249c = 0x00000000;
void func0f015470(void)
{
s32 i;
s32 j;
for (i = 0; i < PLAYERCOUNT(); i++) {
for (j = 0; j < 2; j++) {
struct hand *hand = &g_Vars.players[i]->hands[j];
if (hand->audiohandle2 && sndGetState(hand->audiohandle2) != AL_STOPPED) {
audioStop(hand->audiohandle2);
}
}
}
}
GLOBAL_ASM(
glabel func0f0155f0
glabel getitle0f0155f0
/* f0155f0: 44852000 */ mtc1 $a1,$f4
/* f0155f4: 27bdfef8 */ addiu $sp,$sp,-264
/* f0155f8: 3c018006 */ lui $at,%hi(g_GetitleCamPos+0x8)
@@ -596,12 +579,12 @@ extern u8 var02004d28;
extern u8 var02004dc8;
extern u8 var02005dd0;
Gfx *func0f0155f0(Gfx *gdl, s32 arg1, u32 arg2);
Gfx *getitle0f0155f0(Gfx *gdl, s32 arg1, u32 arg2);
// Mismatch: arg2 is should be accessed using lbu. Changing it a to a u8 does
// this and creates a match, but causes the caller to cast it to u8 which
// creates a mismatch in the caller. GE uses lw so it's likely a u32.
//Gfx *func0f0155f0(Gfx *gdl, s32 arg1, u32 arg2)
//Gfx *getitle0f0155f0(Gfx *gdl, s32 arg1, u32 arg2)
//{
// g_GetitleCamPos.z = arg1;
//
@@ -687,7 +670,7 @@ extern u8 _getitleSegmentRomStart;
extern u8 _getitleSegmentStart;
extern u8 _getitleSegmentEnd;
void getitleInit(void *addr, u32 arg1)
void getitleReset(void *addr, u32 arg1)
{
u32 len = (u32)&_getitleSegmentEnd - (u32)&_getitleSegmentStart;
@@ -740,7 +723,7 @@ Gfx *getitleRender(Gfx *gdl)
guRotate(&var8009cc88[var80062410], var80062484, 0, 1, 0);
gdl = func0f0155f0(gdl, var8009cc8c, (sp30 * sp2c) / 255);
gdl = getitle0f0155f0(gdl, var8009cc8c, (sp30 * sp2c) / 255);
if (var80062498 >= TICKS(1040) && var80062498 >= TICKS(1160)) {
var80062498 = 0;
@@ -752,7 +735,7 @@ Gfx *getitleRender(Gfx *gdl)
return gdl;
}
bool func0f0160e8(void)
bool getitle0f0160e8(void)
{
return (var80062414 ^ 2) == 0;
}
src/game/gfxmemory.c
+1 -1
View File
@@ -63,7 +63,7 @@ u32 g_GfxNumSwaps = 0x00000002;
* Comments in this function are strings that appear in an XBLA debug build.
* They were likely in the N64 version but ifdeffed out.
*/
void gfxInitMemory(void)
void gfxReset(void)
{
s32 stack;
src/game/hudmsg.c
+3 -3
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "constants.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/game_0b0fd0.h"
#include "game/player.h"
#include "game/savebuffer.h"
@@ -658,7 +658,7 @@ void hudmsgsHideByChannel(s32 channelnum)
}
}
void hudmsgsInit(void)
void hudmsgsReset(void)
{
s32 i;
@@ -6258,7 +6258,7 @@ glabel var7f1adef4
// return gdl;
//}
void hudmsgsReset(void)
void hudmsgsStop(void)
{
s32 i;
src/game/inventory/inventory.c → src/game/inv.c
+2 -2
View File
@@ -3,8 +3,8 @@
#include "game/cheats.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/training/training.h"
#include "game/inv.h"
#include "game/training.h"
#include "game/lang.h"
#include "bss.h"
#include "lib/main.h"
src/game/inventory/items.c → src/game/invitems.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "game/chr/chraicommands.h"
#include "game/chraicommands.h"
#include "game/prop.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "stagesetup.h"
#include "data.h"
#include "types.h"
src/game/inventory/init.c → src/game/invreset.c
+2 -3
View File
@@ -2,14 +2,13 @@
#include "constants.h"
#include "constants.h"
#include "game/cheats.h"
#include "game/inventory/init.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "bss.h"
#include "lib/memp.h"
#include "data.h"
#include "types.h"
void invInitGunsHeld(void)
void invReset(void)
{
s32 i;
src/game/game_00b320.c → src/game/langreset.c
+4 -4
View File
@@ -9,7 +9,7 @@
#if VERSION >= VERSION_JPN_FINAL
GLOBAL_ASM(
glabel stageLoadCommonLang
glabel langReset
/* f00b3b0: 27bdffe0 */ addiu $sp,$sp,-32
/* f00b3b4: 3c02800b */ lui $v0,0x800b
/* f00b3b8: 3c03800b */ lui $v1,0x800b
@@ -68,7 +68,7 @@ glabel stageLoadCommonLang
);
#elif VERSION >= VERSION_PAL_FINAL
GLOBAL_ASM(
glabel stageLoadCommonLang
glabel langReset
/* f00b330: 27bdffe0 */ addiu $sp,$sp,-32
/* f00b334: 3c02800b */ lui $v0,0x800b
/* f00b338: 3c03800b */ lui $v1,0x800b
@@ -127,7 +127,7 @@ glabel stageLoadCommonLang
);
#elif VERSION >= VERSION_PAL_BETA
GLOBAL_ASM(
glabel stageLoadCommonLang
glabel langReset
/* f00b330: 27bdffe0 */ addiu $sp,$sp,-32
/* f00b334: 3c02800b */ lui $v0,0x800b
/* f00b338: 3c03800b */ lui $v1,0x800b
@@ -185,7 +185,7 @@ glabel stageLoadCommonLang
/* f00b3f4: 00000000 */ nop
);
#else
void stageLoadCommonLang(s32 stagenum)
void langReset(s32 stagenum)
{
s32 i;
src/game/game_0147d0.c → src/game/lasersightsreset.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0147d0.h"
#include "game/chr/chr.h"
#include "game/lasersights.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/botcmd.h"
src/game/lv.c
+119 -134
View File
@@ -1,109 +1,94 @@
#include <ultra64.h>
#include "constants.h"
#include "game/activemenu/activemenu.h"
#include "game/activemenu/tick.h"
#include "bss.h"
#include "data.h"
#include "game/activemenu.h"
#include "game/atan2f.h"
#include "game/bg.h"
#include "game/bondgun.h"
#include "game/bondhead.h"
#include "game/bondmove.h"
#include "game/bondview.h"
#include "game/camdraw.h"
#include "game/casing.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chr.h"
#include "game/chraction.h"
#include "game/credits.h"
#include "game/debug.h"
#include "game/dlights.h"
#include "game/explosions.h"
#include "game/filemgr.h"
#include "game/game_006900.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/objectives.h"
#include "game/casing.h"
#include "game/playerinit.h"
#include "game/inventory/init.h"
#include "game/game_0125a0.h"
#include "game/explosions/init.h"
#include "game/smoke/init.h"
#include "game/sparks/init.h"
#include "game/weather/init.h"
#include "game/stubs/game_013540.h"
#include "game/game_013550.h"
#include "game/game_013cf0.h"
#include "game/game_0147a0.h"
#include "game/game_0147d0.h"
#include "game/game_014f10.h"
#include "game/game_015010.h"
#include "game/game_0150a0.h"
#include "game/gfxmemory.h"
#include "game/stubs/game_015260.h"
#include "game/stubs/game_015270.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"
#include "game/shards.h"
#include "game/game_015470.h"
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/weather/tick.h"
#include "game/game_01d990.h"
#include "game/chr/chr.h"
#include "game/prop.h"
#include "game/objectives.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
#include "game/game_0b63b0.h"
#include "game/player.h"
#include "game/savebuffer.h"
#include "game/hudmsg.h"
#include "game/menu.h"
#include "game/filemgr.h"
#include "game/game_10c9c0.h"
#include "game/game_11f000.h"
#include "game/playermgr.h"
#include "game/game_129210.h"
#include "game/explosions/explosions.h"
#include "game/sparks/sparks.h"
#include "game/weather/weather.h"
#include "game/sky.h"
#include "game/credits.h"
#include "game/game_13c510.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/bg.h"
#include "game/game_165670.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/texdecompress.h"
#include "game/game_176080.h"
#include "game/mplayer/setup.h"
#include "game/mplayer/scenarios.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/gfxmemory.h"
#include "game/hudmsg.h"
#include "game/inv.h"
#include "game/lang.h"
#include "game/lasersights.h"
#include "game/lv.h"
#include "game/menu.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/mplayer/scenarios.h"
#include "game/mplayer/setup.h"
#include "game/music.h"
#include "game/nbomb.h"
#include "game/objectives.h"
#include "game/pak.h"
#include "game/player.h"
#include "game/playermgr.h"
#include "game/playerreset.h"
#include "game/prop.h"
#include "game/propobj.h"
#include "game/sparks/tick.h"
#include "game/propsnd.h"
#include "game/savebuffer.h"
#include "game/shards.h"
#include "game/sky.h"
#include "game/sparks.h"
#include "game/splat.h"
#include "game/stubs/game_013540.h"
#include "game/stubs/game_015260.h"
#include "game/stubs/game_015270.h"
#include "game/stubs/game_0153f0.h"
#include "game/stubs/game_015400.h"
#include "game/stubs/game_015410.h"
#include "game/texdecompress.h"
#include "game/tiles.h"
#include "game/title.h"
#include "game/training.h"
#include "game/utils.h"
#include "game/vtxstore.h"
#include "game/wallhit.h"
#include "bss.h"
#include "game/weather.h"
#include "lib/anim.h"
#include "lib/args.h"
#include "lib/joy.h"
#include "lib/lib_06440.h"
#include "lib/vi.h"
#include "lib/lib_317f0.h"
#include "lib/main.h"
#include "lib/snd.h"
#include "lib/mtx.h"
#include "lib/music.h"
#include "lib/rng.h"
#include "lib/mtx.h"
#include "lib/anim.h"
#include "lib/lib_317f0.h"
#include "data.h"
#include "lib/snd.h"
#include "lib/vars.h"
#include "lib/vi.h"
#include "types.h"
struct sndstate *g_MiscSfxAudioHandles[3];
@@ -150,13 +135,13 @@ void setVar80084040(u32 value)
var80084040 = value;
}
void lv0f167af8(void)
void lvInit(void)
{
g_Vars.lockscreen = 0;
g_Vars.joydisableframestogo = -1;
}
void lvStopAllMiscSfx(void)
void lvResetMiscSfx(void)
{
s32 i;
@@ -242,9 +227,9 @@ void lvUpdateMiscSfx(void)
}
}
void lvInit(s32 stagenum)
void lvReset(s32 stagenum)
{
lvCancelFade();
lvFadeReset();
var80084014 = false;
var80084010 = 0;
@@ -265,7 +250,7 @@ void lvInit(s32 stagenum)
g_Vars.paksconnected = 0;
g_Vars.stagenum = stagenum;
cheatsActivate();
cheatsReset();
var80084040 = true;
g_Vars.lvframenum = 0;
@@ -305,19 +290,19 @@ void lvInit(s32 stagenum)
g_MiscAudioHandle = NULL;
musicInit();
musicReset();
func0f011124(true);
func0f013b80();
texturesLoadConfigs();
fontsLoadForCurrentStage();
hudmsgsInit();
texReset();
fontsReset();
hudmsgsReset();
if (stagenum == STAGE_TEST_OLD) {
func0f00b480();
titleReset();
}
if (stagenum == STAGE_TITLE) {
func0f00b480();
titleReset();
} else if (stagenum == STAGE_BOOTPAKMENU) {
// empty
} else if (stagenum == STAGE_CREDITS) {
@@ -328,8 +313,8 @@ void lvInit(s32 stagenum)
s32 i;
s32 j;
stageLoadTiles();
bgInit(g_Vars.stagenum);
tilesReset();
bgReset(g_Vars.stagenum);
bgBuildTables(g_Vars.stagenum);
func0f0147a0(g_Vars.stagenum);
@@ -372,24 +357,24 @@ void lvInit(s32 stagenum)
}
mpSetDefaultNamesIfEmpty();
anim0002373c();
animsReset();
objectivesReset();
func0f013ba0();
vtxstoreReset();
func0f011110();
func0f0108d0();
setupLoadFiles(stagenum);
propsndReset();
setupReset(stagenum);
scenarioReset();
gvarsInitProps();
setupInit();
func0f00b510();
stageChooseActiveHeads(stagenum);
setupParseObjects(stagenum);
tagsAllocatePtrs();
explosionsInit();
smokeInit();
sparksInit();
weatherInit();
lvStopAllMiscSfx();
varsReset();
propsReset();
chrmgrReset();
headsReset(stagenum);
propsCreate(stagenum);
tagsReset();
explosionsReset();
smokeReset();
sparksReset();
weatherReset();
lvResetMiscSfx();
switch (g_Vars.stagenum) {
case STAGE_ESCAPE:
@@ -398,7 +383,7 @@ void lvInit(s32 stagenum)
case STAGE_DEFECTION:
case STAGE_ATTACKSHIP:
case STAGE_TEST_OLD:
skyInit();
skyReset();
break;
}
@@ -406,23 +391,23 @@ void lvInit(s32 stagenum)
func0f0147d0();
lasersightsReset();
stub0f013540();
shardsInit();
frUnloadData();
shardsReset();
frReset();
if (g_Vars.stagenum == STAGE_TITLE) {
// empty
} else if (stagenum == STAGE_BOOTPAKMENU) {
setCurrentPlayerNum(0);
menuInit();
menuReset();
} else if (stagenum == STAGE_4MBMENU) {
setCurrentPlayerNum(0);
menuInit();
menuReset();
} else if (stagenum == STAGE_CREDITS) {
creditsInit();
creditsReset();
} else {
s32 i;
func0f1777f8();
utilsReset();
casingsReset();
for (i = 0; i < PLAYERCOUNT(); i++) {
@@ -430,14 +415,14 @@ void lvInit(s32 stagenum)
g_Vars.currentplayer->usedowntime = 0;
g_Vars.currentplayer->invdowntime = g_Vars.currentplayer->usedowntime;
menuInit();
amInit();
invInitGunsHeld();
bgunInit();
menuReset();
amReset();
invReset();
bgunReset();
playerLoadDefaults();
playerInit();
playerReset();
playerSpawn();
currentPlayerInitAnimation();
bheadReset();
if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) {
playermgrCalculateAiBuddyNums();
@@ -446,7 +431,7 @@ void lvInit(s32 stagenum)
acousticReset();
func0f0b65f8();
func0f001bdc();
lightsReset();
setCurrentPlayerNum(0);
}
@@ -454,19 +439,19 @@ void lvInit(s32 stagenum)
mpCalculateTeamIsOnlyAi();
}
pak0f11a2e4();
paksReset();
sndResetCurMp3();
if (stagenum == STAGE_BOOTPAKMENU) {
pakPushPakMenuDialog();
bootmenuReset();
}
if (stagenum == STAGE_4MBMENU) {
func0f10cb2c();
fmbmenuReset();
}
if (IS8MB()) {
func0f14a3c4();
pheadReset();
}
func0f011124(false);
@@ -575,7 +560,7 @@ bool lvIsFadeActive(void)
return g_FadeFrac >= 0;
}
void lvCancelFade(void)
void lvFadeReset(void)
{
g_FadeNumFrames = 0;
g_FadeFrac = -1;
@@ -1196,7 +1181,7 @@ Gfx *lvRender(Gfx *gdl)
gdl = viRenderViewportEdges(gdl);
gdl = func0f11f984(gdl);
bgTick();
func0f004314();
lightsTick();
propsTick(islastplayer);
scenarioTickChr(NULL);
propsSort();
@@ -1307,7 +1292,7 @@ Gfx *lvRender(Gfx *gdl)
currentPlayerInteract(true);
}
func0f0641f4();
propsTestForPickup();
gdl = bgRender(gdl);
chr0f028498(var80075d68 == 15 || g_AnimHostEnabled);
gdl = propsRenderBeams(gdl);
@@ -2011,7 +1996,7 @@ void lvTick(void)
#if VERSION >= VERSION_NTSC_1_0
if (g_Vars.unk0004e4) {
pak0f11c54c();
paksTick();
}
#endif
@@ -2312,7 +2297,7 @@ void lvTick(void)
shardsTick();
sparksTick();
wallhitsTick();
func0f149864();
splatsTick();
if (g_WeatherActive) {
weatherTick();
@@ -2383,9 +2368,9 @@ void lvTickPlayer(void)
g_Vars.currentplayerstats->distance += sqrtf(xdiff * xdiff + zdiff * zdiff);
}
void lvReset(void)
void lvStop(void)
{
pakStopRumbleForAllPaks(true);
paksStop(true);
if (g_MiscAudioHandle && sndGetState(g_MiscAudioHandle)) {
audioStop(g_MiscAudioHandle);
@@ -2397,25 +2382,25 @@ void lvReset(void)
stub0f015270();
}
chrsReset();
explosionsReset();
smokeReset();
chrmgrStop();
explosionsStop();
smokeStop();
stub0f015400();
stub0f015410();
shardsReset();
shardsStop();
stub0f0153f0();
alarmReset();
objsReset(); // props/setup related
weatherReset();
objectivesAutocomplete();
propsStop();
objsStop();
weatherStop();
objectivesStop();
stub0f015260();
func0f015470();
func0f0150a0();
musicReset();
hudmsgsReset();
bgunStop();
propsndStop();
musicStop();
hudmsgsStop();
if (g_Vars.stagenum < NUM_STAGES) {
bgReset();
bgStop();
}
func00033dd8();
@@ -2426,7 +2411,7 @@ void lvReset(void)
}
#if VERSION >= VERSION_NTSC_1_0
func0f01bea0();
menuStop();
#endif
}
src/game/mainmenu.c
+5 -6
View File
@@ -4,7 +4,6 @@
#include "game/game_00c490.h"
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/objectives.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
@@ -13,12 +12,12 @@
#include "game/menu.h"
#include "game/mainmenu.h"
#include "game/filemgr.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/game_1531a0.h"
#include "game/lv.h"
#include "game/mplayer/ingame.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
@@ -797,7 +796,7 @@ struct menudialogdef g_PreAndPostMissionBriefingMenuDialog = {
s32 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_SET) {
func0f01bea0();
menuStop();
if (g_Vars.stagenum == g_MissionConfig.stagenum) {
g_Vars.restartlevel = true;
@@ -6151,13 +6150,13 @@ s32 menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *d
g_Vars.autocutgroupcur = 0;
g_Vars.autocutgroupleft = g_CutsceneCountsByMission[index];
menuPopDialog();
func0f01bea0();
menuStop();
} else {
// Play specific cutscene
g_Vars.autocutgroupcur = data->list.value - 1;
g_Vars.autocutgroupleft = 1;
menuPopDialog();
func0f01bea0();
menuStop();
}
break;
case MENUOP_GETOPTIONVALUE:
src/game/menu.c
+3 -3
View File
@@ -25,13 +25,13 @@
#include "game/texdecompress.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/game_1a78b0.h"
#include "game/gamefile.h"
#include "game/gfxmemory.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/propobj.h"
#include "bss.h"
@@ -21250,7 +21250,7 @@ void func0f0f8bb4(struct menu840 *arg0, u32 arg1, u32 arg2)
arg0->unk524 = arg0->unk54c;
}
void menuInit(void)
void menuReset(void)
{
s32 i;
src/game/menuitem.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "game/game_1531a0.h"
#include "game/lv.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/options.h"
src/game/menustop.c
+38
View File
@@ -0,0 +1,38 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_006900.h"
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/bondgun.h"
#include "game/player.h"
#include "game/menugfx.h"
#include "game/menu.h"
#include "game/filelist.h"
#include "game/mainmenu.h"
#include "game/endscreen.h"
#include "game/playermgr.h"
#include "game/lv.h"
#include "game/music.h"
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "bss.h"
#include "lib/vi.h"
#include "lib/joy.h"
#include "lib/main.h"
#include "lib/snd.h"
#include "data.h"
#include "types.h"
void menuStop(void)
{
if (var80062944) {
var80062944 = 0;
var80062948 = 0;
joy000139c8();
func0f110bf8();
}
}
src/game/game_01bea0.c → src/game/menutick.c
+5 -16
View File
@@ -3,7 +3,6 @@
#include "game/game_006900.h"
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/bondgun.h"
#include "game/player.h"
#include "game/menugfx.h"
@@ -17,7 +16,7 @@
#include "game/mplayer/ingame.h"
#include "game/mplayer/setup.h"
#include "game/game_19aa80.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/gamefile.h"
#include "game/mplayer/mplayer.h"
#include "bss.h"
@@ -42,16 +41,6 @@ const char var7f1a85e0[] = "Live: %d\n";
const char var7f1a85ec[] = "current:";
const char var7f1a85f8[] = " numactive %d ";
void func0f01bea0(void)
{
if (var80062944) {
var80062944 = 0;
var80062948 = 0;
joy000139c8();
func0f110bf8();
}
}
void menuCountDialogs(void)
{
s32 i;
@@ -211,7 +200,7 @@ void menuTick(void)
}
if (var8009dfc0 && g_Vars.currentplayer->gunmem2) {
player0f0b9538();
playerRemoveChrBody();
if (g_Vars.currentplayer->gunmem2);
}
@@ -491,7 +480,7 @@ void menuTick(void)
}
} else {
if (var80062944 == 1) {
func0f01bea0();
menuStop();
}
}
@@ -523,7 +512,7 @@ void menuTick(void)
if (g_MenuData.unk008 == -5) {
// Match is beginning
mpStartMatch();
func0f01bea0();
menuStop();
if (g_Vars.modifiedfiles & MODFILE_MPSETUP) {
bossfileSave();
@@ -573,7 +562,7 @@ void menuTick(void)
}
}
} else if (g_MenuData.unk008 == -7) {
func0f01bea0();
menuStop();
g_FileState = FILESTATE_CHANGINGAGENT;
gamefileLoadDefaults(&g_GameFile);
gamefileApplyOptions(&g_GameFile);
src/game/mplayer/mpaicommands.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chrai.h"
#include "game/chrai.h"
#include "game/bot.h"
#include "bss.h"
#include "data.h"
src/game/mplayer/mplayer.c
+3 -3
View File
@@ -18,7 +18,7 @@
#include "game/game_19aa80.h"
#include "game/lang.h"
#include "game/mplayer/mplayer.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "bss.h"
#include "lib/args.h"
#include "lib/vi.h"
@@ -171,7 +171,7 @@ void mpStartMatch(void)
g_Vars.perfectbuddynum = 1;
}
void mpInit(void)
void mpReset(void)
{
s32 i;
s32 mpindex = 0;
@@ -456,7 +456,7 @@ void func0f1881d4(s32 index)
g_BotConfigsArray[index].difficulty = BOTDIFF_DISABLED;
}
void mpSetDefaultSetup(void)
void mpInit(void)
{
s32 i;
s32 j;
src/game/mplayer/scenarios.c
+3 -3
View File
@@ -1,18 +1,18 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/dlights.h"
#include "game/game_006900.h"
#include "game/game_00c490.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/atan2f.h"
#include "game/bondgun.h"
#include "game/player.h"
#include "game/savebuffer.h"
#include "game/hudmsg.h"
#include "game/menu.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/game_1531a0.h"
#include "game/mplayer/setup.h"
src/game/mpstats.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/player.h"
src/game/music.c
+2 -2
View File
@@ -213,7 +213,7 @@ void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool fadetopause)
}
}
void musicInit(void)
void musicReset(void)
{
s32 i;
@@ -515,7 +515,7 @@ void musicSetStage(s32 stagenum)
g_MusicStageNum = stagenum;
}
void musicReset(void)
void musicStop(void)
{
#if VERSION >= VERSION_NTSC_1_0
func0f16d430();
src/game/nbomb.c
+3 -3
View File
@@ -1,11 +1,11 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/dlights.h"
#include "game/game_006900.h"
#include "game/nbomb.h"
#include "game/chr/chr.h"
#include "game/chr/chraction.h"
#include "game/chr.h"
#include "game/chraction.h"
#include "game/prop.h"
#include "game/objectives.h"
#include "game/atan2f.h"
src/game/objectives/objectives.c → src/game/objectives.c
+4 -4
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/debug.h"
#include "game/prop.h"
#include "game/game_091e10.h"
@@ -8,10 +8,10 @@
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/lv.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/lang.h"
#include "game/propobj.h"
#include "bss.h"
@@ -73,7 +73,7 @@ void func0f095350(u32 arg0, u32 *arg1)
}
#endif
void tagsAllocatePtrs(void)
void tagsReset(void)
{
s32 index = 0;
struct tag *tag = g_TagsLinkedList;
src/game/objectives/setup.c → src/game/objectivesreset.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include <ultra64.h>
#include "constants.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "bss.h"
#include "lib/main.h"
#include "data.h"
src/game/objectives/autocomplete.c → src/game/objectivesstop.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
void objectivesAutocomplete(void)
void objectivesStop(void)
{
s32 i;
src/game/pak/pak.c → src/game/pak.c
+6 -6
View File
@@ -5,7 +5,7 @@
#include "game/menu.h"
#include "game/crc.h"
#include "game/gamefile.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/utils.h"
#include "bss.h"
#include "lib/args.h"
@@ -2270,7 +2270,7 @@ void pak0f1189d0(void)
}
#if VERSION >= VERSION_NTSC_1_0
void pakInitAll(void)
void paksInit(void)
{
u8 prevvalue = g_Vars.paksconnected;
s8 i;
@@ -2310,7 +2310,7 @@ void pakInitAll(void)
}
#else
GLOBAL_ASM(
glabel pakInitAll
glabel paksInit
/* f112d30: 27bdffd0 */ addiu $sp,$sp,-48
/* f112d34: afb00018 */ sw $s0,0x18($sp)
/* f112d38: afbf002c */ sw $ra,0x2c($sp)
@@ -4160,7 +4160,7 @@ void pakMergeBlanks(s8 device)
}
}
void pak0f11a2e4(void)
void paksReset(void)
{
// empty
}
@@ -7329,7 +7329,7 @@ glabel var7f1af0fcnb
#endif
#if VERSION >= VERSION_NTSC_1_0
void pak0f11c54c(void)
void paksTick(void)
{
s32 i;
@@ -8897,7 +8897,7 @@ void pakRumble(s8 device, f32 numsecs, s32 onduration, s32 offduration)
}
#endif
void pakStopRumbleForAllPaks(bool disablepolling)
void paksStop(bool disablepolling)
{
s8 i;
src/game/player.c
+16 -17
View File
@@ -3,15 +3,15 @@
#include "game/bondeyespy.h"
#include "game/bondmove.h"
#include "game/cheats.h"
#include "game/chr/chraction.h"
#include "game/chraction.h"
#include "game/floor.h"
#include "game/inventory/items.h"
#include "game/inv.h"
#include "game/nbomb.h"
#include "game/title.h"
#include "game/chr/chr.h"
#include "game/chr.h"
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/propsnd.h"
#include "game/objectives.h"
#include "game/atan2f.h"
#include "game/game_096ca0.h"
@@ -28,9 +28,9 @@
#include "game/menu.h"
#include "game/mainmenu.h"
#include "game/filemgr.h"
#include "game/inventory/inventory.h"
#include "game/inv.h"
#include "game/playermgr.h"
#include "game/explosions/explosions.h"
#include "game/explosions.h"
#include "game/bondview.h"
#include "game/game_1531a0.h"
#include "game/bg.h"
@@ -44,11 +44,10 @@
#include "game/mplayer/ingame.h"
#include "game/mplayer/scenarios.h"
#include "game/radar.h"
#include "game/training/training.h"
#include "game/training/training.h"
#include "game/training.h"
#include "game/mplayer/mplayer.h"
#include "game/pad.h"
#include "game/pak/pak.h"
#include "game/pak.h"
#include "game/options.h"
#include "game/propobj.h"
#include "game/splat.h"
@@ -881,7 +880,7 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force)
g_Vars.currentplayer->haschrbody = false;
g_Vars.currentplayer->model00d4 = NULL;
chr0f020d44(g_Vars.currentplayer->prop, false);
chrRemove(g_Vars.currentplayer->prop, false);
if (hostchr->bodynum == BODY_SKEDAR) {
g_Vars.antiheadnum = HEAD_MRBLONDE;
@@ -911,7 +910,7 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force)
playerchr->chrwidth = hostchr->chrwidth;
g_Vars.currentplayer->bond2.width = hostchr->chrwidth;
chr0f020d44(hostprop, true);
chrRemove(hostprop, true);
propDeregisterRooms(hostprop);
propDelist(hostprop);
propDisable(hostprop);
@@ -1529,12 +1528,12 @@ void playerTickChrBody(void)
}
}
void player0f0b9538(void)
void playerRemoveChrBody(void)
{
if (g_Vars.currentplayer->haschrbody) {
if (!g_Vars.mplayerisrunning || (IS4MB() && PLAYERCOUNT() == 1)) {
g_Vars.currentplayer->haschrbody = false;
chr0f020d44(g_Vars.currentplayer->prop, false);
chrRemove(g_Vars.currentplayer->prop, false);
g_Vars.currentplayer->model00d4 = NULL;
bmove0f0cb8c4(g_Vars.currentplayer);
bgun0f09df50();
@@ -2046,7 +2045,7 @@ void playerStartCutscene2(void)
var8009de2c = -1;
g_InCutscene = 1;
pakStopRumbleForAllPaks(true);
paksStop(true);
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && g_CutsceneCurAnimFrame60 < animGetNumFrames(g_CutsceneAnimNum) - 1;
g_Vars.cutsceneskip60ths = 0;
}
@@ -4217,7 +4216,7 @@ void playerTick(bool arg0)
struct chrdata *chr;
s32 i;
player0f0b9538();
playerRemoveChrBody();
if (g_PlayersWithControl[g_Vars.currentplayernum]) {
bmoveTick(1, 1, arg0, 0);
@@ -4499,7 +4498,7 @@ void playerTick(bool arg0)
}
}
} else if (g_Vars.tickmode == TICKMODE_GE_FADEIN || g_Vars.tickmode == TICKMODE_GE_FADEOUT) {
player0f0b9538();
playerRemoveChrBody();
bmoveTick(1, 1, arg0, 0);
playerUpdateShake();
playerSetCameraMode(CAMERAMODE_DEFAULT);
@@ -4531,7 +4530,7 @@ void playerTick(bool arg0)
struct pad pad;
f32 speedfrac;
player0f0b9538();
playerRemoveChrBody();
padUnpack(g_Vars.currentplayer->autocontrol_aimpad, PADFIELD_POS, &pad);
if (mainGetStageNum() == g_Stages[STAGEINDEX_EXTRACTION].id

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