mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-12 09:50:50 +00:00
Code Issues Projects Releases Wiki Activity

[iQue] Match z_end_title, z_construct, z_common_data, z_parameter, z_title, z_opening (#2424)

Browse source 
* [iQue] Match z_end_title

* [iQue] Match z_construct

* [iQue] Match z_common_data

* [iQue] Match z_parameter

* [iQue] Match z_title, z_opening

* Actually match z_parameter

* Give up on stack issues

* this->exit = true
This commit is contained in:
cadmic 2025-01-14 08:55:47 -08:00 • committed by GitHub
parent e2ed5568e5
commit 2b9b7a40b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 67 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,18 +46,16 @@ void EndTitle_Update(Actor* thisx, PlayState* play) {
// Used in the castle courtyard
void EndTitle_DrawFull(Actor* thisx, PlayState* play) {
MtxF* mf;
PlayState* play2 = (PlayState*)play;
EndTitle* this = (EndTitle*)thisx;
s32 csCurFrame = play->csCtx.curFrame;
Player* player = GET_PLAYER(play);
mf = &player->mf_9E0;
s32 csCurFrame = play2->csCtx.curFrame;
Player* player = GET_PLAYER(play2);
OPEN_DISPS(play->state.gfxCtx, "../z_end_title.c", 403);
// Draw the Triforce on Link's left hand
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
Matrix_Mult(mf, MTXMODE_NEW);
Matrix_Mult(&player->mf_9E0, MTXMODE_NEW);
Matrix_Translate(0.0f, 150.0f, 170.0f, MTXMODE_APPLY);
Matrix_Scale(0.13f, 0.13f, 0.13f, MTXMODE_APPLY);
Matrix_RotateX(BINANG_TO_RAD(0xBB8), MTXMODE_APPLY);

12
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -40,7 +40,7 @@ void ConsoleLogo_PrintBuildInfo(Gfx** gfxP) {
#endif
void ConsoleLogo_Calc(ConsoleLogoState* this) {
#if PLATFORM_N64
#if !PLATFORM_GC
if ((this->coverAlpha == 0) && (this->visibleDuration != 0)) {
this->unk_1D4--;
this->visibleDuration--;
@ -74,8 +74,8 @@ void ConsoleLogo_SetupView(ConsoleLogoState* this, f32 x, f32 y, f32 z) {
eye.y = y;
eye.z = z;
up.x = up.z = 0.0f;
lookAt.x = lookAt.y = lookAt.z = 0.0f;
up.y = 1.0f;
lookAt.x = lookAt.y = lookAt.z = 0.0f;
View_SetPerspective(view, 30.0f, 10.0f, 12800.0f);
View_LookAt(view, &eye, &lookAt, &up);
@ -92,7 +92,9 @@ void ConsoleLogo_Draw(ConsoleLogoState* this) {
Vec3f v3;
Vec3f v1;
Vec3f v2;
#if !PLATFORM_IQUE
s32 pad2[2];
#endif
OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 395);
@ -165,6 +167,10 @@ void ConsoleLogo_Main(GameState* thisx) {
}
#endif
#if PLATFORM_IQUE
this->exit = true;
#endif
if (this->exit) {
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
gSaveContext.natureAmbienceId = 0xFF;
@ -221,7 +227,7 @@ void ConsoleLogo_Init(GameState* thisx) {
this->state.destroy = ConsoleLogo_Destroy;
this->exit = false;
#if OOT_VERSION < GC_US
#if OOT_VERSION < GC_US || PLATFORM_IQUE
if (!(gPadMgr.validCtrlrsMask & 1)) {
gSaveContext.fileNum = 0xFEDC;
} else {