d_camera work (#2369)

* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
This commit is contained in:
Caroline Madsen
2025-04-01 22:05:30 -04:00
committed by GitHub
parent 2976066aa6
commit 03fafe3e15
56 changed files with 5623 additions and 2230 deletions
+4 -7
View File
@@ -9,9 +9,6 @@
#include "m_Do/m_Do_audio.h"
#include "m_Do/m_Do_graphic.h"
extern "C" u8 func_80141AE8(u8*);
extern "C" s8 func_80252E70(s8*);
/* 80252ED4-80252F28 24D814 0054+00 1/0 0/0 0/0 .text draw__16dDlst_snapShot_cFv */
void dDlst_snapShot_c::draw() {
GXSetTexCopySrc(0, 0, 608, 448);
@@ -130,8 +127,8 @@ dOvlpFd3_c::dOvlpFd3_c() {
/* 80253518-802535AC 24DE58 0094+00 1/0 0/0 0/0 .text execFirstSnap__10dOvlpFd3_cFv */
void dOvlpFd3_c::execFirstSnap() {
if (func_80141AE8(&field_0x11f) == 0 && field_0x11c != 0) {
if (func_80252E70(&mTimer) == 0) {
if (cLib_calcTimer(&field_0x11f) == 0 && field_0x11c != 0) {
if (cLib_calcTimer(&mTimer) == 0) {
setExecute(&execFadeOut);
fopOvlpM_Done(this);
mTimer = 0xFF;
@@ -161,13 +158,13 @@ void dOvlpFd3_c::execFadeOut() {
mDoAud_setFadeOutStart(0);
}
} else {
func_80252E70(&mTimer);
cLib_calcTimer(&mTimer);
}
}
/* 8025368C-80253730 24DFCC 00A4+00 1/0 0/0 0/0 .text execNextSnap__10dOvlpFd3_cFv */
void dOvlpFd3_c::execNextSnap() {
if (func_80252E70(&mTimer) == 0) {
if (cLib_calcTimer(&mTimer) == 0) {
if (!JFWDisplay::getManager()->getFader()->startFadeIn(XREG_S(4) + 26)) {
mDoAud_setFadeInStart(0);
field_0x110 += field_0x112;