mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-18 13:00:23 +00:00
Code Issues Projects Releases Wiki Activity

Decouple Debug Features From gc-eu-mq-dbg (#2296)

Browse source 
* rename OOT_DEBUG to DEBUG_FEATURES

* makefile changes

* add DEBUG_ASSETS

* fix DEBUG_FEATURES usages

* format

* fix errors

* review

* fix problem and review2

* review

* add DEBUG_FEATURES to DEBUG_ASSETS check

* review

* whoops

* format
This commit is contained in:
fig02 2024-11-17 17:02:07 -05:00 • committed by GitHub
parent cf4dc98cc9
commit 17edb82c0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
168 changed files with 652 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -714,7 +714,7 @@ void FileSelect_PulsateCursor(GameState* thisx) {
SramContext* sramCtx = &this->sramCtx;
Input* debugInput = &this->state.input[2];
#if OOT_DEBUG
#if OOT_PAL && DEBUG_FEATURES
if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) {
sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_ENG;
*((u8*)0x80000002) = LANGUAGE_ENG;
@ -1849,7 +1849,7 @@ void FileSelect_FadeOut(GameState* thisx) {
void FileSelect_LoadGame(GameState* thisx) {
FileSelectState* this = (FileSelectState*)thisx;
#if OOT_DEBUG
#if DEBUG_FEATURES
if (this->buttonIndex == FS_BTN_SELECT_FILE_1) {
Audio_PlaySfxGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);

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

@ -250,7 +250,7 @@ static SceneSelectEntry sScenes[] = {
// Rupees & Cow Grotto
{ "114:" T(GFXP_HIRAGANA "ｶｸｼﾄﾋﾞｺﾐｱﾅ 13", "Hidden Dive Hole 13"), MapSelect_LoadGame, ENTR_GROTTOS_13 },
{ "115:" T(GFXP_KATAKANA "ﾊｲﾗﾙ ﾃﾞﾓ", "Hyrule Cutscenes"), MapSelect_LoadGame, ENTR_CUTSCENE_MAP_0 },
#if OOT_DEBUG
#if DEBUG_FEATURES
{ "116:" T(GFXP_HIRAGANA "ﾍﾞｯｼﾂ (ﾀｶﾗﾊﾞｺ" GFXP_KATAKANA "ﾜｰﾌﾟ)", "Special Room (Treasure Chest Warp)"),
MapSelect_LoadGame, ENTR_BESITU_0 },
{ "117:" T(GFXP_HIRAGANA "ｻｻ" GFXP_KATAKANA "ﾃｽﾄ", "Sasaki Test"), MapSelect_LoadGame, ENTR_SASATEST_0 },

4
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -15,7 +15,7 @@
#include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"
#if OOT_DEBUG
#if DEBUG_FEATURES
void ConsoleLogo_PrintBuildInfo(Gfx** gfxP) {
Gfx* gfx;
GfxPrint* printer;
@ -156,7 +156,7 @@ void ConsoleLogo_Main(GameState* thisx) {
ConsoleLogo_Calc(this);
ConsoleLogo_Draw(this);
#if OOT_DEBUG
#if DEBUG_FEATURES
if (gIsCtrlr2Valid) {
Gfx* gfx = POLY_OPA_DISP;