mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-05 09:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename and split some files to create stagetable.c and stagemusic.c

Browse Source
This commit is contained in:
Ryan Dwyer
2022-03-20 15:10:30 +10:00
parent 988b42f287
commit 140b206505
24 changed files with 131 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld/gamefiles.jpn-final.inc
+2 -1
View File
@@ -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); \
ld/gamefiles.ntsc-beta.inc
+2 -1
View File
@@ -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); \
ld/gamefiles.ntsc-final.inc
+2 -1
View File
@@ -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); \
ld/gamefiles.pal-beta.inc
+2 -1
View File
@@ -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); \
ld/gamefiles.pal-final.inc
+2 -1
View File
@@ -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); \
src/game/bg.c
+1 -1
View File
@@ -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"
src/game/bondeyespy.c
+1 -1
View File
@@ -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"
src/game/bondgunreset.c
+1 -1
View File
@@ -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"
src/game/chraction.c
+1 -1
View File
@@ -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"
src/game/chraicommands.c
+1 -1
View File
@@ -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"
src/game/endscreen.c
+1 -1
View File
@@ -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"
src/game/game_00c490.c
+1 -1
View File
@@ -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"
src/game/game_0b63b0.c
+1 -1
View File
@@ -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"
src/game/game_13c510.c
+1 -1
View File
@@ -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"
src/game/game_176080.c
-86
View File
@@ -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;
}
src/game/music.c
+1 -1
View File
@@ -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"
src/game/player.c
+1 -1
View File
@@ -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"
src/game/playerreset.c
+1 -1
View File
@@ -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"
src/game/propobj.c
+1 -1
View File
@@ -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"
src/game/stagemusic.c
+95
View File
@@ -0,0 +1,95 @@
#include <ultra64.h>
#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;
}
src/game/game_1655c0.c → src/game/stagetable.c
View File
src/include/game/game_176080.h
-3
View File
@@ -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
src/include/game/stagemusic.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef IN_GAME_STAGEMUSIC_H
#define IN_GAME_STAGEMUSIC_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
s32 stageGetPrimaryTrack(s32 stagenum);
s32 stageGetAmbientTrack(s32 stagenum);
s32 stageGetNrgTrack(s32 stagenum);
#endif
src/include/game/game_1655c0.h → src/include/game/stagetable.h
+2 -2
View File
@@ -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 <ultra64.h>
#include "data.h"
#include "types.h"