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

10
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1145,7 +1145,7 @@ f32 EnGo2_GetTargetXZSpeed(EnGo2* this) {
}
s32 EnGo2_IsCameraModified(EnGo2* this, GlobalContext* globalCtx) {
Camera* camera = globalCtx->cameraPtrs[0];
Camera* camera = globalCtx->cameraPtrs[MAIN_CAM];
if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
if (EnGo2_IsWakingUp(this)) {
@ -1309,7 +1309,7 @@ void EnGo2_WakeUp(EnGo2* this, GlobalContext* globalCtx) {
}
}
if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
func_800800F8(globalCtx, 0x1068, -0x63, &this->actor, 0);
OnePointCutscene_Init(globalCtx, 4200, -99, &this->actor, MAIN_CAM);
func_80034EC0(&this->skelAnime, sAnimations, 10);
this->skelAnime.playSpeed = 0.5f;
} else {
@ -1466,7 +1466,7 @@ void EnGo2_GoronFireCamera(EnGo2* this, GlobalContext* globalCtx) {
s16 yaw;
this->camId = Gameplay_CreateSubCamera(globalCtx);
Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_WAIT);
Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT);
Gameplay_ChangeCameraStatus(globalCtx, this->camId, CAM_STAT_ACTIVE);
Path_CopyLastPoint(this->path, &this->at);
yaw = Math_Vec3f_Yaw(&this->actor.world.pos, &this->at) + 0xE38;
@ -1480,7 +1480,7 @@ void EnGo2_GoronFireCamera(EnGo2* this, GlobalContext* globalCtx) {
}
void EnGo2_GoronFireClearCamera(EnGo2* this, GlobalContext* globalCtx) {
Gameplay_ChangeCameraStatus(globalCtx, 0, CAM_STAT_ACTIVE);
Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_ACTIVE);
Gameplay_ClearCamera(globalCtx, this->camId);
}
@ -1814,7 +1814,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx) {
this->unk_20C = 0;
this->goronState++;
func_800F483C(0x28, 5);
func_800800F8(globalCtx, 0x105E, -0x63, &this->actor, 0);
OnePointCutscene_Init(globalCtx, 4190, -99, &this->actor, MAIN_CAM);
break;
case 1:
if (DECR(this->animTimer)) {