mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 17:30:25 +00:00
Code Issues Projects Releases Wiki Activity

Match remaining GC retail versions (#2019)

Browse source 
* Match the remaining GC retail versions

* Fix BSS ordering for existing versions

* Disable clang-format for #pragma increment_block_number

* sramResetCode -> sSramResetCode

* Replace 0xFF3F with or-ing all buttons together

* Revert "Disable clang-format for #pragma increment_block_number"

This reverts commit 406b6d26c9.

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
cadmic 2024-08-09 17:58:46 -07:00 • committed by GitHub
parent cd2264f018
commit d495436190
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
59 changed files with 11405 additions and 49 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

@ -808,7 +808,7 @@ static s16 sQuestItemGreen[] = { 255, 255, 255, 255, 60, 100, 130, 50, 200 };
static s16 sQuestItemBlue[] = { 255, 255, 255, 0, 0, 255, 0, 255, 0 };
static s16 sQuestItemFlags[] = { 0x0012, 0x0013, 0x0014, 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005 };
#if OOT_NTSC
#if OOT_NTSC && OOT_VERSION < OOT_GC_JP_CE
static void* sSaveXTextures[] = { gFileSelSaveXJPNTex, gFileSelSaveXENGTex };
#endif

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

@ -170,7 +170,17 @@ void ConsoleLogo_Init(GameState* thisx) {
this->state.main = ConsoleLogo_Main;
this->state.destroy = ConsoleLogo_Destroy;
this->exit = false;
#if OOT_VERSION < OOT_GC_US
if (!(gPadMgr.validCtrlrsMask & 1)) {
gSaveContext.fileNum = 0xFEDC;
} else {
gSaveContext.fileNum = 0xFF;
}
#else
gSaveContext.fileNum = 0xFF;
#endif
Sram_Alloc(&this->state, &this->sramCtx);
this->ult = 0;
this->unk_1D4 = 0x14;