mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-14 19:10:25 +00:00
Code Issues Projects Releases Wiki Activity

OnePointDemo OK (#719)

Browse source 
* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-03-31 11:18:31 -05:00 • committed by GitHub
parent 28cfd82a4f
commit 9b4482314a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 3949 additions and 7571 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
View file

@ -49,8 +49,8 @@ void DemoShd_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80991298(DemoShd* this, GlobalContext* globalCtx) {
if ((globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[0] != NULL) ||
(globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[1] != NULL)) {
if ((globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[0] != NULL) ||
(globalCtx->csCtx.state != CS_STATE_IDLE && globalCtx->csCtx.npcActions[1] != NULL)) {
if (globalCtx->csCtx.frames == 800) {
func_800F3F3C(9);
}
@ -59,7 +59,7 @@ void func_80991298(DemoShd* this, GlobalContext* globalCtx) {
}
}
if (globalCtx->csCtx.state != 0) {
if (globalCtx->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction0 = globalCtx->csCtx.npcActions[0];
if (npcAction0 != NULL) {
@ -74,7 +74,7 @@ void func_80991298(DemoShd* this, GlobalContext* globalCtx) {
}
}
if (globalCtx->csCtx.state != 0) {
if (globalCtx->csCtx.state != CS_STATE_IDLE) {
CsCmdActorAction* npcAction1 = globalCtx->csCtx.npcActions[1];
if (npcAction1 != NULL) {