mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-05-24 15:21:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from aMannus/christmas-tree

Browse Source 
Potential fix for title not showing up
This commit is contained in:
Caladius
2023-11-30 14:20:35 -05:00
committed by GitHub
parent 0aa1e4e135 ef4cb6aa47
commit ba10fe41ea
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/assets/custom/blender-source-files/TempleOfTime_DL.blend
BIN
View File
Binary file not shown.
soh/src/overlays/actors/ovl_End_Title/z_end_title.c
+5 -6
View File
@@ -38,9 +38,6 @@ void EndTitle_Init(Actor* thisx, PlayState* play) {
if (this->actor.params == 1) {
this->actor.draw = EndTitle_DrawNintendoLogo;
}
if (this->actor.params == 2) {
EndTitle_DrawFull(thisx, play);
}
}
void EndTitle_Destroy(Actor* thisx, PlayState* play) {
@@ -75,14 +72,16 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
uint8_t isKak = play->sceneNum == SCENE_KAKARIKO_VILLAGE;
// Draw title cards on the screen
if ((frameCount > 890) && (this->endAlpha < 200)) {
if ((frameCount > 890 || isKak) && (this->endAlpha < 200)) {
this->endAlpha += 7;
}
if ((frameCount > 810) && (this->tlozAlpha < 200)) {
if ((frameCount > 810 || isKak) && (this->tlozAlpha < 200)) {
this->tlozAlpha += 15;
}
if ((frameCount > 850) && (this->ootAlpha < 200)) {
if ((frameCount > 850 || isKak) && (this->ootAlpha < 200)) {
this->ootAlpha += 15;
}