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

6
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -288,7 +288,7 @@ s32 EnXc_MinuetCS(EnXc* this, GlobalContext* globalCtx) {
f32 z = player->actor.world.pos.z;
if (z < -2225.0f) {
if (!Gameplay_InCsMode(globalCtx)) {
if (!Play_InCsMode(globalCtx)) {
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gMinuetCs);
gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_50);
@ -319,7 +319,7 @@ s32 EnXc_BoleroCS(EnXc* this, GlobalContext* globalCtx) {
posRot = &player->actor.world;
if ((posRot->pos.x > -784.0f) && (posRot->pos.x < -584.0f) && (posRot->pos.y > 447.0f) &&
(posRot->pos.y < 647.0f) && (posRot->pos.z > -446.0f) && (posRot->pos.z < -246.0f) &&
!Gameplay_InCsMode(globalCtx)) {
!Play_InCsMode(globalCtx)) {
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&gDeathMountainCraterBoleroCs);
gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_51);
@ -349,7 +349,7 @@ s32 EnXc_SerenadeCS(EnXc* this, GlobalContext* globalCtx) {
s32 stateFlags = player->stateFlags1;
if (CHECK_OWNED_EQUIP(EQUIP_TYPE_BOOTS, EQUIP_INV_BOOTS_IRON) && !GET_EVENTCHKINF(EVENTCHKINF_52) &&
!(stateFlags & PLAYER_STATE1_29) && !Gameplay_InCsMode(globalCtx)) {
!(stateFlags & PLAYER_STATE1_29) && !Play_InCsMode(globalCtx)) {
Cutscene_SetSegment(globalCtx, &gIceCavernSerenadeCs);
gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_52); // Learned Serenade of Water Flag