diff options
| author | cadmic <cadmic24@gmail.com> | 2024-07-06 12:38:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 21:38:31 +0200 |
| commit | bf3339a16d6bf1d48165853540f20aebfdf5367a (patch) | |
| tree | 5a72fe97326ead536796f89a4a1a61f87aa3d243 /src/code/z_construct.c | |
| parent | baf1e8c1748b6440e5d594a8d0079d4eb2e3acee (diff) | |
Set up build system and disassembly for gc-us (#1982)
* Build gc-us
* Set up gc-us disassembly
* Don't disasm unchanged overlays
* Fix gc-eu-mq BSS
* romalign link_animetion for NTSC
* Explicitly set CPP defines to 0/1
* Add #ifs to segment_symbols.h
* Add sButtonTextures now
* Fix message _SHIFTL usage
* Don't ifdef LANGUAGE_MAX
Diffstat (limited to 'src/code/z_construct.c')
| -rw-r--r-- | src/code/z_construct.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 7eab18dd0..143697e19 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -50,6 +50,13 @@ void Interface_Init(PlayState* play) { ASSERT(interfaceCtx->doActionSegment != NULL, "parameter->do_actionSegment != NULL", "../z_construct.c", 169); +#if OOT_NTSC + if (gSaveContext.language == LANGUAGE_JPN) { + doActionOffset = LANGUAGE_JPN * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; + } else { + doActionOffset = LANGUAGE_ENG * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; + } +#else if (gSaveContext.language == LANGUAGE_ENG) { doActionOffset = LANGUAGE_ENG * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; } else if (gSaveContext.language == LANGUAGE_GER) { @@ -57,10 +64,18 @@ void Interface_Init(PlayState* play) { } else { doActionOffset = LANGUAGE_FRA * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; } +#endif DMA_REQUEST_SYNC(interfaceCtx->doActionSegment, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, 2 * DO_ACTION_TEX_SIZE, "../z_construct.c", 174); +#if OOT_NTSC + if (gSaveContext.language == LANGUAGE_JPN) { + doActionOffset = 3 * DO_ACTION_TEX_SIZE + LANGUAGE_JPN * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; + } else { + doActionOffset = 3 * DO_ACTION_TEX_SIZE + LANGUAGE_ENG * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; + } +#else if (gSaveContext.language == LANGUAGE_ENG) { doActionOffset = 3 * DO_ACTION_TEX_SIZE + LANGUAGE_ENG * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; } else if (gSaveContext.language == LANGUAGE_GER) { @@ -68,6 +83,7 @@ void Interface_Init(PlayState* play) { } else { doActionOffset = 3 * DO_ACTION_TEX_SIZE + LANGUAGE_FRA * DO_ACTION_MAX * DO_ACTION_TEX_SIZE; } +#endif DMA_REQUEST_SYNC(interfaceCtx->doActionSegment + 2 * DO_ACTION_TEX_SIZE, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, DO_ACTION_TEX_SIZE, |