izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zret' of https://github.com/HarbourMasters/mm into zret

Browse Source
This commit is contained in:
RevoSucks
2023-10-31 21:26:15 -04:00
parent b1a5cf8ede adb93b43fb
commit 11f36e3e8d
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Dt/z_en_dt.c
+5 -13
View File
@@ -336,17 +336,14 @@ void func_80BEA254(EnDt* this, PlayState* play) {
this->actionFunc = func_80BEA394;
}
// https://decomp.me/scratch/B065h
#ifdef NON_MATCHING
void func_80BEA394(EnDt* this, PlayState* play) {
EnMuto* mutoh = NULL;
EnBaisen* viscen = NULL;
s32 i;
volatile s32 j;
s16 subCamId;
s32 j;
i = D_80BEB26A[this->unk_26E];
goto label;
label:
j = D_80BEB26A[this->unk_26E];
if (this->unk_270 == 1) {
if (CutsceneManager_GetCurrentCsId() == 0x7C) {
@@ -417,8 +414,7 @@ label:
play->msgCtx.msgLength = 0;
func_80BE9DF8(this);
Actor_ChangeFocus(&this->actor, play, this->targetActor);
subCamId = CutsceneManager_GetCurrentSubCamId(this->csIdList[i]);
Camera_SetTargetActor(Play_GetCamera(play, subCamId), this->targetActor);
Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[i])), this->targetActor);
this->unk_244 = 2;
this->actionFunc = func_80BEA8F0;
return;
@@ -441,8 +437,7 @@ label:
func_80BE9DF8(this);
Actor_ChangeFocus(&this->actor, play, this->targetActor);
subCamId = CutsceneManager_GetCurrentSubCamId(this->csIdList[i]);
Camera_SetTargetActor(Play_GetCamera(play, subCamId), this->targetActor);
Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csIdList[i])), this->targetActor);
this->actor.textId = D_80BEB1D0[this->unk_256];
@@ -470,9 +465,6 @@ label:
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Dt/func_80BEA394.s")
#endif
void func_80BEA8F0(EnDt* this, PlayState* play) {
f32 curFrame = this->skelanime.curFrame;