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

Minor Misc Cleanup 3 (#1502)

Browse source 
* more misc cleanup

* remove z64 conflicts

* undo ISVDbg
This commit is contained in:
engineer124 2023-07-06 08:36:19 +10:00 • committed by GitHub
parent 54638f9768
commit 0ce0313342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 155 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1479,7 +1479,7 @@ void FileSelect_LoadGame(GameState* thisx) {
gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT;
gSaveContext.nextCutsceneIndex = 0xFFEF;
gSaveContext.cutsceneTrigger = 0;
gSaveContext.chamberCutsceneNum = 0;
gSaveContext.chamberCutsceneNum = CHAMBER_CS_FOREST;
gSaveContext.nextDayTime = NEXT_TIME_NONE;
gSaveContext.retainWeatherMode = false;

2
src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
View file

@ -828,7 +828,7 @@ void FileSelect_SetupEraseConfirm2(GameState* thisx) {
}
/**
* Allow the player to confirm their chioce to erase or return back to erase select.
* Allow the player to confirm their choice to erase or return back to erase select.
* Update function for `CM_ERASE_CONFIRM`
*/
void FileSelect_EraseConfirm(GameState* thisx) {