summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authorpetrie911 <69443847+petrie911@users.noreply.github.com>2024-04-20 17:07:29 -0500
committerGitHub <noreply@github.com>2024-04-20 17:07:29 -0500
commit95e5f4f07aa17d9ff0cc61e9a7adff26ee4129ec (patch)
tree78daf0c315ad34f7979a2abfce8da2eeacde3620 /src/engine
parente3716b5d48fa523b4f0f183011502cb737007568 (diff)
Some further docs for audio spec and planet paths (#219)
* avoid ub * format * torch * more stuff
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/fox_context.c4
-rw-r--r--src/engine/fox_load.c6
-rw-r--r--src/engine/fox_play.c8
3 files changed, 9 insertions, 9 deletions
diff --git a/src/engine/fox_context.c b/src/engine/fox_context.c
index 0c17bcd8..aaf71bc6 100644
--- a/src/engine/fox_context.c
+++ b/src/engine/fox_context.c
@@ -51,9 +51,9 @@ s32 D_ctx_80177B70[7];
PlanetId D_ctx_80177B90[7];
s32 D_ctx_80177BB0[7];
#ifdef AVOID_UB
-s32 D_ctx_80177BD8[24];
+s32 gPlanetPathStatus[24];
#else
-s32 D_ctx_80177BD8[22]; // overruns gPrevPlanetTeamShields?
+s32 gPlanetPathStatus[22]; // overruns gPrevPlanetTeamShields?
#endif
s32 gPrevPlanetTeamShields[6];
s32 D_ctx_80177C58[6];
diff --git a/src/engine/fox_load.c b/src/engine/fox_load.c
index 556a6c50..10081372 100644
--- a/src/engine/fox_load.c
+++ b/src/engine/fox_load.c
@@ -100,7 +100,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
case OVL_SETUP_TITLE:
changeOvl = Overlay_Init(&sOvlmenu_Title[ovlStage]);
if (changeOvl == true) {
- Audio_SetAudioSpec(0, 0x16);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_22);
}
break;
case OVL_SETUP_MENU:
@@ -175,13 +175,13 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
case OVL_SETUP_VERSUS:
changeOvl = Overlay_Init(&sOvli2_Versus[ovlStage]);
if (changeOvl == true) {
- Audio_SetAudioSpec(3, 0x310);
+ AUDIO_SET_SPEC_ALT(SFXCHAN_3, AUDIOSPEC_16);
}
break;
case OVL_SETUP_LOGO:
changeOvl = Overlay_Init(&sNoOvl_Logo[ovlStage]); // Logo does not load an overlay file
if (changeOvl == true) {
- Audio_SetAudioSpec(0, 0xE);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_14);
}
break;
case OVL_SETUP_CREDITS:
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c
index eacb4b2a..5a35483e 100644
--- a/src/engine/fox_play.c
+++ b/src/engine/fox_play.c
@@ -2371,17 +2371,17 @@ void func_play_800AB334(void) {
switch (gCurrentLevel) {
case LEVEL_TRAINING:
- Audio_SetAudioSpec(0, 28);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_28);
D_ctx_8017796C = -1;
break;
case LEVEL_VENOM_1:
- Audio_SetAudioSpec(0, 6);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_6);
break;
case LEVEL_VENOM_2:
- Audio_SetAudioSpec(0, 6);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_6);
break;
case LEVEL_VENOM_ANDROSS:
- Audio_SetAudioSpec(0, 15);
+ AUDIO_SET_SPEC(SFXCHAN_0, AUDIOSPEC_15);
Audio_SetBaseSfxReverb(0);
D_ctx_8017796C = -1;
break;