hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Inverted map select define

Browse Source
This commit is contained in:
Yanis42
2022-08-27 00:04:59 +02:00
parent 2984a46970
commit 8584b914c2
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/config/config_debug.h
View File

@@ -52,9 +52,9 @@
#define DISABLE_EVENT_EDITOR
/**
* Disable map select
* Enable map select
*/
#define DISABLE_MAP_SELECT
// #define ENABLE_MAP_SELECT
/**
* Enable in-game input display
@@ -66,7 +66,7 @@
*/
// #define FILE_1_NORMAL
#if (defined BOOT_TO_SCENE && defined BOOT_TO_FILE_SELECT) || (defined DISABLE_MAP_SELECT)
#if (defined BOOT_TO_SCENE && defined BOOT_TO_FILE_SELECT) || (!defined ENABLE_MAP_SELECT)
#define FILE_1_NORMAL
#endif

4
include/functions.h
View File

@@ -1572,7 +1572,9 @@ void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, Schedule
void GameState_FaultPrint(void);
void GameState_SetFBFilter(Gfx** gfx);
// ? func_800C4344(?);
#ifdef ENABLE_INPUT_DISPLAY
void GameState_DrawInputDisplay(u16 input, Gfx** gfx);
#endif
void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx);
void GameState_SetFrameBuffer(GraphicsContext* gfxCtx);
// ? func_800C49F4(?);
@@ -2269,7 +2271,7 @@ void Setup_Destroy(GameState* thisx);
void ConsoleLogo_Init(GameState* thisx);
void ConsoleLogo_Destroy(GameState* thisx);
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
void MapSelect_Init(GameState* thisx);
void MapSelect_Destroy(GameState* thisx);
#endif

2
include/z64.h
View File

@@ -1087,7 +1087,7 @@ typedef struct {
/* 0x01E2 */ char unk_1E2[0x06];
} ConsoleLogoState; // size = 0x1E8
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
struct MapSelectState;

2
spec
View File

@@ -543,7 +543,7 @@ beginseg
include "build/src/overlays/gamestates/ovl_title/ovl_title_reloc.o"
endseg
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
beginseg
name "ovl_select"
include "build/src/overlays/gamestates/ovl_select/z_select.o"

4
src/code/graph.c
View File

@@ -107,7 +107,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
return &gGameStateOverlayTable[0];
}
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
if (gameStateInitFunc == MapSelect_Init) {
return &gGameStateOverlayTable[1];
}
@@ -387,7 +387,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
sGraphUpdateTime = time;
}
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
if (gIsCtrlr2Valid && CHECK_BTN_ALL(gameState->input[0].press.button, BTN_Z) &&
CHECK_BTN_ALL(gameState->input[0].cur.button, BTN_L | BTN_R)) {
gSaveContext.gameMode = GAMEMODE_NORMAL;

2
src/code/z_game_dlftbls.c
View File

@@ -14,7 +14,7 @@
GameStateOverlay gGameStateOverlayTable[] = {
GAMESTATE_OVERLAY_INTERNAL(Setup_Init, Setup_Destroy, sizeof(SetupState)),
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
GAMESTATE_OVERLAY(select, MapSelect_Init, MapSelect_Destroy, sizeof(MapSelectState)),
#else
GAMESTATE_NONE,

2
src/overlays/gamestates/ovl_select/z_select.c
View File

@@ -6,7 +6,7 @@
#include "config.h"
#ifndef DISABLE_MAP_SELECT
#ifdef ENABLE_MAP_SELECT
#include "ultra64.h"
#include "global.h"