Some further docs for audio spec and planet paths (#219)

* avoid ub

* format

* torch

* more stuff
This commit is contained in:
petrie911
2024-04-20 17:07:29 -05:00
committed by GitHub
parent e3716b5d48
commit 95e5f4f07a
17 changed files with 243 additions and 146 deletions
+2 -2
View File
@@ -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];
+3 -3
View File
@@ -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:
+4 -4
View File
@@ -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;