github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-24 15:15:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

better conditional logic

Browse source
This commit is contained in:
Baoulettes 2022-04-30 14:46:52 +02:00 • committed by GitHub
commit 2169978de3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/src/code/z_actor.c
View file

@ -1032,6 +1032,9 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
Also Ganondorf do not have French and German title card it seem. Also Ganondorf do not have French and German title card it seem.
A dirty method has been applied to actually detect it, once a better A dirty method has been applied to actually detect it, once a better
method is found this workaround will be reverted.*/ method is found this workaround will be reverted.*/
textureLanguageOffset = 0x0;
shiftTopY = 0x0;
shiftBottomY = 0x1000;
if (gSaveContext.language == LANGUAGE_GER && titleCtx->height == 40 && titleCtx->width == 128) { if (gSaveContext.language == LANGUAGE_GER && titleCtx->height == 40 && titleCtx->width == 128) {
textureLanguageOffset = (width * height * gSaveContext.language); textureLanguageOffset = (width * height * gSaveContext.language);
shiftTopY = 0x400; shiftTopY = 0x400;
@ -1040,10 +1043,6 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
textureLanguageOffset = (width * height * gSaveContext.language); textureLanguageOffset = (width * height * gSaveContext.language);
shiftTopY = 0x800; shiftTopY = 0x800;
shiftBottomY = 0x1800; shiftBottomY = 0x1800;
} else if (titleCtx->height == 39 && titleCtx->width == 128 || gSaveContext.language == LANGUAGE_ENG) { //Fall back to English value.
textureLanguageOffset = 0;
shiftTopY = 0;
shiftBottomY = 0x1000;
} }
// WORLD_OVERLAY_DISP Goes over POLY_XLU_DISP but under POLY_KAL_DISP // WORLD_OVERLAY_DISP Goes over POLY_XLU_DISP but under POLY_KAL_DISP