mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 07:51:48 +00:00
Code Issues Projects Releases Wiki Activity

[PAL N64] Create macros for 50-Hz-related values (#2206)

Browse source 
* [PAL N64] Create macros for 50-Hz-related values

* Use FRAME_RATE_DEPENDENT for player speeds and boot data too

* FRAME_RATE_DEPENDENT -> FRAMERATE_CONST
This commit is contained in:
cadmic 2024-09-18 12:14:47 -07:00 • committed by GitHub
parent 2122a4345b
commit 8348132511
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 258 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/overlays/actors/ovl_End_Title/z_end_title.c
View file

@ -5,6 +5,7 @@
*/
#include "z_end_title.h"
#include "versions.h"
#define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
@ -70,14 +71,14 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_end_title.c", 419);
// Draw title cards on the screen
if ((csCurFrame > 890) && (this->endAlpha < 200)) {
this->endAlpha += 7;
if ((csCurFrame > FRAMERATE_CONST(890, 740)) && (this->endAlpha < 200)) {
this->endAlpha += FRAMERATE_CONST(7, 8);
}
if ((csCurFrame > 810) && (this->tlozAlpha < 200)) {
this->tlozAlpha += 15;
if ((csCurFrame > FRAMERATE_CONST(810, 675)) && (this->tlozAlpha < 200)) {
this->tlozAlpha += FRAMERATE_CONST(15, 18);
}
if ((csCurFrame > 850) && (this->ootAlpha < 200)) {
this->ootAlpha += 15;
if ((csCurFrame > FRAMERATE_CONST(850, 710)) && (this->ootAlpha < 200)) {
this->ootAlpha += FRAMERATE_CONST(15, 18);
}
OVERLAY_DISP = Gfx_SetupDL_64(OVERLAY_DISP);
@ -114,7 +115,7 @@ void EndTitle_DrawNintendoLogo(Actor* thisx, PlayState* play) {
s32 pad;
s32 csCurFrame = play->csCtx.curFrame;
if ((csCurFrame >= 1101) && (this->endAlpha < 255)) {
if ((csCurFrame > FRAMERATE_CONST(1100, 950)) && (this->endAlpha < 255)) {
this->endAlpha += 3;
}