mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +00:00
Code Issues Projects Releases Wiki Activity

sceneNum -> sceneId (#1338)

Browse source 
* sceneNum -> sceneId

* forgot to save play

* scene -> sceneId where appropriate

* Missed 1 + format

* Update src/code/z_sram.c

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update src/code/z_sram.c

Co-authored-by: mzxrules <mzxrules@gmail.com>

* PR

* Fix

Co-authored-by: mzxrules <mzxrules@gmail.com>
This commit is contained in:
Derek Hensley 2022-07-31 16:44:47 -07:00 • committed by GitHub
parent 706d5596bf
commit 9c6461751d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
83 changed files with 444 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
View file

@ -37,7 +37,7 @@ const ActorInit En_Encount2_InitVars = {
void EnEncount2_Init(Actor* thisx, PlayState* play) {
EnEncount2* this = (EnEncount2*)thisx;
if (play->sceneNum != SCENE_SPOT16) {
if (play->sceneId != SCENE_SPOT16) {
this->isNotDeathMountain = true;
}
@ -73,10 +73,10 @@ void EnEncount2_Wait(EnEncount2* this, PlayState* play) {
spawnerState = ENCOUNT2_ACTIVE_DEATH_MOUNTAIN;
}
} else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37))) {
s16 scene = play->sceneNum;
s16 sceneId = play->sceneId;
if (((scene == SCENE_GANON_DEMO) || (scene == SCENE_GANON_FINAL) || (scene == SCENE_GANON_SONOGO) ||
(scene == SCENE_GANONTIKA_SONOGO)) &&
if (((sceneId == SCENE_GANON_DEMO) || (sceneId == SCENE_GANON_FINAL) || (sceneId == SCENE_GANON_SONOGO) ||
(sceneId == SCENE_GANONTIKA_SONOGO)) &&
(!this->collapseSpawnerInactive)) {
spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
}
@ -153,10 +153,10 @@ void EnEncount2_SpawnRocks(EnEncount2* this, PlayState* play) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_VOLCANO - SFX_FLAG);
} else if ((this->actor.xzDistToPlayer < 700.0f) && (Flags_GetSwitch(play, 0x37) != 0)) {
s16 scene = play->sceneNum;
s16 sceneId = play->sceneId;
if (((scene == SCENE_GANON_DEMO) || (scene == SCENE_GANON_FINAL) || (scene == SCENE_GANON_SONOGO) ||
(scene == SCENE_GANONTIKA_SONOGO)) &&
if (((sceneId == SCENE_GANON_DEMO) || (sceneId == SCENE_GANON_FINAL) || (sceneId == SCENE_GANON_SONOGO) ||
(sceneId == SCENE_GANONTIKA_SONOGO)) &&
(!this->collapseSpawnerInactive)) {
maxRocks = 1;
spawnerState = ENCOUNT2_ACTIVE_GANONS_TOWER;
@ -325,7 +325,7 @@ void EnEncount2_UpdateEffects(EnEncount2* this, PlayState* play) {
Math_ApproachF(&effect->pos.z, targetPos.z, 0.3f, 30.0f);
Math_ApproachF(&effect->moveDirection.y, -20.0f, 0.9f, 1.0f);
if (play->sceneNum != SCENE_SPOT16) {
if (play->sceneId != SCENE_SPOT16) {
if (effect->pos.y < (player->actor.floorHeight - 50.0f)) {
effect->isAlive = 0;
}