1
0
mirror of https://github.com/blawar/ooot.git synced 2024-07-02 09:03:36 +00:00

Removed debug file from save slot 1

(that means it is now hidden behind ENABLE_DEBUG_LEVEL_SELECT).

Input displayer in bottom right hand corner is now hidden behind OOT_DEBUG_ROM
This commit is contained in:
DaMarkov 2022-04-03 00:14:34 +02:00
parent 63c4a9e304
commit 306d3061dc
2 changed files with 12 additions and 4 deletions

View File

@ -234,9 +234,11 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) {
}
sLastButtonPressed = gameState->input[0].press.button | gameState->input[0].cur.button;
#ifdef OOT_DEBUG_ROM
if (R_DISABLE_INPUT_DISPLAY == 0) {
GameState_DrawInputDisplay(sLastButtonPressed, &newDList);
}
#endif
gSPEndDisplayList(newDList++);
Graph_BranchDlist(polyOpaP, newDList);

View File

@ -694,20 +694,26 @@ void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) {
u16* ptr;
u16 checksum;
#ifdef ENABLE_DEBUG_LEVEL_SELECT
if (fileChooseCtx->buttonIndex != 0) {
Sram_InitNewSave();
} else {
Sram_InitDebugSave();
} else {//Selected file 1?
Sram_InitDebugSave();//Choose debug save
}
#else
Sram_InitNewSave();
#endif
gSaveContext.entranceIndex = 0xBB;
gSaveContext.linkAge = 1;
gSaveContext.dayTime = 0x6AAB;
gSaveContext.cutsceneIndex = 0xFFF1;
if (fileChooseCtx->buttonIndex == 0) {
gSaveContext.cutsceneIndex = 0;
#ifdef ENABLE_DEBUG_LEVEL_SELECT
if (fileChooseCtx->buttonIndex == 0) {//Selected file 1?
gSaveContext.cutsceneIndex = 0;//Skip cutscene
}
#endif
for (offset = 0; offset < 8; offset++) {
gSaveContext.playerName[offset] = fileChooseCtx->fileNames[fileChooseCtx->buttonIndex][offset];