From 3534950eaa27e4b1ffa99a605718088634d9bbb8 Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Thu, 29 May 2025 15:02:41 +0200 Subject: [PATCH] Extract en_okarina_tag cutscenes --- assets/xml/overlays/ovl_En_Okarina_Tag.xml | 6 + baseroms/gc-eu-mq-dbg/config.yml | 4 + baseroms/gc-eu-mq/config.yml | 4 + baseroms/gc-eu/config.yml | 4 + baseroms/gc-jp-ce/config.yml | 4 + baseroms/gc-jp-mq/config.yml | 4 + baseroms/gc-jp/config.yml | 4 + baseroms/gc-us-mq/config.yml | 4 + baseroms/gc-us/config.yml | 4 + baseroms/ique-cn/config.yml | 4 + baseroms/ntsc-1.0/config.yml | 4 + baseroms/ntsc-1.1/config.yml | 4 + baseroms/ntsc-1.2/config.yml | 4 + baseroms/pal-1.0/config.yml | 4 + baseroms/pal-1.1/config.yml | 4 + spec/overlays_gc.inc | 2 +- spec/overlays_n64_ique.inc | 2 +- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 4 +- .../z_en_okarina_tag_cutscene_data.c | 138 ------------------ tools/assets/extract/extract_xml_z64.py | 1 + tools/assets/extract/write_source.txt | 1 + 21 files changed, 67 insertions(+), 143 deletions(-) create mode 100644 assets/xml/overlays/ovl_En_Okarina_Tag.xml delete mode 100644 src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c diff --git a/assets/xml/overlays/ovl_En_Okarina_Tag.xml b/assets/xml/overlays/ovl_En_Okarina_Tag.xml new file mode 100644 index 0000000000..56afd0d19a --- /dev/null +++ b/assets/xml/overlays/ovl_En_Okarina_Tag.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/baseroms/gc-eu-mq-dbg/config.yml b/baseroms/gc-eu-mq-dbg/config.yml index b8994d79c5..4e3d0d4d89 100644 --- a/baseroms/gc-eu-mq-dbg/config.yml +++ b/baseroms/gc-eu-mq-dbg/config.yml @@ -931,6 +931,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2F80 end_offset: 0x3040 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xCB0 + end_offset: 0x15C0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1578 diff --git a/baseroms/gc-eu-mq/config.yml b/baseroms/gc-eu-mq/config.yml index 7705b1b51d..7ed51868be 100644 --- a/baseroms/gc-eu-mq/config.yml +++ b/baseroms/gc-eu-mq/config.yml @@ -915,6 +915,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-eu/config.yml b/baseroms/gc-eu/config.yml index 0168ba27eb..61ceeaf6b0 100644 --- a/baseroms/gc-eu/config.yml +++ b/baseroms/gc-eu/config.yml @@ -915,6 +915,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-jp-ce/config.yml b/baseroms/gc-jp-ce/config.yml index a9f994e1da..99028ed88a 100644 --- a/baseroms/gc-jp-ce/config.yml +++ b/baseroms/gc-jp-ce/config.yml @@ -914,6 +914,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-jp-mq/config.yml b/baseroms/gc-jp-mq/config.yml index 803857950c..264094b89a 100644 --- a/baseroms/gc-jp-mq/config.yml +++ b/baseroms/gc-jp-mq/config.yml @@ -914,6 +914,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-jp/config.yml b/baseroms/gc-jp/config.yml index a70787e711..fce5791c1f 100644 --- a/baseroms/gc-jp/config.yml +++ b/baseroms/gc-jp/config.yml @@ -914,6 +914,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-us-mq/config.yml b/baseroms/gc-us-mq/config.yml index b417c24c9a..189f42049f 100644 --- a/baseroms/gc-us-mq/config.yml +++ b/baseroms/gc-us-mq/config.yml @@ -914,6 +914,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/gc-us/config.yml b/baseroms/gc-us/config.yml index e98d066f03..ae1d346d0d 100644 --- a/baseroms/gc-us/config.yml +++ b/baseroms/gc-us/config.yml @@ -914,6 +914,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/ique-cn/config.yml b/baseroms/ique-cn/config.yml index f93ed60902..64838363e6 100644 --- a/baseroms/ique-cn/config.yml +++ b/baseroms/ique-cn/config.yml @@ -918,6 +918,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Mag_ique.xml start_offset: 0x2D8C end_offset: 0x2E0C +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x1498 diff --git a/baseroms/ntsc-1.0/config.yml b/baseroms/ntsc-1.0/config.yml index 3d20bb66eb..6d056149a2 100644 --- a/baseroms/ntsc-1.0/config.yml +++ b/baseroms/ntsc-1.0/config.yml @@ -921,6 +921,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAC0 + end_offset: 0x13D0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x14A8 diff --git a/baseroms/ntsc-1.1/config.yml b/baseroms/ntsc-1.1/config.yml index ad89741e31..36295a56db 100644 --- a/baseroms/ntsc-1.1/config.yml +++ b/baseroms/ntsc-1.1/config.yml @@ -921,6 +921,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x14A8 diff --git a/baseroms/ntsc-1.2/config.yml b/baseroms/ntsc-1.2/config.yml index 6791efa3c6..c45a6f2a34 100644 --- a/baseroms/ntsc-1.2/config.yml +++ b/baseroms/ntsc-1.2/config.yml @@ -921,6 +921,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x14A8 diff --git a/baseroms/pal-1.0/config.yml b/baseroms/pal-1.0/config.yml index fb2d450143..3066a09ee6 100644 --- a/baseroms/pal-1.0/config.yml +++ b/baseroms/pal-1.0/config.yml @@ -927,6 +927,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x14A8 diff --git a/baseroms/pal-1.1/config.yml b/baseroms/pal-1.1/config.yml index 3a08389c8f..1f1e703038 100644 --- a/baseroms/pal-1.1/config.yml +++ b/baseroms/pal-1.1/config.yml @@ -927,6 +927,10 @@ assets: xml_path: assets/xml/overlays/ovl_En_Kanban.xml start_offset: 0x2E70 end_offset: 0x2F30 +- name: overlays/ovl_En_Okarina_Tag + xml_path: assets/xml/overlays/ovl_En_Okarina_Tag.xml + start_offset: 0xAE0 + end_offset: 0x13F0 - name: overlays/ovl_En_Sda xml_path: assets/xml/overlays/ovl_En_Sda.xml start_offset: 0x14A8 diff --git a/spec/overlays_gc.inc b/spec/overlays_gc.inc index bad92fe5d0..d6675cac4c 100644 --- a/spec/overlays_gc.inc +++ b/spec/overlays_gc.inc @@ -2398,7 +2398,7 @@ endseg beginseg name "ovl_En_Okarina_Tag" compress - include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.o" + include "$(BUILD_DIR)/assets/overlays/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag_reloc.o" endseg diff --git a/spec/overlays_n64_ique.inc b/spec/overlays_n64_ique.inc index 1b4295d7d7..efc45f1a2a 100644 --- a/spec/overlays_n64_ique.inc +++ b/spec/overlays_n64_ique.inc @@ -1832,7 +1832,7 @@ endseg beginseg name "ovl_En_Okarina_Tag" compress - include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.o" + include "$(BUILD_DIR)/assets/overlays/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.o" include "$(BUILD_DIR)/src/overlays/actors/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag_reloc.o" endseg diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 2ec4c8f08f..091c1cf85b 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -23,6 +23,7 @@ #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" #include "assets/scenes/overworld/spot02/spot02_scene.h" +#include "assets/overlays/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) @@ -49,9 +50,6 @@ ActorProfile En_Okarina_Tag_Profile = { /**/ NULL, }; -extern CutsceneData gWindmillSpinningFasterCs[]; -extern CutsceneData gDoorOfTimeOpeningCs[]; - void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { } diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c deleted file mode 100644 index 2ff69c780e..0000000000 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag_cutscene_data.c +++ /dev/null @@ -1,138 +0,0 @@ -#include "sequence.h" -#include "z64cutscene_commands.h" -#include "z64player.h" - -// clang-format off -CutsceneData gWindmillSpinningFasterCs[] = { - CS_HEADER(4, 360), - CS_DESTINATION(CS_DEST_KAKARIKO_VILLAGE_DRAIN_WELL, 200, 201), - CS_CAM_EYE_SPLINE(0, 331), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3100, 201, -100, 0x3235), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3100, 201, -100, 0x3336), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3100, 201, -100, 0x392C), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3178, 201, 113, 0x2C20), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3178, 201, 113, 0x3235), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3178, 201, 113, 0x3238), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3178, 201, 113, 0x3639), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 3178, 201, 113, 0x2C20), - CS_CAM_AT_SPLINE(0, 360), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3054, 137, -64, 0x3235), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3054, 137, -64, 0x3336), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 90, CS_FLOAT(0x42700000, 60.0f), 3054, 137, -64, 0x392C), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 90, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x2C20), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x3235), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x3238), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x3639), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 3118, 142, 96, 0x2C20), - CS_MISC_LIST(1), - CS_MISC(CS_MISC_SET_FLAG_FAST_WINDMILL, 30, 31, 0x0000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000002, 0xFFFFFFFE, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_END_OF_SCRIPT(), -}; - -CutsceneData gDoorOfTimeOpeningCs[] = { - CS_HEADER(18, 3000), - CS_UNK_DATA_LIST(0x00000021, 1), - CS_UNK_DATA(0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0xFFFFFFAA, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000), - CS_PLAYER_CUE_LIST(3), - CS_PLAYER_CUE(PLAYER_CUEID_17, 0, 80, 0x0000, 0x8000, 0x0000, 0, -40, 1400, 0, -40, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_PLAYER_CUE(PLAYER_CUEID_18, 80, 201, 0x0000, 0x8000, 0x0000, 0, -40, 1400, 0, -40, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_PLAYER_CUE(PLAYER_CUEID_5, 201, 662, 0x0000, 0x8000, 0x0000, 0, -40, 1400, 0, -40, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x1, 1e-45f)), - CS_MISC_LIST(1), - CS_MISC(CS_MISC_TRIFORCE_FLASH, 510, 611, 0x0000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000), - CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 1), - CS_ACTOR_CUE(0x0003, 160, 289, 0x0000, 0x0000, 0x0000, 0, 20, 1400, 0, 60, 1400, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x3E9EC27B, 0.31007752f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE_LIST(CS_CMD_ACTOR_CUE_1_5, 3), - CS_ACTOR_CUE(0x0004, 340, 420, 0x0000, 0x0000, 0x0000, 0, 120, 1335, 0, 40, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBF800000, -1.0f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE(0x0004, 420, 465, 0x0000, 0x0000, 0x0000, 0, 40, 1335, 0, 16, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0xBF088889, -0.53333336f), CS_FLOAT(0x0, 0.0f)), - CS_ACTOR_CUE(0x0002, 465, 519, 0x0000, 0x0000, 0x0000, 0, 16, 1335, 0, 16, 1335, CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f), CS_FLOAT(0x0, 0.0f)), - CS_MISC_LIST(1), - CS_MISC(CS_MISC_SET_CSFLAG_0, 620, 621, 0x0000, 0x00000000, 0x00000001, 0x00000000, 0xFFFFFFFF, 0x00000001, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000), - CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 338, 341), - CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 344, 349), - CS_MISC_LIST(1), - CS_MISC(CS_MISC_STOP_CUTSCENE, 790, 791, 0x0000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000), - CS_TRANSITION(CS_TRANS_GRAY_FILL_IN, 157, 160), - CS_TRANSITION(CS_TRANS_GRAY_FILL_OUT, 159, 166), - CS_START_SEQ_LIST(1), - CS_START_SEQ(NA_BGM_DOOR_OF_TIME, 560, 561, 0x0000, 0x00000000, 0x00000003, 0x00000000, 0x00000004, 0x00000003, 0x00000000, 0x00000004), - CS_CAM_EYE_SPLINE(0, 451), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 2, 11, 1397, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 2, 11, 1397, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 2, 11, 1397, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 27, 1445, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 56, 27, 1385, 0xA5AF), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -19, 27, 1341, 0xAE0A), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA8A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA5ED), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA5A4), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0x20BA), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xC9A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA5A2), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xA5BB), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xAE0A), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -44, -4, 1429, 0xB3A5), - CS_CAM_EYE_SPLINE(340, 1461), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xA5AF), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), -6, 15, 1560, 0xAE0A), - CS_CAM_EYE_SPLINE(490, 941), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1379, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1379, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1379, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1379, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 0, 153, 1379, 0xA5AF), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 55, 32, 1398, 0xAE0A), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA8A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA5ED), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA5A4), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0x20BA), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xC9A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA5A2), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 0, CS_FLOAT(0x42700000, 60.0f), 111, -38, 1511, 0xA5BB), - CS_CAM_AT_SPLINE(0, 480), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 2, 36, 1335, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 2, 36, 1335, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 2, 36, 1335, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 0, -8, 1391, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 1, -5, 1398, 0xA5AF), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -2, -3, 1394, 0xAE0A), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 5, 0, 1399, 0xA8A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 1, 14, 1399, 0xA5ED), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -9, 33, 1402, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xA5A4), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0x20BA), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xC9A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xA5A2), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xA5BB), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xAE0A), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -14, 41, 1409, 0xB3A5), - CS_CAM_AT_SPLINE(340, 1490), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -3, 48, 1414, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -3, 48, 1414, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 1000, CS_FLOAT(0x42700000, 60.0f), -3, 48, 1414, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -3, 48, 1414, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -3, 47, 1414, 0xA5AF), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), -3, 47, 1414, 0xAE0A), - CS_CAM_AT_SPLINE(490, 970), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1274, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 60, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1274, 0xB820), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 60, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1274, 0xD0A1), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 0, 264, 1274, 0xBAEE), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 0, 170, 1275, 0xA5AF), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 10, 51, 1306, 0xAE0A), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA8A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5ED), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA220), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5A4), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0x20BA), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xC9A5), - CS_CAM_POINT(CS_CAM_CONTINUE, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5A2), - CS_CAM_POINT(CS_CAM_STOP, 0x00, 30, CS_FLOAT(0x42700000, 60.0f), 68, -2, 1424, 0xA5BB), - CS_END_OF_SCRIPT(), -}; -// clang-format on diff --git a/tools/assets/extract/extract_xml_z64.py b/tools/assets/extract/extract_xml_z64.py index a7014b7107..82d98bd4a7 100644 --- a/tools/assets/extract/extract_xml_z64.py +++ b/tools/assets/extract/extract_xml_z64.py @@ -92,6 +92,7 @@ def create_file_resources(rescoll: ResourcesDescCollection, file: File): "ovl_Bg_Toki_Swd", "ovl_Bg_Treemouth", "ovl_Demo_Kankyo", + "ovl_En_Okarina_Tag", "ovl_En_Zl1", "ovl_file_choose", }: diff --git a/tools/assets/extract/write_source.txt b/tools/assets/extract/write_source.txt index cf81e2cd72..d12671f288 100644 --- a/tools/assets/extract/write_source.txt +++ b/tools/assets/extract/write_source.txt @@ -407,6 +407,7 @@ assets/overlays/ovl_En_Holl/ovl_En_Holl.c assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c assets/overlays/ovl_En_Mag/ovl_En_Mag.c +assets/overlays/ovl_En_Okarina_Tag/ovl_En_Okarina_Tag.c assets/overlays/ovl_En_Sda/ovl_En_Sda.c assets/overlays/ovl_En_Ssh/ovl_En_Ssh.c assets/overlays/ovl_En_Sth/ovl_En_Sth.c