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

Gameplay_ -> Play_ and this (#1229)

Browse source
This commit is contained in:
fig02 2022-05-17 18:41:50 -04:00 • committed by GitHub
parent f6c472ae5e
commit aadb5f9c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
78 changed files with 1059 additions and 1078 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -522,10 +522,10 @@ void func_80B14E28(EnTa* this, GlobalContext* globalCtx) {
Vec3f subCamEye;
Vec3f subCamAt;
this->subCamId = Gameplay_CreateSubCamera(globalCtx);
this->subCamId = Play_CreateSubCamera(globalCtx);
this->returnToCamId = globalCtx->activeCamId;
Gameplay_ChangeCameraStatus(globalCtx, this->returnToCamId, CAM_STAT_WAIT);
Gameplay_ChangeCameraStatus(globalCtx, this->subCamId, CAM_STAT_ACTIVE);
Play_ChangeCameraStatus(globalCtx, this->returnToCamId, CAM_STAT_WAIT);
Play_ChangeCameraStatus(globalCtx, this->subCamId, CAM_STAT_ACTIVE);
subCamEye.x = 1053.0f;
subCamEye.y = 11.0f;
@ -535,12 +535,12 @@ void func_80B14E28(EnTa* this, GlobalContext* globalCtx) {
subCamAt.y = 45.0f;
subCamAt.z = -40.0f;
Gameplay_CameraSetAtEye(globalCtx, this->subCamId, &subCamAt, &subCamEye);
Play_CameraSetAtEye(globalCtx, this->subCamId, &subCamAt, &subCamEye);
}
void func_80B14EDC(EnTa* this, GlobalContext* globalCtx) {
Gameplay_ChangeCameraStatus(globalCtx, this->returnToCamId, CAM_STAT_ACTIVE);
Gameplay_ClearCamera(globalCtx, this->subCamId);
Play_ChangeCameraStatus(globalCtx, this->returnToCamId, CAM_STAT_ACTIVE);
Play_ClearCamera(globalCtx, this->subCamId);
}
void func_80B14F20(EnTa* this, EnTaActionFunc arg1) {
@ -737,7 +737,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
func_800F5918();
}
if (gSaveContext.timer1Value == 0 && !Gameplay_InCsMode(globalCtx)) {
if (gSaveContext.timer1Value == 0 && !Play_InCsMode(globalCtx)) {
Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
this->unk_2E0 &= ~0x200;
func_80078884(NA_SE_SY_FOUND);