From 140b206505e4a61b2b617d720862a7e58a7e0871 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 20 Mar 2022 15:10:30 +1000 Subject: [PATCH] Rename and split some files to create stagetable.c and stagemusic.c --- ld/gamefiles.jpn-final.inc | 3 +- ld/gamefiles.ntsc-beta.inc | 3 +- ld/gamefiles.ntsc-final.inc | 3 +- ld/gamefiles.pal-beta.inc | 3 +- ld/gamefiles.pal-final.inc | 3 +- src/game/bg.c | 2 +- src/game/bondeyespy.c | 2 +- src/game/bondgunreset.c | 2 +- src/game/chraction.c | 2 +- src/game/chraicommands.c | 2 +- src/game/endscreen.c | 2 +- src/game/game_00c490.c | 2 +- src/game/game_0b63b0.c | 2 +- src/game/game_13c510.c | 2 +- src/game/game_176080.c | 86 ----------------- src/game/music.c | 2 +- src/game/player.c | 2 +- src/game/playerreset.c | 2 +- src/game/propobj.c | 2 +- src/game/stagemusic.c | 95 +++++++++++++++++++ src/game/{game_1655c0.c => stagetable.c} | 0 src/include/game/game_176080.h | 3 - src/include/game/stagemusic.h | 11 +++ .../game/{game_1655c0.h => stagetable.h} | 4 +- 24 files changed, 131 insertions(+), 109 deletions(-) create mode 100644 src/game/stagemusic.c rename src/game/{game_1655c0.c => stagetable.c} (100%) create mode 100644 src/include/game/stagemusic.h rename src/include/game/{game_1655c0.h => stagetable.h} (70%) diff --git a/ld/gamefiles.jpn-final.inc b/ld/gamefiles.jpn-final.inc index 0229b6453..ab4881d98 100644 --- a/ld/gamefiles.jpn-final.inc +++ b/ld/gamefiles.jpn-final.inc @@ -186,7 +186,7 @@ build/ROMID/game/bg.o (section); \ build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ - build/ROMID/game/game_1655c0.o (section); \ + build/ROMID/game/stagetable.o (section); \ build/ROMID/game/game_165670.o (section); \ build/ROMID/game/env.o (section); \ build/ROMID/game/game_1668e0.o (section); \ @@ -203,6 +203,7 @@ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ + build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ build/ROMID/game/mplayer/ingame.o (section); \ build/ROMID/game/mplayer/setup.o (section); \ diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc index 072abd36c..aa3193f07 100644 --- a/ld/gamefiles.ntsc-beta.inc +++ b/ld/gamefiles.ntsc-beta.inc @@ -187,7 +187,7 @@ build/ROMID/game/bg.o (section); \ build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ - build/ROMID/game/game_1655c0.o (section); \ + build/ROMID/game/stagetable.o (section); \ build/ROMID/game/game_165670.o (section); \ build/ROMID/game/env.o (section); \ build/ROMID/game/game_1668e0.o (section); \ @@ -204,6 +204,7 @@ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ + build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ build/ROMID/game/mplayer/ingame.o (section); \ build/ROMID/game/mplayer/setup.o (section); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index 0229b6453..ab4881d98 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -186,7 +186,7 @@ build/ROMID/game/bg.o (section); \ build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ - build/ROMID/game/game_1655c0.o (section); \ + build/ROMID/game/stagetable.o (section); \ build/ROMID/game/game_165670.o (section); \ build/ROMID/game/env.o (section); \ build/ROMID/game/game_1668e0.o (section); \ @@ -203,6 +203,7 @@ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ + build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ build/ROMID/game/mplayer/ingame.o (section); \ build/ROMID/game/mplayer/setup.o (section); \ diff --git a/ld/gamefiles.pal-beta.inc b/ld/gamefiles.pal-beta.inc index f22cfc2a9..0e35bd268 100644 --- a/ld/gamefiles.pal-beta.inc +++ b/ld/gamefiles.pal-beta.inc @@ -187,7 +187,7 @@ build/ROMID/game/bg.o (section); \ build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ - build/ROMID/game/game_1655c0.o (section); \ + build/ROMID/game/stagetable.o (section); \ build/ROMID/game/game_165670.o (section); \ build/ROMID/game/env.o (section); \ build/ROMID/game/game_1668e0.o (section); \ @@ -204,6 +204,7 @@ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ + build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ build/ROMID/game/mplayer/ingame.o (section); \ build/ROMID/game/mplayer/setup.o (section); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index 0229b6453..ab4881d98 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -186,7 +186,7 @@ build/ROMID/game/bg.o (section); \ build/ROMID/game/bgbss.o (section); \ build/ROMID/game/game_165360.o (section); \ - build/ROMID/game/game_1655c0.o (section); \ + build/ROMID/game/stagetable.o (section); \ build/ROMID/game/game_165670.o (section); \ build/ROMID/game/env.o (section); \ build/ROMID/game/game_1668e0.o (section); \ @@ -203,6 +203,7 @@ build/ROMID/game/game_175f90.o (section); \ build/ROMID/game/stubs/game_176000.o (section); \ build/ROMID/game/game_176080.o (section); \ + build/ROMID/game/stagemusic.o (section); \ build/ROMID/game/utils.o (section); \ build/ROMID/game/mplayer/ingame.o (section); \ build/ROMID/game/mplayer/setup.o (section); \ diff --git a/src/game/bg.c b/src/game/bg.c index bf95274f9..312b17c81 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -19,7 +19,7 @@ #include "game/game_1531a0.h" #include "game/bg.h" #include "game/game_165360.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/env.h" #include "game/game_1668e0.h" #include "game/file.h" diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 0236c5834..18f9573fe 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -11,7 +11,7 @@ #include "game/inv.h" #include "game/mplayer/ingame.h" #include "game/playermgr.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/lang.h" #include "game/options.h" #include "game/propobj.h" diff --git a/src/game/bondgunreset.c b/src/game/bondgunreset.c index 5bc939d19..75e3343a8 100644 --- a/src/game/bondgunreset.c +++ b/src/game/bondgunreset.c @@ -2,7 +2,7 @@ #include "constants.h" #include "game/inv.h" #include "game/bondgun.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "bss.h" #include "lib/memp.h" #include "data.h" diff --git a/src/game/chraction.c b/src/game/chraction.c index 99eec7a7c..3bc27d5e2 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -26,7 +26,7 @@ #include "game/sparks.h" #include "game/bg.h" #include "game/game_1531a0.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/env.h" #include "game/lv.h" diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index b520244f0..ba5398e31 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -27,7 +27,7 @@ #include "game/smoke.h" #include "game/weather.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/env.h" #include "game/lv.h" diff --git a/src/game/endscreen.c b/src/game/endscreen.c index a1d5d7d22..074b93288 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -14,7 +14,7 @@ #include "game/mainmenu.h" #include "game/filemgr.h" #include "game/endscreen.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/lv.h" #include "game/mplayer/ingame.h" #include "game/game_19aa80.h" diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 4a4b17821..06ccb37df 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -15,7 +15,7 @@ #include "game/inv.h" #include "game/playermgr.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/file.h" #include "game/lv.h" #include "game/mplayer/scenarios.h" diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index f7bba19e3..05eb541fe 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -31,7 +31,7 @@ #include "game/bondview.h" #include "game/game_1531a0.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/game_1668e0.h" #include "game/gfxmemory.h" diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index cc6a96366..4a10f757d 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -7,7 +7,7 @@ #include "game/game_11f000.h" #include "game/game_13c510.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/game_1668e0.h" #include "bss.h" diff --git a/src/game/game_176080.c b/src/game/game_176080.c index ccb7e3d5d..9b4b5e3c8 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -19,37 +19,6 @@ u8 var800abdc8[0x300]; void *var800844f0 = NULL; void *var800844f4 = NULL; -u32 var800844f8 = 0; -u32 var800844fc = 0; - -struct stagemusic g_StageTracks[] = { - // stage, main theme, background sfx, X theme - { STAGE_CITRAINING, MUSIC_CI, -1, MUSIC_DEFENSE_X }, - { STAGE_DEFECTION, MUSIC_DEFECTION, MUSIC_DDTOWER_SFX, MUSIC_DEFECTION_X }, - { STAGE_INVESTIGATION, MUSIC_INVESTIGATION, MUSIC_INVESTIGATION_SFX, MUSIC_INVESTIGATION_X }, - { STAGE_EXTRACTION, MUSIC_EXTRACTION, MUSIC_DDTOWER_SFX, MUSIC_EXTRACTION_X }, - { STAGE_VILLA, MUSIC_VILLA, MUSIC_OCEAN, MUSIC_VILLA_X }, - { STAGE_CHICAGO, MUSIC_CHICAGO, MUSIC_TRAFFIC, MUSIC_CHICAGO_X }, - { STAGE_G5BUILDING, MUSIC_G5, MUSIC_TRAFFIC, MUSIC_G5_X }, - { STAGE_INFILTRATION, MUSIC_INFILTRATION, MUSIC_INFILTRATION_SFX, MUSIC_INFILTRATION_X }, - { STAGE_RESCUE, MUSIC_RESCUE, MUSIC_A51_LOUDSPEAKER1, MUSIC_RESCUE_X }, - { STAGE_ESCAPE, MUSIC_ESCAPE, MUSIC_A51_LOUDSPEAKER2, MUSIC_ESCAPE_X }, - { STAGE_AIRBASE, MUSIC_AIRBASE, MUSIC_WIND, MUSIC_AIRBASE_X }, - { STAGE_AIRFORCEONE, MUSIC_AIRFORCEONE, MUSIC_AIRFORCEONE_SFX, MUSIC_AIRFORCEONE_X }, - { STAGE_CRASHSITE, MUSIC_CRASHSITE, MUSIC_CRASHSITE_WIND, MUSIC_CRASHSITE_X }, - { STAGE_PELAGIC, MUSIC_PELAGIC, MUSIC_OCEAN, MUSIC_PELAGIC_X }, - { STAGE_DEEPSEA, MUSIC_DEEPSEA, MUSIC_DEEPSEA_SFX, MUSIC_DEEPSEA_X }, - { STAGE_DEFENSE, MUSIC_DEFENSE, -1, MUSIC_DEFENSE_X }, - { STAGE_ATTACKSHIP, MUSIC_ATTACKSHIP, MUSIC_ATTACKSHIP_SFX, MUSIC_ATTACKSHIP_X }, - { STAGE_SKEDARRUINS, MUSIC_SKEDARRUINS, MUSIC_SKEDAR_WIND, MUSIC_SKEDARRUINS_X }, - { STAGE_MBR, MUSIC_DARK_COMBAT, MUSIC_DDTOWER_SFX, MUSIC_DARK_COMBAT }, - { STAGE_MAIANSOS, MUSIC_MAIAN_TEARS, MUSIC_A51_LOUDSPEAKER2, MUSIC_MAIAN_TEARS }, - { STAGE_RETAKING, MUSIC_CI_OPERATIVE, -1, MUSIC_CI_OPERATIVE }, - { STAGE_WAR, MUSIC_ALIEN_CONFLICT, MUSIC_SKEDAR_WIND, MUSIC_ALIEN_CONFLICT }, - { STAGE_DUEL, MUSIC_CREDITS, -1, MUSIC_CREDITS }, - { STAGE_CREDITS, MUSIC_ALIEN_CONFLICT, -1, MUSIC_ALIEN_CONFLICT }, - { 0, 0, 0, 0 }, -}; void *func0f176080(void) { @@ -605,58 +574,3 @@ glabel func0f1766b4 // // return gdl; //} - -s32 stageGetPrimaryTrack(s32 stagenum) -{ - s32 i; - - if (g_Vars.normmplayerisrunning) { - return mpChooseTrack(); - } - - i = 0; - - while (g_StageTracks[i].stagenum) { - if (g_StageTracks[i].stagenum == stagenum) { - if (g_StageTracks[i].primarytrack == -1) { - return mpChooseTrack(); - } - - return g_StageTracks[i].primarytrack; - } - - i++; - } - - return mpChooseTrack(); -} - -s32 stageGetAmbientTrack(s32 stagenum) -{ - s32 i = 0; - - while (g_StageTracks[i].stagenum) { - if (g_StageTracks[i].stagenum == stagenum) { - return g_StageTracks[i].ambienttrack; - } - - i++; - } - - return -1; -} - -s32 stageGetNrgTrack(s32 stagenum) -{ - s32 i = 0; - - while (g_StageTracks[i].stagenum) { - if (g_StageTracks[i].stagenum == stagenum) { - return g_StageTracks[i].xtrack; - } - - i++; - } - - return -1; -} diff --git a/src/game/music.c b/src/game/music.c index 80e45a85b..1f12843e1 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -4,7 +4,7 @@ #include "game/lv.h" #include "game/music.h" #include "game/options.h" -#include "game/game_176080.h" +#include "game/stagemusic.h" #include "bss.h" #include "lib/snd.h" #include "lib/music.h" diff --git a/src/game/player.c b/src/game/player.c index 90c69cbb3..3f1e363c6 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -34,7 +34,7 @@ #include "game/bondview.h" #include "game/game_1531a0.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/game_1668e0.h" #include "game/gfxmemory.h" diff --git a/src/game/playerreset.c b/src/game/playerreset.c index 4a0b77c16..e9e2d522d 100644 --- a/src/game/playerreset.c +++ b/src/game/playerreset.c @@ -12,7 +12,7 @@ #include "game/bondgun.h" #include "game/player.h" #include "game/inv.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/mplayer/scenarios.h" #include "game/mplayer/mplayer.h" #include "game/pad.h" diff --git a/src/game/propobj.c b/src/game/propobj.c index a02ad92e7..27b69e96f 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -40,7 +40,7 @@ #include "game/sparks.h" #include "game/game_1531a0.h" #include "game/bg.h" -#include "game/game_1655c0.h" +#include "game/stagetable.h" #include "game/game_165670.h" #include "game/env.h" #include "game/gfxmemory.h" diff --git a/src/game/stagemusic.c b/src/game/stagemusic.c new file mode 100644 index 000000000..9129a96e2 --- /dev/null +++ b/src/game/stagemusic.c @@ -0,0 +1,95 @@ +#include +#include "constants.h" +#include "lib/sched.h" +#include "game/player.h" +#include "game/mplayer/mplayer.h" +#include "game/options.h" +#include "bss.h" +#include "lib/vi.h" +#include "lib/memp.h" +#include "data.h" +#include "types.h" + +struct stagemusic g_StageTracks[] = { + // stage, main theme, background sfx, X theme + { STAGE_CITRAINING, MUSIC_CI, -1, MUSIC_DEFENSE_X }, + { STAGE_DEFECTION, MUSIC_DEFECTION, MUSIC_DDTOWER_SFX, MUSIC_DEFECTION_X }, + { STAGE_INVESTIGATION, MUSIC_INVESTIGATION, MUSIC_INVESTIGATION_SFX, MUSIC_INVESTIGATION_X }, + { STAGE_EXTRACTION, MUSIC_EXTRACTION, MUSIC_DDTOWER_SFX, MUSIC_EXTRACTION_X }, + { STAGE_VILLA, MUSIC_VILLA, MUSIC_OCEAN, MUSIC_VILLA_X }, + { STAGE_CHICAGO, MUSIC_CHICAGO, MUSIC_TRAFFIC, MUSIC_CHICAGO_X }, + { STAGE_G5BUILDING, MUSIC_G5, MUSIC_TRAFFIC, MUSIC_G5_X }, + { STAGE_INFILTRATION, MUSIC_INFILTRATION, MUSIC_INFILTRATION_SFX, MUSIC_INFILTRATION_X }, + { STAGE_RESCUE, MUSIC_RESCUE, MUSIC_A51_LOUDSPEAKER1, MUSIC_RESCUE_X }, + { STAGE_ESCAPE, MUSIC_ESCAPE, MUSIC_A51_LOUDSPEAKER2, MUSIC_ESCAPE_X }, + { STAGE_AIRBASE, MUSIC_AIRBASE, MUSIC_WIND, MUSIC_AIRBASE_X }, + { STAGE_AIRFORCEONE, MUSIC_AIRFORCEONE, MUSIC_AIRFORCEONE_SFX, MUSIC_AIRFORCEONE_X }, + { STAGE_CRASHSITE, MUSIC_CRASHSITE, MUSIC_CRASHSITE_WIND, MUSIC_CRASHSITE_X }, + { STAGE_PELAGIC, MUSIC_PELAGIC, MUSIC_OCEAN, MUSIC_PELAGIC_X }, + { STAGE_DEEPSEA, MUSIC_DEEPSEA, MUSIC_DEEPSEA_SFX, MUSIC_DEEPSEA_X }, + { STAGE_DEFENSE, MUSIC_DEFENSE, -1, MUSIC_DEFENSE_X }, + { STAGE_ATTACKSHIP, MUSIC_ATTACKSHIP, MUSIC_ATTACKSHIP_SFX, MUSIC_ATTACKSHIP_X }, + { STAGE_SKEDARRUINS, MUSIC_SKEDARRUINS, MUSIC_SKEDAR_WIND, MUSIC_SKEDARRUINS_X }, + { STAGE_MBR, MUSIC_DARK_COMBAT, MUSIC_DDTOWER_SFX, MUSIC_DARK_COMBAT }, + { STAGE_MAIANSOS, MUSIC_MAIAN_TEARS, MUSIC_A51_LOUDSPEAKER2, MUSIC_MAIAN_TEARS }, + { STAGE_RETAKING, MUSIC_CI_OPERATIVE, -1, MUSIC_CI_OPERATIVE }, + { STAGE_WAR, MUSIC_ALIEN_CONFLICT, MUSIC_SKEDAR_WIND, MUSIC_ALIEN_CONFLICT }, + { STAGE_DUEL, MUSIC_CREDITS, -1, MUSIC_CREDITS }, + { STAGE_CREDITS, MUSIC_ALIEN_CONFLICT, -1, MUSIC_ALIEN_CONFLICT }, + { 0, 0, 0, 0 }, +}; + +s32 stageGetPrimaryTrack(s32 stagenum) +{ + s32 i; + + if (g_Vars.normmplayerisrunning) { + return mpChooseTrack(); + } + + i = 0; + + while (g_StageTracks[i].stagenum) { + if (g_StageTracks[i].stagenum == stagenum) { + if (g_StageTracks[i].primarytrack == -1) { + return mpChooseTrack(); + } + + return g_StageTracks[i].primarytrack; + } + + i++; + } + + return mpChooseTrack(); +} + +s32 stageGetAmbientTrack(s32 stagenum) +{ + s32 i = 0; + + while (g_StageTracks[i].stagenum) { + if (g_StageTracks[i].stagenum == stagenum) { + return g_StageTracks[i].ambienttrack; + } + + i++; + } + + return -1; +} + +s32 stageGetNrgTrack(s32 stagenum) +{ + s32 i = 0; + + while (g_StageTracks[i].stagenum) { + if (g_StageTracks[i].stagenum == stagenum) { + return g_StageTracks[i].xtrack; + } + + i++; + } + + return -1; +} diff --git a/src/game/game_1655c0.c b/src/game/stagetable.c similarity index 100% rename from src/game/game_1655c0.c rename to src/game/stagetable.c diff --git a/src/include/game/game_176080.h b/src/include/game/game_176080.h index 29f070d62..4e3875ad7 100644 --- a/src/include/game/game_176080.h +++ b/src/include/game/game_176080.h @@ -12,8 +12,5 @@ Gfx *func0f1762ac(Gfx *gdl); Gfx *func0f1763f4(Gfx *gdl); void *func0f176668(s32 arg0); Gfx *func0f1766b4(Gfx *gdl); -s32 stageGetPrimaryTrack(s32 stagenum); -s32 stageGetAmbientTrack(s32 stagenum); -s32 stageGetNrgTrack(s32 stagenum); #endif diff --git a/src/include/game/stagemusic.h b/src/include/game/stagemusic.h new file mode 100644 index 000000000..e77c422eb --- /dev/null +++ b/src/include/game/stagemusic.h @@ -0,0 +1,11 @@ +#ifndef IN_GAME_STAGEMUSIC_H +#define IN_GAME_STAGEMUSIC_H +#include +#include "data.h" +#include "types.h" + +s32 stageGetPrimaryTrack(s32 stagenum); +s32 stageGetAmbientTrack(s32 stagenum); +s32 stageGetNrgTrack(s32 stagenum); + +#endif diff --git a/src/include/game/game_1655c0.h b/src/include/game/stagetable.h similarity index 70% rename from src/include/game/game_1655c0.h rename to src/include/game/stagetable.h index 45c0d7924..91323033e 100644 --- a/src/include/game/game_1655c0.h +++ b/src/include/game/stagetable.h @@ -1,5 +1,5 @@ -#ifndef _IN_GAME_GAME_1655C0_H -#define _IN_GAME_GAME_1655C0_H +#ifndef _IN_GAME_STAGETABLE_H +#define _IN_GAME_STAGETABLE_H #include #include "data.h" #include "types.h"