mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 19:35:28 +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/code/z_scene.c
View file

@ -38,19 +38,19 @@ void Object_InitBank(PlayState* play, ObjectContext* objectCtx) {
u32 spaceSize;
s32 i;
if (play2->sceneNum == SCENE_SPOT00) {
if (play2->sceneId == SCENE_SPOT00) {
spaceSize = 1024000;
} else if (play2->sceneNum == SCENE_GANON_DEMO) {
} else if (play2->sceneId == SCENE_GANON_DEMO) {
if (gSaveContext.sceneLayer != 4) {
spaceSize = 1177600;
} else {
spaceSize = 1024000;
}
} else if (play2->sceneNum == SCENE_JYASINBOSS) {
} else if (play2->sceneId == SCENE_JYASINBOSS) {
spaceSize = 1075200;
} else if (play2->sceneNum == SCENE_KENJYANOMA) {
} else if (play2->sceneId == SCENE_KENJYANOMA) {
spaceSize = 1075200;
} else if (play2->sceneNum == SCENE_GANON_BOSS) {
} else if (play2->sceneId == SCENE_GANON_BOSS) {
spaceSize = 1075200;
} else {
spaceSize = 1024000;
@ -453,14 +453,14 @@ void Scene_CommandMiscSettings(PlayState* play, SceneCmd* cmd) {
R_SCENE_CAM_TYPE = cmd->miscSettings.sceneCamType;
gSaveContext.worldMapArea = cmd->miscSettings.area;
if ((play->sceneNum == SCENE_SHOP1) || (play->sceneNum == SCENE_SYATEKIJYOU)) {
if ((play->sceneId == SCENE_SHOP1) || (play->sceneId == SCENE_SYATEKIJYOU)) {
if (LINK_AGE_IN_YEARS == YEARS_ADULT) {
gSaveContext.worldMapArea = 1;
}
}
if (((play->sceneNum >= SCENE_SPOT00) && (play->sceneNum <= SCENE_GANON_TOU)) ||
((play->sceneNum >= SCENE_ENTRA) && (play->sceneNum <= SCENE_SHRINE_R))) {
if (((play->sceneId >= SCENE_SPOT00) && (play->sceneId <= SCENE_GANON_TOU)) ||
((play->sceneId >= SCENE_ENTRA) && (play->sceneId <= SCENE_SHRINE_R))) {
if (gSaveContext.cutsceneIndex < 0xFFF0) {
gSaveContext.worldMapAreaData |= gBitFlags[gSaveContext.worldMapArea];
osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.worldMapAreaData,