SceneNum -> SceneId (#1036)

* sceneNum -> sceneId

* horse data scene -> sceneId

* Clean up scene table

* format

* PR comments

* Some more

* It helps if you actually save the file

* PR

* Remove comment

* Format

* Conflicts

include/functions.h

@@ -2087,7 +2087,7 @@ s32 Inventory_GetBtnBItem(PlayState* play);
 void Inventory_ChangeEquipment(s16 value);
 u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment);
 void Inventory_ChangeUpgrade(s16 upgrade, u32 value);
-s32 Inventory_IsMapVisible(s16 sceneNum);
+s32 Inventory_IsMapVisible(s16 sceneId);
 void Inventory_SetMapVisibility(s16 tingleIndex);
 void Inventory_SaveDekuPlaygroundHighScore(s16 timerId);
 void Inventory_IncrementSkullTokenCount(s16 sceneIndex);
@@ -2173,8 +2173,8 @@ void Scene_DrawConfig5(PlayState* play);
 void Scene_DrawConfigMatAnimManualStep(PlayState* play);
 void Scene_DrawConfigGreatBayTemple(PlayState* play);
 EntranceTableEntry* Entrance_GetTableEntry(u16 entrance);
-s32 Entrance_GetSceneNum(u16 entrance);
-s32 Entrance_GetSceneNumAbsolute(u16 entrance);
+s32 Entrance_GetSceneId(u16 entrance);
+s32 Entrance_GetSceneIdAbsolute(u16 entrance);
 s32 Entrance_GetSpawnNum(u16 entrance);
 s32 Entrance_GetTransitionFlags(u16 entrance);
 s32 Schedule_RunScript(PlayState* play, u8* script, ScheduleOutput* output);
@@ -2557,7 +2557,7 @@ s32 Play_ChangeCameraSetting(PlayState* play, s16 camId, s16 setting);
 void func_80169AFC(PlayState* play, s16 camId, s16 arg2);
 u16 Play_GetActorCsCamSetting(PlayState* play, s32 csCamDataIndex);
 Vec3s* Play_GetActorCsCamFuncData(PlayState* play, s32 csCamDataIndex);
-s16 Play_GetOriginalSceneNumber(s16 sceneNum);
+s16 Play_GetOriginalSceneId(s16 sceneId);
 void Play_SaveCycleSceneFlags(GameState* gameState);
 void Play_SetRespawnData(GameState* gameState, s32 respawnNumber, u16 sceneSetup, s32 roomIndex, s32 playerParams, Vec3f* pos, s16 yaw);
 void Play_SetupRespawnPoint(GameState* gameState, s32 respawnNumber, s32 playerParams);

include/variables.h

@@ -1312,7 +1312,7 @@ extern u32 gGsFlagsShift[];
 extern void* gItemIcons[];
 extern u8 gItemSlots[];
 extern s16 gItemPrices[];
-extern u16 gScenesPerRegion[11][27];
+extern u16 gSceneIdsPerRegion[11][27];
 extern u32 D_801C2410[];
 extern s16 gPlayerFormObjectIndices[8];
 extern RomFile gObjectTable[643];

include/z64.h

@@ -1084,7 +1084,7 @@ typedef struct {
 
 struct PlayState {
     /* 0x00000 */ GameState state;
-    /* 0x000A4 */ s16 sceneNum;
+    /* 0x000A4 */ s16 sceneId;
     /* 0x000A6 */ u8 sceneConfig;
     /* 0x000A7 */ char unk_A7[0x9];
     /* 0x000B0 */ void* sceneSegment;

include/z64save.h

@@ -165,7 +165,7 @@ typedef struct Inventory {
 } Inventory; // size = 0x88
 
 typedef struct HorseData {
-    /* 0x0 */ s16 scene;                               // "spot_no"
+    /* 0x0 */ s16 sceneId;                             // "spot_no"
     /* 0x2 */ Vec3s pos;                               // "horse_x", "horse_y" and "horse_z"
     /* 0x8 */ s16 yaw;                                 // "horse_a"
 } HorseData; // size = 0xA
@@ -226,7 +226,7 @@ typedef struct SavePlayerData {
     /* 0x20 */ u8 unk_20;                             // "first_memory"
     /* 0x22 */ u16 owlActivationFlags;                // "memory_warp_point"
     /* 0x24 */ u8 unk_24;                             // "last_warp_pt"
-    /* 0x26 */ s16 savedSceneNum;                     // "scene_data_ID"
+    /* 0x26 */ s16 savedSceneId;                      // "scene_data_ID"
 } SavePlayerData; // size = 0x28
 
 typedef struct Save {

include/z64scene.h

@@ -316,7 +316,7 @@ typedef struct {
 } EntranceEntry; // size = 0x2
 
 typedef struct {
-    /* 0x0 */ s8 sceneNum;
+    /* 0x0 */ s8 sceneId;
     /* 0x1 */ s8 spawnNum;
     /* 0x2 */ u16 flags;
 } EntranceTableEntry; // size = 0x4

include/z64schedule.h

@@ -42,8 +42,8 @@ typedef enum {
     /* 0x07 */ SCHEDULE_CMD_ID_NOP,                  // No-Op
     /* 0x08 */ SCHEDULE_CMD_ID_CHECK_MISC_S,         // Special check based on items or masks and branches if check passes, short range branch
     /* 0x09 */ SCHEDULE_CMD_ID_RET_VAL_S,            // Ends script and returns byte value
-    /* 0x0A */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_S, // Checks if the current scene is not SceneNum and branches if so, short range branch
-    /* 0x0B */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_L, // Checks if the current scene is not SceneNum and branches if so, long range branch
+    /* 0x0A */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_S, // Checks if the current scene is not SceneId and branches if so, short range branch
+    /* 0x0B */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_L, // Checks if the current scene is not SceneId and branches if so, long range branch
     /* 0x0C */ SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_S,   // Checks if the current day is not Day and branches if so, short range branch
     /* 0x0D */ SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_L,   // Checks if the current day is not Day and branches if so, long range branch
     /* 0x0E */ SCHEDULE_CMD_ID_RET_TIME,             // Returns 2 time values
@@ -130,15 +130,15 @@ typedef struct {
 
 typedef struct {
     /* 0x0 */ ScheduleCmdBase base;
-    /* 0x1 */ u8 sceneH;
-    /* 0x2 */ u8 sceneL;
+    /* 0x1 */ u8 sceneIdH;
+    /* 0x2 */ u8 sceneIdL;
     /* 0x3 */ s8 offset;
 } ScheduleCmdCheckNotInSceneS; // size = 0x4
 
 typedef struct {
     /* 0x0 */ ScheduleCmdBase base;
-    /* 0x1 */ u8 sceneH;
-    /* 0x2 */ u8 sceneL;
+    /* 0x1 */ u8 sceneIdH;
+    /* 0x2 */ u8 sceneIdL;
     /* 0x3 */ u8 offsetH;
     /* 0x4 */ u8 offsetL;
 } ScheduleCmdCheckNotInSceneL; // size = 0x5