From 9614a08708082cbdb9cbf2f62786d5bc181ddf32 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 18 Feb 2025 17:50:50 +0100 Subject: [PATCH] use enum names in `SCENE_CMD_SKYBOX_SETTINGS` --- .../extase_oot64/scene_commands_resource.py | 6 +++- tools/assets/extract/oot64_data/__init__.py | 8 +++++ tools/assets/extract/oot64_data/misc_ids.py | 36 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/tools/assets/extract/extase_oot64/scene_commands_resource.py b/tools/assets/extract/extase_oot64/scene_commands_resource.py index 279b45e771..12f92e146f 100644 --- a/tools/assets/extract/extase_oot64/scene_commands_resource.py +++ b/tools/assets/extract/extase_oot64/scene_commands_resource.py @@ -562,7 +562,11 @@ class SceneCommandsResource(Resource, can_size_be_unknown=True): skyboxConfig = data2_B1 envLightMode = data2_B2 assert data2_B3 == 0 - f.write(f"{skyboxId}, {skyboxConfig}, {envLightMode}") + f.write( + f"{oot64_data.get_skybox_id(skyboxId)}, " + f"{skyboxConfig}, " + f"{oot64_data.get_light_mode(envLightMode)}" + ) if cmd_id == SceneCmdId.SCENE_CMD_ID_SKYBOX_DISABLES: assert data1 == 0 skyboxDisabled = data2_B0 diff --git a/tools/assets/extract/oot64_data/__init__.py b/tools/assets/extract/oot64_data/__init__.py index 270b7158fc..7e90913ed9 100644 --- a/tools/assets/extract/oot64_data/__init__.py +++ b/tools/assets/extract/oot64_data/__init__.py @@ -118,3 +118,11 @@ def get_room_shape_type_name(room_shape_type: int) -> str: def get_room_shape_image_amount_type_name(room_shape_image_amount_type: int) -> str: return misc_ids.ROOM_SHAPE_IMAGE_AMOUNT_TYPE[room_shape_image_amount_type] + + +def get_skybox_id(skybox_id: int) -> str: + return misc_ids.SKYBOX_IDS[skybox_id] + + +def get_light_mode(light_mode: int) -> str: + return misc_ids.LIGHT_MODES[light_mode] diff --git a/tools/assets/extract/oot64_data/misc_ids.py b/tools/assets/extract/oot64_data/misc_ids.py index 0376df82af..86d15f5501 100644 --- a/tools/assets/extract/oot64_data/misc_ids.py +++ b/tools/assets/extract/oot64_data/misc_ids.py @@ -117,3 +117,39 @@ ROOM_SHAPE_IMAGE_AMOUNT_TYPE = { 1: "ROOM_SHAPE_IMAGE_AMOUNT_SINGLE", 2: "ROOM_SHAPE_IMAGE_AMOUNT_MULTI", } + +SKYBOX_IDS = { + 0x00: "SKYBOX_NONE", + 0x01: "SKYBOX_NORMAL_SKY", + 0x02: "SKYBOX_BAZAAR", + 0x03: "SKYBOX_OVERCAST_SUNSET", + 0x04: "SKYBOX_MARKET_ADULT", + 0x05: "SKYBOX_CUTSCENE_MAP", + 0x07: "SKYBOX_HOUSE_LINK", + 0x09: "SKYBOX_MARKET_CHILD_DAY", + 0x0A: "SKYBOX_MARKET_CHILD_NIGHT", + 0x0B: "SKYBOX_HAPPY_MASK_SHOP", + 0x0C: "SKYBOX_HOUSE_KNOW_IT_ALL_BROTHERS", + 0x0E: "SKYBOX_HOUSE_OF_TWINS", + 0x0F: "SKYBOX_STABLES", + 0x10: "SKYBOX_HOUSE_KAKARIKO", + 0x11: "SKYBOX_KOKIRI_SHOP", + 0x13: "SKYBOX_GORON_SHOP", + 0x14: "SKYBOX_ZORA_SHOP", + 0x16: "SKYBOX_POTION_SHOP_KAKARIKO", + 0x17: "SKYBOX_POTION_SHOP_MARKET", + 0x18: "SKYBOX_BOMBCHU_SHOP", + 0x1A: "SKYBOX_HOUSE_RICHARD", + 0x1B: "SKYBOX_HOUSE_IMPA", + 0x1C: "SKYBOX_TENT", + 0x1D: "SKYBOX_UNSET_1D", + 0x20: "SKYBOX_HOUSE_MIDO", + 0x21: "SKYBOX_HOUSE_SARIA", + 0x22: "SKYBOX_HOUSE_ALLEY", + 0x27: "SKYBOX_UNSET_27", +} + +LIGHT_MODES = { + 0: "LIGHT_MODE_TIME", + 1: "LIGHT_MODE_SETTINGS", +}