mirror of
https://github.com/n64decomp/perfect_dark.git
synced 2024-11-23 05:49:52 +00:00
Set filenames for artifact.c, chraireset.c, gset.c, projectile.c and text.c
This commit is contained in:
parent
fc211f51c5
commit
ddac1c7bab
@ -26,7 +26,7 @@
|
||||
build/ROMID/game/titlereset.o (section); \
|
||||
build/ROMID/game/chrmgr.o (section); \
|
||||
build/ROMID/game/bodyreset.o (section); \
|
||||
build/ROMID/game/game_00b820.o (section); \
|
||||
build/ROMID/game/chraireset.o (section); \
|
||||
build/ROMID/game/varsreset.o (section); \
|
||||
build/ROMID/game/setup.o (section); \
|
||||
build/ROMID/game/propsndreset.o (section); \
|
||||
@ -95,7 +95,7 @@
|
||||
build/ROMID/game/setuputils.o (section); \
|
||||
build/ROMID/game/propsnd.o (section); \
|
||||
build/ROMID/game/objectives.o (section); \
|
||||
build/ROMID/game/game_096360.o (section); \
|
||||
build/ROMID/game/projectile.o (section); \
|
||||
build/ROMID/game/game_096700.o (section); \
|
||||
build/ROMID/game/atan2f.o (section); \
|
||||
build/ROMID/game/acosasin.o (section); \
|
||||
@ -110,7 +110,7 @@
|
||||
build/ROMID/game/bondgun.o (section); \
|
||||
build/ROMID/game/gunfx.o (section); \
|
||||
build/ROMID/game/mpstats.o (section); \
|
||||
build/ROMID/game/game_0b0fd0.o (section); \
|
||||
build/ROMID/game/gset.o (section); \
|
||||
build/ROMID/game/game_0b2150.o (section); \
|
||||
build/ROMID/game/modelmgr.o (section); \
|
||||
build/ROMID/game/texselect.o (section); \
|
||||
@ -178,7 +178,7 @@
|
||||
build/ROMID/game/stars.o (section); \
|
||||
build/ROMID/game/credits.o (section); \
|
||||
build/ROMID/game/dyntex.o (section); \
|
||||
build/ROMID/game/game_13c510.o (section); \
|
||||
build/ROMID/game/artifact.o (section); \
|
||||
build/ROMID/game/wallhit.o (section); \
|
||||
build/ROMID/game/bondview.o (section); \
|
||||
build/ROMID/game/splat.o (section); \
|
||||
@ -186,7 +186,7 @@
|
||||
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); \
|
||||
build/ROMID/game/text.o (section); \
|
||||
build/ROMID/game/collisionutils.o (section); \
|
||||
build/ROMID/game/bg.o (section); \
|
||||
build/ROMID/game/bgbss.o (section); \
|
||||
|
@ -26,7 +26,7 @@
|
||||
build/ROMID/game/titlereset.o (section); \
|
||||
build/ROMID/game/chrmgr.o (section); \
|
||||
build/ROMID/game/bodyreset.o (section); \
|
||||
build/ROMID/game/game_00b820.o (section); \
|
||||
build/ROMID/game/chraireset.o (section); \
|
||||
build/ROMID/game/varsreset.o (section); \
|
||||
build/ROMID/game/setup.o (section); \
|
||||
build/ROMID/game/propsndreset.o (section); \
|
||||
@ -95,7 +95,7 @@
|
||||
build/ROMID/game/setuputils.o (section); \
|
||||
build/ROMID/game/propsnd.o (section); \
|
||||
build/ROMID/game/objectives.o (section); \
|
||||
build/ROMID/game/game_096360.o (section); \
|
||||
build/ROMID/game/projectile.o (section); \
|
||||
build/ROMID/game/game_096700.o (section); \
|
||||
build/ROMID/game/atan2f.o (section); \
|
||||
build/ROMID/game/acosasin.o (section); \
|
||||
@ -110,7 +110,7 @@
|
||||
build/ROMID/game/bondgun.o (section); \
|
||||
build/ROMID/game/gunfx.o (section); \
|
||||
build/ROMID/game/mpstats.o (section); \
|
||||
build/ROMID/game/game_0b0fd0.o (section); \
|
||||
build/ROMID/game/gset.o (section); \
|
||||
build/ROMID/game/game_0b2150.o (section); \
|
||||
build/ROMID/game/modelmgr.o (section); \
|
||||
build/ROMID/game/texselect.o (section); \
|
||||
@ -178,7 +178,7 @@
|
||||
build/ROMID/game/stars.o (section); \
|
||||
build/ROMID/game/credits.o (section); \
|
||||
build/ROMID/game/dyntex.o (section); \
|
||||
build/ROMID/game/game_13c510.o (section); \
|
||||
build/ROMID/game/artifact.o (section); \
|
||||
build/ROMID/game/wallhit.o (section); \
|
||||
build/ROMID/game/bondview.o (section); \
|
||||
build/ROMID/game/splat.o (section); \
|
||||
@ -186,7 +186,7 @@
|
||||
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); \
|
||||
build/ROMID/game/text.o (section); \
|
||||
build/ROMID/game/collisionutils.o (section); \
|
||||
build/ROMID/game/bg.o (section); \
|
||||
build/ROMID/game/bgbss.o (section); \
|
||||
|
@ -26,7 +26,7 @@
|
||||
build/ROMID/game/titlereset.o (section); \
|
||||
build/ROMID/game/chrmgr.o (section); \
|
||||
build/ROMID/game/bodyreset.o (section); \
|
||||
build/ROMID/game/game_00b820.o (section); \
|
||||
build/ROMID/game/chraireset.o (section); \
|
||||
build/ROMID/game/varsreset.o (section); \
|
||||
build/ROMID/game/setup.o (section); \
|
||||
build/ROMID/game/propsndreset.o (section); \
|
||||
@ -95,7 +95,7 @@
|
||||
build/ROMID/game/setuputils.o (section); \
|
||||
build/ROMID/game/propsnd.o (section); \
|
||||
build/ROMID/game/objectives.o (section); \
|
||||
build/ROMID/game/game_096360.o (section); \
|
||||
build/ROMID/game/projectile.o (section); \
|
||||
build/ROMID/game/game_096700.o (section); \
|
||||
build/ROMID/game/atan2f.o (section); \
|
||||
build/ROMID/game/acosasin.o (section); \
|
||||
@ -110,7 +110,7 @@
|
||||
build/ROMID/game/bondgun.o (section); \
|
||||
build/ROMID/game/gunfx.o (section); \
|
||||
build/ROMID/game/mpstats.o (section); \
|
||||
build/ROMID/game/game_0b0fd0.o (section); \
|
||||
build/ROMID/game/gset.o (section); \
|
||||
build/ROMID/game/game_0b2150.o (section); \
|
||||
build/ROMID/game/modelmgr.o (section); \
|
||||
build/ROMID/game/texselect.o (section); \
|
||||
@ -178,7 +178,7 @@
|
||||
build/ROMID/game/stars.o (section); \
|
||||
build/ROMID/game/credits.o (section); \
|
||||
build/ROMID/game/dyntex.o (section); \
|
||||
build/ROMID/game/game_13c510.o (section); \
|
||||
build/ROMID/game/artifact.o (section); \
|
||||
build/ROMID/game/wallhit.o (section); \
|
||||
build/ROMID/game/bondview.o (section); \
|
||||
build/ROMID/game/splat.o (section); \
|
||||
@ -186,7 +186,7 @@
|
||||
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); \
|
||||
build/ROMID/game/text.o (section); \
|
||||
build/ROMID/game/collisionutils.o (section); \
|
||||
build/ROMID/game/bg.o (section); \
|
||||
build/ROMID/game/bgbss.o (section); \
|
||||
|
@ -26,7 +26,7 @@
|
||||
build/ROMID/game/titlereset.o (section); \
|
||||
build/ROMID/game/chrmgr.o (section); \
|
||||
build/ROMID/game/bodyreset.o (section); \
|
||||
build/ROMID/game/game_00b820.o (section); \
|
||||
build/ROMID/game/chraireset.o (section); \
|
||||
build/ROMID/game/varsreset.o (section); \
|
||||
build/ROMID/game/setup.o (section); \
|
||||
build/ROMID/game/propsndreset.o (section); \
|
||||
@ -95,7 +95,7 @@
|
||||
build/ROMID/game/setuputils.o (section); \
|
||||
build/ROMID/game/propsnd.o (section); \
|
||||
build/ROMID/game/objectives.o (section); \
|
||||
build/ROMID/game/game_096360.o (section); \
|
||||
build/ROMID/game/projectile.o (section); \
|
||||
build/ROMID/game/game_096700.o (section); \
|
||||
build/ROMID/game/atan2f.o (section); \
|
||||
build/ROMID/game/acosasin.o (section); \
|
||||
@ -110,7 +110,7 @@
|
||||
build/ROMID/game/bondgun.o (section); \
|
||||
build/ROMID/game/gunfx.o (section); \
|
||||
build/ROMID/game/mpstats.o (section); \
|
||||
build/ROMID/game/game_0b0fd0.o (section); \
|
||||
build/ROMID/game/gset.o (section); \
|
||||
build/ROMID/game/game_0b2150.o (section); \
|
||||
build/ROMID/game/modelmgr.o (section); \
|
||||
build/ROMID/game/texselect.o (section); \
|
||||
@ -178,7 +178,7 @@
|
||||
build/ROMID/game/stars.o (section); \
|
||||
build/ROMID/game/credits.o (section); \
|
||||
build/ROMID/game/dyntex.o (section); \
|
||||
build/ROMID/game/game_13c510.o (section); \
|
||||
build/ROMID/game/artifact.o (section); \
|
||||
build/ROMID/game/wallhit.o (section); \
|
||||
build/ROMID/game/bondview.o (section); \
|
||||
build/ROMID/game/splat.o (section); \
|
||||
@ -186,7 +186,7 @@
|
||||
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); \
|
||||
build/ROMID/game/text.o (section); \
|
||||
build/ROMID/game/collisionutils.o (section); \
|
||||
build/ROMID/game/bg.o (section); \
|
||||
build/ROMID/game/bgbss.o (section); \
|
||||
|
@ -26,7 +26,7 @@
|
||||
build/ROMID/game/titlereset.o (section); \
|
||||
build/ROMID/game/chrmgr.o (section); \
|
||||
build/ROMID/game/bodyreset.o (section); \
|
||||
build/ROMID/game/game_00b820.o (section); \
|
||||
build/ROMID/game/chraireset.o (section); \
|
||||
build/ROMID/game/varsreset.o (section); \
|
||||
build/ROMID/game/setup.o (section); \
|
||||
build/ROMID/game/propsndreset.o (section); \
|
||||
@ -95,7 +95,7 @@
|
||||
build/ROMID/game/setuputils.o (section); \
|
||||
build/ROMID/game/propsnd.o (section); \
|
||||
build/ROMID/game/objectives.o (section); \
|
||||
build/ROMID/game/game_096360.o (section); \
|
||||
build/ROMID/game/projectile.o (section); \
|
||||
build/ROMID/game/game_096700.o (section); \
|
||||
build/ROMID/game/atan2f.o (section); \
|
||||
build/ROMID/game/acosasin.o (section); \
|
||||
@ -110,7 +110,7 @@
|
||||
build/ROMID/game/bondgun.o (section); \
|
||||
build/ROMID/game/gunfx.o (section); \
|
||||
build/ROMID/game/mpstats.o (section); \
|
||||
build/ROMID/game/game_0b0fd0.o (section); \
|
||||
build/ROMID/game/gset.o (section); \
|
||||
build/ROMID/game/game_0b2150.o (section); \
|
||||
build/ROMID/game/modelmgr.o (section); \
|
||||
build/ROMID/game/texselect.o (section); \
|
||||
@ -178,7 +178,7 @@
|
||||
build/ROMID/game/stars.o (section); \
|
||||
build/ROMID/game/credits.o (section); \
|
||||
build/ROMID/game/dyntex.o (section); \
|
||||
build/ROMID/game/game_13c510.o (section); \
|
||||
build/ROMID/game/artifact.o (section); \
|
||||
build/ROMID/game/wallhit.o (section); \
|
||||
build/ROMID/game/bondview.o (section); \
|
||||
build/ROMID/game/splat.o (section); \
|
||||
@ -186,7 +186,7 @@
|
||||
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); \
|
||||
build/ROMID/game/text.o (section); \
|
||||
build/ROMID/game/collisionutils.o (section); \
|
||||
build/ROMID/game/bg.o (section); \
|
||||
build/ROMID/game/bgbss.o (section); \
|
||||
|
@ -3,12 +3,12 @@
|
||||
#include "game/chraction.h"
|
||||
#include "game/game_006900.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/bot.h"
|
||||
#include "game/botcmd.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/activemenu.h"
|
||||
#include "game/pdmode.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/options.h"
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "game/game_0b2150.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/sky.h"
|
||||
#include "game/game_13c510.h"
|
||||
#include "game/artifact.h"
|
||||
#include "game/bg.h"
|
||||
#include "game/stagetable.h"
|
||||
#include "game/room.h"
|
@ -15,8 +15,8 @@
|
||||
#include "game/sky.h"
|
||||
#include "game/stars.h"
|
||||
#include "game/dyntex.h"
|
||||
#include "game/game_13c510.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/artifact.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/gfxreplace.h"
|
||||
#include "game/bg.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/body.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/chrai.h"
|
||||
#include "game/game_00b820.h"
|
||||
#include "game/chraireset.h"
|
||||
#include "game/playerreset.h"
|
||||
#include "game/setuputils.h"
|
||||
#include "bss.h"
|
||||
|
@ -9,14 +9,14 @@
|
||||
#include "game/chr.h"
|
||||
#include "game/prop.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/game_096360.h"
|
||||
#include "game/projectile.h"
|
||||
#include "game/acosfasinf.h"
|
||||
#include "game/game_096b20.h"
|
||||
#include "game/quaternion.h"
|
||||
#include "game/game_097aa0.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modeldef.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/tex.h"
|
||||
@ -28,7 +28,7 @@
|
||||
#include "game/inv.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/smoke.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/texdecompress.h"
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "game/atan2f.h"
|
||||
#include "game/quaternion.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
#include "game/player.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/sky.h"
|
||||
#include "game/bondview.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/lang.h"
|
||||
#include "game/options.h"
|
||||
|
@ -7,7 +7,7 @@
|
||||
#include "game/propsnd.h"
|
||||
#include "game/atan2f.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/bg.h"
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include "game/chr.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/botact.h"
|
||||
#include "game/pad.h"
|
||||
|
@ -5,7 +5,7 @@
|
||||
#include "game/debug.h"
|
||||
#include "game/chr.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
#include "game/bot.h"
|
||||
|
@ -4,7 +4,7 @@
|
||||
#include "game/debug.h"
|
||||
#include "game/chr.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
#include "game/bot.h"
|
||||
|
@ -10,10 +10,10 @@
|
||||
#include "game/prop.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/game_096360.h"
|
||||
#include "game/projectile.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
|
@ -19,8 +19,8 @@
|
||||
#include "game/explosions.h"
|
||||
#include "game/footstep.h"
|
||||
#include "game/game_006900.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/lv.h"
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include "game/objectives.h"
|
||||
#include "game/atan2f.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/player.h"
|
||||
#include "game/hudmsg.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/chrai.h"
|
||||
#include "game/game_00b820.h"
|
||||
#include "game/chraireset.h"
|
||||
#include "game/playerreset.h"
|
||||
#include "game/body.h"
|
||||
#include "game/setuputils.h"
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
struct prop *g_DangerousProps[12];
|
||||
|
||||
void stage_reset(void)
|
||||
void chrai_reset(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
@ -32,7 +32,7 @@ void stage_reset(void)
|
||||
g_NumChrsSeenPlayerRecently2 = 0;
|
||||
}
|
||||
|
||||
void stage_load_bgchrs(void)
|
||||
void chrai_load_bgchrs(void)
|
||||
{
|
||||
bool modified;
|
||||
struct chrdata tmp;
|
||||
@ -127,7 +127,7 @@ void stage_load_bgchrs(void)
|
||||
g_SquadronList = memp_alloc((MAX_CHRSPERSQUADRON + 1) * MAX_SQUADRONS * sizeof(s16), MEMPOOL_STAGE);
|
||||
}
|
||||
|
||||
void stage_load_ailist_models(void)
|
||||
void chrai_load_ailist_models(void)
|
||||
{
|
||||
u8 *cmd = g_StageSetup.ailists[0].list;
|
||||
s32 i = 0;
|
||||
@ -173,7 +173,7 @@ void stage_load_ailist_models(void)
|
||||
} while (cmd);
|
||||
}
|
||||
|
||||
void stage_load_projectile_models(void)
|
||||
void chrai_load_projectile_models(void)
|
||||
{
|
||||
// empty
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/game_00b820.h"
|
||||
#include "game/chraireset.h"
|
||||
#include "game/title.h"
|
||||
#include "bss.h"
|
||||
#include "lib/memp.h"
|
||||
@ -37,7 +37,7 @@ void chrmgr_reset(void)
|
||||
var8009ccc0[i] = (void *)ALIGN64(memp_alloc(16 * 16 * sizeof(u16) + 0x40, MEMPOOL_STAGE));
|
||||
}
|
||||
|
||||
stage_reset();
|
||||
chrai_reset();
|
||||
}
|
||||
|
||||
void chrmgr_configure(s32 numchrs)
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/game_006900.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/lang.h"
|
||||
#include "bss.h"
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "game/menugfx.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/credits.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/lv.h"
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include "game/objectives.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/menugfx.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "game/menu.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/bossfile.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gamefile.h"
|
||||
#include "game/lang.h"
|
||||
#include "game/mplayer/mplayer.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/cheats.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/hudmsg.h"
|
||||
#include "game/playermgr.h"
|
@ -3,7 +3,7 @@
|
||||
#include "game/acosfasinf.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
#include "game/mtxf2lbulk.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/player.h"
|
||||
#include "game/healthbar.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/file.h"
|
||||
#include "bss.h"
|
||||
|
@ -2,13 +2,13 @@
|
||||
#include "constants.h"
|
||||
#include "constants.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/hudmsg.h"
|
||||
#include "game/menugfx.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/mplayer/mplayer.h"
|
||||
#include "game/options.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/training.h"
|
||||
#include "game/lang.h"
|
||||
|
@ -21,15 +21,15 @@
|
||||
#include "game/explosions.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/game_006900.h"
|
||||
#include "game/game_00b820.h"
|
||||
#include "game/chraireset.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/portal.h"
|
||||
#include "game/fmb.h"
|
||||
#include "game/sky.h"
|
||||
#include "game/game_13c510.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/artifact.h"
|
||||
#include "game/text.h"
|
||||
#include "game/zbuf.h"
|
||||
#include "game/challenge.h"
|
||||
#include "game/chrmgr.h"
|
||||
@ -675,8 +675,8 @@ Gfx *lv_render_man_pos_if_enabled(Gfx *gdl)
|
||||
s32 y2;
|
||||
|
||||
if (debug_is_man_pos_enabled()) {
|
||||
f32 xfrac = g_Vars.currentplayer->bond2.unk00.x;
|
||||
f32 zfrac = g_Vars.currentplayer->bond2.unk00.z;
|
||||
f32 xfrac = g_Vars.currentplayer->bond2.theta.x;
|
||||
f32 zfrac = g_Vars.currentplayer->bond2.theta.z;
|
||||
|
||||
char directions[][3] = {
|
||||
{'n', '\0', '\0'},
|
||||
|
@ -6,8 +6,8 @@
|
||||
#include "game/cheats.h"
|
||||
#include "game/debug.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gamefile.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/lang.h"
|
||||
|
@ -18,7 +18,7 @@
|
||||
#include "game/filelist.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/credits.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/menugfx.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/file.h"
|
||||
#include "game/utils.h"
|
||||
|
@ -9,7 +9,7 @@
|
||||
#include "game/menu.h"
|
||||
#include "game/mainmenu.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/challenge.h"
|
||||
#include "game/training.h"
|
||||
|
@ -3,13 +3,13 @@
|
||||
#include "game/chraction.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/menugfx.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/mainmenu.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/texdecompress.h"
|
||||
#include "game/tex.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/game_006900.h"
|
||||
#include "game/title.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/menu.h"
|
||||
|
@ -4,12 +4,12 @@
|
||||
#include "game/title.h"
|
||||
#include "game/pdmode.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/music.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "game/menu.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
#include "game/mplayer/scenarios.h"
|
||||
#include "game/radar.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "game/menu.h"
|
||||
#include "game/mainmenu.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/music.h"
|
||||
#include "game/mplayer/ingame.h"
|
||||
#include "game/mplayer/setup.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/cheats.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/player.h"
|
||||
#include "game/hudmsg.h"
|
||||
#include "game/playermgr.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/pdmode.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/options.h"
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include "game/bondgun.h"
|
||||
#include "game/env.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/game_0b2150.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
@ -35,7 +35,7 @@
|
||||
#include "game/playermgr.h"
|
||||
#include "game/explosions.h"
|
||||
#include "game/bondview.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/bg.h"
|
||||
#include "game/stagetable.h"
|
||||
#include "game/room.h"
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "game/quaternion.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/game_0b2150.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/portal.h"
|
||||
@ -29,7 +29,7 @@
|
||||
#include "game/playermgr.h"
|
||||
#include "game/explosions.h"
|
||||
#include "game/bondview.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/bg.h"
|
||||
#include "game/stagetable.h"
|
||||
#include "game/room.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/game_096360.h"
|
||||
#include "game/projectile.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/training.h"
|
||||
#include "game/propobj.h"
|
@ -12,7 +12,7 @@
|
||||
#include "game/floor.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
#include "game/player.h"
|
||||
|
@ -14,7 +14,7 @@
|
||||
#include "game/setuputils.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/game_096360.h"
|
||||
#include "game/projectile.h"
|
||||
#include "game/atan2f.h"
|
||||
#include "game/acosfasinf.h"
|
||||
#include "game/quaternion.h"
|
||||
@ -22,7 +22,7 @@
|
||||
#include "game/ceil.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
@ -38,7 +38,7 @@
|
||||
#include "game/explosions.h"
|
||||
#include "game/smoke.h"
|
||||
#include "game/sparks.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/bg.h"
|
||||
#include "game/stagetable.h"
|
||||
#include "game/env.h"
|
||||
|
@ -9,10 +9,10 @@
|
||||
#include "game/prop.h"
|
||||
#include "game/propsnd.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/game_096360.h"
|
||||
#include "game/projectile.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/gunfx.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/modelmgr.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/camera.h"
|
||||
|
@ -6,7 +6,7 @@
|
||||
#include "game/game_0b2150.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/game_152fa0.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/mplayer/scenarios.h"
|
||||
#include "game/radar.h"
|
||||
#include "game/options.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/cheats.h"
|
||||
#include "game/game_00b820.h"
|
||||
#include "game/chraireset.h"
|
||||
#include "game/setup.h"
|
||||
#include "game/objectives.h"
|
||||
#include "game/playerreset.h"
|
||||
@ -2174,5 +2174,5 @@ void setup_create_props(s32 stagenum)
|
||||
chrmgr_configure(0);
|
||||
}
|
||||
|
||||
stage_load_bgchrs();
|
||||
chrai_load_bgchrs();
|
||||
}
|
||||
|
@ -2,12 +2,12 @@
|
||||
#include "constants.h"
|
||||
#include "game/chraction.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/game_0b2150.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/sight.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/lang.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/game_006900.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/stars.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/camera.h"
|
||||
#include "bss.h"
|
||||
#include "lib/vi.h"
|
||||
|
@ -3,7 +3,7 @@
|
||||
#include "game/game_006900.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/savebuffer.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/lang.h"
|
||||
#include "bss.h"
|
@ -10,7 +10,7 @@
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/credits.h"
|
||||
#include "game/bondview.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/lv.h"
|
||||
#include "game/music.h"
|
||||
|
@ -8,8 +8,8 @@
|
||||
#include "game/dlights.h"
|
||||
#include "game/explosions.h"
|
||||
#include "game/filemgr.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gamefile.h"
|
||||
#include "game/hudmsg.h"
|
||||
#include "game/inv.h"
|
||||
|
@ -3,13 +3,13 @@
|
||||
#include "game/chraction.h"
|
||||
#include "game/ceil.h"
|
||||
#include "game/bondgun.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/menugfx.h"
|
||||
#include "game/menu.h"
|
||||
#include "game/mainmenu.h"
|
||||
#include "game/inv.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/file.h"
|
||||
#include "game/texdecompress.h"
|
||||
#include "game/trainingmenus.h"
|
||||
|
@ -2,7 +2,7 @@
|
||||
#include "constants.h"
|
||||
#include "game/dlights.h"
|
||||
#include "game/chr.h"
|
||||
#include "game/game_0b0fd0.h"
|
||||
#include "game/gset.h"
|
||||
#include "game/tex.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/room.h"
|
||||
|
@ -1,5 +1,5 @@
|
||||
#ifndef _IN_GAME_GAME_13C510_H
|
||||
#define _IN_GAME_GAME_13C510_H
|
||||
#ifndef _IN_GAME_ARTIFACT_H
|
||||
#define _IN_GAME_ARTIFACT_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
10
src/include/game/chraireset.h
Normal file
10
src/include/game/chraireset.h
Normal file
@ -0,0 +1,10 @@
|
||||
#ifndef IN_GAME_CHRAIRESET_H
|
||||
#define IN_GAME_CHRAIRESET_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
||||
|
||||
void chrai_reset(void);
|
||||
void chrai_load_bgchrs(void);
|
||||
|
||||
#endif
|
@ -1,10 +0,0 @@
|
||||
#ifndef IN_GAME_GAME_00B820_H
|
||||
#define IN_GAME_GAME_00B820_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
||||
|
||||
void stage_reset(void);
|
||||
void stage_load_bgchrs(void);
|
||||
|
||||
#endif
|
@ -1,5 +1,5 @@
|
||||
#ifndef IN_GAME_GAME_0B0FD0_H
|
||||
#define IN_GAME_GAME_0B0FD0_H
|
||||
#ifndef IN_GAME_GSET_H
|
||||
#define IN_GAME_GSET_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
@ -1,5 +1,5 @@
|
||||
#ifndef _IN_GAME_GAME_096360_H
|
||||
#define _IN_GAME_GAME_096360_H
|
||||
#ifndef _IN_GAME_PROJECTILE_H
|
||||
#define _IN_GAME_PROJECTILE_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
@ -1,5 +1,5 @@
|
||||
#ifndef _IN_GAME_GAME_1531A0_H
|
||||
#define _IN_GAME_GAME_1531A0_H
|
||||
#ifndef _IN_GAME_TEXT_H
|
||||
#define _IN_GAME_TEXT_H
|
||||
#include <ultra64.h>
|
||||
#include "data.h"
|
||||
#include "types.h"
|
@ -1,7 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/prop.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/bg.h"
|
||||
#include "bss.h"
|
||||
#include "lib/dma.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <ultra64.h>
|
||||
#include "constants.h"
|
||||
#include "game/prop.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/bg.h"
|
||||
#include "bss.h"
|
||||
#include "lib/dma.h"
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "game/objectives.h"
|
||||
#include "game/endscreen.h"
|
||||
#include "game/playermgr.h"
|
||||
#include "game/game_1531a0.h"
|
||||
#include "game/text.h"
|
||||
#include "game/gfxmemory.h"
|
||||
#include "game/lang.h"
|
||||
#include "game/lv.h"
|
||||
|
Loading…
Reference in New Issue
Block a user