fix issues

This commit is contained in:
Yanis42
2024-02-03 17:48:02 +01:00
parent 879fe98a1e
commit 422d40f257
6 changed files with 8 additions and 8 deletions

View File

@@ -42,7 +42,7 @@
* Enable/Disable BGM on Map Select
* Comment this to disable BGM
*/
// #define MAP_SELECT_BGM NA_BGM_OWL
#define MAP_SELECT_BGM NA_BGM_OWL
/**
* Fix a crash if you spawn in a grotto without using the grotto actor

View File

@@ -1231,7 +1231,7 @@ u16 D_8016B7E4;
struct {
char str[5];
u16 num;
} sAudioScrPrtBuf[IS_AUDIO_DEBUG_ENABLED ? SCROLL_PRINT_BUF_SIZE : 0];
} sAudioScrPrtBuf[SCROLL_PRINT_BUF_SIZE];
u8 sRiverSoundMainBgmVol;
u8 sRiverSoundMainBgmCurrentVol;

View File

@@ -34,9 +34,9 @@ u8 sCurSfxPlayerChannelIndex;
u8 gSfxBankMuted[7];
UnusedBankLerp sUnusedBankLerp[7];
u16 gAudioSfxSwapSource[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
u16 gAudioSfxSwapTarget[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
u8 gAudioSfxSwapMode[IS_AUDIO_DEBUG_ENABLED ? 10 : 0];
u16 gAudioSfxSwapSource[10];
u16 gAudioSfxSwapTarget[10];
u8 gAudioSfxSwapMode[10];
void Audio_SetSfxBanksMute(u16 muteMask) {
u8 bankId;

View File

@@ -18,7 +18,7 @@ typedef struct {
RegEditor* gRegEditor; // ``gRegEditor->data`` is used by non-debug features in normal gameplay
// ENABLE_CAMERA_DEBUGGER
DebugCamTextBufferEntry sDebugCamTextBuffer[IS_CAMERA_DEBUG_ENABLED ? 22 : 0];
DebugCamTextBufferEntry sDebugCamTextBuffer[22];
s16 sDebugCamTextEntryCount = 0;

View File

@@ -282,7 +282,7 @@ void EnChanger_Update(Actor* thisx, PlayState* play) {
this->timer--;
}
if (BREG(0)) {
if (IS_ACTOR_DEBUG_ENABLED && BREG(0)) {
DebugDisplay_AddObject(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z,
this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, 1.0f, 1.0f,
1.0f, 255, 0, 255, 255, 4, play->state.gfxCtx);

View File

@@ -75,7 +75,7 @@ void MapSelect_Init(GameState* thisx) {
#ifdef MAP_SELECT_BGM
this->toggleBGM = true;
#else
#define MAP_SELECT_BGM NA_BGM_STOP
#define MAP_SELECT_BGM NA_BGM_NO_MUSIC
#endif
}