mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 19:04:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8ee485d2e7' into doc_pause_menu

Browse source
This commit is contained in:
Dragorn421 2024-08-01 21:47:53 +02:00
commit 4dd0649478
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
28 changed files with 488 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/code/z_actor.c
View file

@ -689,7 +689,7 @@ void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void*
SceneTableEntry* loadedScene = play->loadedScene;
u32 size = loadedScene->titleFile.vromEnd - loadedScene->titleFile.vromStart;
if ((size != 0) && (size <= 0x3000)) {
if ((size != 0) && (size <= 0x1000 * LANGUAGE_MAX)) {
DMA_REQUEST_SYNC(texture, loadedScene->titleFile.vromStart, size, "../z_actor.c", 2765);
}
@ -733,7 +733,15 @@ void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) {
OPEN_DISPS(play->state.gfxCtx, "../z_actor.c", 2824);
#if OOT_NTSC
if (gSaveContext.language == LANGUAGE_JPN) {
textureLanguageOffset = 0;
} else {
textureLanguageOffset = width * height;
}
#else
textureLanguageOffset = width * height * gSaveContext.language;
#endif
height = (width * height > 0x1000) ? 0x1000 / width : height;
titleSecondY = titleY + (height * 4);

3
src/code/z_common_data.c
View file

@ -24,4 +24,7 @@ void SaveContext_Init(void) {
gSaveContext.dogIsLost = true;
gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT;
gSaveContext.prevHudVisibilityMode = HUD_VISIBILITY_ALL;
#if OOT_NTSC
gSaveContext.language = LANGUAGE_ENG;
#endif
}

4
src/code/z_play.c
View file

@ -168,7 +168,11 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
break;
default:
#if OOT_NTSC
HUNGUP_AND_CRASH("../z_play.c", 2287);
#else
HUNGUP_AND_CRASH("../z_play.c", 2290);
#endif
break;
}
}