mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +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_Demo_Kankyo/z_demo_kankyo.c
View file

@ -193,7 +193,7 @@ void DemoKankyo_Init(Actor* thisx, PlayState* play) {
switch (this->actor.params) {
case DEMOKANKYO_BLUE_RAIN:
case DEMOKANKYO_BLUE_RAIN_2:
switch (play->sceneNum) {
switch (play->sceneId) {
case SCENE_HIRAL_DEMO:
play->roomCtx.curRoom.segment = NULL;
D_8098CF80 = 10;
@ -318,7 +318,7 @@ void DemoKankyo_SetupType(DemoKankyo* this, PlayState* play) {
this->warpTimer--;
}
if (this->warpTimer == 1) {
if (play->sceneNum == SCENE_TOKINOMA) {
if (play->sceneId == SCENE_TOKINOMA) {
D_8098CF84 = 25;
if (!LINK_IS_ADULT) {
play->csCtx.segment = gChildWarpInToTCS;
@ -340,7 +340,7 @@ void DemoKankyo_SetupType(DemoKankyo* this, PlayState* play) {
}
break;
case DEMOKANKYO_WARP_IN:
if (play->sceneNum == SCENE_TOKINOMA) {
if (play->sceneId == SCENE_TOKINOMA) {
if (!LINK_IS_ADULT) {
play->csCtx.segment = gChildWarpOutToTCS;
} else {
@ -432,7 +432,7 @@ void DemoKankyo_Draw(Actor* thisx, PlayState* play) {
switch (this->actor.params) {
case DEMOKANKYO_BLUE_RAIN:
case DEMOKANKYO_BLUE_RAIN_2:
if (play->sceneNum == SCENE_TOKINOMA) {
if (play->sceneId == SCENE_TOKINOMA) {
if (!Flags_GetEnv(play, 1)) {
break;
} else if (!Actor_IsFacingAndNearPlayer(&this->actor, 300.0f, 0x7530)) {
@ -485,7 +485,7 @@ void DemoKankyo_Draw(Actor* thisx, PlayState* play) {
void func_80989B54(Actor* thisx, PlayState* play, s16 i) {
DemoKankyo* this = (DemoKankyo*)thisx;
switch (play->sceneNum) {
switch (play->sceneId) {
case SCENE_HIRAL_DEMO:
this->unk_150[i].unk_0.x = (Rand_ZeroOne() - 0.5f) * 500.0f;
this->unk_150[i].unk_0.y = 500.0f;
@ -531,7 +531,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
dz = play->view.at.z - play->view.eye.z;
norm = sqrtf(SQ(dx) + SQ(dy) + SQ(dz));
if (play->sceneNum != SCENE_TOKINOMA) {
if (play->sceneId != SCENE_TOKINOMA) {
this->unk_150[i].unk_C.x = play->view.eye.x + (dx / norm) * 350.0f;
this->unk_150[i].unk_C.y = play->view.eye.y + (dy / norm) * 80.0f;
this->unk_150[i].unk_C.z = play->view.eye.z + (dz / norm) * 350.0f;
@ -597,7 +597,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) {
for (j = 0; j < 5; j++) {
s32 pad1;
if (play->sceneNum != SCENE_TOKINOMA) {
if (play->sceneId != SCENE_TOKINOMA) {
if (this->unk_150[i].unk_0.x >= 0.0f) {
translateX = -j * 1500.0f;
} else {
@ -796,7 +796,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) {
&this->unk_150[i].unk_1C) != 0) {
this->unk_150[i].unk_22++;
}
if (play->sceneNum == SCENE_TOKINOMA && play->csCtx.frames == 25) {
if (play->sceneId == SCENE_TOKINOMA && play->csCtx.frames == 25) {
this->unk_150[i].unk_22++;
}
} else {