From b95643b3978cce2d1557606d111d925e9d3aade9 Mon Sep 17 00:00:00 2001 From: Nicholas Estelami Date: Sat, 26 Dec 2020 06:39:52 -0500 Subject: [PATCH] Updated Texture Asset Handling (#478) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Fixed newline issue with ZAPD * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Finished matching remaining scenes. * Removed old commented out spec lines * Decompiled a few object files. * Reorganized xmls a bit. Updated pu_box overlay to use proper symbol. * Updated texture and object file decomp * Moved scenes/ into the assets/ folder * Fixed a few compile errors * Fixed merge issues. * Fixed makefile merge error * Fixed additional merge error * Fixed several more merge issues * Commented out gameplay_keep and sk2 extraction, since currently unused. * Reenabled gameplay_keep extraction since it's used in the spec * Fixed build error * Removed test struct * Fixed makefile error that would happen on fresh builds * Fixed merge issue * Removed relative paths * Multithreading on extraction, spec uses numbers, few changes to XMLs * Removed redundant code from the extract_assets script * object_sk2 and object_spot09_obj OK * object_spot11_obj OK * object_spot17_obj OK * Test: One of the gameplay_keep dlists given a proper symbol * Updated asset symbol names based on new naming scheme * XMLs use "Offset" instead of "Address" now * Fixed merge issues, updated ovl_Magic_Dark xml and gfx file * Updated to use latest build of ZAPD * Updated ZAPD again * Updated ZAP to remove assimp dependency * Jenkins Test: Added .gitkeep file * Updated ZAP once more * Updated png file name to comply with new naming scheme. * Fixed bad include Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> --- .gitignore | 7 + Makefile | 134 +- .../code/z_actor/func_8002FBAC.s | 4 +- .../actors/ovl_Demo_6K/func_8096865C.s | 4 +- .../actors/ovl_Demo_6K/func_809688C4.s | 4 +- .../actors/ovl_Demo_Kankyo/func_8098ABC0.s | 4 +- .../actors/ovl_Demo_Kankyo/func_8098B354.s | 4 +- assets/.gitignore | 3 +- .../objects/object_vase}/.gitkeep | 0 .../overlays/ovl_Magic_Dark}/.gitkeep | 0 {scenes => assets/scenes}/.gitignore | 0 .../misc => assets/scenes/dungeons}/.gitkeep | 0 .../scenes/indoors}/.gitkeep | 0 {scenes/shops => assets/scenes/misc}/.gitkeep | 0 .../scenes/overworld}/.gitkeep | 0 assets/scenes/shops/.gitkeep | 0 assets/scenes/test_levels/.gitkeep | 0 .../icon_item_24_static.xml | 0 .../icon_item_dungeon_static.xml | 0 .../icon_item_field_static.xml | 0 .../icon_item_gameover_static.xml | 0 .../icon_item_nes_static.xml | 0 .../icon_item_static.xml | 0 .../objects/gameplay_field_keep.xml.ignore | 63 + assets/xml/objects/gameplay_keep.xml | 369 +++ assets/xml/objects/object_pu_box.xml | 7 + assets/xml/objects/object_sk2.xml | 55 + assets/xml/objects/object_spot09_obj.xml | 14 + assets/xml/objects/object_spot11_obj.xml | 7 + assets/xml/objects/object_spot17_obj.xml | 6 + assets/xml/objects/object_vase.xml | 7 + assets/xml/overlays/ovl_Magic_Dark.xml | 8 + .../xml/scenes}/dungeons/Bmori1.xml | 0 .../xml/scenes}/dungeons/FIRE_bs.xml | 0 .../xml/scenes}/dungeons/HAKAdan.xml | 0 .../xml/scenes}/dungeons/HAKAdanCH.xml | 0 .../xml/scenes}/dungeons/HAKAdan_bs.xml | 0 .../xml/scenes}/dungeons/HIDAN.xml | 0 .../xml/scenes}/dungeons/MIZUsin.xml | 0 .../xml/scenes}/dungeons/MIZUsin_bs.xml | 0 .../xml/scenes}/dungeons/bdan.xml | 0 .../xml/scenes}/dungeons/bdan_boss.xml | 0 .../xml/scenes}/dungeons/ddan.xml | 0 .../xml/scenes}/dungeons/ddan_boss.xml | 0 .../xml/scenes}/dungeons/ganon.xml | 0 .../xml/scenes}/dungeons/ganon_boss.xml | 0 .../xml/scenes}/dungeons/ganon_demo.xml | 0 .../xml/scenes}/dungeons/ganon_final.xml | 0 .../xml/scenes}/dungeons/ganon_sonogo.xml | 0 .../xml/scenes}/dungeons/ganon_tou.xml | 0 .../xml/scenes}/dungeons/ganontika.xml | 0 .../xml/scenes}/dungeons/ganontikasonogo.xml | 0 .../xml/scenes}/dungeons/gerudoway.xml | 0 .../xml/scenes}/dungeons/ice_doukutu.xml | 0 .../xml/scenes}/dungeons/jyasinboss.xml | 0 .../xml/scenes}/dungeons/jyasinzou.xml | 0 .../xml/scenes}/dungeons/men.xml | 4 +- .../xml/scenes}/dungeons/moribossroom.xml | 0 .../xml/scenes}/dungeons/ydan.xml | 0 .../xml/scenes}/dungeons/ydan_boss.xml | 0 .../xml/scenes}/indoors/bowling.xml | 0 .../xml/scenes}/indoors/daiyousei_izumi.xml | 0 .../xml/scenes}/indoors/hairal_niwa.xml | 0 .../xml/scenes}/indoors/hairal_niwa2.xml | 0 .../xml/scenes}/indoors/hairal_niwa_n.xml | 0 .../xml/scenes}/indoors/hakasitarelay.xml | 0 .../xml => assets/xml/scenes}/indoors/hut.xml | 0 .../xml/scenes}/indoors/hylia_labo.xml | 0 .../xml/scenes}/indoors/impa.xml | 0 .../xml/scenes}/indoors/kakariko.xml | 0 .../xml/scenes}/indoors/kenjyanoma.xml | 0 .../xml/scenes}/indoors/kokiri_home.xml | 0 .../xml/scenes}/indoors/kokiri_home3.xml | 0 .../xml/scenes}/indoors/kokiri_home4.xml | 0 .../xml/scenes}/indoors/kokiri_home5.xml | 0 .../xml/scenes}/indoors/labo.xml | 0 .../xml/scenes}/indoors/link_home.xml | 0 .../xml/scenes}/indoors/mahouya.xml | 0 .../xml/scenes}/indoors/malon_stable.xml | 0 assets/xml/scenes/indoors/miharigoya.xml | 17 + .../xml/scenes}/indoors/nakaniwa.xml | 0 .../xml/scenes}/indoors/syatekijyou.xml | 0 .../xml/scenes}/indoors/takaraya.xml | 0 .../xml/scenes}/indoors/tent.xml | 0 .../xml/scenes}/indoors/tokinoma.xml | 0 .../xml/scenes}/indoors/yousei_izumi_tate.xml | 0 .../xml/scenes}/indoors/yousei_izumi_yoko.xml | 0 .../xml => assets/xml/scenes}/misc/enrui.xml | 0 .../xml/scenes}/misc/entra_n.xml | 0 .../xml/scenes}/misc/hakaana.xml | 0 .../xml/scenes}/misc/hakaana2.xml | 0 .../xml/scenes}/misc/hakaana_ouke.xml | 0 .../xml/scenes}/misc/hiral_demo.xml | 0 .../xml/scenes}/misc/kakariko3.xml | 0 .../xml/scenes}/misc/kakusiana.xml | 0 .../xml/scenes}/misc/kinsuta.xml | 4 +- .../xml/scenes}/misc/market_alley.xml | 0 .../xml/scenes}/misc/market_alley_n.xml | 0 .../xml/scenes}/misc/market_day.xml | 0 .../xml/scenes}/misc/market_night.xml | 0 .../xml/scenes}/misc/market_ruins.xml | 0 .../xml => assets/xml/scenes}/misc/shrine.xml | 0 .../xml/scenes}/misc/shrine_n.xml | 0 .../xml/scenes}/misc/shrine_r.xml | 0 .../xml/scenes}/misc/turibori.xml | 0 .../xml/scenes}/overworld/entra.xml | 0 .../xml/scenes}/overworld/souko.xml | 0 .../xml/scenes}/overworld/spot00.xml | 0 .../xml/scenes}/overworld/spot01.xml | 2 +- .../xml/scenes}/overworld/spot02.xml | 2 +- .../xml/scenes}/overworld/spot03.xml | 8 +- .../xml/scenes}/overworld/spot04.xml | 12 +- assets/xml/scenes/overworld/spot05.xml | 16 + assets/xml/scenes/overworld/spot06.xml | 15 + .../xml/scenes}/overworld/spot07.xml | 0 .../xml/scenes}/overworld/spot08.xml | 0 assets/xml/scenes/overworld/spot09.xml | 16 + .../xml/scenes}/overworld/spot10.xml | 4 +- .../xml/scenes}/overworld/spot11.xml | 0 .../xml/scenes}/overworld/spot12.xml | 2 +- .../xml/scenes}/overworld/spot13.xml | 0 .../xml/scenes}/overworld/spot15.xml | 0 .../xml/scenes}/overworld/spot16.xml | 0 .../xml/scenes}/overworld/spot17.xml | 0 .../xml/scenes}/overworld/spot18.xml | 0 .../xml/scenes}/overworld/spot20.xml | 4 +- .../xml/scenes}/shops/alley_shop.xml | 0 .../xml => assets/xml/scenes}/shops/drag.xml | 0 .../xml/scenes}/shops/face_shop.xml | 0 .../xml => assets/xml/scenes}/shops/golon.xml | 0 .../xml/scenes}/shops/kokiri_shop.xml | 0 .../xml/scenes}/shops/night_shop.xml | 0 .../xml => assets/xml/scenes}/shops/shop1.xml | 0 .../xml => assets/xml/scenes}/shops/zoora.xml | 0 .../xml/scenes}/test_levels/besitu.xml | 0 .../xml/scenes}/test_levels/depth_test.xml | 0 .../xml/scenes}/test_levels/sasatest.xml | 0 .../xml/scenes}/test_levels/sutaru.xml | 2 +- .../xml/scenes}/test_levels/syotes.xml | 0 .../xml/scenes}/test_levels/syotes2.xml | 0 .../xml/scenes}/test_levels/test01.xml | 0 .../xml/scenes}/test_levels/testroom.xml | 0 assets/xml/textures/icon_item_24_static.xml | 24 + .../xml/textures/icon_item_dungeon_static.xml | 23 + .../xml/textures/icon_item_field_static.xml | 32 + .../textures/icon_item_gameover_static.xml | 9 + assets/xml/textures/icon_item_nes_static.xml | 35 + assets/xml/textures/icon_item_static.xml | 183 ++ extract_assets.py | 162 +- extract_baserom.py | 40 +- fixbaserom.py | 2 +- include/variables.h | 1 - include/z64.h | 15 +- include/z64cutscene_commands.h | 2 +- scenes/xml/indoors/miharigoya.xml | 17 - scenes/xml/overworld/spot05.xml | 16 - scenes/xml/overworld/spot06.xml | 15 - scenes/xml/overworld/spot09.xml | 16 - spec | 2076 +++++++++-------- src/code/z_actor.c | 5 +- src/code/z_bgcheck.c | 4 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 4 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 2 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 14 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 6 +- .../z_bg_spot01_idomizu.c | 2 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 9 +- .../z_bg_spot11_bakudankabe.c | 7 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 5 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 8 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 7 +- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 3 +- .../actors/ovl_En_Pu_box/z_en_pu_box.c | 8 +- src/overlays/actors/ovl_En_Vase/z_en_vase.c | 5 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 5 +- .../actors/ovl_Magic_Dark/z_magic_dark_gfx.c | 64 +- .../z_eff_ss_g_ripple.c | 2 +- tools/ZAP2 | 2 +- tools/specprocess.py | 55 + tools/touchasset.py | 13 + undefined_syms.txt | 13 - 182 files changed, 2249 insertions(+), 1472 deletions(-) rename {scenes/dungeons => assets/objects/object_vase}/.gitkeep (100%) rename {scenes/indoors => assets/overlays/ovl_Magic_Dark}/.gitkeep (100%) rename {scenes => assets/scenes}/.gitignore (100%) rename {scenes/misc => assets/scenes/dungeons}/.gitkeep (100%) rename {scenes/overworld => assets/scenes/indoors}/.gitkeep (100%) rename {scenes/shops => assets/scenes/misc}/.gitkeep (100%) rename {scenes/test_levels => assets/scenes/overworld}/.gitkeep (100%) create mode 100644 assets/scenes/shops/.gitkeep create mode 100644 assets/scenes/test_levels/.gitkeep rename assets/textures/{xml => icon_item_24_static}/icon_item_24_static.xml (100%) rename assets/textures/{xml => icon_item_dungeon_static}/icon_item_dungeon_static.xml (100%) rename assets/textures/{xml => icon_item_field_static}/icon_item_field_static.xml (100%) rename assets/textures/{xml => icon_item_gameover_static}/icon_item_gameover_static.xml (100%) rename assets/textures/{xml => icon_item_nes_static}/icon_item_nes_static.xml (100%) rename assets/textures/{xml => icon_item_static}/icon_item_static.xml (100%) create mode 100644 assets/xml/objects/gameplay_field_keep.xml.ignore create mode 100644 assets/xml/objects/gameplay_keep.xml create mode 100644 assets/xml/objects/object_pu_box.xml create mode 100644 assets/xml/objects/object_sk2.xml create mode 100644 assets/xml/objects/object_spot09_obj.xml create mode 100644 assets/xml/objects/object_spot11_obj.xml create mode 100644 assets/xml/objects/object_spot17_obj.xml create mode 100644 assets/xml/objects/object_vase.xml create mode 100644 assets/xml/overlays/ovl_Magic_Dark.xml rename {scenes/xml => assets/xml/scenes}/dungeons/Bmori1.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/FIRE_bs.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/HAKAdan.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/HAKAdanCH.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/HAKAdan_bs.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/HIDAN.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/MIZUsin.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/MIZUsin_bs.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/bdan.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/bdan_boss.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ddan.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ddan_boss.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon_boss.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon_demo.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon_final.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon_sonogo.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganon_tou.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganontika.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ganontikasonogo.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/gerudoway.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ice_doukutu.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/jyasinboss.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/jyasinzou.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/men.xml (83%) rename {scenes/xml => assets/xml/scenes}/dungeons/moribossroom.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ydan.xml (100%) rename {scenes/xml => assets/xml/scenes}/dungeons/ydan_boss.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/bowling.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/daiyousei_izumi.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hairal_niwa.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hairal_niwa2.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hairal_niwa_n.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hakasitarelay.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hut.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/hylia_labo.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/impa.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kakariko.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kenjyanoma.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kokiri_home.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kokiri_home3.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kokiri_home4.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/kokiri_home5.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/labo.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/link_home.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/mahouya.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/malon_stable.xml (100%) create mode 100644 assets/xml/scenes/indoors/miharigoya.xml rename {scenes/xml => assets/xml/scenes}/indoors/nakaniwa.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/syatekijyou.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/takaraya.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/tent.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/tokinoma.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/yousei_izumi_tate.xml (100%) rename {scenes/xml => assets/xml/scenes}/indoors/yousei_izumi_yoko.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/enrui.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/entra_n.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/hakaana.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/hakaana2.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/hakaana_ouke.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/hiral_demo.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/kakariko3.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/kakusiana.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/kinsuta.xml (50%) rename {scenes/xml => assets/xml/scenes}/misc/market_alley.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/market_alley_n.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/market_day.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/market_night.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/market_ruins.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/shrine.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/shrine_n.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/shrine_r.xml (100%) rename {scenes/xml => assets/xml/scenes}/misc/turibori.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/entra.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/souko.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot00.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot01.xml (67%) rename {scenes/xml => assets/xml/scenes}/overworld/spot02.xml (76%) rename {scenes/xml => assets/xml/scenes}/overworld/spot03.xml (58%) rename {scenes/xml => assets/xml/scenes}/overworld/spot04.xml (52%) create mode 100644 assets/xml/scenes/overworld/spot05.xml create mode 100644 assets/xml/scenes/overworld/spot06.xml rename {scenes/xml => assets/xml/scenes}/overworld/spot07.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot08.xml (100%) create mode 100644 assets/xml/scenes/overworld/spot09.xml rename {scenes/xml => assets/xml/scenes}/overworld/spot10.xml (91%) rename {scenes/xml => assets/xml/scenes}/overworld/spot11.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot12.xml (86%) rename {scenes/xml => assets/xml/scenes}/overworld/spot13.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot15.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot16.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot17.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot18.xml (100%) rename {scenes/xml => assets/xml/scenes}/overworld/spot20.xml (71%) rename {scenes/xml => assets/xml/scenes}/shops/alley_shop.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/drag.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/face_shop.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/golon.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/kokiri_shop.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/night_shop.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/shop1.xml (100%) rename {scenes/xml => assets/xml/scenes}/shops/zoora.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/besitu.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/depth_test.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/sasatest.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/sutaru.xml (80%) rename {scenes/xml => assets/xml/scenes}/test_levels/syotes.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/syotes2.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/test01.xml (100%) rename {scenes/xml => assets/xml/scenes}/test_levels/testroom.xml (100%) create mode 100644 assets/xml/textures/icon_item_24_static.xml create mode 100644 assets/xml/textures/icon_item_dungeon_static.xml create mode 100644 assets/xml/textures/icon_item_field_static.xml create mode 100644 assets/xml/textures/icon_item_gameover_static.xml create mode 100644 assets/xml/textures/icon_item_nes_static.xml create mode 100644 assets/xml/textures/icon_item_static.xml delete mode 100644 scenes/xml/indoors/miharigoya.xml delete mode 100644 scenes/xml/overworld/spot05.xml delete mode 100644 scenes/xml/overworld/spot06.xml delete mode 100644 scenes/xml/overworld/spot09.xml create mode 100644 tools/specprocess.py create mode 100644 tools/touchasset.py diff --git a/.gitignore b/.gitignore index 0ec796976e..1348d0d54f 100644 --- a/.gitignore +++ b/.gitignore @@ -44,8 +44,15 @@ tools/*dSYM/ *.i8.png *.ia4.png *.ia8.png +*.ia16.png *.ci4.png *.ci8.png +*.mdli +*.anmi +*.obj +*.mtl +*.fbx +!*_custom* # Per-user configuration .python-version diff --git a/Makefile b/Makefile index fa5fe92259..be0f90ce92 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ EMU_FLAGS = --noosd # Check code syntax with host compiler CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces -Wno-int-conversion -CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -D _LANGUAGE_C -D NON_MATCHING -Iinclude -Isrc -include stdarg.h $(CHECK_WARNINGS) +CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -D _LANGUAGE_C -D NON_MATCHING -Iinclude -Isrc -Iassets -Ibuild -include stdarg.h $(CHECK_WARNINGS) CPP := cpp MKLDSCRIPT := tools/mkldscript @@ -77,7 +77,7 @@ ASFLAGS := -march=vr4300 -32 -Iinclude MIPS_VERSION := -mips2 # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff. -CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Wab,-r4300_mul -woff 649,838,712 +CFLAGS += -G 0 -non_shared -Xfullwarn -Xcpluscomm -Iinclude -Isrc -Iassets -Ibuild -Wab,-r4300_mul -woff 649,838,712 ifeq ($(shell getconf LONG_BIT), 32) # Work around memory allocation bug in QEMU @@ -97,40 +97,46 @@ SPEC := spec SRC_DIRS := $(shell find src -type d) ASM_DIRS := $(shell find asm -type d -not -path "asm/non_matchings*") $(shell find data -type d) -SCENE_DIRS := $(shell find scenes -type d -not -path "scenes/xml*") -TEXTURE_DIRS := assets/textures -TEXTURE_BIN_DIRS := $(shell find assets/textures/* -type d -not -path "assets/textures/xml*") +ASSET_DIRS := assets/objects assets/textures assets/scenes assets/overlays +ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*") +ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml)) +ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin)) +ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \ + $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f) + +TEXTURE_DIRS := assets/textures assets/scenes assets/objects assets/overlays # source files -C_FILES := $(foreach dir,$(SRC_DIRS) $(TEXTURE_BIN_DIRS) $(SCENE_DIRS),$(wildcard $(dir)/*.c)) +C_FILES := $(foreach dir,$(SRC_DIRS) $(ASSET_BIN_DIRS),$(wildcard $(dir)/*.c)) S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s)) -#TEXTURE_FILES := $(foreach dir,$(TEXTURE_DIRS),$(wildcard $(dir)/*.xml)) O_FILES := $(foreach f,$(S_FILES:.s=.o),build/$f) \ $(foreach f,$(C_FILES:.c=.o),build/$f) \ $(foreach f,$(wildcard baserom/*),build/$f.o) -# $(foreach f,$(TEXTURE_FILES:.xml=.o),build/$f) -#TEXTURE_FILES_RGBA32 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.rgba32.png)) -#TEXTURE_FILES_RGBA16 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.rgb5a1.png)) -#TEXTURE_FILES_GRAY4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.i4.png)) -#TEXTURE_FILES_GRAY8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.i8.png)) -#TEXTURE_FILES_GRAYA4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia4.png)) -#TEXTURE_FILES_GRAYA8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia8.png)) -#TEXTURE_FILES_GRAYA16 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia16.png)) -#TEXTURE_FILES_CI4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ci4.png)) -#TEXTURE_FILES_CI8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ci8.png)) -#TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_RGBA32:.rgba32.png=.rgba32),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_RGBA16:.rgb5a1.png=.rgb5a1),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_GRAY4:.i4.png=.i4),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_GRAY8:.i8.png=.i8),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_GRAYA4:.ia4.png=.ia4),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_GRAYA8:.ia8.png=.ia8),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_GRAYA16:.ia16.png=.ia16),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_CI4:.ci4.png=.ci4),build/$f) \ -# $(foreach f,$(TEXTURE_FILES_CI8:.ci8.png=.ci8),build/$f) \ +TEXTURE_BIN_DIRS := $(shell find assets/objects/* assets/textures/* assets/scenes/* assets/overlays/* -type d) + +TEXTURE_FILES_RGBA32 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.rgba32.png)) +TEXTURE_FILES_RGBA16 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.rgb5a1.png)) +TEXTURE_FILES_GRAY4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.i4.png)) +TEXTURE_FILES_GRAY8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.i8.png)) +TEXTURE_FILES_GRAYA4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia4.png)) +TEXTURE_FILES_GRAYA8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia8.png)) +TEXTURE_FILES_GRAYA16 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ia16.png)) +TEXTURE_FILES_CI4 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ci4.png)) +TEXTURE_FILES_CI8 := $(foreach dir,$(TEXTURE_BIN_DIRS),$(wildcard $(dir)/*.ci8.png)) +TEXTURE_FILES_OUT := $(foreach f,$(TEXTURE_FILES_RGBA32:.rgba32.png=.rgba32.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_RGBA16:.rgb5a1.png=.rgb5a1.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_GRAY4:.i4.png=.i4.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_GRAY8:.i8.png=.i8.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_GRAYA4:.ia4.png=.ia4.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_GRAYA8:.ia8.png=.ia8.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_GRAYA16:.ia16.png=.ia16.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_CI4:.ci4.png=.ci4.inc.c),build/$f) \ + $(foreach f,$(TEXTURE_FILES_CI8:.ci8.png=.ci8.inc.c),build/$f) \ # create build directories -$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(TEXTURE_DIRS) $(TEXTURE_BIN_DIRS) $(SCENE_DIRS),build/$(dir))) +$(shell mkdir -p build/baserom) +$(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(TEXTURE_DIRS) $(ASSET_BIN_DIRS),$(shell mkdir -p build/$(dir))) build/src/libultra_boot_O1/%.o: OPTFLAGS := -O1 build/src/libultra_boot_O2/%.o: OPTFLAGS := -O2 @@ -175,7 +181,7 @@ endif $(ROM): $(ELF) $(ELF2ROM) -cic 6105 $< $@ -$(ELF): $(TEXTURE_FILES_OUT) $(O_FILES) build/ldscript.txt build/undefined_syms.txt +$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) build/ldscript.txt build/undefined_syms.txt $(LD) -T build/undefined_syms.txt -T build/ldscript.txt --no-check-sections --accept-unknown-input-arch --emit-relocs -Map build/z64.map -o $@ build/ldscript.txt: $(SPEC) @@ -190,11 +196,12 @@ clean: setup: git submodule update --init --recursive - $(MAKE) -C tools + $(MAKE) -C tools -j python3 fixbaserom.py python3 extract_baserom.py python3 extract_assets.py +resources: $(ASSET_FILES_OUT) test: $(ROM) $(EMULATOR) $(EMU_FLAGS) $< @@ -210,16 +217,6 @@ build/asm/%.o: asm/%.s build/data/%.o: data/%.s iconv --from UTF-8 --to EUC-JP $^ | $(AS) $(ASFLAGS) -o $@ -#build/assets/%.o: assets/%.s -# $(AS) $(ASFLAGS) $^ -o $@ -# $(OBJCOPY) -O binary $@ $@.bin - -#build/assets/%.c: assets/%.xml -# cp $(<:.c=.xml) $@ - -build/scenes/%.o: scenes/%.c - $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^ - $(OBJCOPY) -O binary $@ $@.bin build/assets/%.o: assets/%.c $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $@ $^ @@ -243,38 +240,47 @@ build/src/libultra_code_O1/llcvt.o: src/libultra_code_O1/llcvt.c python3 tools/set_o32abi_bit.py $@ @$(OBJDUMP) -d $@ > $(@:.o=.s) -#build/assets/textures/%.o: assets/textures/%.zdata -# $(OBJCOPY) -I binary -O elf32-big $< $@ +assets/%.c: assets/%.xml +# $(ZAP2) bsf -i $< -o $(dir $@) + $(ZAP2) bsf -eh -i $< -o $(dir $<) + $(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o build/$(@:.c=.o) $@ -#textures/%.zdata: textures/% -# $(ZAP2) $<.xml b +build/%.rgba32.inc.c: %.rgba32.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt rgba32 -i $< -o $@ -#build/assets/%.s: assets/%.xml -# $(ZAP2) e rgba32 $< $@ +build/%.rgb5a1.inc.c: %.rgb5a1.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt rgb5a1 -i $< -o $@ -#build/assets/%.c: assets/%.xml -# cp $(<:.c=.xml) $@ +build/%.i4.inc.c: %.i4.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt i4 -i $< -o $@ -#build/assets/%.rgba32: assets/%.rgba32.png -# $(ZAP2) btex rgba32 $< $@ +build/%.i8.inc.c: %.i8.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt i8 -i $< -o $@ -#build/assets/%.rgb5a1: assets/%.rgb5a1.png -# $(ZAP2) btex rgb5a1 $< $@ +build/%.ia4.inc.c: %.ia4.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt ia4 -i $< -o $@ -#build/assets/%.i4: assets/%.i4.png -# $(ZAP2) btex i4 $< $@ +build/%.ia8.inc.c: %.ia8.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt ia8 -i $< -o $@ -#build/assets/%.i8: assets/%.i8.png -# $(ZAP2) btex i8 $< $@ +build/%.ia16.inc.c: %.ia16.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt ia16 -i $< -o $@ -#build/assets/%.ia4: assets/%.ia4.png -# $(ZAP2) btex ia4 $< $@ +build/assets/%.ci4.inc.c: assets/%.ci4.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt ci4 -i $< -o $@ -#build/assets/%.ia8: assets/%.ia8.png -# $(ZAP2) btex ia8 $< $@ +build/%.ci8.inc.c: %.ci8.png + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) btex -tt ci8 -i $< -o $@ -#build/assets/%.ci4: assets/%.ci4.png -# $(ZAP2) btex ci4 $< $@ - -#build/assets/%.ci8: assets/%.ci8.png -# $(ZAP2) btex ci8 $< $@ +build/assets/%.bin.inc.c: assets/%.bin + python3 tools/touchasset.py $(addsuffix basefile.txt, $(dir $@)) + $(ZAP2) bblb -i $< -o $@ \ No newline at end of file diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 066f6bbbcf..9c9f2d0904 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -529,8 +529,8 @@ glabel func_8002FBAC /* AA746C 800302CC 0C0346A2 */ jal Matrix_NewMtx /* AA7470 800302D0 AFA20058 */ sw $v0, 0x58($sp) /* AA7474 800302D4 8FA30058 */ lw $v1, 0x58($sp) -/* AA7478 800302D8 3C040401 */ lui $a0, %hi(D_04010130) # $a0, 0x401 -/* AA747C 800302DC 24840130 */ addiu $a0, %lo(D_04010130) # addiu $a0, $a0, 0x130 +/* AA7478 800302D8 3C040401 */ lui $a0, %hi(gGameKeepMoteDL0) # $a0, 0x401 +/* AA747C 800302DC 24840130 */ addiu $a0, %lo(gGameKeepMoteDL0) # addiu $a0, $a0, 0x130 /* AA7480 800302E0 AC620004 */ sw $v0, 4($v1) /* AA7484 800302E4 8FA500EC */ lw $a1, 0xec($sp) /* AA7488 800302E8 3C18DE00 */ li $t8, 0xDE000000 # 0.000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s index 97342bd591..c67a2abce1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s @@ -43,11 +43,11 @@ glabel func_8096865C /* 01D4C 8096869C 8FAA0064 */ lw $t2, 0x0064($sp) /* 01D50 809686A0 8459001C */ lh $t9, 0x001C($v0) ## 0000001C /* 01D54 809686A4 3C090401 */ lui $t1, %hi(D_040101A8) ## $t1 = 04010000 -/* 01D58 809686A8 3C080401 */ lui $t0, %hi(D_04010130) ## $t0 = 04010000 +/* 01D58 809686A8 3C080401 */ lui $t0, %hi(gGameKeepMoteDL0) ## $t0 = 04010000 /* 01D5C 809686AC 2B210009 */ slti $at, $t9, 0x0009 /* 01D60 809686B0 14200004 */ bne $at, $zero, .L809686C4 /* 01D64 809686B4 252901A8 */ addiu $t1, $t1, %lo(D_040101A8) ## $t1 = 040101A8 -/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(D_04010130) ## $t0 = 04010130 +/* 01D68 809686B8 25080130 */ addiu $t0, $t0, %lo(gGameKeepMoteDL0) ## $t0 = 04010130 /* 01D6C 809686BC 10000002 */ beq $zero, $zero, .L809686C8 /* 01D70 809686C0 AFA80054 */ sw $t0, 0x0054($sp) .L809686C4: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s index c159586136..aeaa0c2879 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s @@ -79,10 +79,10 @@ glabel func_809688C4 /* 0205C 809689AC 46083302 */ mul.s $f12, $f6, $f8 /* 02060 809689B0 0C034348 */ jal Matrix_RotateY /* 02064 809689B4 00000000 */ nop -/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(D_04010130) ## $t7 = 04010000 +/* 02068 809689B8 3C0F0401 */ lui $t7, %hi(gGameKeepMoteDL0) ## $t7 = 04010000 /* 0206C 809689BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02070 809689C0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(D_04010130) ## $t7 = 04010130 +/* 02074 809689C4 25EF0130 */ addiu $t7, $t7, %lo(gGameKeepMoteDL0) ## $t7 = 04010130 /* 02078 809689C8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 0207C 809689CC AFAF0058 */ sw $t7, 0x0058($sp) /* 02080 809689D0 02E1F021 */ addu $s8, $s7, $at diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index fc24acd7aa..7a7cd59d00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -390,8 +390,8 @@ glabel func_8098ABC0 /* 02274 8098B0F4 93AF00B7 */ lbu $t7, 0x00B7($sp) /* 02278 8098B0F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0227C 8098B0FC 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(D_04010130) ## $t5 = 04010000 -/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(D_04010130) ## $t5 = 04010130 +/* 02280 8098B100 3C0D0401 */ lui $t5, %hi(gGameKeepMoteDL0) ## $t5 = 04010000 +/* 02284 8098B104 25AD0130 */ addiu $t5, $t5, %lo(gGameKeepMoteDL0) ## $t5 = 04010130 /* 02288 8098B108 02417021 */ addu $t6, $s2, $at /* 0228C 8098B10C AFAE0078 */ sw $t6, 0x0078($sp) /* 02290 8098B110 11E00007 */ beq $t7, $zero, .L8098B130 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index de57a07989..fa2b2d8c49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -309,8 +309,8 @@ glabel func_8098B354 /* 028E4 8098B764 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 028E8 8098B768 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 028EC 8098B76C 44060000 */ mfc1 $a2, $f0 -/* 028F0 8098B770 3C150401 */ lui $s5, %hi(D_04010130) ## $s5 = 04010000 -/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(D_04010130) ## $s5 = 04010130 +/* 028F0 8098B770 3C150401 */ lui $s5, %hi(gGameKeepMoteDL0) ## $s5 = 04010000 +/* 028F4 8098B774 26B50130 */ addiu $s5, $s5, %lo(gGameKeepMoteDL0) ## $s5 = 04010130 /* 028F8 8098B778 02C19021 */ addu $s2, $s6, $at /* 028FC 8098B77C 0C034261 */ jal Matrix_Translate /* 02900 8098B780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/assets/.gitignore b/assets/.gitignore index ac3a6c7c20..166bd912dd 100644 --- a/assets/.gitignore +++ b/assets/.gitignore @@ -1,3 +1,4 @@ *.bin *.c -*.h \ No newline at end of file +*.h +*.cfg \ No newline at end of file diff --git a/scenes/dungeons/.gitkeep b/assets/objects/object_vase/.gitkeep similarity index 100% rename from scenes/dungeons/.gitkeep rename to assets/objects/object_vase/.gitkeep diff --git a/scenes/indoors/.gitkeep b/assets/overlays/ovl_Magic_Dark/.gitkeep similarity index 100% rename from scenes/indoors/.gitkeep rename to assets/overlays/ovl_Magic_Dark/.gitkeep diff --git a/scenes/.gitignore b/assets/scenes/.gitignore similarity index 100% rename from scenes/.gitignore rename to assets/scenes/.gitignore diff --git a/scenes/misc/.gitkeep b/assets/scenes/dungeons/.gitkeep similarity index 100% rename from scenes/misc/.gitkeep rename to assets/scenes/dungeons/.gitkeep diff --git a/scenes/overworld/.gitkeep b/assets/scenes/indoors/.gitkeep similarity index 100% rename from scenes/overworld/.gitkeep rename to assets/scenes/indoors/.gitkeep diff --git a/scenes/shops/.gitkeep b/assets/scenes/misc/.gitkeep similarity index 100% rename from scenes/shops/.gitkeep rename to assets/scenes/misc/.gitkeep diff --git a/scenes/test_levels/.gitkeep b/assets/scenes/overworld/.gitkeep similarity index 100% rename from scenes/test_levels/.gitkeep rename to assets/scenes/overworld/.gitkeep diff --git a/assets/scenes/shops/.gitkeep b/assets/scenes/shops/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/assets/scenes/test_levels/.gitkeep b/assets/scenes/test_levels/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/assets/textures/xml/icon_item_24_static.xml b/assets/textures/icon_item_24_static/icon_item_24_static.xml similarity index 100% rename from assets/textures/xml/icon_item_24_static.xml rename to assets/textures/icon_item_24_static/icon_item_24_static.xml diff --git a/assets/textures/xml/icon_item_dungeon_static.xml b/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.xml similarity index 100% rename from assets/textures/xml/icon_item_dungeon_static.xml rename to assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.xml diff --git a/assets/textures/xml/icon_item_field_static.xml b/assets/textures/icon_item_field_static/icon_item_field_static.xml similarity index 100% rename from assets/textures/xml/icon_item_field_static.xml rename to assets/textures/icon_item_field_static/icon_item_field_static.xml diff --git a/assets/textures/xml/icon_item_gameover_static.xml b/assets/textures/icon_item_gameover_static/icon_item_gameover_static.xml similarity index 100% rename from assets/textures/xml/icon_item_gameover_static.xml rename to assets/textures/icon_item_gameover_static/icon_item_gameover_static.xml diff --git a/assets/textures/xml/icon_item_nes_static.xml b/assets/textures/icon_item_nes_static/icon_item_nes_static.xml similarity index 100% rename from assets/textures/xml/icon_item_nes_static.xml rename to assets/textures/icon_item_nes_static/icon_item_nes_static.xml diff --git a/assets/textures/xml/icon_item_static.xml b/assets/textures/icon_item_static/icon_item_static.xml similarity index 100% rename from assets/textures/xml/icon_item_static.xml rename to assets/textures/icon_item_static/icon_item_static.xml diff --git a/assets/xml/objects/gameplay_field_keep.xml.ignore b/assets/xml/objects/gameplay_field_keep.xml.ignore new file mode 100644 index 0000000000..cbd4d5b78a --- /dev/null +++ b/assets/xml/objects/gameplay_field_keep.xml.ignore @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml new file mode 100644 index 0000000000..955f244df4 --- /dev/null +++ b/assets/xml/objects/gameplay_keep.xml @@ -0,0 +1,369 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_pu_box.xml b/assets/xml/objects/object_pu_box.xml new file mode 100644 index 0000000000..f056cfb3ed --- /dev/null +++ b/assets/xml/objects/object_pu_box.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml new file mode 100644 index 0000000000..1e44ac391b --- /dev/null +++ b/assets/xml/objects/object_sk2.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_spot09_obj.xml b/assets/xml/objects/object_spot09_obj.xml new file mode 100644 index 0000000000..782cfe4f4e --- /dev/null +++ b/assets/xml/objects/object_spot09_obj.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_spot11_obj.xml b/assets/xml/objects/object_spot11_obj.xml new file mode 100644 index 0000000000..7d90d15119 --- /dev/null +++ b/assets/xml/objects/object_spot11_obj.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_spot17_obj.xml b/assets/xml/objects/object_spot17_obj.xml new file mode 100644 index 0000000000..773c145fad --- /dev/null +++ b/assets/xml/objects/object_spot17_obj.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/assets/xml/objects/object_vase.xml b/assets/xml/objects/object_vase.xml new file mode 100644 index 0000000000..f0a0da1199 --- /dev/null +++ b/assets/xml/objects/object_vase.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml new file mode 100644 index 0000000000..7569fba64a --- /dev/null +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/Bmori1.xml b/assets/xml/scenes/dungeons/Bmori1.xml similarity index 100% rename from scenes/xml/dungeons/Bmori1.xml rename to assets/xml/scenes/dungeons/Bmori1.xml diff --git a/scenes/xml/dungeons/FIRE_bs.xml b/assets/xml/scenes/dungeons/FIRE_bs.xml similarity index 100% rename from scenes/xml/dungeons/FIRE_bs.xml rename to assets/xml/scenes/dungeons/FIRE_bs.xml diff --git a/scenes/xml/dungeons/HAKAdan.xml b/assets/xml/scenes/dungeons/HAKAdan.xml similarity index 100% rename from scenes/xml/dungeons/HAKAdan.xml rename to assets/xml/scenes/dungeons/HAKAdan.xml diff --git a/scenes/xml/dungeons/HAKAdanCH.xml b/assets/xml/scenes/dungeons/HAKAdanCH.xml similarity index 100% rename from scenes/xml/dungeons/HAKAdanCH.xml rename to assets/xml/scenes/dungeons/HAKAdanCH.xml diff --git a/scenes/xml/dungeons/HAKAdan_bs.xml b/assets/xml/scenes/dungeons/HAKAdan_bs.xml similarity index 100% rename from scenes/xml/dungeons/HAKAdan_bs.xml rename to assets/xml/scenes/dungeons/HAKAdan_bs.xml diff --git a/scenes/xml/dungeons/HIDAN.xml b/assets/xml/scenes/dungeons/HIDAN.xml similarity index 100% rename from scenes/xml/dungeons/HIDAN.xml rename to assets/xml/scenes/dungeons/HIDAN.xml diff --git a/scenes/xml/dungeons/MIZUsin.xml b/assets/xml/scenes/dungeons/MIZUsin.xml similarity index 100% rename from scenes/xml/dungeons/MIZUsin.xml rename to assets/xml/scenes/dungeons/MIZUsin.xml diff --git a/scenes/xml/dungeons/MIZUsin_bs.xml b/assets/xml/scenes/dungeons/MIZUsin_bs.xml similarity index 100% rename from scenes/xml/dungeons/MIZUsin_bs.xml rename to assets/xml/scenes/dungeons/MIZUsin_bs.xml diff --git a/scenes/xml/dungeons/bdan.xml b/assets/xml/scenes/dungeons/bdan.xml similarity index 100% rename from scenes/xml/dungeons/bdan.xml rename to assets/xml/scenes/dungeons/bdan.xml diff --git a/scenes/xml/dungeons/bdan_boss.xml b/assets/xml/scenes/dungeons/bdan_boss.xml similarity index 100% rename from scenes/xml/dungeons/bdan_boss.xml rename to assets/xml/scenes/dungeons/bdan_boss.xml diff --git a/scenes/xml/dungeons/ddan.xml b/assets/xml/scenes/dungeons/ddan.xml similarity index 100% rename from scenes/xml/dungeons/ddan.xml rename to assets/xml/scenes/dungeons/ddan.xml diff --git a/scenes/xml/dungeons/ddan_boss.xml b/assets/xml/scenes/dungeons/ddan_boss.xml similarity index 100% rename from scenes/xml/dungeons/ddan_boss.xml rename to assets/xml/scenes/dungeons/ddan_boss.xml diff --git a/scenes/xml/dungeons/ganon.xml b/assets/xml/scenes/dungeons/ganon.xml similarity index 100% rename from scenes/xml/dungeons/ganon.xml rename to assets/xml/scenes/dungeons/ganon.xml diff --git a/scenes/xml/dungeons/ganon_boss.xml b/assets/xml/scenes/dungeons/ganon_boss.xml similarity index 100% rename from scenes/xml/dungeons/ganon_boss.xml rename to assets/xml/scenes/dungeons/ganon_boss.xml diff --git a/scenes/xml/dungeons/ganon_demo.xml b/assets/xml/scenes/dungeons/ganon_demo.xml similarity index 100% rename from scenes/xml/dungeons/ganon_demo.xml rename to assets/xml/scenes/dungeons/ganon_demo.xml diff --git a/scenes/xml/dungeons/ganon_final.xml b/assets/xml/scenes/dungeons/ganon_final.xml similarity index 100% rename from scenes/xml/dungeons/ganon_final.xml rename to assets/xml/scenes/dungeons/ganon_final.xml diff --git a/scenes/xml/dungeons/ganon_sonogo.xml b/assets/xml/scenes/dungeons/ganon_sonogo.xml similarity index 100% rename from scenes/xml/dungeons/ganon_sonogo.xml rename to assets/xml/scenes/dungeons/ganon_sonogo.xml diff --git a/scenes/xml/dungeons/ganon_tou.xml b/assets/xml/scenes/dungeons/ganon_tou.xml similarity index 100% rename from scenes/xml/dungeons/ganon_tou.xml rename to assets/xml/scenes/dungeons/ganon_tou.xml diff --git a/scenes/xml/dungeons/ganontika.xml b/assets/xml/scenes/dungeons/ganontika.xml similarity index 100% rename from scenes/xml/dungeons/ganontika.xml rename to assets/xml/scenes/dungeons/ganontika.xml diff --git a/scenes/xml/dungeons/ganontikasonogo.xml b/assets/xml/scenes/dungeons/ganontikasonogo.xml similarity index 100% rename from scenes/xml/dungeons/ganontikasonogo.xml rename to assets/xml/scenes/dungeons/ganontikasonogo.xml diff --git a/scenes/xml/dungeons/gerudoway.xml b/assets/xml/scenes/dungeons/gerudoway.xml similarity index 100% rename from scenes/xml/dungeons/gerudoway.xml rename to assets/xml/scenes/dungeons/gerudoway.xml diff --git a/scenes/xml/dungeons/ice_doukutu.xml b/assets/xml/scenes/dungeons/ice_doukutu.xml similarity index 100% rename from scenes/xml/dungeons/ice_doukutu.xml rename to assets/xml/scenes/dungeons/ice_doukutu.xml diff --git a/scenes/xml/dungeons/jyasinboss.xml b/assets/xml/scenes/dungeons/jyasinboss.xml similarity index 100% rename from scenes/xml/dungeons/jyasinboss.xml rename to assets/xml/scenes/dungeons/jyasinboss.xml diff --git a/scenes/xml/dungeons/jyasinzou.xml b/assets/xml/scenes/dungeons/jyasinzou.xml similarity index 100% rename from scenes/xml/dungeons/jyasinzou.xml rename to assets/xml/scenes/dungeons/jyasinzou.xml diff --git a/scenes/xml/dungeons/men.xml b/assets/xml/scenes/dungeons/men.xml similarity index 83% rename from scenes/xml/dungeons/men.xml rename to assets/xml/scenes/dungeons/men.xml index 8de271ba8f..e44b63f6ad 100644 --- a/scenes/xml/dungeons/men.xml +++ b/assets/xml/scenes/dungeons/men.xml @@ -4,8 +4,8 @@ - - + + diff --git a/scenes/xml/dungeons/moribossroom.xml b/assets/xml/scenes/dungeons/moribossroom.xml similarity index 100% rename from scenes/xml/dungeons/moribossroom.xml rename to assets/xml/scenes/dungeons/moribossroom.xml diff --git a/scenes/xml/dungeons/ydan.xml b/assets/xml/scenes/dungeons/ydan.xml similarity index 100% rename from scenes/xml/dungeons/ydan.xml rename to assets/xml/scenes/dungeons/ydan.xml diff --git a/scenes/xml/dungeons/ydan_boss.xml b/assets/xml/scenes/dungeons/ydan_boss.xml similarity index 100% rename from scenes/xml/dungeons/ydan_boss.xml rename to assets/xml/scenes/dungeons/ydan_boss.xml diff --git a/scenes/xml/indoors/bowling.xml b/assets/xml/scenes/indoors/bowling.xml similarity index 100% rename from scenes/xml/indoors/bowling.xml rename to assets/xml/scenes/indoors/bowling.xml diff --git a/scenes/xml/indoors/daiyousei_izumi.xml b/assets/xml/scenes/indoors/daiyousei_izumi.xml similarity index 100% rename from scenes/xml/indoors/daiyousei_izumi.xml rename to assets/xml/scenes/indoors/daiyousei_izumi.xml diff --git a/scenes/xml/indoors/hairal_niwa.xml b/assets/xml/scenes/indoors/hairal_niwa.xml similarity index 100% rename from scenes/xml/indoors/hairal_niwa.xml rename to assets/xml/scenes/indoors/hairal_niwa.xml diff --git a/scenes/xml/indoors/hairal_niwa2.xml b/assets/xml/scenes/indoors/hairal_niwa2.xml similarity index 100% rename from scenes/xml/indoors/hairal_niwa2.xml rename to assets/xml/scenes/indoors/hairal_niwa2.xml diff --git a/scenes/xml/indoors/hairal_niwa_n.xml b/assets/xml/scenes/indoors/hairal_niwa_n.xml similarity index 100% rename from scenes/xml/indoors/hairal_niwa_n.xml rename to assets/xml/scenes/indoors/hairal_niwa_n.xml diff --git a/scenes/xml/indoors/hakasitarelay.xml b/assets/xml/scenes/indoors/hakasitarelay.xml similarity index 100% rename from scenes/xml/indoors/hakasitarelay.xml rename to assets/xml/scenes/indoors/hakasitarelay.xml diff --git a/scenes/xml/indoors/hut.xml b/assets/xml/scenes/indoors/hut.xml similarity index 100% rename from scenes/xml/indoors/hut.xml rename to assets/xml/scenes/indoors/hut.xml diff --git a/scenes/xml/indoors/hylia_labo.xml b/assets/xml/scenes/indoors/hylia_labo.xml similarity index 100% rename from scenes/xml/indoors/hylia_labo.xml rename to assets/xml/scenes/indoors/hylia_labo.xml diff --git a/scenes/xml/indoors/impa.xml b/assets/xml/scenes/indoors/impa.xml similarity index 100% rename from scenes/xml/indoors/impa.xml rename to assets/xml/scenes/indoors/impa.xml diff --git a/scenes/xml/indoors/kakariko.xml b/assets/xml/scenes/indoors/kakariko.xml similarity index 100% rename from scenes/xml/indoors/kakariko.xml rename to assets/xml/scenes/indoors/kakariko.xml diff --git a/scenes/xml/indoors/kenjyanoma.xml b/assets/xml/scenes/indoors/kenjyanoma.xml similarity index 100% rename from scenes/xml/indoors/kenjyanoma.xml rename to assets/xml/scenes/indoors/kenjyanoma.xml diff --git a/scenes/xml/indoors/kokiri_home.xml b/assets/xml/scenes/indoors/kokiri_home.xml similarity index 100% rename from scenes/xml/indoors/kokiri_home.xml rename to assets/xml/scenes/indoors/kokiri_home.xml diff --git a/scenes/xml/indoors/kokiri_home3.xml b/assets/xml/scenes/indoors/kokiri_home3.xml similarity index 100% rename from scenes/xml/indoors/kokiri_home3.xml rename to assets/xml/scenes/indoors/kokiri_home3.xml diff --git a/scenes/xml/indoors/kokiri_home4.xml b/assets/xml/scenes/indoors/kokiri_home4.xml similarity index 100% rename from scenes/xml/indoors/kokiri_home4.xml rename to assets/xml/scenes/indoors/kokiri_home4.xml diff --git a/scenes/xml/indoors/kokiri_home5.xml b/assets/xml/scenes/indoors/kokiri_home5.xml similarity index 100% rename from scenes/xml/indoors/kokiri_home5.xml rename to assets/xml/scenes/indoors/kokiri_home5.xml diff --git a/scenes/xml/indoors/labo.xml b/assets/xml/scenes/indoors/labo.xml similarity index 100% rename from scenes/xml/indoors/labo.xml rename to assets/xml/scenes/indoors/labo.xml diff --git a/scenes/xml/indoors/link_home.xml b/assets/xml/scenes/indoors/link_home.xml similarity index 100% rename from scenes/xml/indoors/link_home.xml rename to assets/xml/scenes/indoors/link_home.xml diff --git a/scenes/xml/indoors/mahouya.xml b/assets/xml/scenes/indoors/mahouya.xml similarity index 100% rename from scenes/xml/indoors/mahouya.xml rename to assets/xml/scenes/indoors/mahouya.xml diff --git a/scenes/xml/indoors/malon_stable.xml b/assets/xml/scenes/indoors/malon_stable.xml similarity index 100% rename from scenes/xml/indoors/malon_stable.xml rename to assets/xml/scenes/indoors/malon_stable.xml diff --git a/assets/xml/scenes/indoors/miharigoya.xml b/assets/xml/scenes/indoors/miharigoya.xml new file mode 100644 index 0000000000..cc78c7a582 --- /dev/null +++ b/assets/xml/scenes/indoors/miharigoya.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/nakaniwa.xml b/assets/xml/scenes/indoors/nakaniwa.xml similarity index 100% rename from scenes/xml/indoors/nakaniwa.xml rename to assets/xml/scenes/indoors/nakaniwa.xml diff --git a/scenes/xml/indoors/syatekijyou.xml b/assets/xml/scenes/indoors/syatekijyou.xml similarity index 100% rename from scenes/xml/indoors/syatekijyou.xml rename to assets/xml/scenes/indoors/syatekijyou.xml diff --git a/scenes/xml/indoors/takaraya.xml b/assets/xml/scenes/indoors/takaraya.xml similarity index 100% rename from scenes/xml/indoors/takaraya.xml rename to assets/xml/scenes/indoors/takaraya.xml diff --git a/scenes/xml/indoors/tent.xml b/assets/xml/scenes/indoors/tent.xml similarity index 100% rename from scenes/xml/indoors/tent.xml rename to assets/xml/scenes/indoors/tent.xml diff --git a/scenes/xml/indoors/tokinoma.xml b/assets/xml/scenes/indoors/tokinoma.xml similarity index 100% rename from scenes/xml/indoors/tokinoma.xml rename to assets/xml/scenes/indoors/tokinoma.xml diff --git a/scenes/xml/indoors/yousei_izumi_tate.xml b/assets/xml/scenes/indoors/yousei_izumi_tate.xml similarity index 100% rename from scenes/xml/indoors/yousei_izumi_tate.xml rename to assets/xml/scenes/indoors/yousei_izumi_tate.xml diff --git a/scenes/xml/indoors/yousei_izumi_yoko.xml b/assets/xml/scenes/indoors/yousei_izumi_yoko.xml similarity index 100% rename from scenes/xml/indoors/yousei_izumi_yoko.xml rename to assets/xml/scenes/indoors/yousei_izumi_yoko.xml diff --git a/scenes/xml/misc/enrui.xml b/assets/xml/scenes/misc/enrui.xml similarity index 100% rename from scenes/xml/misc/enrui.xml rename to assets/xml/scenes/misc/enrui.xml diff --git a/scenes/xml/misc/entra_n.xml b/assets/xml/scenes/misc/entra_n.xml similarity index 100% rename from scenes/xml/misc/entra_n.xml rename to assets/xml/scenes/misc/entra_n.xml diff --git a/scenes/xml/misc/hakaana.xml b/assets/xml/scenes/misc/hakaana.xml similarity index 100% rename from scenes/xml/misc/hakaana.xml rename to assets/xml/scenes/misc/hakaana.xml diff --git a/scenes/xml/misc/hakaana2.xml b/assets/xml/scenes/misc/hakaana2.xml similarity index 100% rename from scenes/xml/misc/hakaana2.xml rename to assets/xml/scenes/misc/hakaana2.xml diff --git a/scenes/xml/misc/hakaana_ouke.xml b/assets/xml/scenes/misc/hakaana_ouke.xml similarity index 100% rename from scenes/xml/misc/hakaana_ouke.xml rename to assets/xml/scenes/misc/hakaana_ouke.xml diff --git a/scenes/xml/misc/hiral_demo.xml b/assets/xml/scenes/misc/hiral_demo.xml similarity index 100% rename from scenes/xml/misc/hiral_demo.xml rename to assets/xml/scenes/misc/hiral_demo.xml diff --git a/scenes/xml/misc/kakariko3.xml b/assets/xml/scenes/misc/kakariko3.xml similarity index 100% rename from scenes/xml/misc/kakariko3.xml rename to assets/xml/scenes/misc/kakariko3.xml diff --git a/scenes/xml/misc/kakusiana.xml b/assets/xml/scenes/misc/kakusiana.xml similarity index 100% rename from scenes/xml/misc/kakusiana.xml rename to assets/xml/scenes/misc/kakusiana.xml diff --git a/scenes/xml/misc/kinsuta.xml b/assets/xml/scenes/misc/kinsuta.xml similarity index 50% rename from scenes/xml/misc/kinsuta.xml rename to assets/xml/scenes/misc/kinsuta.xml index 8c8f2313a9..974b3955e2 100644 --- a/scenes/xml/misc/kinsuta.xml +++ b/assets/xml/scenes/misc/kinsuta.xml @@ -4,8 +4,8 @@ - - + + \ No newline at end of file diff --git a/scenes/xml/misc/market_alley.xml b/assets/xml/scenes/misc/market_alley.xml similarity index 100% rename from scenes/xml/misc/market_alley.xml rename to assets/xml/scenes/misc/market_alley.xml diff --git a/scenes/xml/misc/market_alley_n.xml b/assets/xml/scenes/misc/market_alley_n.xml similarity index 100% rename from scenes/xml/misc/market_alley_n.xml rename to assets/xml/scenes/misc/market_alley_n.xml diff --git a/scenes/xml/misc/market_day.xml b/assets/xml/scenes/misc/market_day.xml similarity index 100% rename from scenes/xml/misc/market_day.xml rename to assets/xml/scenes/misc/market_day.xml diff --git a/scenes/xml/misc/market_night.xml b/assets/xml/scenes/misc/market_night.xml similarity index 100% rename from scenes/xml/misc/market_night.xml rename to assets/xml/scenes/misc/market_night.xml diff --git a/scenes/xml/misc/market_ruins.xml b/assets/xml/scenes/misc/market_ruins.xml similarity index 100% rename from scenes/xml/misc/market_ruins.xml rename to assets/xml/scenes/misc/market_ruins.xml diff --git a/scenes/xml/misc/shrine.xml b/assets/xml/scenes/misc/shrine.xml similarity index 100% rename from scenes/xml/misc/shrine.xml rename to assets/xml/scenes/misc/shrine.xml diff --git a/scenes/xml/misc/shrine_n.xml b/assets/xml/scenes/misc/shrine_n.xml similarity index 100% rename from scenes/xml/misc/shrine_n.xml rename to assets/xml/scenes/misc/shrine_n.xml diff --git a/scenes/xml/misc/shrine_r.xml b/assets/xml/scenes/misc/shrine_r.xml similarity index 100% rename from scenes/xml/misc/shrine_r.xml rename to assets/xml/scenes/misc/shrine_r.xml diff --git a/scenes/xml/misc/turibori.xml b/assets/xml/scenes/misc/turibori.xml similarity index 100% rename from scenes/xml/misc/turibori.xml rename to assets/xml/scenes/misc/turibori.xml diff --git a/scenes/xml/overworld/entra.xml b/assets/xml/scenes/overworld/entra.xml similarity index 100% rename from scenes/xml/overworld/entra.xml rename to assets/xml/scenes/overworld/entra.xml diff --git a/scenes/xml/overworld/souko.xml b/assets/xml/scenes/overworld/souko.xml similarity index 100% rename from scenes/xml/overworld/souko.xml rename to assets/xml/scenes/overworld/souko.xml diff --git a/scenes/xml/overworld/spot00.xml b/assets/xml/scenes/overworld/spot00.xml similarity index 100% rename from scenes/xml/overworld/spot00.xml rename to assets/xml/scenes/overworld/spot00.xml diff --git a/scenes/xml/overworld/spot01.xml b/assets/xml/scenes/overworld/spot01.xml similarity index 67% rename from scenes/xml/overworld/spot01.xml rename to assets/xml/scenes/overworld/spot01.xml index 643298a1bc..224bdcd27b 100644 --- a/scenes/xml/overworld/spot01.xml +++ b/assets/xml/scenes/overworld/spot01.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/scenes/xml/overworld/spot02.xml b/assets/xml/scenes/overworld/spot02.xml similarity index 76% rename from scenes/xml/overworld/spot02.xml rename to assets/xml/scenes/overworld/spot02.xml index 244259ee00..01151316a9 100644 --- a/scenes/xml/overworld/spot02.xml +++ b/assets/xml/scenes/overworld/spot02.xml @@ -4,7 +4,7 @@ - + diff --git a/scenes/xml/overworld/spot03.xml b/assets/xml/scenes/overworld/spot03.xml similarity index 58% rename from scenes/xml/overworld/spot03.xml rename to assets/xml/scenes/overworld/spot03.xml index 9553762842..b3462234b4 100644 --- a/scenes/xml/overworld/spot03.xml +++ b/assets/xml/scenes/overworld/spot03.xml @@ -1,9 +1,9 @@ - - - + + + @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/scenes/xml/overworld/spot04.xml b/assets/xml/scenes/overworld/spot04.xml similarity index 52% rename from scenes/xml/overworld/spot04.xml rename to assets/xml/scenes/overworld/spot04.xml index 614d466fc8..3f668e7748 100644 --- a/scenes/xml/overworld/spot04.xml +++ b/assets/xml/scenes/overworld/spot04.xml @@ -1,10 +1,10 @@ - - - - + + + + @@ -17,8 +17,8 @@ - - + + \ No newline at end of file diff --git a/assets/xml/scenes/overworld/spot05.xml b/assets/xml/scenes/overworld/spot05.xml new file mode 100644 index 0000000000..59d824d895 --- /dev/null +++ b/assets/xml/scenes/overworld/spot05.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/scenes/overworld/spot06.xml b/assets/xml/scenes/overworld/spot06.xml new file mode 100644 index 0000000000..df64dff795 --- /dev/null +++ b/assets/xml/scenes/overworld/spot06.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot07.xml b/assets/xml/scenes/overworld/spot07.xml similarity index 100% rename from scenes/xml/overworld/spot07.xml rename to assets/xml/scenes/overworld/spot07.xml diff --git a/scenes/xml/overworld/spot08.xml b/assets/xml/scenes/overworld/spot08.xml similarity index 100% rename from scenes/xml/overworld/spot08.xml rename to assets/xml/scenes/overworld/spot08.xml diff --git a/assets/xml/scenes/overworld/spot09.xml b/assets/xml/scenes/overworld/spot09.xml new file mode 100644 index 0000000000..f273fb1d13 --- /dev/null +++ b/assets/xml/scenes/overworld/spot09.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot10.xml b/assets/xml/scenes/overworld/spot10.xml similarity index 91% rename from scenes/xml/overworld/spot10.xml rename to assets/xml/scenes/overworld/spot10.xml index 67d9960029..77195310ab 100644 --- a/scenes/xml/overworld/spot10.xml +++ b/assets/xml/scenes/overworld/spot10.xml @@ -1,8 +1,8 @@ - - + + diff --git a/scenes/xml/overworld/spot11.xml b/assets/xml/scenes/overworld/spot11.xml similarity index 100% rename from scenes/xml/overworld/spot11.xml rename to assets/xml/scenes/overworld/spot11.xml diff --git a/scenes/xml/overworld/spot12.xml b/assets/xml/scenes/overworld/spot12.xml similarity index 86% rename from scenes/xml/overworld/spot12.xml rename to assets/xml/scenes/overworld/spot12.xml index 0832e29189..47dfb8be1c 100644 --- a/scenes/xml/overworld/spot12.xml +++ b/assets/xml/scenes/overworld/spot12.xml @@ -1,7 +1,7 @@ - + diff --git a/scenes/xml/overworld/spot13.xml b/assets/xml/scenes/overworld/spot13.xml similarity index 100% rename from scenes/xml/overworld/spot13.xml rename to assets/xml/scenes/overworld/spot13.xml diff --git a/scenes/xml/overworld/spot15.xml b/assets/xml/scenes/overworld/spot15.xml similarity index 100% rename from scenes/xml/overworld/spot15.xml rename to assets/xml/scenes/overworld/spot15.xml diff --git a/scenes/xml/overworld/spot16.xml b/assets/xml/scenes/overworld/spot16.xml similarity index 100% rename from scenes/xml/overworld/spot16.xml rename to assets/xml/scenes/overworld/spot16.xml diff --git a/scenes/xml/overworld/spot17.xml b/assets/xml/scenes/overworld/spot17.xml similarity index 100% rename from scenes/xml/overworld/spot17.xml rename to assets/xml/scenes/overworld/spot17.xml diff --git a/scenes/xml/overworld/spot18.xml b/assets/xml/scenes/overworld/spot18.xml similarity index 100% rename from scenes/xml/overworld/spot18.xml rename to assets/xml/scenes/overworld/spot18.xml diff --git a/scenes/xml/overworld/spot20.xml b/assets/xml/scenes/overworld/spot20.xml similarity index 71% rename from scenes/xml/overworld/spot20.xml rename to assets/xml/scenes/overworld/spot20.xml index ee2fdd9345..ea798035b5 100644 --- a/scenes/xml/overworld/spot20.xml +++ b/assets/xml/scenes/overworld/spot20.xml @@ -5,8 +5,8 @@ - - + + \ No newline at end of file diff --git a/scenes/xml/shops/alley_shop.xml b/assets/xml/scenes/shops/alley_shop.xml similarity index 100% rename from scenes/xml/shops/alley_shop.xml rename to assets/xml/scenes/shops/alley_shop.xml diff --git a/scenes/xml/shops/drag.xml b/assets/xml/scenes/shops/drag.xml similarity index 100% rename from scenes/xml/shops/drag.xml rename to assets/xml/scenes/shops/drag.xml diff --git a/scenes/xml/shops/face_shop.xml b/assets/xml/scenes/shops/face_shop.xml similarity index 100% rename from scenes/xml/shops/face_shop.xml rename to assets/xml/scenes/shops/face_shop.xml diff --git a/scenes/xml/shops/golon.xml b/assets/xml/scenes/shops/golon.xml similarity index 100% rename from scenes/xml/shops/golon.xml rename to assets/xml/scenes/shops/golon.xml diff --git a/scenes/xml/shops/kokiri_shop.xml b/assets/xml/scenes/shops/kokiri_shop.xml similarity index 100% rename from scenes/xml/shops/kokiri_shop.xml rename to assets/xml/scenes/shops/kokiri_shop.xml diff --git a/scenes/xml/shops/night_shop.xml b/assets/xml/scenes/shops/night_shop.xml similarity index 100% rename from scenes/xml/shops/night_shop.xml rename to assets/xml/scenes/shops/night_shop.xml diff --git a/scenes/xml/shops/shop1.xml b/assets/xml/scenes/shops/shop1.xml similarity index 100% rename from scenes/xml/shops/shop1.xml rename to assets/xml/scenes/shops/shop1.xml diff --git a/scenes/xml/shops/zoora.xml b/assets/xml/scenes/shops/zoora.xml similarity index 100% rename from scenes/xml/shops/zoora.xml rename to assets/xml/scenes/shops/zoora.xml diff --git a/scenes/xml/test_levels/besitu.xml b/assets/xml/scenes/test_levels/besitu.xml similarity index 100% rename from scenes/xml/test_levels/besitu.xml rename to assets/xml/scenes/test_levels/besitu.xml diff --git a/scenes/xml/test_levels/depth_test.xml b/assets/xml/scenes/test_levels/depth_test.xml similarity index 100% rename from scenes/xml/test_levels/depth_test.xml rename to assets/xml/scenes/test_levels/depth_test.xml diff --git a/scenes/xml/test_levels/sasatest.xml b/assets/xml/scenes/test_levels/sasatest.xml similarity index 100% rename from scenes/xml/test_levels/sasatest.xml rename to assets/xml/scenes/test_levels/sasatest.xml diff --git a/scenes/xml/test_levels/sutaru.xml b/assets/xml/scenes/test_levels/sutaru.xml similarity index 80% rename from scenes/xml/test_levels/sutaru.xml rename to assets/xml/scenes/test_levels/sutaru.xml index e0d7f00a0a..f4227fede0 100644 --- a/scenes/xml/test_levels/sutaru.xml +++ b/assets/xml/scenes/test_levels/sutaru.xml @@ -1,7 +1,7 @@ - + diff --git a/scenes/xml/test_levels/syotes.xml b/assets/xml/scenes/test_levels/syotes.xml similarity index 100% rename from scenes/xml/test_levels/syotes.xml rename to assets/xml/scenes/test_levels/syotes.xml diff --git a/scenes/xml/test_levels/syotes2.xml b/assets/xml/scenes/test_levels/syotes2.xml similarity index 100% rename from scenes/xml/test_levels/syotes2.xml rename to assets/xml/scenes/test_levels/syotes2.xml diff --git a/scenes/xml/test_levels/test01.xml b/assets/xml/scenes/test_levels/test01.xml similarity index 100% rename from scenes/xml/test_levels/test01.xml rename to assets/xml/scenes/test_levels/test01.xml diff --git a/scenes/xml/test_levels/testroom.xml b/assets/xml/scenes/test_levels/testroom.xml similarity index 100% rename from scenes/xml/test_levels/testroom.xml rename to assets/xml/scenes/test_levels/testroom.xml diff --git a/assets/xml/textures/icon_item_24_static.xml b/assets/xml/textures/icon_item_24_static.xml new file mode 100644 index 0000000000..46e3bafa7a --- /dev/null +++ b/assets/xml/textures/icon_item_24_static.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/icon_item_dungeon_static.xml b/assets/xml/textures/icon_item_dungeon_static.xml new file mode 100644 index 0000000000..a0f1dabaf8 --- /dev/null +++ b/assets/xml/textures/icon_item_dungeon_static.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/icon_item_field_static.xml b/assets/xml/textures/icon_item_field_static.xml new file mode 100644 index 0000000000..91196736b7 --- /dev/null +++ b/assets/xml/textures/icon_item_field_static.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/icon_item_gameover_static.xml b/assets/xml/textures/icon_item_gameover_static.xml new file mode 100644 index 0000000000..d7ba47ab75 --- /dev/null +++ b/assets/xml/textures/icon_item_gameover_static.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/icon_item_nes_static.xml b/assets/xml/textures/icon_item_nes_static.xml new file mode 100644 index 0000000000..6eb9717973 --- /dev/null +++ b/assets/xml/textures/icon_item_nes_static.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/xml/textures/icon_item_static.xml b/assets/xml/textures/icon_item_static.xml new file mode 100644 index 0000000000..ce07e46e89 --- /dev/null +++ b/assets/xml/textures/icon_item_static.xml @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extract_assets.py b/extract_assets.py index 4a997b9ca7..398c5d0179 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -1,140 +1,42 @@ #!/usr/bin/python3 import os from shutil import copyfile +from multiprocessing import Pool +from multiprocessing import cpu_count -def ExtractFile(xmlPath, outputPath): - execStr = "tools/ZAP2/ZAP2.out e -i %s -b baserom/ -o %s -gsf 1 -sm tools/ZAP2/SymbolMap_OoTMqDbg.txt" % (xmlPath, outputPath) +def Extract(xmlPath, outputPath): + ExtractFile(xmlPath, outputPath, 1, 0) + +def ExtractScene(xmlPath, outputPath): + ExtractFile(xmlPath, outputPath, 1, 1) + +def ExtractFile(xmlPath, outputPath, genSrcFile, incFilePrefix): + execStr = "tools/ZAP2/ZAP2.out e -eh -i %s -b baserom/ -o %s -gsf %i -ifp %i -sm tools/ZAP2/SymbolMap_OoTMqDbg.txt" % (xmlPath, outputPath, genSrcFile, incFilePrefix) print(execStr) os.system(execStr) - # Copy generated C file to parent folder... - #fileName = os.path.basename(xmlPath) - #dirPath = os.path.dirname(xmlPath) - #copyfile(outputPath + "/" + fileName.replace(".xml", ".c"), outputPath + "/../" + fileName.replace(".xml", ".c")) +def ExtractFunc(fullPath): + outPath = ("assets/" + fullPath.split("assets/xml/")[1]).split(".xml")[0] + + if (fullPath.startswith("assets/xml/scenes/")): + ExtractScene(fullPath, outPath) + else: + Extract(fullPath, outPath) + +xmlFiles = [] + +for currentPath, folders, files in os.walk("assets"): + for file in files: + fullPath = os.path.join(currentPath, file) + if file.endswith(".xml") and currentPath.startswith("assets/xml"): + outPath = ("assets/" + fullPath.split("assets/xml/")[1]).split(".xml")[0] + xmlFiles.append(fullPath) + +numCores = cpu_count() +print("Extracting assets with " + str(numCores) + " CPU cores.") +p = Pool(numCores) +p.map(ExtractFunc, xmlFiles) -# Textures -ExtractFile("assets/textures/xml/icon_item_24_static.xml", "assets/textures/icon_item_24_static") -ExtractFile("assets/textures/xml/icon_item_dungeon_static.xml", "assets/textures/icon_item_dungeon_static") -ExtractFile("assets/textures/xml/icon_item_field_static.xml", "assets/textures/icon_item_field_static") -ExtractFile("assets/textures/xml/icon_item_gameover_static.xml", "assets/textures/icon_item_gameover_static") -ExtractFile("assets/textures/xml/icon_item_nes_static.xml", "assets/textures/icon_item_nes_static") -ExtractFile("assets/textures/xml/icon_item_static.xml", "assets/textures/icon_item_static") - -# Scenes and Rooms -ExtractFile("scenes/xml/test_levels/test01.xml", "scenes/test_levels/test01") -ExtractFile("scenes/xml/test_levels/testroom.xml", "scenes/test_levels/testroom") -ExtractFile("scenes/xml/test_levels/sutaru.xml", "scenes/test_levels/sutaru") -ExtractFile("scenes/xml/test_levels/syotes.xml", "scenes/test_levels/syotes") -ExtractFile("scenes/xml/test_levels/syotes2.xml", "scenes/test_levels/syotes2") -ExtractFile("scenes/xml/test_levels/besitu.xml", "scenes/test_levels/besitu") -ExtractFile("scenes/xml/test_levels/sasatest.xml", "scenes/test_levels/sasatest") -ExtractFile("scenes/xml/test_levels/depth_test.xml", "scenes/test_levels/depth_test") - -ExtractFile("scenes/xml/misc/kinsuta.xml", "scenes/misc/kinsuta") -ExtractFile("scenes/xml/misc/kakusiana.xml", "scenes/misc/kakusiana") -ExtractFile("scenes/xml/misc/hakaana.xml", "scenes/misc/hakaana") -ExtractFile("scenes/xml/misc/hakaana2.xml", "scenes/misc/hakaana2") -ExtractFile("scenes/xml/misc/hakaana_ouke.xml", "scenes/misc/hakaana_ouke") -ExtractFile("scenes/xml/misc/hiral_demo.xml", "scenes/misc/hiral_demo") -ExtractFile("scenes/xml/misc/market_day.xml", "scenes/misc/market_day") -ExtractFile("scenes/xml/misc/market_night.xml", "scenes/misc/market_night") -ExtractFile("scenes/xml/misc/market_ruins.xml", "scenes/misc/market_ruins") -ExtractFile("scenes/xml/misc/market_alley.xml", "scenes/misc/market_alley") -ExtractFile("scenes/xml/misc/market_alley_n.xml", "scenes/misc/market_alley_n") -ExtractFile("scenes/xml/misc/kakariko3.xml", "scenes/misc/kakariko3") -ExtractFile("scenes/xml/misc/turibori.xml", "scenes/misc/turibori") -ExtractFile("scenes/xml/misc/shrine.xml", "scenes/misc/shrine") -ExtractFile("scenes/xml/misc/shrine_n.xml", "scenes/misc/shrine_n") -ExtractFile("scenes/xml/misc/shrine_r.xml", "scenes/misc/shrine_r") -ExtractFile("scenes/xml/misc/entra_n.xml", "scenes/misc/entra_n") -ExtractFile("scenes/xml/misc/enrui.xml", "scenes/misc/enrui") - -ExtractFile("scenes/xml/overworld/spot00.xml", "scenes/overworld/spot00") -ExtractFile("scenes/xml/overworld/spot01.xml", "scenes/overworld/spot01") -ExtractFile("scenes/xml/overworld/spot02.xml", "scenes/overworld/spot02") -ExtractFile("scenes/xml/overworld/spot03.xml", "scenes/overworld/spot03") -ExtractFile("scenes/xml/overworld/spot04.xml", "scenes/overworld/spot04") -ExtractFile("scenes/xml/overworld/spot05.xml", "scenes/overworld/spot05") -ExtractFile("scenes/xml/overworld/spot06.xml", "scenes/overworld/spot06") -ExtractFile("scenes/xml/overworld/spot07.xml", "scenes/overworld/spot07") -ExtractFile("scenes/xml/overworld/spot08.xml", "scenes/overworld/spot08") -ExtractFile("scenes/xml/overworld/spot09.xml", "scenes/overworld/spot09") -ExtractFile("scenes/xml/overworld/spot10.xml", "scenes/overworld/spot10") -ExtractFile("scenes/xml/overworld/spot11.xml", "scenes/overworld/spot11") -ExtractFile("scenes/xml/overworld/spot12.xml", "scenes/overworld/spot12") -ExtractFile("scenes/xml/overworld/spot13.xml", "scenes/overworld/spot13") -ExtractFile("scenes/xml/overworld/spot15.xml", "scenes/overworld/spot15") -ExtractFile("scenes/xml/overworld/spot16.xml", "scenes/overworld/spot16") -ExtractFile("scenes/xml/overworld/spot17.xml", "scenes/overworld/spot17") -ExtractFile("scenes/xml/overworld/spot18.xml", "scenes/overworld/spot18") -ExtractFile("scenes/xml/overworld/spot20.xml", "scenes/overworld/spot20") -ExtractFile("scenes/xml/overworld/souko.xml", "scenes/overworld/souko") -ExtractFile("scenes/xml/overworld/entra.xml", "scenes/overworld/entra") - -ExtractFile("scenes/xml/indoors/takaraya.xml", "scenes/indoors/takaraya") -ExtractFile("scenes/xml/indoors/tokinoma.xml", "scenes/indoors/tokinoma") -ExtractFile("scenes/xml/indoors/kenjyanoma.xml", "scenes/indoors/kenjyanoma") -ExtractFile("scenes/xml/indoors/hylia_labo.xml", "scenes/indoors/hylia_labo") -ExtractFile("scenes/xml/indoors/miharigoya.xml", "scenes/indoors/miharigoya") -ExtractFile("scenes/xml/indoors/mahouya.xml", "scenes/indoors/mahouya") -ExtractFile("scenes/xml/indoors/syatekijyou.xml", "scenes/indoors/syatekijyou") -ExtractFile("scenes/xml/indoors/hairal_niwa.xml", "scenes/indoors/hairal_niwa") -ExtractFile("scenes/xml/indoors/hairal_niwa2.xml", "scenes/indoors/hairal_niwa2") -ExtractFile("scenes/xml/indoors/hairal_niwa_n.xml", "scenes/indoors/hairal_niwa_n") -ExtractFile("scenes/xml/indoors/labo.xml", "scenes/indoors/labo") -ExtractFile("scenes/xml/indoors/tent.xml", "scenes/indoors/tent") -ExtractFile("scenes/xml/indoors/impa.xml", "scenes/indoors/impa") -ExtractFile("scenes/xml/indoors/bowling.xml", "scenes/indoors/bowling") -ExtractFile("scenes/xml/indoors/hakasitarelay.xml", "scenes/indoors/hakasitarelay") -ExtractFile("scenes/xml/indoors/nakaniwa.xml", "scenes/indoors/nakaniwa") -ExtractFile("scenes/xml/indoors/daiyousei_izumi.xml", "scenes/indoors/daiyousei_izumi") -ExtractFile("scenes/xml/indoors/yousei_izumi_tate.xml", "scenes/indoors/yousei_izumi_tate") -ExtractFile("scenes/xml/indoors/yousei_izumi_yoko.xml", "scenes/indoors/yousei_izumi_yoko") -ExtractFile("scenes/xml/indoors/malon_stable.xml", "scenes/indoors/malon_stable") -ExtractFile("scenes/xml/indoors/kakariko.xml", "scenes/indoors/kakariko") -ExtractFile("scenes/xml/indoors/hut.xml", "scenes/indoors/hut") -ExtractFile("scenes/xml/indoors/kokiri_home.xml", "scenes/indoors/kokiri_home") -ExtractFile("scenes/xml/indoors/kokiri_home3.xml", "scenes/indoors/kokiri_home3") -ExtractFile("scenes/xml/indoors/kokiri_home4.xml", "scenes/indoors/kokiri_home4") -ExtractFile("scenes/xml/indoors/kokiri_home5.xml", "scenes/indoors/kokiri_home5") -ExtractFile("scenes/xml/indoors/link_home.xml", "scenes/indoors/link_home") - -ExtractFile("scenes/xml/shops/golon.xml", "scenes/shops/golon") -ExtractFile("scenes/xml/shops/zoora.xml", "scenes/shops/zoora") -ExtractFile("scenes/xml/shops/drag.xml", "scenes/shops/drag") -ExtractFile("scenes/xml/shops/alley_shop.xml", "scenes/shops/alley_shop") -ExtractFile("scenes/xml/shops/night_shop.xml", "scenes/shops/night_shop") -ExtractFile("scenes/xml/shops/face_shop.xml", "scenes/shops/face_shop") -ExtractFile("scenes/xml/shops/kokiri_shop.xml", "scenes/shops/kokiri_shop") -ExtractFile("scenes/xml/shops/shop1.xml", "scenes/shops/shop1") - -ExtractFile("scenes/xml/dungeons/ydan.xml", "scenes/dungeons/ydan") -ExtractFile("scenes/xml/dungeons/ydan_boss.xml", "scenes/dungeons/ydan_boss") -ExtractFile("scenes/xml/dungeons/ddan.xml", "scenes/dungeons/ddan") -ExtractFile("scenes/xml/dungeons/ddan_boss.xml", "scenes/dungeons/ddan_boss") -ExtractFile("scenes/xml/dungeons/bdan.xml", "scenes/dungeons/bdan") -ExtractFile("scenes/xml/dungeons/bdan_boss.xml", "scenes/dungeons/bdan_boss") -ExtractFile("scenes/xml/dungeons/Bmori1.xml", "scenes/dungeons/Bmori1") -ExtractFile("scenes/xml/dungeons/FIRE_bs.xml", "scenes/dungeons/FIRE_bs") -ExtractFile("scenes/xml/dungeons/moribossroom.xml", "scenes/dungeons/moribossroom") -ExtractFile("scenes/xml/dungeons/HIDAN.xml", "scenes/dungeons/HIDAN") -ExtractFile("scenes/xml/dungeons/MIZUsin.xml", "scenes/dungeons/MIZUsin") -ExtractFile("scenes/xml/dungeons/MIZUsin_bs.xml", "scenes/dungeons/MIZUsin_bs") -ExtractFile("scenes/xml/dungeons/jyasinzou.xml", "scenes/dungeons/jyasinzou") -ExtractFile("scenes/xml/dungeons/HAKAdan.xml", "scenes/dungeons/HAKAdan") -ExtractFile("scenes/xml/dungeons/HAKAdan_bs.xml", "scenes/dungeons/HAKAdan_bs") -ExtractFile("scenes/xml/dungeons/HAKAdanCH.xml", "scenes/dungeons/HAKAdanCH") -ExtractFile("scenes/xml/dungeons/ice_doukutu.xml", "scenes/dungeons/ice_doukutu") -ExtractFile("scenes/xml/dungeons/jyasinboss.xml", "scenes/dungeons/jyasinboss") -ExtractFile("scenes/xml/dungeons/men.xml", "scenes/dungeons/men") -ExtractFile("scenes/xml/dungeons/gerudoway.xml", "scenes/dungeons/gerudoway") -ExtractFile("scenes/xml/dungeons/ganontika.xml", "scenes/dungeons/ganontika") -ExtractFile("scenes/xml/dungeons/ganontikasonogo.xml", "scenes/dungeons/ganontikasonogo") -ExtractFile("scenes/xml/dungeons/ganon.xml", "scenes/dungeons/ganon") -ExtractFile("scenes/xml/dungeons/ganon_boss.xml", "scenes/dungeons/ganon_boss") -ExtractFile("scenes/xml/dungeons/ganon_demo.xml", "scenes/dungeons/ganon_demo") -ExtractFile("scenes/xml/dungeons/ganon_final.xml", "scenes/dungeons/ganon_final") -ExtractFile("scenes/xml/dungeons/ganon_sonogo.xml", "scenes/dungeons/ganon_sonogo") -ExtractFile("scenes/xml/dungeons/ganon_tou.xml", "scenes/dungeons/ganon_tou") \ No newline at end of file +#os.system("make resources") \ No newline at end of file diff --git a/extract_baserom.py b/extract_baserom.py index 38e68efc7e..3432257e92 100755 --- a/extract_baserom.py +++ b/extract_baserom.py @@ -3,6 +3,8 @@ import os; import sys; import struct; +from multiprocessing import Pool +from multiprocessing import cpu_count ROM_FILE_NAME = 'baserom.z64' @@ -1555,22 +1557,7 @@ def write_output_file(name, offset, size): except IOError: print('failed to write file ' + name) - -try: - os.mkdir('baserom') -except: - pass - -# read baserom data -try: - with open(ROM_FILE_NAME, 'rb') as f: - romData = f.read() -except IOError: - print('failed to read file' + ROM_FILE_NAME) - sys.exit(1) - -# extract files -for i in range(0, 1532): +def ExtractFunc(i): filename = 'baserom/' + FILE_NAMES[i] entryOffset = FILE_TABLE_OFFSET + 16 * i @@ -1590,3 +1577,24 @@ for i in range(0, 1532): write_output_file(filename, physStart, size) if compressed: os.system('tools/yaz0 -d ' + filename + ' ' + filename) + +##################################################################### + +try: + os.mkdir('baserom') +except: + pass + +# read baserom data +try: + with open(ROM_FILE_NAME, 'rb') as f: + romData = f.read() +except IOError: + print('failed to read file' + ROM_FILE_NAME) + sys.exit(1) + +# extract files +numCores = cpu_count() +print("Extracting baserom with " + str(numCores) + " CPU cores.") +p = Pool(numCores) +p.map(ExtractFunc, range(0, FILE_COUNT)) \ No newline at end of file diff --git a/fixbaserom.py b/fixbaserom.py index 9ac8d062a5..a2f2d1dbde 100644 --- a/fixbaserom.py +++ b/fixbaserom.py @@ -70,4 +70,4 @@ print("Writing new ROM 'baserom.z64'.") with open("baserom.z64", mode="wb") as file: file.write(bytes(strippedContent)) -print("Done!") +print("Done!") \ No newline at end of file diff --git a/include/variables.h b/include/variables.h index 275700eaf5..71761d7660 100644 --- a/include/variables.h +++ b/include/variables.h @@ -37,7 +37,6 @@ extern u32 D_04004298; extern u8 D_04006020[]; extern Gfx D_0400C820[]; extern u32 D_0400CB70; -extern Gfx D_04010130[]; extern Gfx D_04015720[]; extern Gfx D_04015760[]; //extern ? D_0401A0B0; diff --git a/include/z64.h b/include/z64.h index 3b5b2f7c73..305f03b7e4 100644 --- a/include/z64.h +++ b/include/z64.h @@ -189,10 +189,17 @@ typedef struct { } SubGlobalContext7B8; // size = 0x8 typedef struct { - /* 0x00 */ char unk_00[0x2]; - /* 0x02 */ s16 unk_02; - /* 0x04 */ char unk_04[0x8]; - /* 0x0C */ u32 unk_0C; + /* 0x00 */ s16 xMin; + /* 0x02 */ s16 ySurface; + /* 0x04 */ s16 zMin; + /* 0x06 */ s16 xLength; + /* 0x08 */ s16 zLength; + /* 0x0C */ u32 properties; + + // 0x0008_0000 = ? + // 0x0007_E000 = Room Index, 0x3F = all rooms + // 0x0000_1F00 = Lighting Settings Index + // 0x0000_00FF = CamData index } WaterBox; // size = 0x10 typedef struct { diff --git a/include/z64cutscene_commands.h b/include/z64cutscene_commands.h index f09810de94..98ebb90ae2 100644 --- a/include/z64cutscene_commands.h +++ b/include/z64cutscene_commands.h @@ -437,4 +437,4 @@ */ #define CS_END() 0xFFFFFFFF, 0x00000000 -#endif +#endif \ No newline at end of file diff --git a/scenes/xml/indoors/miharigoya.xml b/scenes/xml/indoors/miharigoya.xml deleted file mode 100644 index 38e99bb69a..0000000000 --- a/scenes/xml/indoors/miharigoya.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scenes/xml/overworld/spot05.xml b/scenes/xml/overworld/spot05.xml deleted file mode 100644 index 3da224567d..0000000000 --- a/scenes/xml/overworld/spot05.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scenes/xml/overworld/spot06.xml b/scenes/xml/overworld/spot06.xml deleted file mode 100644 index 04c8a60bc8..0000000000 --- a/scenes/xml/overworld/spot06.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scenes/xml/overworld/spot09.xml b/scenes/xml/overworld/spot09.xml deleted file mode 100644 index 906f83a2b6..0000000000 --- a/scenes/xml/overworld/spot09.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spec b/spec index 33a679007e..6ef513f6ae 100644 --- a/spec +++ b/spec @@ -2,9 +2,6 @@ * ROM spec file */ -#define SEGMENT_SCENE 0x02000000 -#define SEGMENT_ROOM 0x03000000 - beginseg name "makerom" include "build/asm/rom_header.o" @@ -3559,7 +3556,9 @@ endseg beginseg name "gameplay_keep" romalign 0x1000 - include "build/baserom/gameplay_keep.o" + //include "build/baserom/gameplay_keep.o" + include "build/assets/objects/gameplay_keep/gameplay_keep.o" + number 04 endseg beginseg @@ -3829,7 +3828,9 @@ endseg beginseg name "object_sk2" romalign 0x1000 - include "build/baserom/object_sk2.o" + //include "build/baserom/object_sk2.o" + include "build/assets/objects/object_sk2/object_sk2.o" + number 06 endseg beginseg @@ -4243,7 +4244,9 @@ endseg beginseg name "object_pu_box" romalign 0x1000 - include "build/baserom/object_pu_box.o" + //include "build/baserom/object_pu_box.o" + include "build/assets/objects/object_pu_box/object_pu_box.o" + number 06 endseg beginseg @@ -4255,7 +4258,8 @@ endseg beginseg name "object_vase" romalign 0x1000 - include "build/baserom/object_vase.o" + include "build/assets/objects/object_vase/object_vase.o" + number 06 endseg beginseg @@ -4495,7 +4499,9 @@ endseg beginseg name "object_spot09_obj" romalign 0x1000 - include "build/baserom/object_spot09_obj.o" + //include "build/baserom/object_spot09_obj.o" + include "build/assets/objects/object_spot09_obj/object_spot09_obj.o" + number 06 endseg beginseg @@ -4513,7 +4519,9 @@ endseg beginseg name "object_spot17_obj" romalign 0x1000 - include "build/baserom/object_spot17_obj.o" + //include "build/baserom/object_spot17_obj.o" + include "build/assets/objects/object_spot17_obj/object_spot17_obj.o" + number 06 endseg beginseg @@ -5623,7 +5631,9 @@ endseg beginseg name "object_spot11_obj" romalign 0x1000 - include "build/baserom/object_spot11_obj.o" + //include "build/baserom/object_spot11_obj.o" + include "build/assets/objects/object_spot11_obj/object_spot11_obj.o" + number 06 endseg beginseg @@ -6613,3578 +6623,3578 @@ endseg beginseg name "ydan_scene" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ydan/ydan_scene.o" + number 02 endseg beginseg name "ydan_room_0" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_0.o" + number 03 endseg beginseg name "ydan_room_1" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_1.o" + number 03 endseg beginseg name "ydan_room_2" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_2.o" + number 03 endseg beginseg name "ydan_room_3" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_3.o" + number 03 endseg beginseg name "ydan_room_4" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_4.o" + number 03 endseg beginseg name "ydan_room_5" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_5.o" + number 03 endseg beginseg name "ydan_room_6" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_6.o" + number 03 endseg beginseg name "ydan_room_7" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_7.o" + number 03 endseg beginseg name "ydan_room_8" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_8.o" + number 03 endseg beginseg name "ydan_room_9" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_9.o" + number 03 endseg beginseg name "ydan_room_10" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_10.o" + number 03 endseg beginseg name "ydan_room_11" romalign 0x1000 - include "build/scenes/dungeons/ydan/ydan_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan/ydan_room_11.o" + number 03 endseg beginseg name "ddan_scene" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ddan/ddan_scene.o" + number 02 endseg beginseg name "ddan_room_0" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_0.o" + number 03 endseg beginseg name "ddan_room_1" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_1.o" + number 03 endseg beginseg name "ddan_room_2" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_2.o" + number 03 endseg beginseg name "ddan_room_3" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_3.o" + number 03 endseg beginseg name "ddan_room_4" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_4.o" + number 03 endseg beginseg name "ddan_room_5" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_5.o" + number 03 endseg beginseg name "ddan_room_6" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_6.o" + number 03 endseg beginseg name "ddan_room_7" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_7.o" + number 03 endseg beginseg name "ddan_room_8" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_8.o" + number 03 endseg beginseg name "ddan_room_9" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_9.o" + number 03 endseg beginseg name "ddan_room_10" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_10.o" + number 03 endseg beginseg name "ddan_room_11" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_11.o" + number 03 endseg beginseg name "ddan_room_12" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_12.o" + number 03 endseg beginseg name "ddan_room_13" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_13.o" + number 03 endseg beginseg name "ddan_room_14" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_14.o" + number 03 endseg beginseg name "ddan_room_15" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_15.o" + number 03 endseg beginseg name "ddan_room_16" romalign 0x1000 - include "build/scenes/dungeons/ddan/ddan_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan/ddan_room_16.o" + number 03 endseg beginseg name "bdan_scene" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/bdan/bdan_scene.o" + number 02 endseg beginseg name "bdan_room_0" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_0.o" + number 03 endseg beginseg name "bdan_room_1" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_1.o" + number 03 endseg beginseg name "bdan_room_2" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_2.o" + number 03 endseg beginseg name "bdan_room_3" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_3.o" + number 03 endseg beginseg name "bdan_room_4" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_4.o" + number 03 endseg beginseg name "bdan_room_5" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_5.o" + number 03 endseg beginseg name "bdan_room_6" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_6.o" + number 03 endseg beginseg name "bdan_room_7" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_7.o" + number 03 endseg beginseg name "bdan_room_8" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_8.o" + number 03 endseg beginseg name "bdan_room_9" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_9.o" + number 03 endseg beginseg name "bdan_room_10" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_10.o" + number 03 endseg beginseg name "bdan_room_11" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_11.o" + number 03 endseg beginseg name "bdan_room_12" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_12.o" + number 03 endseg beginseg name "bdan_room_13" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_13.o" + number 03 endseg beginseg name "bdan_room_14" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_14.o" + number 03 endseg beginseg name "bdan_room_15" romalign 0x1000 - include "build/scenes/dungeons/bdan/bdan_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan/bdan_room_15.o" + number 03 endseg beginseg name "Bmori1_scene" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/Bmori1/Bmori1_scene.o" + number 02 endseg beginseg name "Bmori1_room_0" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_0.o" + number 03 endseg beginseg name "Bmori1_room_1" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_1.o" + number 03 endseg beginseg name "Bmori1_room_2" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_2.o" + number 03 endseg beginseg name "Bmori1_room_3" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_3.o" + number 03 endseg beginseg name "Bmori1_room_4" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_4.o" + number 03 endseg beginseg name "Bmori1_room_5" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_5.o" + number 03 endseg beginseg name "Bmori1_room_6" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_6.o" + number 03 endseg beginseg name "Bmori1_room_7" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_7.o" + number 03 endseg beginseg name "Bmori1_room_8" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_8.o" + number 03 endseg beginseg name "Bmori1_room_9" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_9.o" + number 03 endseg beginseg name "Bmori1_room_10" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_10.o" + number 03 endseg beginseg name "Bmori1_room_11" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_11.o" + number 03 endseg beginseg name "Bmori1_room_12" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_12.o" + number 03 endseg beginseg name "Bmori1_room_13" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_13.o" + number 03 endseg beginseg name "Bmori1_room_14" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_14.o" + number 03 endseg beginseg name "Bmori1_room_15" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_15.o" + number 03 endseg beginseg name "Bmori1_room_16" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_16.o" + number 03 endseg beginseg name "Bmori1_room_17" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_17.o" + number 03 endseg beginseg name "Bmori1_room_18" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_18.o" + number 03 endseg beginseg name "Bmori1_room_19" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_19.o" + number 03 endseg beginseg name "Bmori1_room_20" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_20.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_20.o" + number 03 endseg beginseg name "Bmori1_room_21" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_21.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_21.o" + number 03 endseg beginseg name "Bmori1_room_22" romalign 0x1000 - include "build/scenes/dungeons/Bmori1/Bmori1_room_22.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/Bmori1/Bmori1_room_22.o" + number 03 endseg beginseg name "HIDAN_scene" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/HIDAN/HIDAN_scene.o" + number 02 endseg beginseg name "HIDAN_room_0" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_0.o" + number 03 endseg beginseg name "HIDAN_room_1" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_1.o" + number 03 endseg beginseg name "HIDAN_room_2" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_2.o" + number 03 endseg beginseg name "HIDAN_room_3" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_3.o" + number 03 endseg beginseg name "HIDAN_room_4" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_4.o" + number 03 endseg beginseg name "HIDAN_room_5" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_5.o" + number 03 endseg beginseg name "HIDAN_room_6" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_6.o" + number 03 endseg beginseg name "HIDAN_room_7" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_7.o" + number 03 endseg beginseg name "HIDAN_room_8" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_8.o" + number 03 endseg beginseg name "HIDAN_room_9" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_9.o" + number 03 endseg beginseg name "HIDAN_room_10" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_10.o" + number 03 endseg beginseg name "HIDAN_room_11" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_11.o" + number 03 endseg beginseg name "HIDAN_room_12" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_12.o" + number 03 endseg beginseg name "HIDAN_room_13" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_13.o" + number 03 endseg beginseg name "HIDAN_room_14" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_14.o" + number 03 endseg beginseg name "HIDAN_room_15" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_15.o" + number 03 endseg beginseg name "HIDAN_room_16" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_16.o" + number 03 endseg beginseg name "HIDAN_room_17" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_17.o" + number 03 endseg beginseg name "HIDAN_room_18" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_18.o" + number 03 endseg beginseg name "HIDAN_room_19" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_19.o" + number 03 endseg beginseg name "HIDAN_room_20" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_20.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_20.o" + number 03 endseg beginseg name "HIDAN_room_21" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_21.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_21.o" + number 03 endseg beginseg name "HIDAN_room_22" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_22.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_22.o" + number 03 endseg beginseg name "HIDAN_room_23" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_23.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_23.o" + number 03 endseg beginseg name "HIDAN_room_24" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_24.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_24.o" + number 03 endseg beginseg name "HIDAN_room_25" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_25.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_25.o" + number 03 endseg beginseg name "HIDAN_room_26" romalign 0x1000 - include "build/scenes/dungeons/HIDAN/HIDAN_room_26.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HIDAN/HIDAN_room_26.o" + number 03 endseg beginseg name "MIZUsin_scene" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_scene.o" + number 02 endseg beginseg name "MIZUsin_room_0" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_0.o" + number 03 endseg beginseg name "MIZUsin_room_1" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_1.o" + number 03 endseg beginseg name "MIZUsin_room_2" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_2.o" + number 03 endseg beginseg name "MIZUsin_room_3" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_3.o" + number 03 endseg beginseg name "MIZUsin_room_4" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_4.o" + number 03 endseg beginseg name "MIZUsin_room_5" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_5.o" + number 03 endseg beginseg name "MIZUsin_room_6" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_6.o" + number 03 endseg beginseg name "MIZUsin_room_7" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_7.o" + number 03 endseg beginseg name "MIZUsin_room_8" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_8.o" + number 03 endseg beginseg name "MIZUsin_room_9" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_9.o" + number 03 endseg beginseg name "MIZUsin_room_10" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_10.o" + number 03 endseg beginseg name "MIZUsin_room_11" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_11.o" + number 03 endseg beginseg name "MIZUsin_room_12" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_12.o" + number 03 endseg beginseg name "MIZUsin_room_13" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_13.o" + number 03 endseg beginseg name "MIZUsin_room_14" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_14.o" + number 03 endseg beginseg name "MIZUsin_room_15" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_15.o" + number 03 endseg beginseg name "MIZUsin_room_16" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_16.o" + number 03 endseg beginseg name "MIZUsin_room_17" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_17.o" + number 03 endseg beginseg name "MIZUsin_room_18" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_18.o" + number 03 endseg beginseg name "MIZUsin_room_19" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_19.o" + number 03 endseg beginseg name "MIZUsin_room_20" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_20.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_20.o" + number 03 endseg beginseg name "MIZUsin_room_21" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_21.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_21.o" + number 03 endseg beginseg name "MIZUsin_room_22" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin/MIZUsin_room_22.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin/MIZUsin_room_22.o" + number 03 endseg beginseg name "jyasinzou_scene" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_scene.o" + number 02 endseg beginseg name "jyasinzou_room_0" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_0.o" + number 03 endseg beginseg name "jyasinzou_room_1" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_1.o" + number 03 endseg beginseg name "jyasinzou_room_2" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_2.o" + number 03 endseg beginseg name "jyasinzou_room_3" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_3.o" + number 03 endseg beginseg name "jyasinzou_room_4" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_4.o" + number 03 endseg beginseg name "jyasinzou_room_5" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_5.o" + number 03 endseg beginseg name "jyasinzou_room_6" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_6.o" + number 03 endseg beginseg name "jyasinzou_room_7" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_7.o" + number 03 endseg beginseg name "jyasinzou_room_8" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_8.o" + number 03 endseg beginseg name "jyasinzou_room_9" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_9.o" + number 03 endseg beginseg name "jyasinzou_room_10" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_10.o" + number 03 endseg beginseg name "jyasinzou_room_11" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_11.o" + number 03 endseg beginseg name "jyasinzou_room_12" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_12.o" + number 03 endseg beginseg name "jyasinzou_room_13" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_13.o" + number 03 endseg beginseg name "jyasinzou_room_14" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_14.o" + number 03 endseg beginseg name "jyasinzou_room_15" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_15.o" + number 03 endseg beginseg name "jyasinzou_room_16" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_16.o" + number 03 endseg beginseg name "jyasinzou_room_17" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_17.o" + number 03 endseg beginseg name "jyasinzou_room_18" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_18.o" + number 03 endseg beginseg name "jyasinzou_room_19" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_19.o" + number 03 endseg beginseg name "jyasinzou_room_20" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_20.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_20.o" + number 03 endseg beginseg name "jyasinzou_room_21" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_21.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_21.o" + number 03 endseg beginseg name "jyasinzou_room_22" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_22.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_22.o" + number 03 endseg beginseg name "jyasinzou_room_23" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_23.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_23.o" + number 03 endseg beginseg name "jyasinzou_room_24" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_24.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_24.o" + number 03 endseg beginseg name "jyasinzou_room_25" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_25.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_25.o" + number 03 endseg beginseg name "jyasinzou_room_26" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_26.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_26.o" + number 03 endseg beginseg name "jyasinzou_room_27" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_27.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_27.o" + number 03 endseg beginseg name "jyasinzou_room_28" romalign 0x1000 - include "build/scenes/dungeons/jyasinzou/jyasinzou_room_28.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinzou/jyasinzou_room_28.o" + number 03 endseg beginseg name "HAKAdan_scene" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_scene.o" + number 02 endseg beginseg name "HAKAdan_room_0" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_0.o" + number 03 endseg beginseg name "HAKAdan_room_1" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_1.o" + number 03 endseg beginseg name "HAKAdan_room_2" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_2.o" + number 03 endseg beginseg name "HAKAdan_room_3" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_3.o" + number 03 endseg beginseg name "HAKAdan_room_4" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_4.o" + number 03 endseg beginseg name "HAKAdan_room_5" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_5.o" + number 03 endseg beginseg name "HAKAdan_room_6" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_6.o" + number 03 endseg beginseg name "HAKAdan_room_7" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_7.o" + number 03 endseg beginseg name "HAKAdan_room_8" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_8.o" + number 03 endseg beginseg name "HAKAdan_room_9" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_9.o" + number 03 endseg beginseg name "HAKAdan_room_10" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_10.o" + number 03 endseg beginseg name "HAKAdan_room_11" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_11.o" + number 03 endseg beginseg name "HAKAdan_room_12" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_12.o" + number 03 endseg beginseg name "HAKAdan_room_13" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_13.o" + number 03 endseg beginseg name "HAKAdan_room_14" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_14.o" + number 03 endseg beginseg name "HAKAdan_room_15" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_15.o" + number 03 endseg beginseg name "HAKAdan_room_16" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_16.o" + number 03 endseg beginseg name "HAKAdan_room_17" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_17.o" + number 03 endseg beginseg name "HAKAdan_room_18" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_18.o" + number 03 endseg beginseg name "HAKAdan_room_19" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_19.o" + number 03 endseg beginseg name "HAKAdan_room_20" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_20.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_20.o" + number 03 endseg beginseg name "HAKAdan_room_21" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_21.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_21.o" + number 03 endseg beginseg name "HAKAdan_room_22" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan/HAKAdan_room_22.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan/HAKAdan_room_22.o" + number 03 endseg beginseg name "HAKAdanCH_scene" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.o" + number 02 endseg beginseg name "HAKAdanCH_room_0" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.o" + number 03 endseg beginseg name "HAKAdanCH_room_1" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.o" + number 03 endseg beginseg name "HAKAdanCH_room_2" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.o" + number 03 endseg beginseg name "HAKAdanCH_room_3" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.o" + number 03 endseg beginseg name "HAKAdanCH_room_4" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.o" + number 03 endseg beginseg name "HAKAdanCH_room_5" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.o" + number 03 endseg beginseg name "HAKAdanCH_room_6" romalign 0x1000 - include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.o" + number 03 endseg beginseg name "ice_doukutu_scene" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_scene.o" + number 02 endseg beginseg name "ice_doukutu_room_0" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.o" + number 03 endseg beginseg name "ice_doukutu_room_1" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.o" + number 03 endseg beginseg name "ice_doukutu_room_2" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.o" + number 03 endseg beginseg name "ice_doukutu_room_3" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.o" + number 03 endseg beginseg name "ice_doukutu_room_4" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.o" + number 03 endseg beginseg name "ice_doukutu_room_5" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.o" + number 03 endseg beginseg name "ice_doukutu_room_6" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.o" + number 03 endseg beginseg name "ice_doukutu_room_7" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.o" + number 03 endseg beginseg name "ice_doukutu_room_8" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.o" + number 03 endseg beginseg name "ice_doukutu_room_9" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.o" + number 03 endseg beginseg name "ice_doukutu_room_10" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.o" + number 03 endseg beginseg name "ice_doukutu_room_11" romalign 0x1000 - include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.o" + number 03 endseg beginseg name "men_scene" romalign 0x1000 - include "build/scenes/dungeons/men/men_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/men/men_scene.o" + number 02 endseg beginseg name "men_room_0" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_0.o" + number 03 endseg beginseg name "men_room_1" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_1.o" + number 03 endseg beginseg name "men_room_2" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_2.o" + number 03 endseg beginseg name "men_room_3" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_3.o" + number 03 endseg beginseg name "men_room_4" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_4.o" + number 03 endseg beginseg name "men_room_5" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_5.o" + number 03 endseg beginseg name "men_room_6" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_6.o" + number 03 endseg beginseg name "men_room_7" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_7.o" + number 03 endseg beginseg name "men_room_8" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_8.o" + number 03 endseg beginseg name "men_room_9" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_9.o" + number 03 endseg beginseg name "men_room_10" romalign 0x1000 - include "build/scenes/dungeons/men/men_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/men/men_room_10.o" + number 03 endseg beginseg name "ganontika_scene" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganontika/ganontika_scene.o" + number 02 endseg beginseg name "ganontika_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_0.o" + number 03 endseg beginseg name "ganontika_room_1" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_1.o" + number 03 endseg beginseg name "ganontika_room_2" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_2.o" + number 03 endseg beginseg name "ganontika_room_3" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_3.o" + number 03 endseg beginseg name "ganontika_room_4" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_4.o" + number 03 endseg beginseg name "ganontika_room_5" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_5.o" + number 03 endseg beginseg name "ganontika_room_6" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_6.o" + number 03 endseg beginseg name "ganontika_room_7" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_7.o" + number 03 endseg beginseg name "ganontika_room_8" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_8.o" + number 03 endseg beginseg name "ganontika_room_9" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_9.o" + number 03 endseg beginseg name "ganontika_room_10" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_10.o" + number 03 endseg beginseg name "ganontika_room_11" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_11.o" + number 03 endseg beginseg name "ganontika_room_12" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_12.o" + number 03 endseg beginseg name "ganontika_room_13" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_13.o" + number 03 endseg beginseg name "ganontika_room_14" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_14.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_14.o" + number 03 endseg beginseg name "ganontika_room_15" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_15.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_15.o" + number 03 endseg beginseg name "ganontika_room_16" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_16.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_16.o" + number 03 endseg beginseg name "ganontika_room_17" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_17.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_17.o" + number 03 endseg beginseg name "ganontika_room_18" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_18.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_18.o" + number 03 endseg beginseg name "ganontika_room_19" romalign 0x1000 - include "build/scenes/dungeons/ganontika/ganontika_room_19.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontika/ganontika_room_19.o" + number 03 endseg beginseg name "syotes_scene" romalign 0x1000 - include "build/scenes/test_levels/syotes/syotes_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/syotes/syotes_scene.o" + number 02 endseg beginseg name "syotes_room_0" romalign 0x1000 - include "build/scenes/test_levels/syotes/syotes_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/syotes/syotes_room_0.o" + number 03 endseg beginseg name "syotes2_scene" romalign 0x1000 - include "build/scenes/test_levels/syotes2/syotes2_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/syotes2/syotes2_scene.o" + number 02 endseg beginseg name "syotes2_room_0" romalign 0x1000 - include "build/scenes/test_levels/syotes2/syotes2_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/syotes2/syotes2_room_0.o" + number 03 endseg beginseg name "depth_test_scene" romalign 0x1000 - include "build/scenes/test_levels/depth_test/depth_test_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/depth_test/depth_test_scene.o" + number 02 endseg beginseg name "depth_test_room_0" romalign 0x1000 - include "build/scenes/test_levels/depth_test/depth_test_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/depth_test/depth_test_room_0.o" + number 03 endseg beginseg name "spot00_scene" romalign 0x1000 - include "build/scenes/overworld/spot00/spot00_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot00/spot00_scene.o" + number 02 endseg beginseg name "spot00_room_0" romalign 0x1000 - include "build/scenes/overworld/spot00/spot00_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot00/spot00_room_0.o" + number 03 endseg beginseg name "spot01_scene" romalign 0x1000 - include "build/scenes/overworld/spot01/spot01_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot01/spot01_scene.o" + number 02 endseg beginseg name "spot01_room_0" romalign 0x1000 - include "build/scenes/overworld/spot01/spot01_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot01/spot01_room_0.o" + number 03 endseg beginseg name "spot02_scene" romalign 0x1000 - include "build/scenes/overworld/spot02/spot02_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot02/spot02_scene.o" + number 02 endseg beginseg name "spot02_room_0" romalign 0x1000 - include "build/scenes/overworld/spot02/spot02_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot02/spot02_room_0.o" + number 03 endseg beginseg name "spot02_room_1" romalign 0x1000 - include "build/scenes/overworld/spot02/spot02_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot02/spot02_room_1.o" + number 03 endseg beginseg name "spot03_scene" romalign 0x1000 - include "build/scenes/overworld/spot03/spot03_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot03/spot03_scene.o" + number 02 endseg beginseg name "spot03_room_0" romalign 0x1000 - include "build/scenes/overworld/spot03/spot03_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot03/spot03_room_0.o" + number 03 endseg beginseg name "spot03_room_1" romalign 0x1000 - include "build/scenes/overworld/spot03/spot03_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot03/spot03_room_1.o" + number 03 endseg beginseg name "spot04_scene" romalign 0x1000 - include "build/scenes/overworld/spot04/spot04_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot04/spot04_scene.o" + number 02 endseg beginseg name "spot04_room_0" romalign 0x1000 - include "build/scenes/overworld/spot04/spot04_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot04/spot04_room_0.o" + number 03 endseg beginseg name "spot04_room_1" romalign 0x1000 - include "build/scenes/overworld/spot04/spot04_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot04/spot04_room_1.o" + number 03 endseg beginseg name "spot04_room_2" romalign 0x1000 - include "build/scenes/overworld/spot04/spot04_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot04/spot04_room_2.o" + number 03 endseg beginseg name "spot05_scene" romalign 0x1000 - include "build/scenes/overworld/spot05/spot05_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot05/spot05_scene.o" + number 02 endseg beginseg name "spot05_room_0" romalign 0x1000 - include "build/scenes/overworld/spot05/spot05_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot05/spot05_room_0.o" + number 03 endseg beginseg name "spot06_scene" romalign 0x1000 - include "build/scenes/overworld/spot06/spot06_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot06/spot06_scene.o" + number 02 endseg beginseg name "spot06_room_0" romalign 0x1000 - include "build/scenes/overworld/spot06/spot06_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot06/spot06_room_0.o" + number 03 endseg beginseg name "spot07_scene" romalign 0x1000 - include "build/scenes/overworld/spot07/spot07_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot07/spot07_scene.o" + number 02 endseg beginseg name "spot07_room_0" romalign 0x1000 - include "build/scenes/overworld/spot07/spot07_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot07/spot07_room_0.o" + number 03 endseg beginseg name "spot07_room_1" romalign 0x1000 - include "build/scenes/overworld/spot07/spot07_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot07/spot07_room_1.o" + number 03 endseg beginseg name "spot08_scene" romalign 0x1000 - include "build/scenes/overworld/spot08/spot08_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot08/spot08_scene.o" + number 02 endseg beginseg name "spot08_room_0" romalign 0x1000 - include "build/scenes/overworld/spot08/spot08_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot08/spot08_room_0.o" + number 03 endseg beginseg name "spot09_scene" romalign 0x1000 - include "build/scenes/overworld/spot09/spot09_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot09/spot09_scene.o" + number 02 endseg beginseg name "spot09_room_0" romalign 0x1000 - include "build/scenes/overworld/spot09/spot09_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot09/spot09_room_0.o" + number 03 endseg beginseg name "spot10_scene" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot10/spot10_scene.o" + number 02 endseg beginseg name "spot10_room_0" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_0.o" + number 03 endseg beginseg name "spot10_room_1" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_1.o" + number 03 endseg beginseg name "spot10_room_2" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_2.o" + number 03 endseg beginseg name "spot10_room_3" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_3.o" + number 03 endseg beginseg name "spot10_room_4" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_4.o" + number 03 endseg beginseg name "spot10_room_5" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_5.o" + number 03 endseg beginseg name "spot10_room_6" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_6.o" + number 03 endseg beginseg name "spot10_room_7" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_7.o" + number 03 endseg beginseg name "spot10_room_8" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_8.o" + number 03 endseg beginseg name "spot10_room_9" romalign 0x1000 - include "build/scenes/overworld/spot10/spot10_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot10/spot10_room_9.o" + number 03 endseg beginseg name "spot11_scene" romalign 0x1000 - include "build/scenes/overworld/spot11/spot11_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot11/spot11_scene.o" + number 02 endseg beginseg name "spot11_room_0" romalign 0x1000 - include "build/scenes/overworld/spot11/spot11_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot11/spot11_room_0.o" + number 03 endseg beginseg name "spot12_scene" romalign 0x1000 - include "build/scenes/overworld/spot12/spot12_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot12/spot12_scene.o" + number 02 endseg beginseg name "spot12_room_0" romalign 0x1000 - include "build/scenes/overworld/spot12/spot12_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot12/spot12_room_0.o" + number 03 endseg beginseg name "spot12_room_1" romalign 0x1000 - include "build/scenes/overworld/spot12/spot12_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot12/spot12_room_1.o" + number 03 endseg beginseg name "spot13_scene" romalign 0x1000 - include "build/scenes/overworld/spot13/spot13_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot13/spot13_scene.o" + number 02 endseg beginseg name "spot13_room_0" romalign 0x1000 - include "build/scenes/overworld/spot13/spot13_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot13/spot13_room_0.o" + number 03 endseg beginseg name "spot13_room_1" romalign 0x1000 - include "build/scenes/overworld/spot13/spot13_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot13/spot13_room_1.o" + number 03 endseg beginseg name "spot15_scene" romalign 0x1000 - include "build/scenes/overworld/spot15/spot15_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot15/spot15_scene.o" + number 02 endseg beginseg name "spot15_room_0" romalign 0x1000 - include "build/scenes/overworld/spot15/spot15_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot15/spot15_room_0.o" + number 03 endseg beginseg name "spot16_scene" romalign 0x1000 - include "build/scenes/overworld/spot16/spot16_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot16/spot16_scene.o" + number 02 endseg beginseg name "spot16_room_0" romalign 0x1000 - include "build/scenes/overworld/spot16/spot16_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot16/spot16_room_0.o" + number 03 endseg beginseg name "spot17_scene" romalign 0x1000 - include "build/scenes/overworld/spot17/spot17_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot17/spot17_scene.o" + number 02 endseg beginseg name "spot17_room_0" romalign 0x1000 - include "build/scenes/overworld/spot17/spot17_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot17/spot17_room_0.o" + number 03 endseg beginseg name "spot17_room_1" romalign 0x1000 - include "build/scenes/overworld/spot17/spot17_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot17/spot17_room_1.o" + number 03 endseg beginseg name "spot18_scene" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot18/spot18_scene.o" + number 02 endseg beginseg name "spot18_room_0" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot18/spot18_room_0.o" + number 03 endseg beginseg name "spot18_room_1" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot18/spot18_room_1.o" + number 03 endseg beginseg name "spot18_room_2" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot18/spot18_room_2.o" + number 03 endseg beginseg name "spot18_room_3" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot18/spot18_room_3.o" + number 03 endseg beginseg name "market_day_scene" romalign 0x1000 - include "build/scenes/misc/market_day/market_day_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/market_day/market_day_scene.o" + number 02 endseg beginseg name "market_day_room_0" romalign 0x1000 - include "build/scenes/misc/market_day/market_day_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/market_day/market_day_room_0.o" + number 03 endseg beginseg name "market_night_scene" romalign 0x1000 - include "build/scenes/misc/market_night/market_night_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/market_night/market_night_scene.o" + number 02 endseg beginseg name "market_night_room_0" romalign 0x1000 - include "build/scenes/misc/market_night/market_night_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/market_night/market_night_room_0.o" + number 03 endseg beginseg name "testroom_scene" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/testroom/testroom_scene.o" + number 02 endseg beginseg name "testroom_room_0" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/testroom/testroom_room_0.o" + number 03 endseg beginseg name "testroom_room_1" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/testroom/testroom_room_1.o" + number 03 endseg beginseg name "testroom_room_2" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/testroom/testroom_room_2.o" + number 03 endseg beginseg name "testroom_room_3" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/testroom/testroom_room_3.o" + number 03 endseg beginseg name "testroom_room_4" romalign 0x1000 - include "build/scenes/test_levels/testroom/testroom_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/testroom/testroom_room_4.o" + number 03 endseg beginseg name "kenjyanoma_scene" romalign 0x1000 - include "build/scenes/indoors/kenjyanoma/kenjyanoma_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kenjyanoma/kenjyanoma_scene.o" + number 02 endseg beginseg name "kenjyanoma_room_0" romalign 0x1000 - include "build/scenes/indoors/kenjyanoma/kenjyanoma_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kenjyanoma/kenjyanoma_room_0.o" + number 03 endseg beginseg name "tokinoma_scene" romalign 0x1000 - include "build/scenes/indoors/tokinoma/tokinoma_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/tokinoma/tokinoma_scene.o" + number 02 endseg beginseg name "tokinoma_room_0" romalign 0x1000 - include "build/scenes/indoors/tokinoma/tokinoma_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/tokinoma/tokinoma_room_0.o" + number 03 endseg beginseg name "tokinoma_room_1" romalign 0x1000 - include "build/scenes/indoors/tokinoma/tokinoma_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/tokinoma/tokinoma_room_1.o" + number 03 endseg beginseg name "sutaru_scene" romalign 0x1000 - include "build/scenes/test_levels/sutaru/sutaru_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/sutaru/sutaru_scene.o" + number 02 endseg beginseg name "sutaru_room_0" romalign 0x1000 - include "build/scenes/test_levels/sutaru/sutaru_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/sutaru/sutaru_room_0.o" + number 03 endseg beginseg name "link_home_scene" romalign 0x1000 - include "build/scenes/indoors/link_home/link_home_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/link_home/link_home_scene.o" + number 02 endseg beginseg name "link_home_room_0" romalign 0x1000 - include "build/scenes/indoors/link_home/link_home_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/link_home/link_home_room_0.o" + number 03 endseg beginseg name "kokiri_shop_scene" romalign 0x1000 - include "build/scenes/shops/kokiri_shop/kokiri_shop_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/kokiri_shop/kokiri_shop_scene.o" + number 02 endseg beginseg name "kokiri_shop_room_0" romalign 0x1000 - include "build/scenes/shops/kokiri_shop/kokiri_shop_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/kokiri_shop/kokiri_shop_room_0.o" + number 03 endseg beginseg name "kokiri_home_scene" romalign 0x1000 - include "build/scenes/indoors/kokiri_home/kokiri_home_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kokiri_home/kokiri_home_scene.o" + number 02 endseg beginseg name "kokiri_home_room_0" romalign 0x1000 - include "build/scenes/indoors/kokiri_home/kokiri_home_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kokiri_home/kokiri_home_room_0.o" + number 03 endseg beginseg name "kakusiana_scene" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/kakusiana/kakusiana_scene.o" + number 02 endseg beginseg name "kakusiana_room_0" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_0.o" + number 03 endseg beginseg name "kakusiana_room_1" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_1.o" + number 03 endseg beginseg name "kakusiana_room_2" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_2.o" + number 03 endseg beginseg name "kakusiana_room_3" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_3.o" + number 03 endseg beginseg name "kakusiana_room_4" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_4.o" + number 03 endseg beginseg name "kakusiana_room_5" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_5.o" + number 03 endseg beginseg name "kakusiana_room_6" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_6.o" + number 03 endseg beginseg name "kakusiana_room_7" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_7.o" + number 03 endseg beginseg name "kakusiana_room_8" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_8.o" + number 03 endseg beginseg name "kakusiana_room_9" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_9.o" + number 03 endseg beginseg name "kakusiana_room_10" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_10.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_10.o" + number 03 endseg beginseg name "kakusiana_room_11" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_11.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_11.o" + number 03 endseg beginseg name "kakusiana_room_12" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_12.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_12.o" + number 03 endseg beginseg name "kakusiana_room_13" romalign 0x1000 - include "build/scenes/misc/kakusiana/kakusiana_room_13.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakusiana/kakusiana_room_13.o" + number 03 endseg beginseg name "entra_scene" romalign 0x1000 - include "build/scenes/overworld/entra/entra_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/entra/entra_scene.o" + number 02 endseg beginseg name "entra_room_0" romalign 0x1000 - include "build/scenes/overworld/entra/entra_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/entra/entra_room_0.o" + number 03 endseg beginseg name "moribossroom_scene" romalign 0x1000 - include "build/scenes/dungeons/moribossroom/moribossroom_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/moribossroom/moribossroom_scene.o" + number 02 endseg beginseg name "moribossroom_room_0" romalign 0x1000 - include "build/scenes/dungeons/moribossroom/moribossroom_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/moribossroom/moribossroom_room_0.o" + number 03 endseg beginseg name "moribossroom_room_1" romalign 0x1000 - include "build/scenes/dungeons/moribossroom/moribossroom_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/moribossroom/moribossroom_room_1.o" + number 03 endseg beginseg name "syatekijyou_scene" romalign 0x1000 - include "build/scenes/indoors/syatekijyou/syatekijyou_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/syatekijyou/syatekijyou_scene.o" + number 02 endseg beginseg name "syatekijyou_room_0" romalign 0x1000 - include "build/scenes/indoors/syatekijyou/syatekijyou_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/syatekijyou/syatekijyou_room_0.o" + number 03 endseg beginseg name "shop1_scene" romalign 0x1000 - include "build/scenes/shops/shop1/shop1_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/shop1/shop1_scene.o" + number 02 endseg beginseg name "shop1_room_0" romalign 0x1000 - include "build/scenes/shops/shop1/shop1_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/shop1/shop1_room_0.o" + number 03 endseg beginseg name "hairal_niwa_scene" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa/hairal_niwa_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hairal_niwa/hairal_niwa_scene.o" + number 02 endseg beginseg name "hairal_niwa_room_0" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa/hairal_niwa_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hairal_niwa/hairal_niwa_room_0.o" + number 03 endseg beginseg name "ganon_tou_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon_tou/ganon_tou_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon_tou/ganon_tou_scene.o" + number 02 endseg beginseg name "ganon_tou_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon_tou/ganon_tou_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_tou/ganon_tou_room_0.o" + number 03 endseg beginseg name "sasatest_scene" romalign 0x1000 - include "build/scenes/test_levels/sasatest/sasatest_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/sasatest/sasatest_scene.o" + number 02 endseg beginseg name "sasatest_room_0" romalign 0x1000 - include "build/scenes/test_levels/sasatest/sasatest_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/sasatest/sasatest_room_0.o" + number 03 endseg beginseg name "market_alley_scene" romalign 0x1000 - include "build/scenes/misc/market_alley/market_alley_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/market_alley/market_alley_scene.o" + number 02 endseg beginseg name "market_alley_room_0" romalign 0x1000 - include "build/scenes/misc/market_alley/market_alley_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/market_alley/market_alley_room_0.o" + number 03 endseg beginseg name "spot20_scene" romalign 0x1000 - include "build/scenes/overworld/spot20/spot20_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/spot20/spot20_scene.o" + number 02 endseg beginseg name "spot20_room_0" romalign 0x1000 - include "build/scenes/overworld/spot20/spot20_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/spot20/spot20_room_0.o" + number 03 endseg beginseg name "market_ruins_scene" romalign 0x1000 - include "build/scenes/misc/market_ruins/market_ruins_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/market_ruins/market_ruins_scene.o" + number 02 endseg beginseg name "market_ruins_room_0" romalign 0x1000 - include "build/scenes/misc/market_ruins/market_ruins_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/market_ruins/market_ruins_room_0.o" + number 03 endseg beginseg name "entra_n_scene" romalign 0x1000 - include "build/scenes/misc/entra_n/entra_n_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/entra_n/entra_n_scene.o" + number 02 endseg beginseg name "entra_n_room_0" romalign 0x1000 - include "build/scenes/misc/entra_n/entra_n_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/entra_n/entra_n_room_0.o" + number 03 endseg beginseg name "enrui_scene" romalign 0x1000 - include "build/scenes/misc/enrui/enrui_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/enrui/enrui_scene.o" + number 02 endseg beginseg name "enrui_room_0" romalign 0x1000 - include "build/scenes/misc/enrui/enrui_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/enrui/enrui_room_0.o" + number 03 endseg beginseg name "market_alley_n_scene" romalign 0x1000 - include "build/scenes/misc/market_alley_n/market_alley_n_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/market_alley_n/market_alley_n_scene.o" + number 02 endseg beginseg name "market_alley_n_room_0" romalign 0x1000 - include "build/scenes/misc/market_alley_n/market_alley_n_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/market_alley_n/market_alley_n_room_0.o" + number 03 endseg beginseg name "hiral_demo_scene" romalign 0x1000 - include "build/scenes/misc/hiral_demo/hiral_demo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/hiral_demo/hiral_demo_scene.o" + number 02 endseg beginseg name "hiral_demo_room_0" romalign 0x1000 - include "build/scenes/misc/hiral_demo/hiral_demo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hiral_demo/hiral_demo_room_0.o" + number 03 endseg beginseg name "kokiri_home3_scene" romalign 0x1000 - include "build/scenes/indoors/kokiri_home3/kokiri_home3_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kokiri_home3/kokiri_home3_scene.o" + number 02 endseg beginseg name "kokiri_home3_room_0" romalign 0x1000 - include "build/scenes/indoors/kokiri_home3/kokiri_home3_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kokiri_home3/kokiri_home3_room_0.o" + number 03 endseg beginseg name "malon_stable_scene" romalign 0x1000 - include "build/scenes/indoors/malon_stable/malon_stable_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/malon_stable/malon_stable_scene.o" + number 02 endseg beginseg name "malon_stable_room_0" romalign 0x1000 - include "build/scenes/indoors/malon_stable/malon_stable_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/malon_stable/malon_stable_room_0.o" + number 03 endseg beginseg name "kakariko_scene" romalign 0x1000 - include "build/scenes/indoors/kakariko/kakariko_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kakariko/kakariko_scene.o" + number 02 endseg beginseg name "kakariko_room_0" romalign 0x1000 - include "build/scenes/indoors/kakariko/kakariko_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kakariko/kakariko_room_0.o" + number 03 endseg beginseg name "bdan_boss_scene" romalign 0x1000 - include "build/scenes/dungeons/bdan_boss/bdan_boss_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_scene.o" + number 02 endseg beginseg name "bdan_boss_room_0" romalign 0x1000 - include "build/scenes/dungeons/bdan_boss/bdan_boss_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_room_0.o" + number 03 endseg beginseg name "bdan_boss_room_1" romalign 0x1000 - include "build/scenes/dungeons/bdan_boss/bdan_boss_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/bdan_boss/bdan_boss_room_1.o" + number 03 endseg beginseg name "FIRE_bs_scene" romalign 0x1000 - include "build/scenes/dungeons/FIRE_bs/FIRE_bs_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_scene.o" + number 02 endseg beginseg name "FIRE_bs_room_0" romalign 0x1000 - include "build/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.o" + number 03 endseg beginseg name "FIRE_bs_room_1" romalign 0x1000 - include "build/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.o" + number 03 endseg beginseg name "hut_scene" romalign 0x1000 - include "build/scenes/indoors/hut/hut_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hut/hut_scene.o" + number 02 endseg beginseg name "hut_room_0" romalign 0x1000 - include "build/scenes/indoors/hut/hut_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hut/hut_room_0.o" + number 03 endseg beginseg name "daiyousei_izumi_scene" romalign 0x1000 - include "build/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.o" + number 02 endseg beginseg name "daiyousei_izumi_room_0" romalign 0x1000 - include "build/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.o" + number 03 endseg beginseg name "hakaana_scene" romalign 0x1000 - include "build/scenes/misc/hakaana/hakaana_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/hakaana/hakaana_scene.o" + number 02 endseg beginseg name "hakaana_room_0" romalign 0x1000 - include "build/scenes/misc/hakaana/hakaana_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hakaana/hakaana_room_0.o" + number 03 endseg beginseg name "yousei_izumi_tate_scene" romalign 0x1000 - include "build/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.o" + number 02 endseg beginseg name "yousei_izumi_tate_room_0" romalign 0x1000 - include "build/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.o" + number 03 endseg beginseg name "yousei_izumi_yoko_scene" romalign 0x1000 - include "build/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.o" + number 02 endseg beginseg name "yousei_izumi_yoko_room_0" romalign 0x1000 - include "build/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.o" + number 03 endseg beginseg name "golon_scene" romalign 0x1000 - include "build/scenes/shops/golon/golon_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/golon/golon_scene.o" + number 02 endseg beginseg name "golon_room_0" romalign 0x1000 - include "build/scenes/shops/golon/golon_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/golon/golon_room_0.o" + number 03 endseg beginseg name "zoora_scene" romalign 0x1000 - include "build/scenes/shops/zoora/zoora_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/zoora/zoora_scene.o" + number 02 endseg beginseg name "zoora_room_0" romalign 0x1000 - include "build/scenes/shops/zoora/zoora_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/zoora/zoora_room_0.o" + number 03 endseg beginseg name "drag_scene" romalign 0x1000 - include "build/scenes/shops/drag/drag_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/drag/drag_scene.o" + number 02 endseg beginseg name "drag_room_0" romalign 0x1000 - include "build/scenes/shops/drag/drag_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/drag/drag_room_0.o" + number 03 endseg beginseg name "alley_shop_scene" romalign 0x1000 - include "build/scenes/shops/alley_shop/alley_shop_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/alley_shop/alley_shop_scene.o" + number 02 endseg beginseg name "alley_shop_room_0" romalign 0x1000 - include "build/scenes/shops/alley_shop/alley_shop_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/alley_shop/alley_shop_room_0.o" + number 03 endseg beginseg name "night_shop_scene" romalign 0x1000 - include "build/scenes/shops/night_shop/night_shop_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/night_shop/night_shop_scene.o" + number 02 endseg beginseg name "night_shop_room_0" romalign 0x1000 - include "build/scenes/shops/night_shop/night_shop_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/night_shop/night_shop_room_0.o" + number 03 endseg beginseg name "impa_scene" romalign 0x1000 - include "build/scenes/indoors/impa/impa_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/impa/impa_scene.o" + number 02 endseg beginseg name "impa_room_0" romalign 0x1000 - include "build/scenes/indoors/impa/impa_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/impa/impa_room_0.o" + number 03 endseg beginseg name "labo_scene" romalign 0x1000 - include "build/scenes/indoors/labo/labo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/labo/labo_scene.o" + number 02 endseg beginseg name "labo_room_0" romalign 0x1000 - include "build/scenes/indoors/labo/labo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/labo/labo_room_0.o" + number 03 endseg beginseg name "tent_scene" romalign 0x1000 - include "build/scenes/indoors/tent/tent_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/tent/tent_scene.o" + number 02 endseg beginseg name "tent_room_0" romalign 0x1000 - include "build/scenes/indoors/tent/tent_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/tent/tent_room_0.o" + number 03 endseg beginseg name "nakaniwa_scene" romalign 0x1000 - include "build/scenes/indoors/nakaniwa/nakaniwa_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/nakaniwa/nakaniwa_scene.o" + number 02 endseg beginseg name "nakaniwa_room_0" romalign 0x1000 - include "build/scenes/indoors/nakaniwa/nakaniwa_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/nakaniwa/nakaniwa_room_0.o" + number 03 endseg beginseg name "ddan_boss_scene" romalign 0x1000 - include "build/scenes/dungeons/ddan_boss/ddan_boss_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_scene.o" + number 02 endseg beginseg name "ddan_boss_room_0" romalign 0x1000 - include "build/scenes/dungeons/ddan_boss/ddan_boss_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_room_0.o" + number 03 endseg beginseg name "ddan_boss_room_1" romalign 0x1000 - include "build/scenes/dungeons/ddan_boss/ddan_boss_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.o" + number 03 endseg beginseg name "ydan_boss_scene" romalign 0x1000 - include "build/scenes/dungeons/ydan_boss/ydan_boss_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_scene.o" + number 02 endseg beginseg name "ydan_boss_room_0" romalign 0x1000 - include "build/scenes/dungeons/ydan_boss/ydan_boss_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_room_0.o" + number 03 endseg beginseg name "ydan_boss_room_1" romalign 0x1000 - include "build/scenes/dungeons/ydan_boss/ydan_boss_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ydan_boss/ydan_boss_room_1.o" + number 03 endseg beginseg name "HAKAdan_bs_scene" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.o" + number 02 endseg beginseg name "HAKAdan_bs_room_0" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.o" + number 03 endseg beginseg name "HAKAdan_bs_room_1" romalign 0x1000 - include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.o" + number 03 endseg beginseg name "MIZUsin_bs_scene" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.o" + number 02 endseg beginseg name "MIZUsin_bs_room_0" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.o" + number 03 endseg beginseg name "MIZUsin_bs_room_1" romalign 0x1000 - include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.o" + number 03 endseg beginseg name "ganon_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon/ganon_scene.o" + number 02 endseg beginseg name "ganon_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_0.o" + number 03 endseg beginseg name "ganon_room_1" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_1.o" + number 03 endseg beginseg name "ganon_room_2" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_2.o" + number 03 endseg beginseg name "ganon_room_3" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_3.o" + number 03 endseg beginseg name "ganon_room_4" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_4.o" + number 03 endseg beginseg name "ganon_room_5" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_5.o" + number 03 endseg beginseg name "ganon_room_6" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_6.o" + number 03 endseg beginseg name "ganon_room_7" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_7.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_7.o" + number 03 endseg beginseg name "ganon_room_8" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_8.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_8.o" + number 03 endseg beginseg name "ganon_room_9" romalign 0x1000 - include "build/scenes/dungeons/ganon/ganon_room_9.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon/ganon_room_9.o" + number 03 endseg beginseg name "ganon_boss_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon_boss/ganon_boss_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon_boss/ganon_boss_scene.o" + number 02 endseg beginseg name "ganon_boss_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon_boss/ganon_boss_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_boss/ganon_boss_room_0.o" + number 03 endseg beginseg name "jyasinboss_scene" romalign 0x1000 - include "build/scenes/dungeons/jyasinboss/jyasinboss_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_scene.o" + number 02 endseg beginseg name "jyasinboss_room_0" romalign 0x1000 - include "build/scenes/dungeons/jyasinboss/jyasinboss_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_0.o" + number 03 endseg beginseg name "jyasinboss_room_1" romalign 0x1000 - include "build/scenes/dungeons/jyasinboss/jyasinboss_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_1.o" + number 03 endseg beginseg name "jyasinboss_room_2" romalign 0x1000 - include "build/scenes/dungeons/jyasinboss/jyasinboss_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_2.o" + number 03 endseg beginseg name "jyasinboss_room_3" romalign 0x1000 - include "build/scenes/dungeons/jyasinboss/jyasinboss_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/jyasinboss/jyasinboss_room_3.o" + number 03 endseg beginseg name "kokiri_home4_scene" romalign 0x1000 - include "build/scenes/indoors/kokiri_home4/kokiri_home4_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kokiri_home4/kokiri_home4_scene.o" + number 02 endseg beginseg name "kokiri_home4_room_0" romalign 0x1000 - include "build/scenes/indoors/kokiri_home4/kokiri_home4_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kokiri_home4/kokiri_home4_room_0.o" + number 03 endseg beginseg name "kokiri_home5_scene" romalign 0x1000 - include "build/scenes/indoors/kokiri_home5/kokiri_home5_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/kokiri_home5/kokiri_home5_scene.o" + number 02 endseg beginseg name "kokiri_home5_room_0" romalign 0x1000 - include "build/scenes/indoors/kokiri_home5/kokiri_home5_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/kokiri_home5/kokiri_home5_room_0.o" + number 03 endseg beginseg name "ganon_final_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon_final/ganon_final_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon_final/ganon_final_scene.o" + number 02 endseg beginseg name "ganon_final_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon_final/ganon_final_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_final/ganon_final_room_0.o" + number 03 endseg beginseg name "kakariko3_scene" romalign 0x1000 - include "build/scenes/misc/kakariko3/kakariko3_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/kakariko3/kakariko3_scene.o" + number 02 endseg beginseg name "kakariko3_room_0" romalign 0x1000 - include "build/scenes/misc/kakariko3/kakariko3_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kakariko3/kakariko3_room_0.o" + number 03 endseg beginseg name "hairal_niwa2_scene" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.o" + number 02 endseg beginseg name "hairal_niwa2_room_0" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.o" + number 03 endseg beginseg name "hakasitarelay_scene" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.o" + number 02 endseg beginseg name "hakasitarelay_room_0" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_0.o" + number 03 endseg beginseg name "hakasitarelay_room_1" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_1.o" + number 03 endseg beginseg name "hakasitarelay_room_2" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_2.o" + number 03 endseg beginseg name "hakasitarelay_room_3" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_3.o" + number 03 endseg beginseg name "hakasitarelay_room_4" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_4.o" + number 03 endseg beginseg name "hakasitarelay_room_5" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_5.o" + number 03 endseg beginseg name "hakasitarelay_room_6" romalign 0x1000 - include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hakasitarelay/hakasitarelay_room_6.o" + number 03 endseg beginseg name "shrine_scene" romalign 0x1000 - include "build/scenes/misc/shrine/shrine_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/shrine/shrine_scene.o" + number 02 endseg beginseg name "shrine_room_0" romalign 0x1000 - include "build/scenes/misc/shrine/shrine_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/shrine/shrine_room_0.o" + number 03 endseg beginseg name "turibori_scene" romalign 0x1000 - include "build/scenes/misc/turibori/turibori_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/turibori/turibori_scene.o" + number 02 endseg beginseg name "turibori_room_0" romalign 0x1000 - include "build/scenes/misc/turibori/turibori_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/turibori/turibori_room_0.o" + number 03 endseg beginseg name "shrine_n_scene" romalign 0x1000 - include "build/scenes/misc/shrine_n/shrine_n_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/shrine_n/shrine_n_scene.o" + number 02 endseg beginseg name "shrine_n_room_0" romalign 0x1000 - include "build/scenes/misc/shrine_n/shrine_n_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/shrine_n/shrine_n_room_0.o" + number 03 endseg beginseg name "shrine_r_scene" romalign 0x1000 - include "build/scenes/misc/shrine_r/shrine_r_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/shrine_r/shrine_r_scene.o" + number 02 endseg beginseg name "shrine_r_room_0" romalign 0x1000 - include "build/scenes/misc/shrine_r/shrine_r_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/shrine_r/shrine_r_room_0.o" + number 03 endseg beginseg name "hakaana2_scene" romalign 0x1000 - include "build/scenes/misc/hakaana2/hakaana2_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/hakaana2/hakaana2_scene.o" + number 02 endseg beginseg name "hakaana2_room_0" romalign 0x1000 - include "build/scenes/misc/hakaana2/hakaana2_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hakaana2/hakaana2_room_0.o" + number 03 endseg beginseg name "gerudoway_scene" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/gerudoway/gerudoway_scene.o" + number 02 endseg beginseg name "gerudoway_room_0" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_0.o" + number 03 endseg beginseg name "gerudoway_room_1" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_1.o" + number 03 endseg beginseg name "gerudoway_room_2" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_2.o" + number 03 endseg beginseg name "gerudoway_room_3" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_3.o" + number 03 endseg beginseg name "gerudoway_room_4" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_4.o" + number 03 endseg beginseg name "gerudoway_room_5" romalign 0x1000 - include "build/scenes/dungeons/gerudoway/gerudoway_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/gerudoway/gerudoway_room_5.o" + number 03 endseg beginseg name "hairal_niwa_n_scene" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.o" + number 02 endseg beginseg name "hairal_niwa_n_room_0" romalign 0x1000 - include "build/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.o" + number 03 endseg beginseg name "bowling_scene" romalign 0x1000 - include "build/scenes/indoors/bowling/bowling_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/bowling/bowling_scene.o" + number 02 endseg beginseg name "bowling_room_0" romalign 0x1000 - include "build/scenes/indoors/bowling/bowling_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/bowling/bowling_room_0.o" + number 03 endseg beginseg name "hakaana_ouke_scene" romalign 0x1000 - include "build/scenes/misc/hakaana_ouke/hakaana_ouke_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.o" + number 02 endseg beginseg name "hakaana_ouke_room_0" romalign 0x1000 - include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.o" + number 03 endseg beginseg name "hakaana_ouke_room_1" romalign 0x1000 - include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.o" + number 03 endseg beginseg name "hakaana_ouke_room_2" romalign 0x1000 - include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.o" + number 03 endseg beginseg name "hylia_labo_scene" romalign 0x1000 - include "build/scenes/indoors/hylia_labo/hylia_labo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/hylia_labo/hylia_labo_scene.o" + number 02 endseg beginseg name "hylia_labo_room_0" romalign 0x1000 - include "build/scenes/indoors/hylia_labo/hylia_labo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/hylia_labo/hylia_labo_room_0.o" + number 03 endseg beginseg name "souko_scene" romalign 0x1000 - include "build/scenes/overworld/souko/souko_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/overworld/souko/souko_scene.o" + number 02 endseg beginseg name "souko_room_0" romalign 0x1000 - include "build/scenes/overworld/souko/souko_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/souko/souko_room_0.o" + number 03 endseg beginseg name "souko_room_1" romalign 0x1000 - include "build/scenes/overworld/souko/souko_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/souko/souko_room_1.o" + number 03 endseg beginseg name "souko_room_2" romalign 0x1000 - include "build/scenes/overworld/souko/souko_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/overworld/souko/souko_room_2.o" + number 03 endseg beginseg name "miharigoya_scene" romalign 0x1000 - include "build/scenes/indoors/miharigoya/miharigoya_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/miharigoya/miharigoya_scene.o" + number 02 endseg beginseg name "miharigoya_room_0" romalign 0x1000 - include "build/scenes/indoors/miharigoya/miharigoya_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/miharigoya/miharigoya_room_0.o" + number 03 endseg beginseg name "mahouya_scene" romalign 0x1000 - include "build/scenes/indoors/mahouya/mahouya_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/mahouya/mahouya_scene.o" + number 02 endseg beginseg name "mahouya_room_0" romalign 0x1000 - include "build/scenes/indoors/mahouya/mahouya_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/mahouya/mahouya_room_0.o" + number 03 endseg beginseg name "takaraya_scene" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/indoors/takaraya/takaraya_scene.o" + number 02 endseg beginseg name "takaraya_room_0" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_0.o" + number 03 endseg beginseg name "takaraya_room_1" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_1.o" + number 03 endseg beginseg name "takaraya_room_2" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_2.o" + number 03 endseg beginseg name "takaraya_room_3" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_3.o" + number 03 endseg beginseg name "takaraya_room_4" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_4.o" + number 03 endseg beginseg name "takaraya_room_5" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_5.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_5.o" + number 03 endseg beginseg name "takaraya_room_6" romalign 0x1000 - include "build/scenes/indoors/takaraya/takaraya_room_6.o" - address SEGMENT_ROOM + include "build/assets/scenes/indoors/takaraya/takaraya_room_6.o" + number 03 endseg beginseg name "ganon_sonogo_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.o" + number 02 endseg beginseg name "ganon_sonogo_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.o" + number 03 endseg beginseg name "ganon_sonogo_room_1" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.o" + number 03 endseg beginseg name "ganon_sonogo_room_2" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.o" + number 03 endseg beginseg name "ganon_sonogo_room_3" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.o" + number 03 endseg beginseg name "ganon_sonogo_room_4" romalign 0x1000 - include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.o" + number 03 endseg beginseg name "ganon_demo_scene" romalign 0x1000 - include "build/scenes/dungeons/ganon_demo/ganon_demo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganon_demo/ganon_demo_scene.o" + number 02 endseg beginseg name "ganon_demo_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganon_demo/ganon_demo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganon_demo/ganon_demo_room_0.o" + number 03 endseg beginseg name "besitu_scene" romalign 0x1000 - include "build/scenes/test_levels/besitu/besitu_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/besitu/besitu_scene.o" + number 02 endseg beginseg name "besitu_room_0" romalign 0x1000 - include "build/scenes/test_levels/besitu/besitu_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/besitu/besitu_room_0.o" + number 03 endseg beginseg name "face_shop_scene" romalign 0x1000 - include "build/scenes/shops/face_shop/face_shop_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/shops/face_shop/face_shop_scene.o" + number 02 endseg beginseg name "face_shop_room_0" romalign 0x1000 - include "build/scenes/shops/face_shop/face_shop_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/shops/face_shop/face_shop_room_0.o" + number 03 endseg beginseg name "kinsuta_scene" romalign 0x1000 - include "build/scenes/misc/kinsuta/kinsuta_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/misc/kinsuta/kinsuta_scene.o" + number 02 endseg beginseg name "kinsuta_room_0" romalign 0x1000 - include "build/scenes/misc/kinsuta/kinsuta_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/misc/kinsuta/kinsuta_room_0.o" + number 03 endseg beginseg name "ganontikasonogo_scene" romalign 0x1000 - include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.o" + number 02 endseg beginseg name "ganontikasonogo_room_0" romalign 0x1000 - include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.o" + number 03 endseg beginseg name "ganontikasonogo_room_1" romalign 0x1000 - include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.o" - address SEGMENT_ROOM + include "build/assets/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.o" + number 03 endseg beginseg name "test01_scene" romalign 0x1000 - include "build/scenes/test_levels/test01/test01_scene.o" - address SEGMENT_SCENE + include "build/assets/scenes/test_levels/test01/test01_scene.o" + number 02 endseg beginseg name "test01_room_0" romalign 0x1000 - include "build/scenes/test_levels/test01/test01_room_0.o" - address SEGMENT_ROOM + include "build/assets/scenes/test_levels/test01/test01_room_0.o" + number 03 endseg beginseg @@ -10269,4 +10279,4 @@ beginseg name "softsprite_matrix_static" romalign 0x1000 include "build/baserom/softsprite_matrix_static.o" -endseg +endseg \ No newline at end of file diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 331837e714..b5a27fd78a 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3,6 +3,7 @@ #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" +#include "objects/gameplay_keep/gameplay_keep.h" void ActorShape_Init(ActorShape* shape, f32 arg1, void* shadowDrawFunc, f32 arg3) { shape->unk_08 = arg1; @@ -1909,7 +1910,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_XLU_DISP++, &D_04010130); + gSPDisplayList(POLY_XLU_DISP++, &gGameKeepMoteDL0); Matrix_Pull(); phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF); @@ -1917,7 +1918,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_XLU_DISP++, &D_04010130); + gSPDisplayList(POLY_XLU_DISP++, &gGameKeepMoteDL0); } lightPos.x = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index f92940126b..546e626847 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -437,8 +437,8 @@ s32 func_80042108(CollisionContext* a0, CollisionPoly* a1, u32 a2) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042244.s") u32 func_80042538(CollisionContext* colCtx, WaterBox* arg1) { - u32 unk0C = arg1->unk_0C; - return unk0C & 0xFF; + u32 properties = arg1->properties; + return properties & 0xFF; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042548.s") diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 6256967242..2b5e8ec6d0 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -107,7 +107,7 @@ void BgBdanObjects_Init(Actor* thisx, GlobalContext* globalCtx) { thisx->params &= 0xFF; if (thisx->params == 2) { thisx->flags |= 0x30; - globalCtx->colCtx.stat.colHeader->waterBoxes[7].unk_02 = thisx->posRot.pos.y; + globalCtx->colCtx.stat.colHeader->waterBoxes[7].ySurface = thisx->posRot.pos.y; this->actionFunc = func_8086C9A8; return; } @@ -394,7 +394,7 @@ void func_8086C9F0(BgBdanObjects* this, GlobalContext* globalCtx) { } func_8002F948(this, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } - globalCtx->colCtx.stat.colHeader->waterBoxes[7].unk_02 = this->dyna.actor.posRot.pos.y; + globalCtx->colCtx.stat.colHeader->waterBoxes[7].ySurface = this->dyna.actor.posRot.pos.y; } void func_8086CABC(BgBdanObjects* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index e7d239eb04..0f9d1f17a5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -60,7 +60,7 @@ void func_80881D94(BgHakaWater* this, GlobalContext* globalCtx) { s32 i; for (i = 0; i < 9; i++) { - globalCtx->colCtx.stat.colHeader->waterBoxes[i].unk_02 = (s16)this->actor.posRot.pos.y - 8; + globalCtx->colCtx.stat.colHeader->waterBoxes[i].ySurface = (s16)this->actor.posRot.pos.y - 8; } } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index b5629ab65c..3b2ef5a336 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -87,7 +87,7 @@ void BgMizuWater_SetWaterBoxesHeight(WaterBox* waterBoxes, s16 height) { u32 i; for (i = 0; i < 8; i++) { - waterBoxes[sWaterBoxIndexes[i]].unk_02 = height; + waterBoxes[sWaterBoxIndexes[i]].ySurface = height; } } @@ -139,7 +139,7 @@ void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) { if (Flags_GetSwitch(globalCtx, this->switchFlag)) { this->actor.posRot.pos.y = this->baseY + 85.0f; } - waterBoxes[6].unk_02 = this->actor.posRot.pos.y; + waterBoxes[6].ySurface = this->actor.posRot.pos.y; break; case 3: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -147,7 +147,7 @@ void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) { if (1) {} this->targetY = this->actor.posRot.pos.y; } - waterBoxes[8].unk_02 = this->actor.posRot.pos.y; + waterBoxes[8].ySurface = this->actor.posRot.pos.y; break; case 4: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -155,7 +155,7 @@ void BgMizuWater_Init(Actor* thisx, GlobalContext* globalCtx) { if (1) {} this->targetY = this->actor.posRot.pos.y; } - waterBoxes[16].unk_02 = this->actor.posRot.pos.y; + waterBoxes[16].ySurface = this->actor.posRot.pos.y; break; } @@ -255,7 +255,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } - waterBoxes[6].unk_02 = this->actor.posRot.pos.y; + waterBoxes[6].ySurface = this->actor.posRot.pos.y; break; case 3: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -267,7 +267,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } - waterBoxes[8].unk_02 = this->actor.posRot.pos.y; + waterBoxes[8].ySurface = this->actor.posRot.pos.y; break; case 4: if (Flags_GetSwitch(globalCtx, this->switchFlag)) { @@ -279,7 +279,7 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, GlobalContext* globalCtx) { globalCtx->unk_11D30[0] = 0; this->actionFunc = BgMizuWater_WaitForAction; } - waterBoxes[16].unk_02 = this->actor.posRot.pos.y; + waterBoxes[16].ySurface = this->actor.posRot.pos.y; break; } diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 8a5cf93b8b..25b29caa95 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -43,9 +43,9 @@ void BgMoriIdomizu_SetupAction(BgMoriIdomizu* this, BgMoriIdomizuActionFunc acti void BgMoriIdomizu_SetWaterLevel(GlobalContext* globalCtx, s16 waterLevel) { WaterBox* waterBox = globalCtx->colCtx.stat.colHeader->waterBoxes; - waterBox[2].unk_02 = waterLevel; - waterBox[3].unk_02 = waterLevel; - waterBox[4].unk_02 = waterLevel; + waterBox[2].ySurface = waterLevel; + waterBox[3].ySurface = waterLevel; + waterBox[4].ySurface = waterLevel; } void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 10b5e7d789..b77795a89c 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -55,7 +55,7 @@ void func_808ABB84(BgSpot01Idomizu* this, GlobalContext* globalCtx) { if (gSaveContext.eventChkInf[6] & 0x80) { this->waterHeight = -550.0f; } - globalCtx->colCtx.stat.colHeader->waterBoxes[0].unk_02 = this->actor.posRot.pos.y; + globalCtx->colCtx.stat.colHeader->waterBoxes[0].ySurface = this->actor.posRot.pos.y; if (this->waterHeight < this->actor.posRot.pos.y) { Audio_PlaySoundGeneral(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 482f3e37a8..3ae4336d97 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot09_obj.h" +#include "objects/object_spot09_obj/object_spot09_obj.h" #define FLAGS 0x00000000 @@ -31,7 +32,7 @@ const ActorInit Bg_Spot09_Obj_InitVars = { (ActorFunc)BgSpot09Obj_Draw, }; -static UNK_PTR D_808B1F90[] = { NULL, 0x06005520, 0x0600283C, 0x06008458, 0x06007580 }; +static UNK_PTR D_808B1F90[] = { NULL, gBgSpot09Col1, gBgSpot09Col2, gBgSpot09Col3, gBgSpot09Col4 }; static s32 (*D_808B1FA4[])(BgSpot09Obj* this, GlobalContext* globalCtx) = { func_808B1BEC, @@ -51,9 +52,7 @@ static InitChainEntry sInitChain2[] = { ICHAIN_F32(uncullZoneDownward, 1500, ICHAIN_STOP), }; -static Gfx* sDLists[] = { 0x06000100, 0x06003970, 0x06001120, 0x06007D40, 0x06006210 }; - -extern Gfx D_06008010[]; +static Gfx* sDLists[] = { gBgSpot09DL1, gBgSpot09DL2, gBgSpot09DL3, gBgSpot09DL4, gBgSpot09DL5 }; s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { s32 carpentersRescued; @@ -176,7 +175,7 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_06008010); + gSPDisplayList(POLY_XLU_DISP++, gBgSpot09DL6); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); } diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 7e7e5387f5..cdca30c065 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -6,6 +6,7 @@ #include "z_bg_spot11_bakudankabe.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" +#include "objects/object_spot11_obj/object_spot11_obj.h" #define FLAGS 0x00000030 @@ -37,8 +38,6 @@ static ColliderCylinderInit sCylinderInit = { static Vec3f D_808B272C = { 2259.0f, 108.0f, -1550.0f }; static Vec3f D_808B2738 = { 2259.0f, 108.0f, -1550.0f }; -extern UNK_TYPE D_06001A58; -extern Gfx D_06001980[]; extern Gfx D_0500A880[]; void func_808B2180(BgSpot11Bakudankabe* this, GlobalContext* globalCtx) { @@ -109,7 +108,7 @@ void BgSpot11Bakudankabe_Init(Actor* thisx, GlobalContext* globalCtx) { return; } func_808B2180(this, globalCtx); - DynaPolyInfo_Alloc(&D_06001A58, &sp24); + DynaPolyInfo_Alloc(gBgSpot11Col, &sp24); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, sp24); Actor_SetScale(&this->dyna.actor, 1.0f); osSyncPrintf("(spot11 爆弾壁)(arg_data 0x%04x)\n", this->dyna.actor.params); @@ -139,5 +138,5 @@ void BgSpot11Bakudankabe_Update(Actor* thisx, GlobalContext* globalCtx) { void BgSpot11Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot11Bakudankabe* this = THIS; - Gfx_DrawDListOpa(globalCtx, D_06001980); + Gfx_DrawDListOpa(globalCtx, gBgSpot11DL1); } diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index da2c21baea..28e4a3c6a4 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -48,7 +48,7 @@ extern Gfx D_06000870[]; void func_808B27F0(GlobalContext* globalCtx, s16 arg1) { WaterBox* waterBox = &globalCtx->colCtx.stat.colHeader->waterBoxes[0]; - waterBox->unk_02 = arg1; + waterBox->ySurface = arg1; } s32 func_808B280C(GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 880d51455c..86ec989efd 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -5,6 +5,7 @@ */ #include "z_bg_spot17_funen.h" +#include "objects/object_spot17_obj/object_spot17_obj.h" #define FLAGS 0x00000030 @@ -32,8 +33,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -extern Gfx D_06000B40[]; - void BgSpot17Funen_Init(Actor* thisx, GlobalContext* globalCtx) { BgSpot17Funen* this = THIS; @@ -68,7 +67,7 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20)); - gSPDisplayList(POLY_XLU_DISP++, D_06000B40); + gSPDisplayList(POLY_XLU_DISP++, gBgSpot17DL1); if (1) {} diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index a7237b8bda..b5eb7e48d6 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -60,7 +60,7 @@ void BgYdanHasi_Init(Actor* thisx, GlobalContext* globalCtx) { // Water the moving platform floats on in B1. Never runs in Master Quest thisx->initPosRot.pos.y = (thisx->initPosRot.pos.y + -5.0f); thisx->posRot.pos.y = thisx->initPosRot.pos.y; - waterBox->unk_02 = thisx->initPosRot.pos.y; + waterBox->ySurface = thisx->initPosRot.pos.y; this->actionFunc = BgYdanHasi_InitWater; } else { if (thisx->params == 0) { @@ -68,7 +68,7 @@ void BgYdanHasi_Init(Actor* thisx, GlobalContext* globalCtx) { DynaPolyInfo_Alloc(&D_06007798, &localConst); thisx->scale.z = 0.15f; thisx->scale.x = 0.15f; - thisx->posRot.pos.y = (waterBox->unk_02 + 20.0f); + thisx->posRot.pos.y = (waterBox->ySurface + 20.0f); this->actionFunc = BgYdanHasi_UpdateFloatingBlock; } else { // 3 platforms on 2F @@ -100,7 +100,7 @@ void BgYdanHasi_UpdateFloatingBlock(BgYdanHasi* this, GlobalContext* globalCtx) this->dyna.actor.posRot.pos.z = ((Math_CosS(this->dyna.actor.posRot.rot.y) * framesAfterMath) + this->dyna.actor.initPosRot.pos.z); waterBox = &globalCtx->colCtx.stat.colHeader->waterBoxes[1]; - this->dyna.actor.posRot.pos.y = waterBox->unk_02 + 20.0f; + this->dyna.actor.posRot.pos.y = waterBox->ySurface + 20.0f; if (this->timer != 0) { this->timer--; } @@ -134,7 +134,7 @@ WaterBox* BgYdanHasi_MoveWater(BgYdanHasi* this, GlobalContext* globalCtx) { func_8002F948(&this->dyna.actor, NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); } waterBox = globalCtx->colCtx.stat.colHeader->waterBoxes; - globalCtx->colCtx.stat.colHeader->waterBoxes[1].unk_02 = this->dyna.actor.posRot.pos.y; + globalCtx->colCtx.stat.colHeader->waterBoxes[1].ySurface = this->dyna.actor.posRot.pos.y; if (1) {} return waterBox + 0x1; } diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 70ab7f634a..1125f737e8 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,5 +1,6 @@ #include "z_demo_effect.h" #include "vt.h" +#include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000030 @@ -55,8 +56,6 @@ void DemoEffect_InitPositionFromCsAction(DemoEffect* this, GlobalContext* global void DemoEffect_MoveToCsEndpoint(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, s32 shouldUpdateFacing); void DemoEffect_MoveGetItem(DemoEffect* this, GlobalContext* globalCtx, s32 csActionId, f32 speed); -extern Gfx D_04010130[]; // lightBall - extern Gfx D_06001240[]; // kokiriJewel extern Gfx D_060010E0[]; // kokiriJewelHolder extern Gfx D_060020A0[]; // goronJewel @@ -1882,7 +1881,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { if (this->light.flicker == 0) { this->light.flicker = 1; } else { - disp = (u32)D_04010130; // necessary to match, should be able to remove after fake matches are fixed + disp = (u32)gGameKeepMoteDL0; // necessary to match, should be able to remove after fake matches are fixed alpha = &this->light.alpha; func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, this->primXluColor[0], this->primXluColor[1], @@ -1925,7 +1924,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2901), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); this->blueOrb.rotation += 0x01F4; - gSPDisplayList(POLY_XLU_DISP++, D_04010130); + gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2907); } diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 2f76151a1f..b64ff50ad0 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -6,6 +6,7 @@ #include "z_en_butte.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" +#include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x00000000 @@ -122,7 +123,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255); - gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&D_04010130)); + gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(&gGameKeepMoteDL0)); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 326); } diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index dad81baadd..02cdc84910 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -5,6 +5,7 @@ */ #include "z_en_pu_box.h" +#include "objects/object_pu_box/object_pu_box.h" #define FLAGS 0x00000010 @@ -27,9 +28,6 @@ const ActorInit En_Pu_box_InitVars = { (ActorFunc)EnPubox_Draw, }; -extern Gfx D_06000380[]; -extern UNK_TYPE D_060006D0; - void EnPubox_Init(Actor* thisx, GlobalContext* globalCtx) { u32 local_c = 0; EnPubox* this = THIS; @@ -59,7 +57,7 @@ void EnPubox_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.unk_15C = 0; thisx->unk_1F = 1; thisx->gravity = -2.0f; - DynaPolyInfo_Alloc(&D_060006D0, &local_c); + DynaPolyInfo_Alloc(&gPuBoxCol, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); } @@ -88,5 +86,5 @@ void EnPubox_Update(Actor* thisx, GlobalContext* globalCtx) { } void EnPubox_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, &D_06000380); + Gfx_DrawDListOpa(globalCtx, gPuBoxDL2); } diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index 128ecafcd3..85bf977e1f 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -5,6 +5,7 @@ */ #include "z_en_vase.h" +#include "objects/object_vase/object_vase.h" #define FLAGS 0x00000010 @@ -26,8 +27,6 @@ const ActorInit En_Vase_InitVars = { (ActorFunc)EnVase_Draw, }; -extern Gfx D_06000000[]; - void EnVase_Init(Actor* thisx, GlobalContext* globalCtx) { EnVase* this = THIS; @@ -40,5 +39,5 @@ void EnVase_Destroy(Actor* thisx, GlobalContext* globalCtx) { } void EnVase_Draw(Actor* thisx, GlobalContext* globalCtx) { - Gfx_DrawDListOpa(globalCtx, &D_06000000); + Gfx_DrawDListOpa(globalCtx, &gVaseDL); } diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 937d793cdf..09adad2501 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -5,6 +5,7 @@ */ #include "z_magic_dark.h" +#include "objects/gameplay_keep/gameplay_keep.h" #define FLAGS 0x02000010 @@ -269,12 +270,12 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 632), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY); - gSPDisplayList(POLY_XLU_DISP++, D_04010130); + gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0); Matrix_Pull(); Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 639), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, D_04010130); + gSPDisplayList(POLY_XLU_DISP++, gGameKeepMoteDL0); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 643); } diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c index 165054b177..490c278b0c 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark_gfx.c @@ -1,67 +1,11 @@ #include "z_magic_dark.h" -extern UNK_TYPE D_04032490[]; - -static UNK_TYPE sDiamondTexture[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, - 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, - 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, - 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, - 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, - 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, - 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, - 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, - 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, - 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, - 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, - 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, - 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, - 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, - 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, - 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, - 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, - 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, - 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, - 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, - 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, - 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, - 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, - 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, - 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, - 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, - 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, - 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, - 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, - 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, - 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, - 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, - 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, - 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, - 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, - 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, - 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, - 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, - 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, - 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, - 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, - 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, - 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, - 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, - 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, - 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, - 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF +static u64 sDiamondTexture[] = { + #include "assets/overlays/ovl_Magic_Dark/diamond_texture.i8.inc.c" }; +extern UNK_TYPE D_04032490[]; + static Vtx sDiamondVerts[] = { VTX(0, 0, 64, 1024, 512, 0x00, 0x00, 0x78, 0xFF), VTX(55, 0, 32, 1707, 512, 0x67, 0x00, 0x3C, 0xFF), VTX(0, 108, 0, 1365, 0, 0x00, 0x78, 0x00, 0xFF), VTX(55, 0, -32, 2389, 512, 0x67, 0x00, 0xC4, 0xFF), diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 55b7ff919a..3cfdcca494 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -78,7 +78,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, UNK_PT radius = this->rRadius * 0.0025f; if ((this->rWaterBoxNum != -1) && (this->rWaterBoxNum < globalCtx->colCtx.stat.colHeader->nbWaterBoxes)) { - yPos = (this->rWaterBoxNum + globalCtx->colCtx.stat.colHeader->waterBoxes)->unk_02; + yPos = (this->rWaterBoxNum + globalCtx->colCtx.stat.colHeader->waterBoxes)->ySurface; } else { yPos = this->pos.y; } diff --git a/tools/ZAP2 b/tools/ZAP2 index 15fcb21d2c..8033e46c02 160000 --- a/tools/ZAP2 +++ b/tools/ZAP2 @@ -1 +1 @@ -Subproject commit 15fcb21d2c4e2ef2f720d28a0f7dec259ddd06f5 +Subproject commit 8033e46c02c70fcd48cbafc6256dd7f3f1bd11a4 diff --git a/tools/specprocess.py b/tools/specprocess.py new file mode 100644 index 0000000000..234ea4bd29 --- /dev/null +++ b/tools/specprocess.py @@ -0,0 +1,55 @@ +import os +import sys + +specFile = open("spec", "r"); +specText = specFile.read(); +specFile.close() +specLines = specText.split("\n"); + +# TODO: CLEAN THIS UP! +for i in range(0, len(specLines)): + line = specLines[i] + if (line.startswith("INCLUDE_SEG_SCENE")): + params = line.split("(")[1].split(")")[0].split(",") + for j in range(0, len(params)): + while (params[j].startswith(" ")): + params[j] = params[j][1 : len(params[j])] + + line = "beginseg\r\n"; + line += "\tname " + params[0] + "\r\n"; + line += "\tromalign 0x1000\r\n"; + line += "\tinclude " + params[1] + "\r\n"; + line += "\taddress SEGMENT_SCENE\r\n"; + line += "endseg\r\n"; + elif (line.startswith("INCLUDE_SEG_ROOM")): + params = line.split("(")[1].split(")")[0].split(",") + for j in range(0, len(params)): + while (params[j].startswith(" ")): + params[j] = params[j][1 : len(params[j])] + + line = "beginseg\r\n"; + line += "\tname " + params[0] + "\r\n"; + line += "\tromalign 0x1000\r\n"; + line += "\tinclude " + params[1] + "\r\n"; + line += "\taddress SEGMENT_ROOM\r\n"; + line += "endseg\r\n"; + elif (line.startswith("INCLUDE_SEG_OBJECT")): + params = line.split("(")[1].split(")")[0].split(",") + for j in range(0, len(params)): + while (params[j].startswith(" ")): + params[j] = params[j][1 : len(params[j])] + + line = "beginseg\r\n"; + line += "\tname " + params[0] + "\r\n"; + line += "\tromalign 0x1000\r\n"; + line += "\tinclude " + params[1] + "\r\n"; + line += "\taddress SEGMENT_OBJECT\r\n"; + line += "endseg\r\n"; + + + line += "\r\n"; + specLines[i] = line; + +specOut = open("build/spec_preproc", "w"); +specOut.writelines(specLines); +specOut.close(); \ No newline at end of file diff --git a/tools/touchasset.py b/tools/touchasset.py new file mode 100644 index 0000000000..2ef98a9c01 --- /dev/null +++ b/tools/touchasset.py @@ -0,0 +1,13 @@ +#!/usr/bin/python3 +import sys +import os +from os import path + +if (path.exists(sys.argv[1])): + f = open(sys.argv[1], "r") + text = f.read() + f.close() + + execStr = "touch " + text + print(execStr) + os.system(execStr) \ No newline at end of file diff --git a/undefined_syms.txt b/undefined_syms.txt index fd9c0fa223..748bcd5f4c 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -223,7 +223,6 @@ D_04006020 = 0x04006020; D_0400C808 = 0x0400C808; D_0400C820 = 0x0400C820; D_0400CB70 = 0x0400CB70; -D_04010130 = 0x04010130; D_04015720 = 0x04015720; D_04015760 = 0x04015760; D_040184B0 = 0x040184B0; @@ -291,9 +290,6 @@ D_06004E98 = 0x06004E98; D_05017870 = 0x05017870; D_05017A60 = 0x05017A60; -// z_en_vase -D_06000000 = 0x06000000; - // z_door_toki D_06007888 = 0x06007888; @@ -304,12 +300,7 @@ D_060007D0 = 0x060007D0; D_06001A38 = 0x06001A38; D_06001C58 = 0x06001C58; -// z_bg_spot09_obj -D_06008010 = 0x06008010; - // z_bg_spot11_bakudankabe -D_06001A58 = 0x06001A58; -D_06001980 = 0x06001980; D_0500A880 = 0x0500A880; // z_bg_spot12_gate @@ -526,9 +517,6 @@ D_06001D8C = 0x06001D8C; D_06002348 = 0x06002348; D_06002E54 = 0x06002E54; -// z_bg_spot17_funen -D_06000B40 = 0x06000B40; - // z_bg_spot17_bakudankabe D_06000A38 = 0x06000A38; D_060008A0 = 0x060008A0; @@ -1591,7 +1579,6 @@ D_06005EA0 = 0x06005EA0; D_0600018C = 0x0600018C; // z_demo_effect -D_04010130 = 0x04010130; D_06001240 = 0x06001240; D_060010E0 = 0x060010E0; D_060020A0 = 0x060020A0;