MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-07-04 18:13:37 +00:00
Code Releases Wiki Activity

Merge pull request #49 from DaMarkov/removed-illegal-memory-access

Browse Source 
Removed illegal memory access
This commit is contained in:
Blake Warner 2022-02-04 20:43:57 -05:00 committed by GitHub
commit 093148588d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/code/z_play.c
View File

@ -375,7 +375,9 @@ void Gameplay_Init(GameState* thisx) {
if ((gEntranceTable[((void)0, gSaveContext.entranceIndex)].scene == SCENE_SPOT09) &&
gSaveContext.sceneSetupIndex == 6) {
osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts"
#ifdef N64_VERSION
((void (*)())0x81000000)();
#endif
osSyncPrintf("出戻り？\n"); // "Return?"
}

7
src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -410,8 +410,9 @@ void FileChoose_PulsateCursor(GameState* thisx) {
if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) {
sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_ENG;
#ifdef N64_VERSION
*((u8*)0x80000002) = LANGUAGE_ENG;
#endif
SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE);
osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND],
sramCtx->readBuff[SRAM_HEADER_ZTARGET], sramCtx->readBuff[SRAM_HEADER_LANGUAGE],
@ -423,7 +424,9 @@ void FileChoose_PulsateCursor(GameState* thisx) {
sramCtx->readBuff[SRAM_HEADER_MAGIC]);
} else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DUP)) {
sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_GER;
#ifdef N64_VERSION
*((u8*)0x80000002) = LANGUAGE_GER;
#endif
SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE);
osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND],
@ -435,7 +438,9 @@ void FileChoose_PulsateCursor(GameState* thisx) {
sramCtx->readBuff[SRAM_HEADER_MAGIC]);
} else if (CHECK_BTN_ALL(debugInput->press.button, BTN_DRIGHT)) {
sramCtx->readBuff[SRAM_HEADER_LANGUAGE] = gSaveContext.language = LANGUAGE_FRA;
#ifdef N64_VERSION
*((u8*)0x80000002) = LANGUAGE_FRA;
#endif
SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, 3, OS_WRITE);
osSyncPrintf("1:read_buff[]=%x, %x, %x, %x\n", sramCtx->readBuff[SRAM_HEADER_SOUND],