mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +00:00
Code Issues Projects Releases Wiki Activity

use enum names in SCENE_CMD_SKYBOX_SETTINGS

Browse source
This commit is contained in:
Dragorn421 2025-02-18 17:50:50 +01:00
parent c3cc5d324a
commit 9614a08708
No known key found for this signature in database
GPG key ID: 381AEBAF3D429335
3 changed files with 49 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/assets/extract/extase_oot64/scene_commands_resource.py
View file

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

8
tools/assets/extract/oot64_data/__init__.py
View file

@ -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]

36
tools/assets/extract/oot64_data/misc_ids.py
View file

@ -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",
}