diff --git a/include/scene.h b/include/scene.h index 8e5b1a100c..5aafc40169 100644 --- a/include/scene.h +++ b/include/scene.h @@ -400,13 +400,13 @@ typedef enum NaviQuestHintFileId { // Scene commands typedef enum SceneCommandTypeID { - /* 0x00 */ SCENE_CMD_ID_SPAWN_LIST, + /* 0x00 */ SCENE_CMD_ID_PLAYER_ENTRY_LIST, /* 0x01 */ SCENE_CMD_ID_ACTOR_LIST, /* 0x02 */ SCENE_CMD_ID_UNUSED_2, /* 0x03 */ SCENE_CMD_ID_COLLISION_HEADER, /* 0x04 */ SCENE_CMD_ID_ROOM_LIST, /* 0x05 */ SCENE_CMD_ID_WIND_SETTINGS, - /* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST, + /* 0x06 */ SCENE_CMD_ID_SPAWN_LIST, /* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES, /* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR, /* 0x09 */ SCENE_CMD_ID_UNDEFINED_9, @@ -429,8 +429,8 @@ typedef enum SceneCommandTypeID { /* 0x1A */ SCENE_CMD_ID_MAX } SceneCommandTypeID; -#define SCENE_CMD_SPAWN_LIST(numSpawns, spawnList) \ - { SCENE_CMD_ID_SPAWN_LIST, numSpawns, CMD_PTR(spawnList) } +#define SCENE_CMD_PLAYER_ENTRY_LIST(length, playerEntryList) \ + { SCENE_CMD_ID_PLAYER_ENTRY_LIST, length, CMD_PTR(playerEntryList) } #define SCENE_CMD_ACTOR_LIST(numActors, actorList) \ { SCENE_CMD_ID_ACTOR_LIST, numActors, CMD_PTR(actorList) } @@ -447,8 +447,8 @@ typedef enum SceneCommandTypeID { #define SCENE_CMD_WIND_SETTINGS(xDir, yDir, zDir, strength) \ { SCENE_CMD_ID_WIND_SETTINGS, 0, CMD_BBBB(xDir, yDir, zDir, strength) } -#define SCENE_CMD_ENTRANCE_LIST(entranceList) \ - { SCENE_CMD_ID_ENTRANCE_LIST, 0, CMD_PTR(entranceList) } +#define SCENE_CMD_SPAWN_LIST(spawnList) \ + { SCENE_CMD_ID_SPAWN_LIST, 0, CMD_PTR(spawnList) } #define SCENE_CMD_SPECIAL_FILES(naviQuestHintFileId, keepObjectId) \ { SCENE_CMD_ID_SPECIAL_FILES, naviQuestHintFileId, CMD_W(keepObjectId) } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index a3182a2f88..38323e6c7b 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -531,13 +531,13 @@ void Scene_SetTransitionForNextEntrance(PlayState* play) { } SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX] = { - Scene_CommandPlayerEntryList, // SCENE_CMD_ID_SPAWN_LIST + Scene_CommandPlayerEntryList, // SCENE_CMD_ID_PLAYER_ENTRY_LIST Scene_CommandActorEntryList, // SCENE_CMD_ID_ACTOR_LIST Scene_CommandUnused2, // SCENE_CMD_ID_UNUSED_2 Scene_CommandCollisionHeader, // SCENE_CMD_ID_COLLISION_HEADER Scene_CommandRoomList, // SCENE_CMD_ID_ROOM_LIST Scene_CommandWindSettings, // SCENE_CMD_ID_WIND_SETTINGS - Scene_CommandSpawnList, // SCENE_CMD_ID_ENTRANCE_LIST + Scene_CommandSpawnList, // SCENE_CMD_ID_SPAWN_LIST Scene_CommandSpecialFiles, // SCENE_CMD_ID_SPECIAL_FILES Scene_CommandRoomBehavior, // SCENE_CMD_ID_ROOM_BEHAVIOR Scene_CommandUndefined9, // SCENE_CMD_ID_UNDEFINED_9 diff --git a/tools/assets/extract/extase_oot64/scene_commands_resource.py b/tools/assets/extract/extase_oot64/scene_commands_resource.py index 57f2cbf440..aa6da2bc45 100644 --- a/tools/assets/extract/extase_oot64/scene_commands_resource.py +++ b/tools/assets/extract/extase_oot64/scene_commands_resource.py @@ -44,13 +44,13 @@ VERBOSE_NOT_FULLY_PARSED_SCENECMD = False class SceneCmdId(enum.Enum): # keep the SCENE_CMD_ID_ prefix for grepability - SCENE_CMD_ID_SPAWN_LIST = 0 + SCENE_CMD_ID_PLAYER_ENTRY_LIST = 0 SCENE_CMD_ID_ACTOR_LIST = enum.auto() SCENE_CMD_ID_UNUSED_2 = enum.auto() SCENE_CMD_ID_COLLISION_HEADER = enum.auto() SCENE_CMD_ID_ROOM_LIST = enum.auto() SCENE_CMD_ID_WIND_SETTINGS = enum.auto() - SCENE_CMD_ID_ENTRANCE_LIST = enum.auto() + SCENE_CMD_ID_SPAWN_LIST = enum.auto() SCENE_CMD_ID_SPECIAL_FILES = enum.auto() SCENE_CMD_ID_ROOM_BEHAVIOR = enum.auto() SCENE_CMD_ID_UNDEFINED_9 = enum.auto() @@ -73,13 +73,13 @@ class SceneCmdId(enum.Enum): scene_cmd_macro_name_by_cmd_id = { - SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: "SCENE_CMD_SPAWN_LIST", + SceneCmdId.SCENE_CMD_ID_PLAYER_ENTRY_LIST: "SCENE_CMD_PLAYER_ENTRY_LIST", SceneCmdId.SCENE_CMD_ID_ACTOR_LIST: "SCENE_CMD_ACTOR_LIST", SceneCmdId.SCENE_CMD_ID_UNUSED_2: "SCENE_CMD_UNUSED_02", SceneCmdId.SCENE_CMD_ID_COLLISION_HEADER: "SCENE_CMD_COL_HEADER", SceneCmdId.SCENE_CMD_ID_ROOM_LIST: "SCENE_CMD_ROOM_LIST", SceneCmdId.SCENE_CMD_ID_WIND_SETTINGS: "SCENE_CMD_WIND_SETTINGS", - SceneCmdId.SCENE_CMD_ID_ENTRANCE_LIST: "SCENE_CMD_ENTRANCE_LIST", + SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: "SCENE_CMD_SPAWN_LIST", SceneCmdId.SCENE_CMD_ID_SPECIAL_FILES: "SCENE_CMD_SPECIAL_FILES", SceneCmdId.SCENE_CMD_ID_ROOM_BEHAVIOR: "SCENE_CMD_ROOM_BEHAVIOR", SceneCmdId.SCENE_CMD_ID_UNDEFINED_9: "SCENE_CMD_UNK_09", @@ -220,7 +220,7 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): ) ) - if cmd_id == SceneCmdId.SCENE_CMD_ID_ENTRANCE_LIST: + if cmd_id == SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: assert data1 == 0 resource = memory_context.report_resource_at_segmented( self, @@ -250,7 +250,7 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): ) ) - if cmd_id == SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: + if cmd_id == SceneCmdId.SCENE_CMD_ID_PLAYER_ENTRY_LIST: self.player_entry_list_length = data1 resource = memory_context.report_resource_at_segmented( self, @@ -439,7 +439,7 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): f.write(" " * 4) f.write(scene_cmd_macro_name_by_cmd_id[cmd_id]) f.write("(") - if cmd_id == SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: + if cmd_id == SceneCmdId.SCENE_CMD_ID_PLAYER_ENTRY_LIST: address = data2_I f.write( memory_context.get_c_expression_length_at_segmented(address) @@ -474,7 +474,7 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): zDir = data2_B2 strength = data2_B3 f.write(f"{xDir}, {yDir}, {zDir}, {strength}") - if cmd_id == SceneCmdId.SCENE_CMD_ID_ENTRANCE_LIST: + if cmd_id == SceneCmdId.SCENE_CMD_ID_SPAWN_LIST: assert data1 == 0 address = data2_I f.write(memory_context.get_c_reference_at_segmented(address))