mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +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

4
src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
View file

@ -218,7 +218,7 @@ void ObjTimeblock_Normal(ObjTimeblock* this, GlobalContext* globalCtx) {
this->demoEffectTimer = 160;
// Possibly points the camera to this actor
func_80080480(globalCtx, &this->dyna.actor);
OnePointCutscene_Attention(globalCtx, &this->dyna.actor);
// "◯◯◯◯ Time Block Attention Camera (frame counter %d)\n"
osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", globalCtx->state.frames);
@ -275,7 +275,7 @@ void ObjTimeblock_AltBehaviorVisible(ObjTimeblock* this, GlobalContext* globalCt
this->demoEffectFirstPartTimer = 12;
ObjTimeblock_SpawnDemoEffect(this, globalCtx);
this->demoEffectTimer = 160;
func_80080480(globalCtx, &this->dyna.actor);
OnePointCutscene_Attention(globalCtx, &this->dyna.actor);
// "Time Block Attention Camera (frame counter)"
osSyncPrintf("◯◯◯◯ Time Block 注目カメラ (frame counter %d)\n", globalCtx->state.frames);
ObjTimeblock_ToggleSwitchFlag(globalCtx, this->dyna.actor.params & 0x3F);