sceneNum -> sceneId (#1338)

* 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>

1 files changed, 20 insertions, 20 deletions

diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index 6f9483247..c8201c9d7 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -53,7 +53,7 @@ void Map_SetFloorPalettesData(PlayState* play, s16 floor) {
         interfaceCtx->mapPalette[31] = 1;
     }
 
-    switch (play->sceneNum) {
+    switch (play->sceneId) {
         case SCENE_YDAN:
         case SCENE_DDAN:
         case SCENE_BDAN:
@@ -87,7 +87,7 @@ void Map_InitData(PlayState* play, s16 room) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
     s16 extendedMapIndex;
 
-    switch (play->sceneNum) {
+    switch (play->sceneId) {
         case SCENE_SPOT00:
         case SCENE_SPOT01:
         case SCENE_SPOT02:
@@ -109,19 +109,19 @@ void Map_InitData(PlayState* play, s16 room) {
         case SCENE_SPOT20:
         case SCENE_GANON_TOU:
             extendedMapIndex = mapIndex;
-            if (play->sceneNum == SCENE_SPOT02) {
+            if (play->sceneId == SCENE_SPOT02) {
                 if (CHECK_QUEST_ITEM(QUEST_SONG_NOCTURNE)) {
                     extendedMapIndex = 0x14;
                 }
-            } else if (play->sceneNum == SCENE_SPOT06) {
+            } else if (play->sceneId == SCENE_SPOT06) {
                 if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !CHECK_QUEST_ITEM(QUEST_MEDALLION_WATER)) {
                     extendedMapIndex = 0x15;
                 }
-            } else if (play->sceneNum == SCENE_SPOT09) {
+            } else if (play->sceneId == SCENE_SPOT09) {
                 if ((LINK_AGE_IN_YEARS == YEARS_ADULT) && !GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
                     extendedMapIndex = 0x16;
                 }
-            } else if (play->sceneNum == SCENE_SPOT12) {
+            } else if (play->sceneId == SCENE_SPOT12) {
                 if (GET_EVENTCHKINF_CARPENTERS_FREE_ALL()) {
                     extendedMapIndex = 0x17;
                 }
@@ -175,10 +175,10 @@ void Map_InitRoomData(PlayState* play, s16 room) {
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
 
     osSyncPrintf("＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\nroom_no=%d (%d)(%d)\n＊＊＊＊＊＊＊\n＊＊＊＊＊＊＊\n", room,
-                 mapIndex, play->sceneNum);
+                 mapIndex, play->sceneId);
 
     if (room >= 0) {
-        switch (play->sceneNum) {
+        switch (play->sceneId) {
             case SCENE_YDAN:
             case SCENE_DDAN:
             case SCENE_BDAN:
@@ -233,11 +233,11 @@ void Map_Init(PlayState* play) {
 
     interfaceCtx->mapSegment = GameState_Alloc(&play->state, 0x1000, "../z_map_exp.c", 457);
     // "ＭＡＰ texture initialization scene_data_ID=%d mapSegment=%x"
-    osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化   scene_data_ID=%d\nmapSegment=%x\n\n", play->sceneNum,
+    osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化   scene_data_ID=%d\nmapSegment=%x\n\n", play->sceneId,
                  interfaceCtx->mapSegment, play);
     ASSERT(interfaceCtx->mapSegment != NULL, "parameter->mapSegment != NULL", "../z_map_exp.c", 459);
 
-    switch (play->sceneNum) {
+    switch (play->sceneId) {
         case SCENE_SPOT00:
         case SCENE_SPOT01:
         case SCENE_SPOT02:
@@ -258,7 +258,7 @@ void Map_Init(PlayState* play) {
         case SCENE_SPOT18:
         case SCENE_SPOT20:
         case SCENE_GANON_TOU:
-            mapIndex = play->sceneNum - SCENE_SPOT00;
+            mapIndex = play->sceneId - SCENE_SPOT00;
             R_MAP_INDEX = gSaveContext.mapIndex = mapIndex;
             R_COMPASS_SCALE_X = gMapData->owCompassInfo[mapIndex][0];
             R_COMPASS_SCALE_Y = gMapData->owCompassInfo[mapIndex][1];
@@ -293,9 +293,9 @@ void Map_Init(PlayState* play) {
         case SCENE_MIZUSIN_BS:
         case SCENE_JYASINBOSS:
         case SCENE_HAKADAN_BS:
-            mapIndex = (play->sceneNum >= SCENE_YDAN_BOSS) ? play->sceneNum - SCENE_YDAN_BOSS : play->sceneNum;
+            mapIndex = (play->sceneId >= SCENE_YDAN_BOSS) ? play->sceneId - SCENE_YDAN_BOSS : play->sceneId;
             R_MAP_INDEX = gSaveContext.mapIndex = mapIndex;
-            if ((play->sceneNum <= SCENE_ICE_DOUKUTO) || (play->sceneNum >= SCENE_YDAN_BOSS)) {
+            if ((play->sceneId <= SCENE_ICE_DOUKUTO) || (play->sceneId >= SCENE_YDAN_BOSS)) {
                 R_COMPASS_SCALE_X = gMapData->dgnCompassInfo[mapIndex][0];
                 R_COMPASS_SCALE_Y = gMapData->dgnCompassInfo[mapIndex][1];
                 R_COMPASS_OFFSET_X = gMapData->dgnCompassInfo[mapIndex][2];
@@ -365,7 +365,7 @@ void Minimap_Draw(PlayState* play) {
     OPEN_DISPS(play->state.gfxCtx, "../z_map_exp.c", 626);
 
     if (play->pauseCtx.state < 4) {
-        switch (play->sceneNum) {
+        switch (play->sceneId) {
             case SCENE_YDAN:
             case SCENE_DDAN:
             case SCENE_BDAN:
@@ -453,8 +453,8 @@ void Minimap_Draw(PlayState* play) {
                                         (R_OW_MINIMAP_Y + gMapData->owMinimapHeight[mapIndex]) << 2, G_TX_RENDERTILE, 0,
                                         0, 1 << 10, 1 << 10);
 
-                    if (((play->sceneNum != SCENE_SPOT01) && (play->sceneNum != SCENE_SPOT04) &&
-                         (play->sceneNum != SCENE_SPOT08)) ||
+                    if (((play->sceneId != SCENE_SPOT01) && (play->sceneId != SCENE_SPOT04) &&
+                         (play->sceneId != SCENE_SPOT08)) ||
                         (LINK_AGE_IN_YEARS != YEARS_ADULT)) {
                         if ((gMapData->owEntranceFlag[sEntranceIconMapIndex] == 0xFFFF) ||
                             ((gMapData->owEntranceFlag[sEntranceIconMapIndex] != 0xFFFF) &&
@@ -474,7 +474,7 @@ void Minimap_Draw(PlayState* play) {
                         }
                     }
 
-                    if ((play->sceneNum == SCENE_SPOT08) &&
+                    if ((play->sceneId == SCENE_SPOT08) &&
                         (gSaveContext.infTable[INFTABLE_1AX_INDEX] & gBitFlags[INFTABLE_1A9_SHIFT])) {
                         gDPLoadTextureBlock(OVERLAY_DISP++, gMapDungeonEntranceIconTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8,
                                             8, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
@@ -521,7 +521,7 @@ void Map_Update(PlayState* play) {
     s16 i;
 
     if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0)) {
-        switch (play->sceneNum) {
+        switch (play->sceneId) {
             case SCENE_YDAN:
             case SCENE_DDAN:
             case SCENE_BDAN:
@@ -583,9 +583,9 @@ void Map_Update(PlayState* play) {
             case SCENE_MIZUSIN_BS:
             case SCENE_JYASINBOSS:
             case SCENE_HAKADAN_BS:
-                VREG(30) = gMapData->bossFloor[play->sceneNum - SCENE_YDAN_BOSS];
+                VREG(30) = gMapData->bossFloor[play->sceneId - SCENE_YDAN_BOSS];
                 R_MAP_TEX_INDEX =
-                    R_MAP_TEX_INDEX_BASE + gMapData->floorTexIndexOffset[play->sceneNum - SCENE_YDAN_BOSS][VREG(30)];
+                    R_MAP_TEX_INDEX_BASE + gMapData->floorTexIndexOffset[play->sceneId - SCENE_YDAN_BOSS][VREG(30)];
                 break;
         }
     }