diff options
| author | cadmic <cadmic24@gmail.com> | 2024-07-27 21:09:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-28 00:09:05 -0400 |
| commit | 067d06bb56f2acb3436c24150e16487437dbf7c1 (patch) | |
| tree | c34f0a0d2f92cf4d154f8fbe496fa5b29a8e2702 /src/code | |
| parent | 7fcbf3f4b280e26284a8f62dbcb5b72d0e24dcc4 (diff) | |
Match NTSC loose ends (#2004)
* Match NTSC loose ends
* Add comment about giObjectSegment size
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 10 | ||||
| -rw-r--r-- | src/code/z_common_data.c | 3 | ||||
| -rw-r--r-- | src/code/z_play.c | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 6afae4f1f..890a05a68 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -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); diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 47aecd9e6..a0588d929 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -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 } diff --git a/src/code/z_play.c b/src/code/z_play.c index 7abd6705c..4f536524f 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -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; } } |