1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +00:00

OnePointDemo OK (#719)

* 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

View file

@ -341,7 +341,7 @@ void func_809FE638(EnDu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
if (!(player->stateFlags1 & 0x20000000)) {
func_800800F8(globalCtx, 0xD02, -0x63, &this->actor, 0);
OnePointCutscene_Init(globalCtx, 3330, -99, &this->actor, MAIN_CAM);
player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.world.rot.y + 0x7FFF;
func_800F5C64(0x51);
EnDu_SetupAction(this, func_809FE6CC);
@ -414,7 +414,7 @@ void func_809FE890(EnDu* this, GlobalContext* globalCtx) {
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
CsCmdActorAction* csAction;
if (globalCtx->csCtx.state == 0) {
if (globalCtx->csCtx.state == CS_STATE_IDLE) {
func_8002DF54(globalCtx, &this->actor, 1);
EnDu_SetupAction(this, func_809FEB08);
return;