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

Finished ovl_Demo_Go (#287)

Browse source 
* Finished ovl_Demo_Go

* renaming arg
This commit is contained in:
Ethan Roseman 2020-07-22 20:15:56 -04:00 • committed by GitHub
parent 3c3cfa6751
commit 8a309a4e19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -200,21 +200,16 @@ UNK_TYPE DemoGo_FrameUpdateMatrix(DemoGo* this) {
return SkelAnime_FrameUpdateMatrix(&this->skelAnime);
}
#ifdef NON_MATCHING
// return value isn't produced in the same way
s32 func_8097CDB0(DemoGo* this, GlobalContext* globalCtx, u16 csCmdNPCAction) {
s32 func_8097CDB0(DemoGo* this, GlobalContext* globalCtx, u16 npcAction) {
CutsceneContext* csCtx = &globalCtx->csCtx;
CsCmdActorAction* npcAction = csCtx->npcActions[func_8097C870(this)];
if (csCtx->state != 0) {
if (npcAction != NULL && npcAction->action == csCmdNPCAction) {
return 1;
}
s32 actionIdx = func_8097C870(this);
if ((csCtx->state != 0) && (csCtx->npcActions[actionIdx] != NULL) &&
(csCtx->npcActions[actionIdx]->action == npcAction)) {
return 1;
}
return 0;
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s")
#endif
void func_8097CE10(DemoGo* this, GlobalContext* globalCtx) {
this->action = 1;