mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

z_play retail OK (#1688)

Browse source 
* z_play OK

* cleanup spacing

* PR
This commit is contained in:
engineer124 2024-02-02 09:00:27 +11:00 • committed by GitHub
parent 64dd475a3a
commit 1e21f69b37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1436,8 +1436,6 @@ void FileSelect_FadeOut(GameState* thisx) {
*/
void FileSelect_LoadGame(GameState* thisx) {
FileSelectState* this = (FileSelectState*)thisx;
u16 swordEquipValue;
s32 pad;
if (this->buttonIndex == FS_BTN_SELECT_FILE_1) {
Audio_PlaySfxGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
@ -1506,6 +1504,7 @@ void FileSelect_LoadGame(GameState* thisx) {
(gSaveContext.save.info.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
(gSaveContext.save.info.equips.buttonItems[0] != ITEM_SWORD_BIGGORON) &&
(gSaveContext.save.info.equips.buttonItems[0] != ITEM_GIANTS_KNIFE)) {
u16 swordEquipValue;
gSaveContext.save.info.equips.buttonItems[0] = ITEM_NONE;
swordEquipValue =

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

@ -11,11 +11,7 @@
void MapSelect_LoadTitle(MapSelectState* this) {
this->state.running = false;
{
GameState* state = &this->state;
SET_NEXT_GAMESTATE(state, ConsoleLogo_Init, ConsoleLogoState);
}
SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState);
}
void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
@ -45,11 +41,7 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
gWeatherMode = WEATHER_MODE_CLEAR;
this->state.running = false;
{
GameState* state = &this->state;
SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
}
SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState);
}
// "Translation" (Actual name)

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

@ -128,7 +128,7 @@ void ConsoleLogo_Main(GameState* thisx) {
ConsoleLogo_Calc(this);
ConsoleLogo_Draw(this);
if (gIsCtrlr2Valid) {
if (OOT_DEBUG && gIsCtrlr2Valid) {
Gfx* gfx = POLY_OPA_DISP;
s32 pad;

1
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -2635,7 +2635,6 @@ void KaleidoScope_Update(PlayState* play) {
s16 stepG;
s16 stepB;
s16 stepA;
s32 pad;
if ((R_PAUSE_BG_PRERENDER_STATE >= PAUSE_BG_PRERENDER_READY) &&
(((pauseCtx->state >= PAUSE_STATE_OPENING_1) && (pauseCtx->state <= PAUSE_STATE_SAVE_PROMPT)) ||