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

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
commit ba10fe41ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
soh/assets/custom/blender-source-files/TempleOfTime_DL.blend Normal file
View file

Binary file not shown.

11
soh/src/overlays/actors/ovl_End_Title/z_end_title.c
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;
}