diff --git a/Makefile b/Makefile index 84ef6c00f9..4d2120b23a 100644 --- a/Makefile +++ b/Makefile @@ -180,8 +180,8 @@ build/assets/%.o: assets/%.c build/src/overlays/%.o: src/overlays/%.c $(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $^ $(CC_CHECK) $^ - $(ZAP2) bovl $@ $^ $(@:.o=_reloc.s) - $(AS) $(ASFLAGS) $(@:.o=_reloc.s) -o $(@:.o=_reloc.o) + $(ZAP2) bovl -i $@ -cfg $^ -o $(@:.o=_reloc.s) + -test -f $(@:.o=_reloc.s) && $(AS) $(ASFLAGS) $(@:.o=_reloc.s) -o $(@:.o=_reloc.o) @$(OBJDUMP) -d $@ > $(@:.o=.s) build/src/%.o: src/%.c @@ -223,4 +223,4 @@ build/src/%.o: src/%.c # $(ZAP2) btex ci4 $< $@ #build/assets/%.ci8: assets/%.ci8.png -# $(ZAP2) btex ci8 $< $@ +# $(ZAP2) btex ci8 $< $@ \ No newline at end of file diff --git a/extract_assets.py b/extract_assets.py index 964cf2bb9e..10c00d23f1 100644 --- a/extract_assets.py +++ b/extract_assets.py @@ -3,7 +3,7 @@ import os from shutil import copyfile def ExtractFile(xmlPath, outputPath): - execStr = "tools/ZAP2/ZAP2.out e %s baserom/ %s 1" % (xmlPath, outputPath) + execStr = "tools/ZAP2/ZAP2.out e -i %s -b baserom/ -o %s -gsf 1 -sm tools/ZAP2/SymbolMap_OoTMqDbg.txt" % (xmlPath, outputPath) print(execStr) os.system(execStr) @@ -26,5 +26,110 @@ ExtractFile("assets/textures/xml/icon_item_static.xml", "assets/textures/icon_it 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/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/miharigoya.xml", "scenes/misc/miharigoya") \ No newline at end of file +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_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/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_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 diff --git a/include/segment_symbols.h b/include/segment_symbols.h index f4a72a8d60..1b527cd2fe 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -1008,131 +1008,620 @@ DECLARE_ROM_SEGMENT(vr_FCVR_static) DECLARE_ROM_SEGMENT(elf_message_field) DECLARE_ROM_SEGMENT(elf_message_ydan) +// SCENES AND ROOMS DECLARE_ROM_SEGMENT(ydan_scene) +DECLARE_ROM_SEGMENT(ydan_room_0) +DECLARE_ROM_SEGMENT(ydan_room_1) +DECLARE_ROM_SEGMENT(ydan_room_2) +DECLARE_ROM_SEGMENT(ydan_room_3) +DECLARE_ROM_SEGMENT(ydan_room_4) +DECLARE_ROM_SEGMENT(ydan_room_5) +DECLARE_ROM_SEGMENT(ydan_room_6) +DECLARE_ROM_SEGMENT(ydan_room_7) +DECLARE_ROM_SEGMENT(ydan_room_8) +DECLARE_ROM_SEGMENT(ydan_room_9) +DECLARE_ROM_SEGMENT(ydan_room_10) +DECLARE_ROM_SEGMENT(ydan_room_11) + DECLARE_ROM_SEGMENT(ddan_scene) +DECLARE_ROM_SEGMENT(ddan_room_0) +DECLARE_ROM_SEGMENT(ddan_room_1) +DECLARE_ROM_SEGMENT(ddan_room_2) +DECLARE_ROM_SEGMENT(ddan_room_3) +DECLARE_ROM_SEGMENT(ddan_room_4) +DECLARE_ROM_SEGMENT(ddan_room_5) +DECLARE_ROM_SEGMENT(ddan_room_6) +DECLARE_ROM_SEGMENT(ddan_room_7) +DECLARE_ROM_SEGMENT(ddan_room_8) +DECLARE_ROM_SEGMENT(ddan_room_9) +DECLARE_ROM_SEGMENT(ddan_room_10) +DECLARE_ROM_SEGMENT(ddan_room_11) +DECLARE_ROM_SEGMENT(ddan_room_12) +DECLARE_ROM_SEGMENT(ddan_room_13) +DECLARE_ROM_SEGMENT(ddan_room_14) +DECLARE_ROM_SEGMENT(ddan_room_15) +DECLARE_ROM_SEGMENT(ddan_room_16) + DECLARE_ROM_SEGMENT(bdan_scene) +DECLARE_ROM_SEGMENT(bdan_room_0) +DECLARE_ROM_SEGMENT(bdan_room_1) +DECLARE_ROM_SEGMENT(bdan_room_2) +DECLARE_ROM_SEGMENT(bdan_room_3) +DECLARE_ROM_SEGMENT(bdan_room_4) +DECLARE_ROM_SEGMENT(bdan_room_5) +DECLARE_ROM_SEGMENT(bdan_room_6) +DECLARE_ROM_SEGMENT(bdan_room_7) +DECLARE_ROM_SEGMENT(bdan_room_8) +DECLARE_ROM_SEGMENT(bdan_room_9) +DECLARE_ROM_SEGMENT(bdan_room_10) +DECLARE_ROM_SEGMENT(bdan_room_11) +DECLARE_ROM_SEGMENT(bdan_room_12) +DECLARE_ROM_SEGMENT(bdan_room_13) +DECLARE_ROM_SEGMENT(bdan_room_14) +DECLARE_ROM_SEGMENT(bdan_room_15) + DECLARE_ROM_SEGMENT(Bmori1_scene) +DECLARE_ROM_SEGMENT(Bmori1_room_0) +DECLARE_ROM_SEGMENT(Bmori1_room_1) +DECLARE_ROM_SEGMENT(Bmori1_room_2) +DECLARE_ROM_SEGMENT(Bmori1_room_3) +DECLARE_ROM_SEGMENT(Bmori1_room_4) +DECLARE_ROM_SEGMENT(Bmori1_room_5) +DECLARE_ROM_SEGMENT(Bmori1_room_6) +DECLARE_ROM_SEGMENT(Bmori1_room_7) +DECLARE_ROM_SEGMENT(Bmori1_room_8) +DECLARE_ROM_SEGMENT(Bmori1_room_9) +DECLARE_ROM_SEGMENT(Bmori1_room_10) +DECLARE_ROM_SEGMENT(Bmori1_room_11) +DECLARE_ROM_SEGMENT(Bmori1_room_12) +DECLARE_ROM_SEGMENT(Bmori1_room_13) +DECLARE_ROM_SEGMENT(Bmori1_room_14) +DECLARE_ROM_SEGMENT(Bmori1_room_15) +DECLARE_ROM_SEGMENT(Bmori1_room_16) +DECLARE_ROM_SEGMENT(Bmori1_room_17) +DECLARE_ROM_SEGMENT(Bmori1_room_18) +DECLARE_ROM_SEGMENT(Bmori1_room_19) +DECLARE_ROM_SEGMENT(Bmori1_room_20) +DECLARE_ROM_SEGMENT(Bmori1_room_21) +DECLARE_ROM_SEGMENT(Bmori1_room_22) + DECLARE_ROM_SEGMENT(HIDAN_scene) +DECLARE_ROM_SEGMENT(HIDAN_room_0) +DECLARE_ROM_SEGMENT(HIDAN_room_1) +DECLARE_ROM_SEGMENT(HIDAN_room_2) +DECLARE_ROM_SEGMENT(HIDAN_room_3) +DECLARE_ROM_SEGMENT(HIDAN_room_4) +DECLARE_ROM_SEGMENT(HIDAN_room_5) +DECLARE_ROM_SEGMENT(HIDAN_room_6) +DECLARE_ROM_SEGMENT(HIDAN_room_7) +DECLARE_ROM_SEGMENT(HIDAN_room_8) +DECLARE_ROM_SEGMENT(HIDAN_room_9) +DECLARE_ROM_SEGMENT(HIDAN_room_10) +DECLARE_ROM_SEGMENT(HIDAN_room_11) +DECLARE_ROM_SEGMENT(HIDAN_room_12) +DECLARE_ROM_SEGMENT(HIDAN_room_13) +DECLARE_ROM_SEGMENT(HIDAN_room_14) +DECLARE_ROM_SEGMENT(HIDAN_room_15) +DECLARE_ROM_SEGMENT(HIDAN_room_16) +DECLARE_ROM_SEGMENT(HIDAN_room_17) +DECLARE_ROM_SEGMENT(HIDAN_room_18) +DECLARE_ROM_SEGMENT(HIDAN_room_19) +DECLARE_ROM_SEGMENT(HIDAN_room_20) +DECLARE_ROM_SEGMENT(HIDAN_room_21) +DECLARE_ROM_SEGMENT(HIDAN_room_22) +DECLARE_ROM_SEGMENT(HIDAN_room_23) +DECLARE_ROM_SEGMENT(HIDAN_room_24) +DECLARE_ROM_SEGMENT(HIDAN_room_25) +DECLARE_ROM_SEGMENT(HIDAN_room_26) + DECLARE_ROM_SEGMENT(MIZUsin_scene) +DECLARE_ROM_SEGMENT(MIZUsin_room_0) +DECLARE_ROM_SEGMENT(MIZUsin_room_1) +DECLARE_ROM_SEGMENT(MIZUsin_room_2) +DECLARE_ROM_SEGMENT(MIZUsin_room_3) +DECLARE_ROM_SEGMENT(MIZUsin_room_4) +DECLARE_ROM_SEGMENT(MIZUsin_room_5) +DECLARE_ROM_SEGMENT(MIZUsin_room_6) +DECLARE_ROM_SEGMENT(MIZUsin_room_7) +DECLARE_ROM_SEGMENT(MIZUsin_room_8) +DECLARE_ROM_SEGMENT(MIZUsin_room_9) +DECLARE_ROM_SEGMENT(MIZUsin_room_10) +DECLARE_ROM_SEGMENT(MIZUsin_room_11) +DECLARE_ROM_SEGMENT(MIZUsin_room_12) +DECLARE_ROM_SEGMENT(MIZUsin_room_13) +DECLARE_ROM_SEGMENT(MIZUsin_room_14) +DECLARE_ROM_SEGMENT(MIZUsin_room_15) +DECLARE_ROM_SEGMENT(MIZUsin_room_16) +DECLARE_ROM_SEGMENT(MIZUsin_room_17) +DECLARE_ROM_SEGMENT(MIZUsin_room_18) +DECLARE_ROM_SEGMENT(MIZUsin_room_19) +DECLARE_ROM_SEGMENT(MIZUsin_room_20) +DECLARE_ROM_SEGMENT(MIZUsin_room_21) +DECLARE_ROM_SEGMENT(MIZUsin_room_22) + DECLARE_ROM_SEGMENT(jyasinzou_scene) +DECLARE_ROM_SEGMENT(jyasinzou_room_0) +DECLARE_ROM_SEGMENT(jyasinzou_room_1) +DECLARE_ROM_SEGMENT(jyasinzou_room_2) +DECLARE_ROM_SEGMENT(jyasinzou_room_3) +DECLARE_ROM_SEGMENT(jyasinzou_room_4) +DECLARE_ROM_SEGMENT(jyasinzou_room_5) +DECLARE_ROM_SEGMENT(jyasinzou_room_6) +DECLARE_ROM_SEGMENT(jyasinzou_room_7) +DECLARE_ROM_SEGMENT(jyasinzou_room_8) +DECLARE_ROM_SEGMENT(jyasinzou_room_9) +DECLARE_ROM_SEGMENT(jyasinzou_room_10) +DECLARE_ROM_SEGMENT(jyasinzou_room_11) +DECLARE_ROM_SEGMENT(jyasinzou_room_12) +DECLARE_ROM_SEGMENT(jyasinzou_room_13) +DECLARE_ROM_SEGMENT(jyasinzou_room_14) +DECLARE_ROM_SEGMENT(jyasinzou_room_15) +DECLARE_ROM_SEGMENT(jyasinzou_room_16) +DECLARE_ROM_SEGMENT(jyasinzou_room_17) +DECLARE_ROM_SEGMENT(jyasinzou_room_18) +DECLARE_ROM_SEGMENT(jyasinzou_room_19) +DECLARE_ROM_SEGMENT(jyasinzou_room_20) +DECLARE_ROM_SEGMENT(jyasinzou_room_21) +DECLARE_ROM_SEGMENT(jyasinzou_room_22) +DECLARE_ROM_SEGMENT(jyasinzou_room_23) +DECLARE_ROM_SEGMENT(jyasinzou_room_24) +DECLARE_ROM_SEGMENT(jyasinzou_room_25) +DECLARE_ROM_SEGMENT(jyasinzou_room_26) +DECLARE_ROM_SEGMENT(jyasinzou_room_27) +DECLARE_ROM_SEGMENT(jyasinzou_room_28) + DECLARE_ROM_SEGMENT(HAKAdan_scene) +DECLARE_ROM_SEGMENT(HAKAdan_room_0) +DECLARE_ROM_SEGMENT(HAKAdan_room_1) +DECLARE_ROM_SEGMENT(HAKAdan_room_2) +DECLARE_ROM_SEGMENT(HAKAdan_room_3) +DECLARE_ROM_SEGMENT(HAKAdan_room_4) +DECLARE_ROM_SEGMENT(HAKAdan_room_5) +DECLARE_ROM_SEGMENT(HAKAdan_room_6) +DECLARE_ROM_SEGMENT(HAKAdan_room_7) +DECLARE_ROM_SEGMENT(HAKAdan_room_8) +DECLARE_ROM_SEGMENT(HAKAdan_room_9) +DECLARE_ROM_SEGMENT(HAKAdan_room_10) +DECLARE_ROM_SEGMENT(HAKAdan_room_11) +DECLARE_ROM_SEGMENT(HAKAdan_room_12) +DECLARE_ROM_SEGMENT(HAKAdan_room_13) +DECLARE_ROM_SEGMENT(HAKAdan_room_14) +DECLARE_ROM_SEGMENT(HAKAdan_room_15) +DECLARE_ROM_SEGMENT(HAKAdan_room_16) +DECLARE_ROM_SEGMENT(HAKAdan_room_17) +DECLARE_ROM_SEGMENT(HAKAdan_room_18) +DECLARE_ROM_SEGMENT(HAKAdan_room_19) +DECLARE_ROM_SEGMENT(HAKAdan_room_20) +DECLARE_ROM_SEGMENT(HAKAdan_room_21) +DECLARE_ROM_SEGMENT(HAKAdan_room_22) + DECLARE_ROM_SEGMENT(HAKAdanCH_scene) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_0) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_1) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_2) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_3) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_4) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_5) +DECLARE_ROM_SEGMENT(HAKAdanCH_room_6) + DECLARE_ROM_SEGMENT(ice_doukutu_scene) +DECLARE_ROM_SEGMENT(ice_doukutu_room_0) +DECLARE_ROM_SEGMENT(ice_doukutu_room_1) +DECLARE_ROM_SEGMENT(ice_doukutu_room_2) +DECLARE_ROM_SEGMENT(ice_doukutu_room_3) +DECLARE_ROM_SEGMENT(ice_doukutu_room_4) +DECLARE_ROM_SEGMENT(ice_doukutu_room_5) +DECLARE_ROM_SEGMENT(ice_doukutu_room_6) +DECLARE_ROM_SEGMENT(ice_doukutu_room_7) +DECLARE_ROM_SEGMENT(ice_doukutu_room_8) +DECLARE_ROM_SEGMENT(ice_doukutu_room_9) +DECLARE_ROM_SEGMENT(ice_doukutu_room_10) +DECLARE_ROM_SEGMENT(ice_doukutu_room_11) + DECLARE_ROM_SEGMENT(ganon_scene) +DECLARE_ROM_SEGMENT(ganon_room_0) +DECLARE_ROM_SEGMENT(ganon_room_1) +DECLARE_ROM_SEGMENT(ganon_room_2) +DECLARE_ROM_SEGMENT(ganon_room_3) +DECLARE_ROM_SEGMENT(ganon_room_4) +DECLARE_ROM_SEGMENT(ganon_room_5) +DECLARE_ROM_SEGMENT(ganon_room_6) +DECLARE_ROM_SEGMENT(ganon_room_7) +DECLARE_ROM_SEGMENT(ganon_room_8) +DECLARE_ROM_SEGMENT(ganon_room_9) + DECLARE_ROM_SEGMENT(men_scene) +DECLARE_ROM_SEGMENT(men_room_0) +DECLARE_ROM_SEGMENT(men_room_1) +DECLARE_ROM_SEGMENT(men_room_2) +DECLARE_ROM_SEGMENT(men_room_3) +DECLARE_ROM_SEGMENT(men_room_4) +DECLARE_ROM_SEGMENT(men_room_5) +DECLARE_ROM_SEGMENT(men_room_6) +DECLARE_ROM_SEGMENT(men_room_7) +DECLARE_ROM_SEGMENT(men_room_8) +DECLARE_ROM_SEGMENT(men_room_9) +DECLARE_ROM_SEGMENT(men_room_10) + DECLARE_ROM_SEGMENT(gerudoway_scene) +DECLARE_ROM_SEGMENT(gerudoway_room_0) +DECLARE_ROM_SEGMENT(gerudoway_room_1) +DECLARE_ROM_SEGMENT(gerudoway_room_2) +DECLARE_ROM_SEGMENT(gerudoway_room_3) +DECLARE_ROM_SEGMENT(gerudoway_room_4) +DECLARE_ROM_SEGMENT(gerudoway_room_5) + DECLARE_ROM_SEGMENT(ganontika_scene) +DECLARE_ROM_SEGMENT(ganontika_room_0) +DECLARE_ROM_SEGMENT(ganontika_room_1) +DECLARE_ROM_SEGMENT(ganontika_room_2) +DECLARE_ROM_SEGMENT(ganontika_room_3) +DECLARE_ROM_SEGMENT(ganontika_room_4) +DECLARE_ROM_SEGMENT(ganontika_room_5) +DECLARE_ROM_SEGMENT(ganontika_room_6) +DECLARE_ROM_SEGMENT(ganontika_room_7) +DECLARE_ROM_SEGMENT(ganontika_room_8) +DECLARE_ROM_SEGMENT(ganontika_room_9) +DECLARE_ROM_SEGMENT(ganontika_room_10) +DECLARE_ROM_SEGMENT(ganontika_room_11) +DECLARE_ROM_SEGMENT(ganontika_room_12) +DECLARE_ROM_SEGMENT(ganontika_room_13) +DECLARE_ROM_SEGMENT(ganontika_room_14) +DECLARE_ROM_SEGMENT(ganontika_room_15) +DECLARE_ROM_SEGMENT(ganontika_room_16) +DECLARE_ROM_SEGMENT(ganontika_room_17) +DECLARE_ROM_SEGMENT(ganontika_room_18) +DECLARE_ROM_SEGMENT(ganontika_room_19) + DECLARE_ROM_SEGMENT(ganon_sonogo_scene) +DECLARE_ROM_SEGMENT(ganon_sonogo_room_0) +DECLARE_ROM_SEGMENT(ganon_sonogo_room_1) +DECLARE_ROM_SEGMENT(ganon_sonogo_room_2) +DECLARE_ROM_SEGMENT(ganon_sonogo_room_3) +DECLARE_ROM_SEGMENT(ganon_sonogo_room_4) + DECLARE_ROM_SEGMENT(ganontikasonogo_scene) +DECLARE_ROM_SEGMENT(ganontikasonogo_room_0) +DECLARE_ROM_SEGMENT(ganontikasonogo_room_1) + DECLARE_ROM_SEGMENT(takaraya_scene) +DECLARE_ROM_SEGMENT(takaraya_room_0) +DECLARE_ROM_SEGMENT(takaraya_room_1) +DECLARE_ROM_SEGMENT(takaraya_room_2) +DECLARE_ROM_SEGMENT(takaraya_room_3) +DECLARE_ROM_SEGMENT(takaraya_room_4) +DECLARE_ROM_SEGMENT(takaraya_room_5) +DECLARE_ROM_SEGMENT(takaraya_room_6) + DECLARE_ROM_SEGMENT(ydan_boss_scene) +DECLARE_ROM_SEGMENT(ydan_boss_room_0) +DECLARE_ROM_SEGMENT(ydan_boss_room_1) DECLARE_ROM_SEGMENT(ddan_boss_scene) DECLARE_ROM_SEGMENT(ddan_boss_room_0) DECLARE_ROM_SEGMENT(ddan_boss_room_1) DECLARE_ROM_SEGMENT(bdan_boss_scene) +DECLARE_ROM_SEGMENT(bdan_boss_room_0) +DECLARE_ROM_SEGMENT(bdan_boss_room_1) + DECLARE_ROM_SEGMENT(moribossroom_scene) +DECLARE_ROM_SEGMENT(moribossroom_room_0) +DECLARE_ROM_SEGMENT(moribossroom_room_1) + DECLARE_ROM_SEGMENT(FIRE_bs_scene) +DECLARE_ROM_SEGMENT(FIRE_bs_room_0) +DECLARE_ROM_SEGMENT(FIRE_bs_room_1) + DECLARE_ROM_SEGMENT(MIZUsin_bs_scene) +DECLARE_ROM_SEGMENT(MIZUsin_bs_room_0) +DECLARE_ROM_SEGMENT(MIZUsin_bs_room_1) + DECLARE_ROM_SEGMENT(jyasinboss_scene) +DECLARE_ROM_SEGMENT(jyasinboss_room_0) +DECLARE_ROM_SEGMENT(jyasinboss_room_1) +DECLARE_ROM_SEGMENT(jyasinboss_room_2) +DECLARE_ROM_SEGMENT(jyasinboss_room_3) + DECLARE_ROM_SEGMENT(HAKAdan_bs_scene) +DECLARE_ROM_SEGMENT(HAKAdan_bs_room_0) +DECLARE_ROM_SEGMENT(HAKAdan_bs_room_1) + DECLARE_ROM_SEGMENT(ganon_boss_scene) +DECLARE_ROM_SEGMENT(ganon_boss_room_0) + DECLARE_ROM_SEGMENT(ganon_final_scene) +DECLARE_ROM_SEGMENT(ganon_final_room_0) + DECLARE_ROM_SEGMENT(entra_scene) +DECLARE_ROM_SEGMENT(entra_room_0) + DECLARE_ROM_SEGMENT(entra_n_scene) +DECLARE_ROM_SEGMENT(entra_n_room_0) + DECLARE_ROM_SEGMENT(enrui_scene) +DECLARE_ROM_SEGMENT(enrui_room_0) + DECLARE_ROM_SEGMENT(market_alley_scene) +DECLARE_ROM_SEGMENT(market_alley_room_0) + DECLARE_ROM_SEGMENT(market_alley_n_scene) +DECLARE_ROM_SEGMENT(market_alley_n_room_0) + DECLARE_ROM_SEGMENT(market_day_scene) +DECLARE_ROM_SEGMENT(market_day_room_0) + DECLARE_ROM_SEGMENT(market_night_scene) +DECLARE_ROM_SEGMENT(market_night_room_0) + DECLARE_ROM_SEGMENT(market_ruins_scene) +DECLARE_ROM_SEGMENT(market_ruins_room_0) + DECLARE_ROM_SEGMENT(shrine_scene) +DECLARE_ROM_SEGMENT(shrine_room_0) + DECLARE_ROM_SEGMENT(shrine_n_scene) +DECLARE_ROM_SEGMENT(shrine_n_room_0) + DECLARE_ROM_SEGMENT(shrine_r_scene) +DECLARE_ROM_SEGMENT(shrine_r_room_0) + DECLARE_ROM_SEGMENT(kokiri_home_scene) +DECLARE_ROM_SEGMENT(kokiri_home_room_0) + DECLARE_ROM_SEGMENT(kokiri_home3_scene) +DECLARE_ROM_SEGMENT(kokiri_home3_room_0) + DECLARE_ROM_SEGMENT(kokiri_home4_scene) +DECLARE_ROM_SEGMENT(kokiri_home4_room_0) + DECLARE_ROM_SEGMENT(kokiri_home5_scene) +DECLARE_ROM_SEGMENT(kokiri_home5_room_0) + DECLARE_ROM_SEGMENT(kakariko_scene) +DECLARE_ROM_SEGMENT(kakariko_room_0) + DECLARE_ROM_SEGMENT(kakariko3_scene) +DECLARE_ROM_SEGMENT(kakariko3_room_0) + DECLARE_ROM_SEGMENT(shop1_scene) +DECLARE_ROM_SEGMENT(shop1_room_0) + DECLARE_ROM_SEGMENT(kokiri_shop_scene) +DECLARE_ROM_SEGMENT(kokiri_shop_room_0) + DECLARE_ROM_SEGMENT(golon_scene) +DECLARE_ROM_SEGMENT(golon_room_0) + DECLARE_ROM_SEGMENT(zoora_scene) +DECLARE_ROM_SEGMENT(zoora_room_0) + DECLARE_ROM_SEGMENT(drag_scene) +DECLARE_ROM_SEGMENT(drag_room_0) + DECLARE_ROM_SEGMENT(alley_shop_scene) +DECLARE_ROM_SEGMENT(alley_shop_room_0) + DECLARE_ROM_SEGMENT(night_shop_scene) +DECLARE_ROM_SEGMENT(night_shop_room_0) + DECLARE_ROM_SEGMENT(face_shop_scene) +DECLARE_ROM_SEGMENT(face_shop_room_0) + DECLARE_ROM_SEGMENT(link_home_scene) +DECLARE_ROM_SEGMENT(link_home_room_0) + DECLARE_ROM_SEGMENT(impa_scene) +DECLARE_ROM_SEGMENT(impa_room_0) + DECLARE_ROM_SEGMENT(malon_stable_scene) +DECLARE_ROM_SEGMENT(malon_stable_room_0) + DECLARE_ROM_SEGMENT(labo_scene) +DECLARE_ROM_SEGMENT(labo_room_0) + DECLARE_ROM_SEGMENT(hylia_labo_scene) +DECLARE_ROM_SEGMENT(hylia_labo_room_0) + DECLARE_ROM_SEGMENT(tent_scene) +DECLARE_ROM_SEGMENT(tent_room_0) + DECLARE_ROM_SEGMENT(hut_scene) +DECLARE_ROM_SEGMENT(hut_room_0) + DECLARE_ROM_SEGMENT(daiyousei_izumi_scene) +DECLARE_ROM_SEGMENT(daiyousei_izumi_room_0) + DECLARE_ROM_SEGMENT(yousei_izumi_tate_scene) +DECLARE_ROM_SEGMENT(yousei_izumi_tate_room_0) + DECLARE_ROM_SEGMENT(yousei_izumi_yoko_scene) +DECLARE_ROM_SEGMENT(yousei_izumi_yoko_room_0) + DECLARE_ROM_SEGMENT(kakusiana_scene) +DECLARE_ROM_SEGMENT(kakusiana_room_0) +DECLARE_ROM_SEGMENT(kakusiana_room_1) +DECLARE_ROM_SEGMENT(kakusiana_room_2) +DECLARE_ROM_SEGMENT(kakusiana_room_3) +DECLARE_ROM_SEGMENT(kakusiana_room_4) +DECLARE_ROM_SEGMENT(kakusiana_room_5) +DECLARE_ROM_SEGMENT(kakusiana_room_6) +DECLARE_ROM_SEGMENT(kakusiana_room_7) +DECLARE_ROM_SEGMENT(kakusiana_room_8) +DECLARE_ROM_SEGMENT(kakusiana_room_9) +DECLARE_ROM_SEGMENT(kakusiana_room_10) +DECLARE_ROM_SEGMENT(kakusiana_room_11) +DECLARE_ROM_SEGMENT(kakusiana_room_12) +DECLARE_ROM_SEGMENT(kakusiana_room_13) + DECLARE_ROM_SEGMENT(hakaana_scene) +DECLARE_ROM_SEGMENT(hakaana_room_0) + DECLARE_ROM_SEGMENT(hakaana2_scene) +DECLARE_ROM_SEGMENT(hakaana2_room_0) + DECLARE_ROM_SEGMENT(hakaana_ouke_scene) +DECLARE_ROM_SEGMENT(hakaana_ouke_room_0) +DECLARE_ROM_SEGMENT(hakaana_ouke_room_1) +DECLARE_ROM_SEGMENT(hakaana_ouke_room_2) + DECLARE_ROM_SEGMENT(syatekijyou_scene) +DECLARE_ROM_SEGMENT(syatekijyou_room_0) + DECLARE_ROM_SEGMENT(tokinoma_scene) +DECLARE_ROM_SEGMENT(tokinoma_room_0) +DECLARE_ROM_SEGMENT(tokinoma_room_1) + DECLARE_ROM_SEGMENT(kenjyanoma_scene) +DECLARE_ROM_SEGMENT(kenjyanoma_room_0) + DECLARE_ROM_SEGMENT(hairal_niwa_scene) +DECLARE_ROM_SEGMENT(hairal_niwa_room_0) + DECLARE_ROM_SEGMENT(hairal_niwa_n_scene) +DECLARE_ROM_SEGMENT(hairal_niwa_n_room_0) + DECLARE_ROM_SEGMENT(hiral_demo_scene) +DECLARE_ROM_SEGMENT(hiral_demo_room_0) + DECLARE_ROM_SEGMENT(hakasitarelay_scene) +DECLARE_ROM_SEGMENT(hakasitarelay_room_0) +DECLARE_ROM_SEGMENT(hakasitarelay_room_1) +DECLARE_ROM_SEGMENT(hakasitarelay_room_2) +DECLARE_ROM_SEGMENT(hakasitarelay_room_3) +DECLARE_ROM_SEGMENT(hakasitarelay_room_4) +DECLARE_ROM_SEGMENT(hakasitarelay_room_5) +DECLARE_ROM_SEGMENT(hakasitarelay_room_6) + DECLARE_ROM_SEGMENT(turibori_scene) +DECLARE_ROM_SEGMENT(turibori_room_0) + DECLARE_ROM_SEGMENT(nakaniwa_scene) +DECLARE_ROM_SEGMENT(nakaniwa_room_0) + DECLARE_ROM_SEGMENT(bowling_scene) +DECLARE_ROM_SEGMENT(bowling_room_0) + DECLARE_ROM_SEGMENT(souko_scene) +DECLARE_ROM_SEGMENT(souko_room_0) +DECLARE_ROM_SEGMENT(souko_room_1) +DECLARE_ROM_SEGMENT(souko_room_2) DECLARE_ROM_SEGMENT(miharigoya_scene) DECLARE_ROM_SEGMENT(miharigoya_room_0) DECLARE_ROM_SEGMENT(mahouya_scene) +DECLARE_ROM_SEGMENT(mahouya_room_0) + DECLARE_ROM_SEGMENT(ganon_demo_scene) +DECLARE_ROM_SEGMENT(ganon_demo_room_0) DECLARE_ROM_SEGMENT(kinsuta_scene) DECLARE_ROM_SEGMENT(kinsuta_room_0) DECLARE_ROM_SEGMENT(spot00_scene) +DECLARE_ROM_SEGMENT(spot00_room_0) + DECLARE_ROM_SEGMENT(spot01_scene) +DECLARE_ROM_SEGMENT(spot01_room_0) + DECLARE_ROM_SEGMENT(spot02_scene) +DECLARE_ROM_SEGMENT(spot02_room_0) +DECLARE_ROM_SEGMENT(spot02_room_1) + DECLARE_ROM_SEGMENT(spot03_scene) +DECLARE_ROM_SEGMENT(spot03_room_0) +DECLARE_ROM_SEGMENT(spot03_room_1) + DECLARE_ROM_SEGMENT(spot04_scene) +DECLARE_ROM_SEGMENT(spot04_room_0) +DECLARE_ROM_SEGMENT(spot04_room_1) +DECLARE_ROM_SEGMENT(spot04_room_2) + DECLARE_ROM_SEGMENT(spot05_scene) +DECLARE_ROM_SEGMENT(spot05_room_0) + DECLARE_ROM_SEGMENT(spot06_scene) +DECLARE_ROM_SEGMENT(spot06_room_0) + DECLARE_ROM_SEGMENT(spot07_scene) +DECLARE_ROM_SEGMENT(spot07_room_0) +DECLARE_ROM_SEGMENT(spot07_room_1) + DECLARE_ROM_SEGMENT(spot08_scene) +DECLARE_ROM_SEGMENT(spot08_room_0) + DECLARE_ROM_SEGMENT(spot09_scene) +DECLARE_ROM_SEGMENT(spot09_room_0) + DECLARE_ROM_SEGMENT(spot10_scene) +DECLARE_ROM_SEGMENT(spot10_room_0) +DECLARE_ROM_SEGMENT(spot10_room_1) +DECLARE_ROM_SEGMENT(spot10_room_2) +DECLARE_ROM_SEGMENT(spot10_room_3) +DECLARE_ROM_SEGMENT(spot10_room_4) +DECLARE_ROM_SEGMENT(spot10_room_5) +DECLARE_ROM_SEGMENT(spot10_room_6) +DECLARE_ROM_SEGMENT(spot10_room_7) +DECLARE_ROM_SEGMENT(spot10_room_8) +DECLARE_ROM_SEGMENT(spot10_room_9) + DECLARE_ROM_SEGMENT(spot11_scene) +DECLARE_ROM_SEGMENT(spot11_room_0) + DECLARE_ROM_SEGMENT(spot12_scene) +DECLARE_ROM_SEGMENT(spot12_room_0) +DECLARE_ROM_SEGMENT(spot12_room_1) + DECLARE_ROM_SEGMENT(spot13_scene) +DECLARE_ROM_SEGMENT(spot13_room_0) +DECLARE_ROM_SEGMENT(spot13_room_1) + DECLARE_ROM_SEGMENT(spot15_scene) +DECLARE_ROM_SEGMENT(spot15_room_0) + DECLARE_ROM_SEGMENT(spot16_scene) +DECLARE_ROM_SEGMENT(spot16_room_0) + DECLARE_ROM_SEGMENT(spot17_scene) +DECLARE_ROM_SEGMENT(spot17_room_0) +DECLARE_ROM_SEGMENT(spot17_room_1) + DECLARE_ROM_SEGMENT(spot18_scene) +DECLARE_ROM_SEGMENT(spot18_room_0) +DECLARE_ROM_SEGMENT(spot18_room_1) +DECLARE_ROM_SEGMENT(spot18_room_2) +DECLARE_ROM_SEGMENT(spot18_room_3) + DECLARE_ROM_SEGMENT(spot20_scene) +DECLARE_ROM_SEGMENT(spot20_room_0) + DECLARE_ROM_SEGMENT(ganon_tou_scene) +DECLARE_ROM_SEGMENT(ganon_tou_room_0) DECLARE_ROM_SEGMENT(test01_scene) DECLARE_ROM_SEGMENT(test01_room_0) DECLARE_ROM_SEGMENT(besitu_scene) +DECLARE_ROM_SEGMENT(besitu_room_0) + DECLARE_ROM_SEGMENT(depth_test_scene) +DECLARE_ROM_SEGMENT(depth_test_room_0) + DECLARE_ROM_SEGMENT(syotes_scene) +DECLARE_ROM_SEGMENT(syotes_room_0) + DECLARE_ROM_SEGMENT(syotes2_scene) +DECLARE_ROM_SEGMENT(syotes2_room_0) DECLARE_ROM_SEGMENT(sutaru_scene) DECLARE_ROM_SEGMENT(sutaru_room_0) DECLARE_ROM_SEGMENT(hairal_niwa2_scene) +DECLARE_ROM_SEGMENT(hairal_niwa2_room_0) + DECLARE_ROM_SEGMENT(sasatest_scene) +DECLARE_ROM_SEGMENT(sasatest_room_0) DECLARE_ROM_SEGMENT(testroom_scene) DECLARE_ROM_SEGMENT(testroom_room_0) @@ -1141,4 +1630,5 @@ DECLARE_ROM_SEGMENT(testroom_room_2) DECLARE_ROM_SEGMENT(testroom_room_3) DECLARE_ROM_SEGMENT(testroom_room_4) + #endif diff --git a/scenes/indoors/.gitkeep b/scenes/indoors/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scenes/overworld/.gitkeep b/scenes/overworld/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scenes/shops/.gitkeep b/scenes/shops/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scenes/xml/dungeons/Bmori1.xml b/scenes/xml/dungeons/Bmori1.xml new file mode 100644 index 0000000000..2c95cf2c75 --- /dev/null +++ b/scenes/xml/dungeons/Bmori1.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/FIRE_bs.xml b/scenes/xml/dungeons/FIRE_bs.xml new file mode 100644 index 0000000000..85d4339390 --- /dev/null +++ b/scenes/xml/dungeons/FIRE_bs.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/HAKAdan.xml b/scenes/xml/dungeons/HAKAdan.xml new file mode 100644 index 0000000000..6fb2e608e5 --- /dev/null +++ b/scenes/xml/dungeons/HAKAdan.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/HAKAdanCH.xml b/scenes/xml/dungeons/HAKAdanCH.xml new file mode 100644 index 0000000000..d6cffc0acc --- /dev/null +++ b/scenes/xml/dungeons/HAKAdanCH.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/HAKAdan_bs.xml b/scenes/xml/dungeons/HAKAdan_bs.xml new file mode 100644 index 0000000000..6e2c0ca873 --- /dev/null +++ b/scenes/xml/dungeons/HAKAdan_bs.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/HIDAN.xml b/scenes/xml/dungeons/HIDAN.xml new file mode 100644 index 0000000000..aca6479610 --- /dev/null +++ b/scenes/xml/dungeons/HIDAN.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/MIZUsin.xml b/scenes/xml/dungeons/MIZUsin.xml new file mode 100644 index 0000000000..e7dd1d3329 --- /dev/null +++ b/scenes/xml/dungeons/MIZUsin.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/MIZUsin_bs.xml b/scenes/xml/dungeons/MIZUsin_bs.xml new file mode 100644 index 0000000000..08b2754692 --- /dev/null +++ b/scenes/xml/dungeons/MIZUsin_bs.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/bdan.xml b/scenes/xml/dungeons/bdan.xml new file mode 100644 index 0000000000..503b08ae55 --- /dev/null +++ b/scenes/xml/dungeons/bdan.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/bdan_boss.xml b/scenes/xml/dungeons/bdan_boss.xml new file mode 100644 index 0000000000..dfe45de2dd --- /dev/null +++ b/scenes/xml/dungeons/bdan_boss.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ddan.xml b/scenes/xml/dungeons/ddan.xml new file mode 100644 index 0000000000..ae877c9eb9 --- /dev/null +++ b/scenes/xml/dungeons/ddan.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ddan_boss.xml b/scenes/xml/dungeons/ddan_boss.xml new file mode 100644 index 0000000000..e4576938c4 --- /dev/null +++ b/scenes/xml/dungeons/ddan_boss.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon.xml b/scenes/xml/dungeons/ganon.xml new file mode 100644 index 0000000000..ee3b2a56c7 --- /dev/null +++ b/scenes/xml/dungeons/ganon.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon_boss.xml b/scenes/xml/dungeons/ganon_boss.xml new file mode 100644 index 0000000000..ec864b2311 --- /dev/null +++ b/scenes/xml/dungeons/ganon_boss.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon_demo.xml b/scenes/xml/dungeons/ganon_demo.xml new file mode 100644 index 0000000000..06cb759e01 --- /dev/null +++ b/scenes/xml/dungeons/ganon_demo.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon_final.xml b/scenes/xml/dungeons/ganon_final.xml new file mode 100644 index 0000000000..558e164ab2 --- /dev/null +++ b/scenes/xml/dungeons/ganon_final.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon_sonogo.xml b/scenes/xml/dungeons/ganon_sonogo.xml new file mode 100644 index 0000000000..1a32d2bc59 --- /dev/null +++ b/scenes/xml/dungeons/ganon_sonogo.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganon_tou.xml b/scenes/xml/dungeons/ganon_tou.xml new file mode 100644 index 0000000000..c1da5c149e --- /dev/null +++ b/scenes/xml/dungeons/ganon_tou.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganontika.xml b/scenes/xml/dungeons/ganontika.xml new file mode 100644 index 0000000000..7d8255e149 --- /dev/null +++ b/scenes/xml/dungeons/ganontika.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ganontikasonogo.xml b/scenes/xml/dungeons/ganontikasonogo.xml new file mode 100644 index 0000000000..66ead96dc5 --- /dev/null +++ b/scenes/xml/dungeons/ganontikasonogo.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/gerudoway.xml b/scenes/xml/dungeons/gerudoway.xml new file mode 100644 index 0000000000..e5c3b3c0b8 --- /dev/null +++ b/scenes/xml/dungeons/gerudoway.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ice_doukutu.xml b/scenes/xml/dungeons/ice_doukutu.xml new file mode 100644 index 0000000000..6ff76674a6 --- /dev/null +++ b/scenes/xml/dungeons/ice_doukutu.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/jyasinboss.xml b/scenes/xml/dungeons/jyasinboss.xml new file mode 100644 index 0000000000..c70a67c3de --- /dev/null +++ b/scenes/xml/dungeons/jyasinboss.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/jyasinzou.xml b/scenes/xml/dungeons/jyasinzou.xml new file mode 100644 index 0000000000..2c81bd2eda --- /dev/null +++ b/scenes/xml/dungeons/jyasinzou.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/men.xml b/scenes/xml/dungeons/men.xml new file mode 100644 index 0000000000..8de271ba8f --- /dev/null +++ b/scenes/xml/dungeons/men.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/moribossroom.xml b/scenes/xml/dungeons/moribossroom.xml new file mode 100644 index 0000000000..70922f3a2e --- /dev/null +++ b/scenes/xml/dungeons/moribossroom.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ydan.xml b/scenes/xml/dungeons/ydan.xml new file mode 100644 index 0000000000..302c0647b5 --- /dev/null +++ b/scenes/xml/dungeons/ydan.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/dungeons/ydan_boss.xml b/scenes/xml/dungeons/ydan_boss.xml new file mode 100644 index 0000000000..8c84f705e6 --- /dev/null +++ b/scenes/xml/dungeons/ydan_boss.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/bowling.xml b/scenes/xml/indoors/bowling.xml new file mode 100644 index 0000000000..da21413ffe --- /dev/null +++ b/scenes/xml/indoors/bowling.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/daiyousei_izumi.xml b/scenes/xml/indoors/daiyousei_izumi.xml new file mode 100644 index 0000000000..39a064a3cf --- /dev/null +++ b/scenes/xml/indoors/daiyousei_izumi.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/hairal_niwa.xml b/scenes/xml/indoors/hairal_niwa.xml new file mode 100644 index 0000000000..dd617317e1 --- /dev/null +++ b/scenes/xml/indoors/hairal_niwa.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/hairal_niwa_n.xml b/scenes/xml/indoors/hairal_niwa_n.xml new file mode 100644 index 0000000000..2d70481ba8 --- /dev/null +++ b/scenes/xml/indoors/hairal_niwa_n.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/hakasitarelay.xml b/scenes/xml/indoors/hakasitarelay.xml new file mode 100644 index 0000000000..a0ed677191 --- /dev/null +++ b/scenes/xml/indoors/hakasitarelay.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/hut.xml b/scenes/xml/indoors/hut.xml new file mode 100644 index 0000000000..bc3936f4a3 --- /dev/null +++ b/scenes/xml/indoors/hut.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/hylia_labo.xml b/scenes/xml/indoors/hylia_labo.xml new file mode 100644 index 0000000000..07ecda72d8 --- /dev/null +++ b/scenes/xml/indoors/hylia_labo.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/impa.xml b/scenes/xml/indoors/impa.xml new file mode 100644 index 0000000000..22829842cd --- /dev/null +++ b/scenes/xml/indoors/impa.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kakariko.xml b/scenes/xml/indoors/kakariko.xml new file mode 100644 index 0000000000..bc8f0e5705 --- /dev/null +++ b/scenes/xml/indoors/kakariko.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kenjyanoma.xml b/scenes/xml/indoors/kenjyanoma.xml new file mode 100644 index 0000000000..04d064d90a --- /dev/null +++ b/scenes/xml/indoors/kenjyanoma.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kokiri_home.xml b/scenes/xml/indoors/kokiri_home.xml new file mode 100644 index 0000000000..78ead77881 --- /dev/null +++ b/scenes/xml/indoors/kokiri_home.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kokiri_home3.xml b/scenes/xml/indoors/kokiri_home3.xml new file mode 100644 index 0000000000..57c26dae1d --- /dev/null +++ b/scenes/xml/indoors/kokiri_home3.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kokiri_home4.xml b/scenes/xml/indoors/kokiri_home4.xml new file mode 100644 index 0000000000..7a01c0eaeb --- /dev/null +++ b/scenes/xml/indoors/kokiri_home4.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/kokiri_home5.xml b/scenes/xml/indoors/kokiri_home5.xml new file mode 100644 index 0000000000..489815db1a --- /dev/null +++ b/scenes/xml/indoors/kokiri_home5.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/labo.xml b/scenes/xml/indoors/labo.xml new file mode 100644 index 0000000000..d69ae4219e --- /dev/null +++ b/scenes/xml/indoors/labo.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/link_home.xml b/scenes/xml/indoors/link_home.xml new file mode 100644 index 0000000000..86b6183715 --- /dev/null +++ b/scenes/xml/indoors/link_home.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/mahouya.xml b/scenes/xml/indoors/mahouya.xml new file mode 100644 index 0000000000..145d761137 --- /dev/null +++ b/scenes/xml/indoors/mahouya.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/malon_stable.xml b/scenes/xml/indoors/malon_stable.xml new file mode 100644 index 0000000000..df1f7a852b --- /dev/null +++ b/scenes/xml/indoors/malon_stable.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/miharigoya.xml b/scenes/xml/indoors/miharigoya.xml similarity index 83% rename from scenes/xml/misc/miharigoya.xml rename to scenes/xml/indoors/miharigoya.xml index 4128112bb8..38e99bb69a 100644 --- a/scenes/xml/misc/miharigoya.xml +++ b/scenes/xml/indoors/miharigoya.xml @@ -1,6 +1,8 @@ + + diff --git a/scenes/xml/indoors/nakaniwa.xml b/scenes/xml/indoors/nakaniwa.xml new file mode 100644 index 0000000000..acd8a14a23 --- /dev/null +++ b/scenes/xml/indoors/nakaniwa.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/syatekijyou.xml b/scenes/xml/indoors/syatekijyou.xml new file mode 100644 index 0000000000..de6f9cadaf --- /dev/null +++ b/scenes/xml/indoors/syatekijyou.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/takaraya.xml b/scenes/xml/indoors/takaraya.xml new file mode 100644 index 0000000000..2edf392e31 --- /dev/null +++ b/scenes/xml/indoors/takaraya.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/tent.xml b/scenes/xml/indoors/tent.xml new file mode 100644 index 0000000000..973155b54b --- /dev/null +++ b/scenes/xml/indoors/tent.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/tokinoma.xml b/scenes/xml/indoors/tokinoma.xml new file mode 100644 index 0000000000..d2fe9c3282 --- /dev/null +++ b/scenes/xml/indoors/tokinoma.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/yousei_izumi_tate.xml b/scenes/xml/indoors/yousei_izumi_tate.xml new file mode 100644 index 0000000000..ab54d8d18f --- /dev/null +++ b/scenes/xml/indoors/yousei_izumi_tate.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/indoors/yousei_izumi_yoko.xml b/scenes/xml/indoors/yousei_izumi_yoko.xml new file mode 100644 index 0000000000..c202a283b6 --- /dev/null +++ b/scenes/xml/indoors/yousei_izumi_yoko.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/enrui.xml b/scenes/xml/misc/enrui.xml new file mode 100644 index 0000000000..2507e56054 --- /dev/null +++ b/scenes/xml/misc/enrui.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/entra_n.xml b/scenes/xml/misc/entra_n.xml new file mode 100644 index 0000000000..e186ff9ae9 --- /dev/null +++ b/scenes/xml/misc/entra_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/hakaana.xml b/scenes/xml/misc/hakaana.xml new file mode 100644 index 0000000000..4cff72c6d4 --- /dev/null +++ b/scenes/xml/misc/hakaana.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/hakaana2.xml b/scenes/xml/misc/hakaana2.xml new file mode 100644 index 0000000000..993bb492b8 --- /dev/null +++ b/scenes/xml/misc/hakaana2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/hakaana_ouke.xml b/scenes/xml/misc/hakaana_ouke.xml new file mode 100644 index 0000000000..f84f85131d --- /dev/null +++ b/scenes/xml/misc/hakaana_ouke.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/hiral_demo.xml b/scenes/xml/misc/hiral_demo.xml new file mode 100644 index 0000000000..880a1c2215 --- /dev/null +++ b/scenes/xml/misc/hiral_demo.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/kakusiana.xml b/scenes/xml/misc/kakusiana.xml new file mode 100644 index 0000000000..83a9a695c0 --- /dev/null +++ b/scenes/xml/misc/kakusiana.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/market_alley.xml b/scenes/xml/misc/market_alley.xml new file mode 100644 index 0000000000..bb254a29d8 --- /dev/null +++ b/scenes/xml/misc/market_alley.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/market_alley_n.xml b/scenes/xml/misc/market_alley_n.xml new file mode 100644 index 0000000000..114aef4f37 --- /dev/null +++ b/scenes/xml/misc/market_alley_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/market_ruins.xml b/scenes/xml/misc/market_ruins.xml new file mode 100644 index 0000000000..ceaff25ffc --- /dev/null +++ b/scenes/xml/misc/market_ruins.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/shrine.xml b/scenes/xml/misc/shrine.xml new file mode 100644 index 0000000000..03410ee3f6 --- /dev/null +++ b/scenes/xml/misc/shrine.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/shrine_n.xml b/scenes/xml/misc/shrine_n.xml new file mode 100644 index 0000000000..0201def0c0 --- /dev/null +++ b/scenes/xml/misc/shrine_n.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/shrine_r.xml b/scenes/xml/misc/shrine_r.xml new file mode 100644 index 0000000000..b8004c7e1f --- /dev/null +++ b/scenes/xml/misc/shrine_r.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/turibori.xml b/scenes/xml/misc/turibori.xml new file mode 100644 index 0000000000..294b13749f --- /dev/null +++ b/scenes/xml/misc/turibori.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/entra.xml b/scenes/xml/overworld/entra.xml new file mode 100644 index 0000000000..a55e676bb7 --- /dev/null +++ b/scenes/xml/overworld/entra.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/souko.xml b/scenes/xml/overworld/souko.xml new file mode 100644 index 0000000000..10e0b08a8b --- /dev/null +++ b/scenes/xml/overworld/souko.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot00.xml b/scenes/xml/overworld/spot00.xml new file mode 100644 index 0000000000..f8e3439251 --- /dev/null +++ b/scenes/xml/overworld/spot00.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot01.xml b/scenes/xml/overworld/spot01.xml new file mode 100644 index 0000000000..643298a1bc --- /dev/null +++ b/scenes/xml/overworld/spot01.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot02.xml b/scenes/xml/overworld/spot02.xml new file mode 100644 index 0000000000..244259ee00 --- /dev/null +++ b/scenes/xml/overworld/spot02.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot03.xml b/scenes/xml/overworld/spot03.xml new file mode 100644 index 0000000000..9553762842 --- /dev/null +++ b/scenes/xml/overworld/spot03.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot04.xml b/scenes/xml/overworld/spot04.xml new file mode 100644 index 0000000000..614d466fc8 --- /dev/null +++ b/scenes/xml/overworld/spot04.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot05.xml b/scenes/xml/overworld/spot05.xml new file mode 100644 index 0000000000..3da224567d --- /dev/null +++ b/scenes/xml/overworld/spot05.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot06.xml b/scenes/xml/overworld/spot06.xml new file mode 100644 index 0000000000..04c8a60bc8 --- /dev/null +++ b/scenes/xml/overworld/spot06.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot07.xml b/scenes/xml/overworld/spot07.xml new file mode 100644 index 0000000000..24b8a5a66d --- /dev/null +++ b/scenes/xml/overworld/spot07.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot08.xml b/scenes/xml/overworld/spot08.xml new file mode 100644 index 0000000000..a07906104f --- /dev/null +++ b/scenes/xml/overworld/spot08.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot09.xml b/scenes/xml/overworld/spot09.xml new file mode 100644 index 0000000000..906f83a2b6 --- /dev/null +++ b/scenes/xml/overworld/spot09.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot10.xml b/scenes/xml/overworld/spot10.xml new file mode 100644 index 0000000000..67d9960029 --- /dev/null +++ b/scenes/xml/overworld/spot10.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot11.xml b/scenes/xml/overworld/spot11.xml new file mode 100644 index 0000000000..8e1e567477 --- /dev/null +++ b/scenes/xml/overworld/spot11.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot12.xml b/scenes/xml/overworld/spot12.xml new file mode 100644 index 0000000000..0832e29189 --- /dev/null +++ b/scenes/xml/overworld/spot12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot13.xml b/scenes/xml/overworld/spot13.xml new file mode 100644 index 0000000000..c92c879862 --- /dev/null +++ b/scenes/xml/overworld/spot13.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot15.xml b/scenes/xml/overworld/spot15.xml new file mode 100644 index 0000000000..c26d8dad93 --- /dev/null +++ b/scenes/xml/overworld/spot15.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot16.xml b/scenes/xml/overworld/spot16.xml new file mode 100644 index 0000000000..0d445acaef --- /dev/null +++ b/scenes/xml/overworld/spot16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot17.xml b/scenes/xml/overworld/spot17.xml new file mode 100644 index 0000000000..385645b72a --- /dev/null +++ b/scenes/xml/overworld/spot17.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot18.xml b/scenes/xml/overworld/spot18.xml new file mode 100644 index 0000000000..9361d54673 --- /dev/null +++ b/scenes/xml/overworld/spot18.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/overworld/spot20.xml b/scenes/xml/overworld/spot20.xml new file mode 100644 index 0000000000..ee2fdd9345 --- /dev/null +++ b/scenes/xml/overworld/spot20.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/alley_shop.xml b/scenes/xml/shops/alley_shop.xml new file mode 100644 index 0000000000..3df0dd011d --- /dev/null +++ b/scenes/xml/shops/alley_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/drag.xml b/scenes/xml/shops/drag.xml new file mode 100644 index 0000000000..bb3660cde7 --- /dev/null +++ b/scenes/xml/shops/drag.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/face_shop.xml b/scenes/xml/shops/face_shop.xml new file mode 100644 index 0000000000..7eba877318 --- /dev/null +++ b/scenes/xml/shops/face_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/golon.xml b/scenes/xml/shops/golon.xml new file mode 100644 index 0000000000..232bfe4e5b --- /dev/null +++ b/scenes/xml/shops/golon.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/kokiri_shop.xml b/scenes/xml/shops/kokiri_shop.xml new file mode 100644 index 0000000000..fe1a4f26f8 --- /dev/null +++ b/scenes/xml/shops/kokiri_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/night_shop.xml b/scenes/xml/shops/night_shop.xml new file mode 100644 index 0000000000..0cf376f583 --- /dev/null +++ b/scenes/xml/shops/night_shop.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/shop1.xml b/scenes/xml/shops/shop1.xml new file mode 100644 index 0000000000..5506efeb70 --- /dev/null +++ b/scenes/xml/shops/shop1.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/shops/zoora.xml b/scenes/xml/shops/zoora.xml new file mode 100644 index 0000000000..f6996d0ff2 --- /dev/null +++ b/scenes/xml/shops/zoora.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/test_levels/besitu.xml b/scenes/xml/test_levels/besitu.xml new file mode 100644 index 0000000000..6dba6e4db2 --- /dev/null +++ b/scenes/xml/test_levels/besitu.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/test_levels/depth_test.xml b/scenes/xml/test_levels/depth_test.xml new file mode 100644 index 0000000000..ab0ce511bb --- /dev/null +++ b/scenes/xml/test_levels/depth_test.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/test_levels/sasatest.xml b/scenes/xml/test_levels/sasatest.xml new file mode 100644 index 0000000000..1ba06f9eb9 --- /dev/null +++ b/scenes/xml/test_levels/sasatest.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/test_levels/sutaru.xml b/scenes/xml/test_levels/sutaru.xml index a06f06ec83..e0d7f00a0a 100644 --- a/scenes/xml/test_levels/sutaru.xml +++ b/scenes/xml/test_levels/sutaru.xml @@ -1,8 +1,11 @@ - + + + - + + \ No newline at end of file diff --git a/scenes/xml/test_levels/syotes2.xml b/scenes/xml/test_levels/syotes2.xml new file mode 100644 index 0000000000..ffe712da1f --- /dev/null +++ b/scenes/xml/test_levels/syotes2.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/spec b/spec index 510a567b48..1281fa170e 100644 --- a/spec +++ b/spec @@ -2,6 +2,9 @@ * ROM spec file */ +#define SEGMENT_SCENE 0x02000000 +#define SEGMENT_ROOM 0x03000000 + beginseg name "makerom" include "build/asm/rom_header.o" @@ -6892,1393 +6895,1625 @@ endseg beginseg name "ydan_scene" romalign 0x1000 - include "build/baserom/ydan_scene.o" + include "build/scenes/dungeons/ydan/ydan_scene.o" + address SEGMENT_SCENE endseg beginseg name "ydan_room_0" romalign 0x1000 - include "build/baserom/ydan_room_0.o" + include "build/scenes/dungeons/ydan/ydan_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_1" romalign 0x1000 - include "build/baserom/ydan_room_1.o" + include "build/scenes/dungeons/ydan/ydan_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_2" romalign 0x1000 - include "build/baserom/ydan_room_2.o" + include "build/scenes/dungeons/ydan/ydan_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_3" romalign 0x1000 - include "build/baserom/ydan_room_3.o" + include "build/scenes/dungeons/ydan/ydan_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_4" romalign 0x1000 - include "build/baserom/ydan_room_4.o" + include "build/scenes/dungeons/ydan/ydan_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_5" romalign 0x1000 - include "build/baserom/ydan_room_5.o" + include "build/scenes/dungeons/ydan/ydan_room_5.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_6" romalign 0x1000 - include "build/baserom/ydan_room_6.o" + include "build/scenes/dungeons/ydan/ydan_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_7" romalign 0x1000 - include "build/baserom/ydan_room_7.o" + include "build/scenes/dungeons/ydan/ydan_room_7.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_8" romalign 0x1000 - include "build/baserom/ydan_room_8.o" + include "build/scenes/dungeons/ydan/ydan_room_8.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_9" romalign 0x1000 - include "build/baserom/ydan_room_9.o" + include "build/scenes/dungeons/ydan/ydan_room_9.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_10" romalign 0x1000 - include "build/baserom/ydan_room_10.o" + include "build/scenes/dungeons/ydan/ydan_room_10.o" + address SEGMENT_ROOM endseg beginseg name "ydan_room_11" romalign 0x1000 - include "build/baserom/ydan_room_11.o" + include "build/scenes/dungeons/ydan/ydan_room_11.o" + address SEGMENT_ROOM endseg beginseg name "ddan_scene" romalign 0x1000 - include "build/baserom/ddan_scene.o" + include "build/scenes/dungeons/ddan/ddan_scene.o" + address SEGMENT_SCENE endseg beginseg name "ddan_room_0" romalign 0x1000 - include "build/baserom/ddan_room_0.o" + include "build/scenes/dungeons/ddan/ddan_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_1" romalign 0x1000 - include "build/baserom/ddan_room_1.o" + include "build/scenes/dungeons/ddan/ddan_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_2" romalign 0x1000 - include "build/baserom/ddan_room_2.o" + include "build/scenes/dungeons/ddan/ddan_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_3" romalign 0x1000 - include "build/baserom/ddan_room_3.o" + include "build/scenes/dungeons/ddan/ddan_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_4" romalign 0x1000 - include "build/baserom/ddan_room_4.o" + include "build/scenes/dungeons/ddan/ddan_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_5" romalign 0x1000 - include "build/baserom/ddan_room_5.o" + include "build/scenes/dungeons/ddan/ddan_room_5.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_6" romalign 0x1000 - include "build/baserom/ddan_room_6.o" + include "build/scenes/dungeons/ddan/ddan_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_7" romalign 0x1000 - include "build/baserom/ddan_room_7.o" + include "build/scenes/dungeons/ddan/ddan_room_7.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_8" romalign 0x1000 - include "build/baserom/ddan_room_8.o" + include "build/scenes/dungeons/ddan/ddan_room_8.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_9" romalign 0x1000 - include "build/baserom/ddan_room_9.o" + include "build/scenes/dungeons/ddan/ddan_room_9.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_10" romalign 0x1000 - include "build/baserom/ddan_room_10.o" + include "build/scenes/dungeons/ddan/ddan_room_10.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_11" romalign 0x1000 - include "build/baserom/ddan_room_11.o" + include "build/scenes/dungeons/ddan/ddan_room_11.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_12" romalign 0x1000 - include "build/baserom/ddan_room_12.o" + include "build/scenes/dungeons/ddan/ddan_room_12.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_13" romalign 0x1000 - include "build/baserom/ddan_room_13.o" + include "build/scenes/dungeons/ddan/ddan_room_13.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_14" romalign 0x1000 - include "build/baserom/ddan_room_14.o" + include "build/scenes/dungeons/ddan/ddan_room_14.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_15" romalign 0x1000 - include "build/baserom/ddan_room_15.o" + include "build/scenes/dungeons/ddan/ddan_room_15.o" + address SEGMENT_ROOM endseg beginseg name "ddan_room_16" romalign 0x1000 - include "build/baserom/ddan_room_16.o" + include "build/scenes/dungeons/ddan/ddan_room_16.o" + address SEGMENT_ROOM endseg beginseg name "bdan_scene" romalign 0x1000 - include "build/baserom/bdan_scene.o" + include "build/scenes/dungeons/bdan/bdan_scene.o" + address SEGMENT_SCENE endseg beginseg name "bdan_room_0" romalign 0x1000 - include "build/baserom/bdan_room_0.o" + include "build/scenes/dungeons/bdan/bdan_room_0.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_1" romalign 0x1000 - include "build/baserom/bdan_room_1.o" + include "build/scenes/dungeons/bdan/bdan_room_1.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_2" romalign 0x1000 - include "build/baserom/bdan_room_2.o" + include "build/scenes/dungeons/bdan/bdan_room_2.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_3" romalign 0x1000 - include "build/baserom/bdan_room_3.o" + include "build/scenes/dungeons/bdan/bdan_room_3.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_4" romalign 0x1000 - include "build/baserom/bdan_room_4.o" + include "build/scenes/dungeons/bdan/bdan_room_4.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_5" romalign 0x1000 - include "build/baserom/bdan_room_5.o" + include "build/scenes/dungeons/bdan/bdan_room_5.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_6" romalign 0x1000 - include "build/baserom/bdan_room_6.o" + include "build/scenes/dungeons/bdan/bdan_room_6.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_7" romalign 0x1000 - include "build/baserom/bdan_room_7.o" + include "build/scenes/dungeons/bdan/bdan_room_7.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_8" romalign 0x1000 - include "build/baserom/bdan_room_8.o" + include "build/scenes/dungeons/bdan/bdan_room_8.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_9" romalign 0x1000 - include "build/baserom/bdan_room_9.o" + include "build/scenes/dungeons/bdan/bdan_room_9.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_10" romalign 0x1000 - include "build/baserom/bdan_room_10.o" + include "build/scenes/dungeons/bdan/bdan_room_10.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_11" romalign 0x1000 - include "build/baserom/bdan_room_11.o" + include "build/scenes/dungeons/bdan/bdan_room_11.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_12" romalign 0x1000 - include "build/baserom/bdan_room_12.o" + include "build/scenes/dungeons/bdan/bdan_room_12.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_13" romalign 0x1000 - include "build/baserom/bdan_room_13.o" + include "build/scenes/dungeons/bdan/bdan_room_13.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_14" romalign 0x1000 - include "build/baserom/bdan_room_14.o" + include "build/scenes/dungeons/bdan/bdan_room_14.o" + address SEGMENT_ROOM endseg beginseg name "bdan_room_15" romalign 0x1000 - include "build/baserom/bdan_room_15.o" + include "build/scenes/dungeons/bdan/bdan_room_15.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_scene" romalign 0x1000 - include "build/baserom/Bmori1_scene.o" + include "build/scenes/dungeons/Bmori1/Bmori1_scene.o" + address SEGMENT_SCENE endseg beginseg name "Bmori1_room_0" romalign 0x1000 - include "build/baserom/Bmori1_room_0.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_0.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_1" romalign 0x1000 - include "build/baserom/Bmori1_room_1.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_1.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_2" romalign 0x1000 - include "build/baserom/Bmori1_room_2.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_2.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_3" romalign 0x1000 - include "build/baserom/Bmori1_room_3.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_3.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_4" romalign 0x1000 - include "build/baserom/Bmori1_room_4.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_4.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_5" romalign 0x1000 - include "build/baserom/Bmori1_room_5.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_5.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_6" romalign 0x1000 - include "build/baserom/Bmori1_room_6.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_6.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_7" romalign 0x1000 - include "build/baserom/Bmori1_room_7.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_7.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_8" romalign 0x1000 - include "build/baserom/Bmori1_room_8.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_8.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_9" romalign 0x1000 - include "build/baserom/Bmori1_room_9.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_9.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_10" romalign 0x1000 - include "build/baserom/Bmori1_room_10.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_10.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_11" romalign 0x1000 - include "build/baserom/Bmori1_room_11.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_11.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_12" romalign 0x1000 - include "build/baserom/Bmori1_room_12.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_12.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_13" romalign 0x1000 - include "build/baserom/Bmori1_room_13.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_13.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_14" romalign 0x1000 - include "build/baserom/Bmori1_room_14.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_14.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_15" romalign 0x1000 - include "build/baserom/Bmori1_room_15.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_15.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_16" romalign 0x1000 - include "build/baserom/Bmori1_room_16.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_16.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_17" romalign 0x1000 - include "build/baserom/Bmori1_room_17.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_17.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_18" romalign 0x1000 - include "build/baserom/Bmori1_room_18.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_18.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_19" romalign 0x1000 - include "build/baserom/Bmori1_room_19.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_19.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_20" romalign 0x1000 - include "build/baserom/Bmori1_room_20.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_20.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_21" romalign 0x1000 - include "build/baserom/Bmori1_room_21.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_21.o" + address SEGMENT_ROOM endseg beginseg name "Bmori1_room_22" romalign 0x1000 - include "build/baserom/Bmori1_room_22.o" + include "build/scenes/dungeons/Bmori1/Bmori1_room_22.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_scene" romalign 0x1000 - include "build/baserom/HIDAN_scene.o" + include "build/scenes/dungeons/HIDAN/HIDAN_scene.o" + address SEGMENT_SCENE endseg beginseg name "HIDAN_room_0" romalign 0x1000 - include "build/baserom/HIDAN_room_0.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_0.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_1" romalign 0x1000 - include "build/baserom/HIDAN_room_1.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_1.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_2" romalign 0x1000 - include "build/baserom/HIDAN_room_2.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_2.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_3" romalign 0x1000 - include "build/baserom/HIDAN_room_3.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_3.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_4" romalign 0x1000 - include "build/baserom/HIDAN_room_4.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_4.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_5" romalign 0x1000 - include "build/baserom/HIDAN_room_5.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_5.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_6" romalign 0x1000 - include "build/baserom/HIDAN_room_6.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_6.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_7" romalign 0x1000 - include "build/baserom/HIDAN_room_7.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_7.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_8" romalign 0x1000 - include "build/baserom/HIDAN_room_8.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_8.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_9" romalign 0x1000 - include "build/baserom/HIDAN_room_9.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_9.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_10" romalign 0x1000 - include "build/baserom/HIDAN_room_10.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_10.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_11" romalign 0x1000 - include "build/baserom/HIDAN_room_11.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_11.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_12" romalign 0x1000 - include "build/baserom/HIDAN_room_12.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_12.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_13" romalign 0x1000 - include "build/baserom/HIDAN_room_13.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_13.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_14" romalign 0x1000 - include "build/baserom/HIDAN_room_14.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_14.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_15" romalign 0x1000 - include "build/baserom/HIDAN_room_15.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_15.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_16" romalign 0x1000 - include "build/baserom/HIDAN_room_16.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_16.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_17" romalign 0x1000 - include "build/baserom/HIDAN_room_17.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_17.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_18" romalign 0x1000 - include "build/baserom/HIDAN_room_18.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_18.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_19" romalign 0x1000 - include "build/baserom/HIDAN_room_19.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_19.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_20" romalign 0x1000 - include "build/baserom/HIDAN_room_20.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_20.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_21" romalign 0x1000 - include "build/baserom/HIDAN_room_21.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_21.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_22" romalign 0x1000 - include "build/baserom/HIDAN_room_22.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_22.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_23" romalign 0x1000 - include "build/baserom/HIDAN_room_23.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_23.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_24" romalign 0x1000 - include "build/baserom/HIDAN_room_24.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_24.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_25" romalign 0x1000 - include "build/baserom/HIDAN_room_25.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_25.o" + address SEGMENT_ROOM endseg beginseg name "HIDAN_room_26" romalign 0x1000 - include "build/baserom/HIDAN_room_26.o" + include "build/scenes/dungeons/HIDAN/HIDAN_room_26.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_scene" romalign 0x1000 - include "build/baserom/MIZUsin_scene.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_scene.o" + address SEGMENT_SCENE endseg beginseg name "MIZUsin_room_0" romalign 0x1000 - include "build/baserom/MIZUsin_room_0.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_0.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_1" romalign 0x1000 - include "build/baserom/MIZUsin_room_1.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_1.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_2" romalign 0x1000 - include "build/baserom/MIZUsin_room_2.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_2.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_3" romalign 0x1000 - include "build/baserom/MIZUsin_room_3.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_3.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_4" romalign 0x1000 - include "build/baserom/MIZUsin_room_4.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_4.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_5" romalign 0x1000 - include "build/baserom/MIZUsin_room_5.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_5.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_6" romalign 0x1000 - include "build/baserom/MIZUsin_room_6.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_6.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_7" romalign 0x1000 - include "build/baserom/MIZUsin_room_7.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_7.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_8" romalign 0x1000 - include "build/baserom/MIZUsin_room_8.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_8.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_9" romalign 0x1000 - include "build/baserom/MIZUsin_room_9.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_9.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_10" romalign 0x1000 - include "build/baserom/MIZUsin_room_10.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_10.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_11" romalign 0x1000 - include "build/baserom/MIZUsin_room_11.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_11.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_12" romalign 0x1000 - include "build/baserom/MIZUsin_room_12.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_12.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_13" romalign 0x1000 - include "build/baserom/MIZUsin_room_13.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_13.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_14" romalign 0x1000 - include "build/baserom/MIZUsin_room_14.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_14.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_15" romalign 0x1000 - include "build/baserom/MIZUsin_room_15.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_15.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_16" romalign 0x1000 - include "build/baserom/MIZUsin_room_16.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_16.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_17" romalign 0x1000 - include "build/baserom/MIZUsin_room_17.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_17.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_18" romalign 0x1000 - include "build/baserom/MIZUsin_room_18.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_18.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_19" romalign 0x1000 - include "build/baserom/MIZUsin_room_19.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_19.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_20" romalign 0x1000 - include "build/baserom/MIZUsin_room_20.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_20.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_21" romalign 0x1000 - include "build/baserom/MIZUsin_room_21.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_21.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_room_22" romalign 0x1000 - include "build/baserom/MIZUsin_room_22.o" + include "build/scenes/dungeons/MIZUsin/MIZUsin_room_22.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_scene" romalign 0x1000 - include "build/baserom/jyasinzou_scene.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_scene.o" + address SEGMENT_SCENE endseg beginseg name "jyasinzou_room_0" romalign 0x1000 - include "build/baserom/jyasinzou_room_0.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_0.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_1" romalign 0x1000 - include "build/baserom/jyasinzou_room_1.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_1.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_2" romalign 0x1000 - include "build/baserom/jyasinzou_room_2.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_2.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_3" romalign 0x1000 - include "build/baserom/jyasinzou_room_3.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_3.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_4" romalign 0x1000 - include "build/baserom/jyasinzou_room_4.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_4.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_5" romalign 0x1000 - include "build/baserom/jyasinzou_room_5.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_5.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_6" romalign 0x1000 - include "build/baserom/jyasinzou_room_6.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_6.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_7" romalign 0x1000 - include "build/baserom/jyasinzou_room_7.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_7.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_8" romalign 0x1000 - include "build/baserom/jyasinzou_room_8.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_8.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_9" romalign 0x1000 - include "build/baserom/jyasinzou_room_9.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_9.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_10" romalign 0x1000 - include "build/baserom/jyasinzou_room_10.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_10.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_11" romalign 0x1000 - include "build/baserom/jyasinzou_room_11.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_11.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_12" romalign 0x1000 - include "build/baserom/jyasinzou_room_12.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_12.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_13" romalign 0x1000 - include "build/baserom/jyasinzou_room_13.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_13.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_14" romalign 0x1000 - include "build/baserom/jyasinzou_room_14.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_14.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_15" romalign 0x1000 - include "build/baserom/jyasinzou_room_15.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_15.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_16" romalign 0x1000 - include "build/baserom/jyasinzou_room_16.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_16.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_17" romalign 0x1000 - include "build/baserom/jyasinzou_room_17.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_17.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_18" romalign 0x1000 - include "build/baserom/jyasinzou_room_18.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_18.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_19" romalign 0x1000 - include "build/baserom/jyasinzou_room_19.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_19.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_20" romalign 0x1000 - include "build/baserom/jyasinzou_room_20.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_20.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_21" romalign 0x1000 - include "build/baserom/jyasinzou_room_21.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_21.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_22" romalign 0x1000 - include "build/baserom/jyasinzou_room_22.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_22.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_23" romalign 0x1000 - include "build/baserom/jyasinzou_room_23.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_23.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_24" romalign 0x1000 - include "build/baserom/jyasinzou_room_24.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_24.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_25" romalign 0x1000 - include "build/baserom/jyasinzou_room_25.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_25.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_26" romalign 0x1000 - include "build/baserom/jyasinzou_room_26.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_26.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_27" romalign 0x1000 - include "build/baserom/jyasinzou_room_27.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_27.o" + address SEGMENT_ROOM endseg beginseg name "jyasinzou_room_28" romalign 0x1000 - include "build/baserom/jyasinzou_room_28.o" + include "build/scenes/dungeons/jyasinzou/jyasinzou_room_28.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_scene" romalign 0x1000 - include "build/baserom/HAKAdan_scene.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_scene.o" + address SEGMENT_SCENE endseg beginseg name "HAKAdan_room_0" romalign 0x1000 - include "build/baserom/HAKAdan_room_0.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_0.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_1" romalign 0x1000 - include "build/baserom/HAKAdan_room_1.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_1.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_2" romalign 0x1000 - include "build/baserom/HAKAdan_room_2.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_2.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_3" romalign 0x1000 - include "build/baserom/HAKAdan_room_3.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_3.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_4" romalign 0x1000 - include "build/baserom/HAKAdan_room_4.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_4.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_5" romalign 0x1000 - include "build/baserom/HAKAdan_room_5.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_5.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_6" romalign 0x1000 - include "build/baserom/HAKAdan_room_6.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_6.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_7" romalign 0x1000 - include "build/baserom/HAKAdan_room_7.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_7.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_8" romalign 0x1000 - include "build/baserom/HAKAdan_room_8.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_8.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_9" romalign 0x1000 - include "build/baserom/HAKAdan_room_9.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_9.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_10" romalign 0x1000 - include "build/baserom/HAKAdan_room_10.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_10.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_11" romalign 0x1000 - include "build/baserom/HAKAdan_room_11.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_11.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_12" romalign 0x1000 - include "build/baserom/HAKAdan_room_12.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_12.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_13" romalign 0x1000 - include "build/baserom/HAKAdan_room_13.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_13.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_14" romalign 0x1000 - include "build/baserom/HAKAdan_room_14.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_14.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_15" romalign 0x1000 - include "build/baserom/HAKAdan_room_15.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_15.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_16" romalign 0x1000 - include "build/baserom/HAKAdan_room_16.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_16.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_17" romalign 0x1000 - include "build/baserom/HAKAdan_room_17.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_17.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_18" romalign 0x1000 - include "build/baserom/HAKAdan_room_18.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_18.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_19" romalign 0x1000 - include "build/baserom/HAKAdan_room_19.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_19.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_20" romalign 0x1000 - include "build/baserom/HAKAdan_room_20.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_20.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_21" romalign 0x1000 - include "build/baserom/HAKAdan_room_21.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_21.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_room_22" romalign 0x1000 - include "build/baserom/HAKAdan_room_22.o" + include "build/scenes/dungeons/HAKAdan/HAKAdan_room_22.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_scene" romalign 0x1000 - include "build/baserom/HAKAdanCH_scene.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_scene.o" + address SEGMENT_SCENE endseg beginseg name "HAKAdanCH_room_0" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_0.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_0.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_1" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_1.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_1.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_2" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_2.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_2.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_3" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_3.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_3.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_4" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_4.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_4.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_5" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_5.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_5.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdanCH_room_6" romalign 0x1000 - include "build/baserom/HAKAdanCH_room_6.o" + include "build/scenes/dungeons/HAKAdanCH/HAKAdanCH_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_scene" romalign 0x1000 - include "build/baserom/ice_doukutu_scene.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_scene.o" + address SEGMENT_SCENE endseg beginseg name "ice_doukutu_room_0" romalign 0x1000 - include "build/baserom/ice_doukutu_room_0.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_1" romalign 0x1000 - include "build/baserom/ice_doukutu_room_1.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_2" romalign 0x1000 - include "build/baserom/ice_doukutu_room_2.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_3" romalign 0x1000 - include "build/baserom/ice_doukutu_room_3.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_4" romalign 0x1000 - include "build/baserom/ice_doukutu_room_4.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_5" romalign 0x1000 - include "build/baserom/ice_doukutu_room_5.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_5.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_6" romalign 0x1000 - include "build/baserom/ice_doukutu_room_6.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_7" romalign 0x1000 - include "build/baserom/ice_doukutu_room_7.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_7.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_8" romalign 0x1000 - include "build/baserom/ice_doukutu_room_8.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_8.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_9" romalign 0x1000 - include "build/baserom/ice_doukutu_room_9.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_9.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_10" romalign 0x1000 - include "build/baserom/ice_doukutu_room_10.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_10.o" + address SEGMENT_ROOM endseg beginseg name "ice_doukutu_room_11" romalign 0x1000 - include "build/baserom/ice_doukutu_room_11.o" + include "build/scenes/dungeons/ice_doukutu/ice_doukutu_room_11.o" + address SEGMENT_ROOM endseg beginseg name "men_scene" romalign 0x1000 - include "build/baserom/men_scene.o" + include "build/scenes/dungeons/men/men_scene.o" + address SEGMENT_SCENE endseg beginseg name "men_room_0" romalign 0x1000 - include "build/baserom/men_room_0.o" + include "build/scenes/dungeons/men/men_room_0.o" + address SEGMENT_ROOM endseg beginseg name "men_room_1" romalign 0x1000 - include "build/baserom/men_room_1.o" + include "build/scenes/dungeons/men/men_room_1.o" + address SEGMENT_ROOM endseg beginseg name "men_room_2" romalign 0x1000 - include "build/baserom/men_room_2.o" + include "build/scenes/dungeons/men/men_room_2.o" + address SEGMENT_ROOM endseg beginseg name "men_room_3" romalign 0x1000 - include "build/baserom/men_room_3.o" + include "build/scenes/dungeons/men/men_room_3.o" + address SEGMENT_ROOM endseg beginseg name "men_room_4" romalign 0x1000 - include "build/baserom/men_room_4.o" + include "build/scenes/dungeons/men/men_room_4.o" + address SEGMENT_ROOM endseg beginseg name "men_room_5" romalign 0x1000 - include "build/baserom/men_room_5.o" + include "build/scenes/dungeons/men/men_room_5.o" + address SEGMENT_ROOM endseg beginseg name "men_room_6" romalign 0x1000 - include "build/baserom/men_room_6.o" + include "build/scenes/dungeons/men/men_room_6.o" + address SEGMENT_ROOM endseg beginseg name "men_room_7" romalign 0x1000 - include "build/baserom/men_room_7.o" + include "build/scenes/dungeons/men/men_room_7.o" + address SEGMENT_ROOM endseg beginseg name "men_room_8" romalign 0x1000 - include "build/baserom/men_room_8.o" + include "build/scenes/dungeons/men/men_room_8.o" + address SEGMENT_ROOM endseg beginseg name "men_room_9" romalign 0x1000 - include "build/baserom/men_room_9.o" + include "build/scenes/dungeons/men/men_room_9.o" + address SEGMENT_ROOM endseg beginseg name "men_room_10" romalign 0x1000 - include "build/baserom/men_room_10.o" + include "build/scenes/dungeons/men/men_room_10.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_scene" romalign 0x1000 - include "build/baserom/ganontika_scene.o" + include "build/scenes/dungeons/ganontika/ganontika_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganontika_room_0" romalign 0x1000 - include "build/baserom/ganontika_room_0.o" + include "build/scenes/dungeons/ganontika/ganontika_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_1" romalign 0x1000 - include "build/baserom/ganontika_room_1.o" + include "build/scenes/dungeons/ganontika/ganontika_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_2" romalign 0x1000 - include "build/baserom/ganontika_room_2.o" + include "build/scenes/dungeons/ganontika/ganontika_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_3" romalign 0x1000 - include "build/baserom/ganontika_room_3.o" + include "build/scenes/dungeons/ganontika/ganontika_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_4" romalign 0x1000 - include "build/baserom/ganontika_room_4.o" + include "build/scenes/dungeons/ganontika/ganontika_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_5" romalign 0x1000 - include "build/baserom/ganontika_room_5.o" + include "build/scenes/dungeons/ganontika/ganontika_room_5.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_6" romalign 0x1000 - include "build/baserom/ganontika_room_6.o" + include "build/scenes/dungeons/ganontika/ganontika_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_7" romalign 0x1000 - include "build/baserom/ganontika_room_7.o" + include "build/scenes/dungeons/ganontika/ganontika_room_7.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_8" romalign 0x1000 - include "build/baserom/ganontika_room_8.o" + include "build/scenes/dungeons/ganontika/ganontika_room_8.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_9" romalign 0x1000 - include "build/baserom/ganontika_room_9.o" + include "build/scenes/dungeons/ganontika/ganontika_room_9.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_10" romalign 0x1000 - include "build/baserom/ganontika_room_10.o" + include "build/scenes/dungeons/ganontika/ganontika_room_10.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_11" romalign 0x1000 - include "build/baserom/ganontika_room_11.o" + include "build/scenes/dungeons/ganontika/ganontika_room_11.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_12" romalign 0x1000 - include "build/baserom/ganontika_room_12.o" + include "build/scenes/dungeons/ganontika/ganontika_room_12.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_13" romalign 0x1000 - include "build/baserom/ganontika_room_13.o" + include "build/scenes/dungeons/ganontika/ganontika_room_13.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_14" romalign 0x1000 - include "build/baserom/ganontika_room_14.o" + include "build/scenes/dungeons/ganontika/ganontika_room_14.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_15" romalign 0x1000 - include "build/baserom/ganontika_room_15.o" + include "build/scenes/dungeons/ganontika/ganontika_room_15.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_16" romalign 0x1000 - include "build/baserom/ganontika_room_16.o" + include "build/scenes/dungeons/ganontika/ganontika_room_16.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_17" romalign 0x1000 - include "build/baserom/ganontika_room_17.o" + include "build/scenes/dungeons/ganontika/ganontika_room_17.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_18" romalign 0x1000 - include "build/baserom/ganontika_room_18.o" + include "build/scenes/dungeons/ganontika/ganontika_room_18.o" + address SEGMENT_ROOM endseg beginseg name "ganontika_room_19" romalign 0x1000 - include "build/baserom/ganontika_room_19.o" + include "build/scenes/dungeons/ganontika/ganontika_room_19.o" + address SEGMENT_ROOM endseg beginseg @@ -8296,361 +8531,421 @@ endseg beginseg name "syotes2_scene" romalign 0x1000 - include "build/baserom/syotes2_scene.o" + include "build/scenes/test_levels/syotes2/syotes2_scene.o" + address SEGMENT_SCENE endseg beginseg name "syotes2_room_0" romalign 0x1000 - include "build/baserom/syotes2_room_0.o" + include "build/scenes/test_levels/syotes2/syotes2_room_0.o" + address SEGMENT_ROOM endseg beginseg name "depth_test_scene" romalign 0x1000 - include "build/baserom/depth_test_scene.o" + include "build/scenes/test_levels/depth_test/depth_test_scene.o" + address SEGMENT_SCENE endseg beginseg name "depth_test_room_0" romalign 0x1000 - include "build/baserom/depth_test_room_0.o" + include "build/scenes/test_levels/depth_test/depth_test_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot00_scene" romalign 0x1000 - include "build/baserom/spot00_scene.o" + include "build/scenes/overworld/spot00/spot00_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot00_room_0" romalign 0x1000 - include "build/baserom/spot00_room_0.o" + include "build/scenes/overworld/spot00/spot00_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot01_scene" romalign 0x1000 - include "build/baserom/spot01_scene.o" + include "build/scenes/overworld/spot01/spot01_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot01_room_0" romalign 0x1000 - include "build/baserom/spot01_room_0.o" + include "build/scenes/overworld/spot01/spot01_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot02_scene" romalign 0x1000 - include "build/baserom/spot02_scene.o" + include "build/scenes/overworld/spot02/spot02_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot02_room_0" romalign 0x1000 - include "build/baserom/spot02_room_0.o" + include "build/scenes/overworld/spot02/spot02_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot02_room_1" romalign 0x1000 - include "build/baserom/spot02_room_1.o" + include "build/scenes/overworld/spot02/spot02_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot03_scene" romalign 0x1000 - include "build/baserom/spot03_scene.o" + include "build/scenes/overworld/spot03/spot03_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot03_room_0" romalign 0x1000 - include "build/baserom/spot03_room_0.o" + include "build/scenes/overworld/spot03/spot03_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot03_room_1" romalign 0x1000 - include "build/baserom/spot03_room_1.o" + include "build/scenes/overworld/spot03/spot03_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot04_scene" romalign 0x1000 - include "build/baserom/spot04_scene.o" + include "build/scenes/overworld/spot04/spot04_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot04_room_0" romalign 0x1000 - include "build/baserom/spot04_room_0.o" + include "build/scenes/overworld/spot04/spot04_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot04_room_1" romalign 0x1000 - include "build/baserom/spot04_room_1.o" + include "build/scenes/overworld/spot04/spot04_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot04_room_2" romalign 0x1000 - include "build/baserom/spot04_room_2.o" + include "build/scenes/overworld/spot04/spot04_room_2.o" + address SEGMENT_ROOM endseg beginseg name "spot05_scene" romalign 0x1000 - include "build/baserom/spot05_scene.o" + include "build/scenes/overworld/spot05/spot05_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot05_room_0" romalign 0x1000 - include "build/baserom/spot05_room_0.o" + include "build/scenes/overworld/spot05/spot05_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot06_scene" romalign 0x1000 - include "build/baserom/spot06_scene.o" + include "build/scenes/overworld/spot06/spot06_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot06_room_0" romalign 0x1000 - include "build/baserom/spot06_room_0.o" + include "build/scenes/overworld/spot06/spot06_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot07_scene" romalign 0x1000 - include "build/baserom/spot07_scene.o" + include "build/scenes/overworld/spot07/spot07_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot07_room_0" romalign 0x1000 - include "build/baserom/spot07_room_0.o" + include "build/scenes/overworld/spot07/spot07_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot07_room_1" romalign 0x1000 - include "build/baserom/spot07_room_1.o" + include "build/scenes/overworld/spot07/spot07_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot08_scene" romalign 0x1000 - include "build/baserom/spot08_scene.o" + include "build/scenes/overworld/spot08/spot08_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot08_room_0" romalign 0x1000 - include "build/baserom/spot08_room_0.o" + include "build/scenes/overworld/spot08/spot08_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot09_scene" romalign 0x1000 - include "build/baserom/spot09_scene.o" + include "build/scenes/overworld/spot09/spot09_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot09_room_0" romalign 0x1000 - include "build/baserom/spot09_room_0.o" + include "build/scenes/overworld/spot09/spot09_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot10_scene" romalign 0x1000 - include "build/baserom/spot10_scene.o" + include "build/scenes/overworld/spot10/spot10_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot10_room_0" romalign 0x1000 - include "build/baserom/spot10_room_0.o" + include "build/scenes/overworld/spot10/spot10_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_1" romalign 0x1000 - include "build/baserom/spot10_room_1.o" + include "build/scenes/overworld/spot10/spot10_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_2" romalign 0x1000 - include "build/baserom/spot10_room_2.o" + include "build/scenes/overworld/spot10/spot10_room_2.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_3" romalign 0x1000 - include "build/baserom/spot10_room_3.o" + include "build/scenes/overworld/spot10/spot10_room_3.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_4" romalign 0x1000 - include "build/baserom/spot10_room_4.o" + include "build/scenes/overworld/spot10/spot10_room_4.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_5" romalign 0x1000 - include "build/baserom/spot10_room_5.o" + include "build/scenes/overworld/spot10/spot10_room_5.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_6" romalign 0x1000 - include "build/baserom/spot10_room_6.o" + include "build/scenes/overworld/spot10/spot10_room_6.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_7" romalign 0x1000 - include "build/baserom/spot10_room_7.o" + include "build/scenes/overworld/spot10/spot10_room_7.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_8" romalign 0x1000 - include "build/baserom/spot10_room_8.o" + include "build/scenes/overworld/spot10/spot10_room_8.o" + address SEGMENT_ROOM endseg beginseg name "spot10_room_9" romalign 0x1000 - include "build/baserom/spot10_room_9.o" + include "build/scenes/overworld/spot10/spot10_room_9.o" + address SEGMENT_ROOM endseg beginseg name "spot11_scene" romalign 0x1000 - include "build/baserom/spot11_scene.o" + include "build/scenes/overworld/spot11/spot11_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot11_room_0" romalign 0x1000 - include "build/baserom/spot11_room_0.o" + include "build/scenes/overworld/spot11/spot11_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot12_scene" romalign 0x1000 - include "build/baserom/spot12_scene.o" + include "build/scenes/overworld/spot12/spot12_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot12_room_0" romalign 0x1000 - include "build/baserom/spot12_room_0.o" + include "build/scenes/overworld/spot12/spot12_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot12_room_1" romalign 0x1000 - include "build/baserom/spot12_room_1.o" + include "build/scenes/overworld/spot12/spot12_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot13_scene" romalign 0x1000 - include "build/baserom/spot13_scene.o" + include "build/scenes/overworld/spot13/spot13_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot13_room_0" romalign 0x1000 - include "build/baserom/spot13_room_0.o" + include "build/scenes/overworld/spot13/spot13_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot13_room_1" romalign 0x1000 - include "build/baserom/spot13_room_1.o" + include "build/scenes/overworld/spot13/spot13_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot15_scene" romalign 0x1000 - include "build/baserom/spot15_scene.o" + include "build/scenes/overworld/spot15/spot15_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot15_room_0" romalign 0x1000 - include "build/baserom/spot15_room_0.o" + include "build/scenes/overworld/spot15/spot15_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot16_scene" romalign 0x1000 - include "build/baserom/spot16_scene.o" + include "build/scenes/overworld/spot16/spot16_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot16_room_0" romalign 0x1000 - include "build/baserom/spot16_room_0.o" + include "build/scenes/overworld/spot16/spot16_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot17_scene" romalign 0x1000 - include "build/baserom/spot17_scene.o" + include "build/scenes/overworld/spot17/spot17_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot17_room_0" romalign 0x1000 - include "build/baserom/spot17_room_0.o" + include "build/scenes/overworld/spot17/spot17_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot17_room_1" romalign 0x1000 - include "build/baserom/spot17_room_1.o" + include "build/scenes/overworld/spot17/spot17_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot18_scene" romalign 0x1000 - include "build/baserom/spot18_scene.o" + include "build/scenes/overworld/spot18/spot18_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot18_room_0" romalign 0x1000 - include "build/baserom/spot18_room_0.o" + include "build/scenes/overworld/spot18/spot18_room_0.o" + address SEGMENT_ROOM endseg beginseg name "spot18_room_1" romalign 0x1000 - include "build/baserom/spot18_room_1.o" + include "build/scenes/overworld/spot18/spot18_room_1.o" + address SEGMENT_ROOM endseg beginseg name "spot18_room_2" romalign 0x1000 - include "build/baserom/spot18_room_2.o" + include "build/scenes/overworld/spot18/spot18_room_2.o" + address SEGMENT_ROOM endseg beginseg name "spot18_room_3" romalign 0x1000 - include "build/baserom/spot18_room_3.o" + include "build/scenes/overworld/spot18/spot18_room_3.o" + address SEGMENT_ROOM endseg beginseg @@ -8680,853 +8975,976 @@ endseg beginseg name "testroom_scene" romalign 0x1000 - //include "build/baserom/testroom_scene.o" include "build/scenes/test_levels/testroom/testroom_scene.o" - address 0x02000000 + address SEGMENT_SCENE endseg beginseg name "testroom_room_0" romalign 0x1000 - //include "build/baserom/testroom_room_0.o" include "build/scenes/test_levels/testroom/testroom_room_0.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "testroom_room_1" romalign 0x1000 - //include "build/baserom/testroom_room_1.o" include "build/scenes/test_levels/testroom/testroom_room_1.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "testroom_room_2" romalign 0x1000 - //include "build/baserom/testroom_room_2.o" include "build/scenes/test_levels/testroom/testroom_room_2.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "testroom_room_3" romalign 0x1000 - //include "build/baserom/testroom_room_3.o" include "build/scenes/test_levels/testroom/testroom_room_3.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "testroom_room_4" romalign 0x1000 - //include "build/baserom/testroom_room_4.o" include "build/scenes/test_levels/testroom/testroom_room_4.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "kenjyanoma_scene" romalign 0x1000 - include "build/baserom/kenjyanoma_scene.o" + include "build/scenes/indoors/kenjyanoma/kenjyanoma_scene.o" + address SEGMENT_SCENE endseg beginseg name "kenjyanoma_room_0" romalign 0x1000 - include "build/baserom/kenjyanoma_room_0.o" + include "build/scenes/indoors/kenjyanoma/kenjyanoma_room_0.o" + address SEGMENT_ROOM endseg beginseg name "tokinoma_scene" romalign 0x1000 - include "build/baserom/tokinoma_scene.o" + include "build/scenes/indoors/tokinoma/tokinoma_scene.o" + address SEGMENT_SCENE endseg beginseg name "tokinoma_room_0" romalign 0x1000 - include "build/baserom/tokinoma_room_0.o" + include "build/scenes/indoors/tokinoma/tokinoma_room_0.o" + address SEGMENT_ROOM endseg beginseg name "tokinoma_room_1" romalign 0x1000 - include "build/baserom/tokinoma_room_1.o" + include "build/scenes/indoors/tokinoma/tokinoma_room_1.o" + address SEGMENT_ROOM endseg beginseg name "sutaru_scene" romalign 0x1000 - //include "build/baserom/sutaru_scene.o" include "build/scenes/test_levels/sutaru/sutaru_scene.o" - address 0x02000000 + address SEGMENT_SCENE endseg beginseg name "sutaru_room_0" romalign 0x1000 - //include "build/baserom/sutaru_room_0.o" include "build/scenes/test_levels/sutaru/sutaru_room_0.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "link_home_scene" romalign 0x1000 - include "build/baserom/link_home_scene.o" + include "build/scenes/indoors/link_home/link_home_scene.o" + address SEGMENT_SCENE endseg beginseg name "link_home_room_0" romalign 0x1000 - include "build/baserom/link_home_room_0.o" + include "build/scenes/indoors/link_home/link_home_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kokiri_shop_scene" romalign 0x1000 - include "build/baserom/kokiri_shop_scene.o" + include "build/scenes/shops/kokiri_shop/kokiri_shop_scene.o" + address SEGMENT_SCENE endseg beginseg name "kokiri_shop_room_0" romalign 0x1000 - include "build/baserom/kokiri_shop_room_0.o" + include "build/scenes/shops/kokiri_shop/kokiri_shop_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kokiri_home_scene" romalign 0x1000 - include "build/baserom/kokiri_home_scene.o" + include "build/scenes/indoors/kokiri_home/kokiri_home_scene.o" + address SEGMENT_SCENE endseg beginseg name "kokiri_home_room_0" romalign 0x1000 - include "build/baserom/kokiri_home_room_0.o" + include "build/scenes/indoors/kokiri_home/kokiri_home_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_scene" romalign 0x1000 - include "build/baserom/kakusiana_scene.o" + include "build/scenes/misc/kakusiana/kakusiana_scene.o" + address SEGMENT_SCENE endseg beginseg name "kakusiana_room_0" romalign 0x1000 - include "build/baserom/kakusiana_room_0.o" + include "build/scenes/misc/kakusiana/kakusiana_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_1" romalign 0x1000 - include "build/baserom/kakusiana_room_1.o" + include "build/scenes/misc/kakusiana/kakusiana_room_1.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_2" romalign 0x1000 - include "build/baserom/kakusiana_room_2.o" + include "build/scenes/misc/kakusiana/kakusiana_room_2.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_3" romalign 0x1000 - include "build/baserom/kakusiana_room_3.o" + include "build/scenes/misc/kakusiana/kakusiana_room_3.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_4" romalign 0x1000 - include "build/baserom/kakusiana_room_4.o" + include "build/scenes/misc/kakusiana/kakusiana_room_4.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_5" romalign 0x1000 - include "build/baserom/kakusiana_room_5.o" + include "build/scenes/misc/kakusiana/kakusiana_room_5.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_6" romalign 0x1000 - include "build/baserom/kakusiana_room_6.o" + include "build/scenes/misc/kakusiana/kakusiana_room_6.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_7" romalign 0x1000 - include "build/baserom/kakusiana_room_7.o" + include "build/scenes/misc/kakusiana/kakusiana_room_7.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_8" romalign 0x1000 - include "build/baserom/kakusiana_room_8.o" + include "build/scenes/misc/kakusiana/kakusiana_room_8.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_9" romalign 0x1000 - include "build/baserom/kakusiana_room_9.o" + include "build/scenes/misc/kakusiana/kakusiana_room_9.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_10" romalign 0x1000 - include "build/baserom/kakusiana_room_10.o" + include "build/scenes/misc/kakusiana/kakusiana_room_10.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_11" romalign 0x1000 - include "build/baserom/kakusiana_room_11.o" + include "build/scenes/misc/kakusiana/kakusiana_room_11.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_12" romalign 0x1000 - include "build/baserom/kakusiana_room_12.o" + include "build/scenes/misc/kakusiana/kakusiana_room_12.o" + address SEGMENT_ROOM endseg beginseg name "kakusiana_room_13" romalign 0x1000 - include "build/baserom/kakusiana_room_13.o" + include "build/scenes/misc/kakusiana/kakusiana_room_13.o" + address SEGMENT_ROOM endseg beginseg name "entra_scene" romalign 0x1000 - include "build/baserom/entra_scene.o" + include "build/scenes/overworld/entra/entra_scene.o" + address SEGMENT_SCENE endseg beginseg name "entra_room_0" romalign 0x1000 - include "build/baserom/entra_room_0.o" + include "build/scenes/overworld/entra/entra_room_0.o" + address SEGMENT_ROOM endseg beginseg name "moribossroom_scene" romalign 0x1000 - include "build/baserom/moribossroom_scene.o" + include "build/scenes/dungeons/moribossroom/moribossroom_scene.o" + address SEGMENT_SCENE endseg beginseg name "moribossroom_room_0" romalign 0x1000 - include "build/baserom/moribossroom_room_0.o" + include "build/scenes/dungeons/moribossroom/moribossroom_room_0.o" + address SEGMENT_ROOM endseg beginseg name "moribossroom_room_1" romalign 0x1000 - include "build/baserom/moribossroom_room_1.o" + include "build/scenes/dungeons/moribossroom/moribossroom_room_1.o" + address SEGMENT_ROOM endseg beginseg name "syatekijyou_scene" romalign 0x1000 - include "build/baserom/syatekijyou_scene.o" + include "build/scenes/indoors/syatekijyou/syatekijyou_scene.o" + address SEGMENT_SCENE endseg beginseg name "syatekijyou_room_0" romalign 0x1000 - include "build/baserom/syatekijyou_room_0.o" + include "build/scenes/indoors/syatekijyou/syatekijyou_room_0.o" + address SEGMENT_ROOM endseg beginseg name "shop1_scene" romalign 0x1000 - include "build/baserom/shop1_scene.o" + include "build/scenes/shops/shop1/shop1_scene.o" + address SEGMENT_SCENE endseg beginseg name "shop1_room_0" romalign 0x1000 - include "build/baserom/shop1_room_0.o" + include "build/scenes/shops/shop1/shop1_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hairal_niwa_scene" romalign 0x1000 - include "build/baserom/hairal_niwa_scene.o" + include "build/scenes/indoors/hairal_niwa/hairal_niwa_scene.o" + address SEGMENT_SCENE endseg beginseg name "hairal_niwa_room_0" romalign 0x1000 - include "build/baserom/hairal_niwa_room_0.o" + include "build/scenes/indoors/hairal_niwa/hairal_niwa_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganon_tou_scene" romalign 0x1000 - include "build/baserom/ganon_tou_scene.o" + include "build/scenes/dungeons/ganon_tou/ganon_tou_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_tou_room_0" romalign 0x1000 - include "build/baserom/ganon_tou_room_0.o" + include "build/scenes/dungeons/ganon_tou/ganon_tou_room_0.o" + address SEGMENT_ROOM endseg beginseg name "sasatest_scene" romalign 0x1000 - include "build/baserom/sasatest_scene.o" + include "build/scenes/test_levels/sasatest/sasatest_scene.o" + address SEGMENT_SCENE endseg beginseg name "sasatest_room_0" romalign 0x1000 - include "build/baserom/sasatest_room_0.o" + include "build/scenes/test_levels/sasatest/sasatest_room_0.o" + address SEGMENT_ROOM endseg beginseg name "market_alley_scene" romalign 0x1000 - include "build/baserom/market_alley_scene.o" + include "build/scenes/misc/market_alley/market_alley_scene.o" + address SEGMENT_SCENE endseg beginseg name "market_alley_room_0" romalign 0x1000 include "build/baserom/market_alley_room_0.o" + //include "build/scenes/misc/market_alley/market_alley_room_0.o" + //address SEGMENT_ROOM endseg beginseg name "spot20_scene" romalign 0x1000 - include "build/baserom/spot20_scene.o" + include "build/scenes/overworld/spot20/spot20_scene.o" + address SEGMENT_SCENE endseg beginseg name "spot20_room_0" romalign 0x1000 - include "build/baserom/spot20_room_0.o" + include "build/scenes/overworld/spot20/spot20_room_0.o" + address SEGMENT_ROOM endseg beginseg name "market_ruins_scene" romalign 0x1000 - include "build/baserom/market_ruins_scene.o" + include "build/scenes/misc/market_ruins/market_ruins_scene.o" + address SEGMENT_SCENE endseg beginseg name "market_ruins_room_0" romalign 0x1000 - include "build/baserom/market_ruins_room_0.o" + include "build/scenes/misc/market_ruins/market_ruins_room_0.o" + address SEGMENT_ROOM endseg beginseg name "entra_n_scene" romalign 0x1000 - include "build/baserom/entra_n_scene.o" + include "build/scenes/misc/entra_n/entra_n_scene.o" + address SEGMENT_SCENE endseg beginseg name "entra_n_room_0" romalign 0x1000 - include "build/baserom/entra_n_room_0.o" + include "build/scenes/misc/entra_n/entra_n_room_0.o" + address SEGMENT_ROOM endseg beginseg name "enrui_scene" romalign 0x1000 - include "build/baserom/enrui_scene.o" + include "build/scenes/misc/enrui/enrui_scene.o" + address SEGMENT_SCENE endseg beginseg name "enrui_room_0" romalign 0x1000 - include "build/baserom/enrui_room_0.o" + include "build/scenes/misc/enrui/enrui_room_0.o" + address SEGMENT_ROOM endseg beginseg name "market_alley_n_scene" romalign 0x1000 - include "build/baserom/market_alley_n_scene.o" + include "build/scenes/misc/market_alley_n/market_alley_n_scene.o" + address SEGMENT_SCENE endseg beginseg name "market_alley_n_room_0" romalign 0x1000 include "build/baserom/market_alley_n_room_0.o" + //include "build/scenes/misc/market_alley_n/market_alley_n_room_0.o" + //address SEGMENT_ROOM endseg beginseg name "hiral_demo_scene" romalign 0x1000 - include "build/baserom/hiral_demo_scene.o" + include "build/scenes/misc/hiral_demo/hiral_demo_scene.o" + address SEGMENT_SCENE endseg beginseg name "hiral_demo_room_0" romalign 0x1000 - include "build/baserom/hiral_demo_room_0.o" + include "build/scenes/misc/hiral_demo/hiral_demo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kokiri_home3_scene" romalign 0x1000 - include "build/baserom/kokiri_home3_scene.o" + include "build/scenes/indoors/kokiri_home3/kokiri_home3_scene.o" + address SEGMENT_SCENE endseg beginseg name "kokiri_home3_room_0" romalign 0x1000 - include "build/baserom/kokiri_home3_room_0.o" + include "build/scenes/indoors/kokiri_home3/kokiri_home3_room_0.o" + address SEGMENT_ROOM endseg beginseg name "malon_stable_scene" romalign 0x1000 - include "build/baserom/malon_stable_scene.o" + include "build/scenes/indoors/malon_stable/malon_stable_scene.o" + address SEGMENT_SCENE endseg beginseg name "malon_stable_room_0" romalign 0x1000 - include "build/baserom/malon_stable_room_0.o" + include "build/scenes/indoors/malon_stable/malon_stable_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kakariko_scene" romalign 0x1000 - include "build/baserom/kakariko_scene.o" + include "build/scenes/indoors/kakariko/kakariko_scene.o" + address SEGMENT_SCENE endseg beginseg name "kakariko_room_0" romalign 0x1000 - include "build/baserom/kakariko_room_0.o" + include "build/scenes/indoors/kakariko/kakariko_room_0.o" + address SEGMENT_ROOM endseg beginseg name "bdan_boss_scene" romalign 0x1000 - include "build/baserom/bdan_boss_scene.o" + include "build/scenes/dungeons/bdan_boss/bdan_boss_scene.o" + address SEGMENT_SCENE endseg beginseg name "bdan_boss_room_0" romalign 0x1000 - include "build/baserom/bdan_boss_room_0.o" + include "build/scenes/dungeons/bdan_boss/bdan_boss_room_0.o" + address SEGMENT_ROOM endseg beginseg name "bdan_boss_room_1" romalign 0x1000 - include "build/baserom/bdan_boss_room_1.o" + include "build/scenes/dungeons/bdan_boss/bdan_boss_room_1.o" + address SEGMENT_ROOM endseg beginseg name "FIRE_bs_scene" romalign 0x1000 - include "build/baserom/FIRE_bs_scene.o" + include "build/scenes/dungeons/FIRE_bs/FIRE_bs_scene.o" + address SEGMENT_SCENE endseg beginseg name "FIRE_bs_room_0" romalign 0x1000 - include "build/baserom/FIRE_bs_room_0.o" + include "build/scenes/dungeons/FIRE_bs/FIRE_bs_room_0.o" + address SEGMENT_ROOM endseg beginseg name "FIRE_bs_room_1" romalign 0x1000 - include "build/baserom/FIRE_bs_room_1.o" + include "build/scenes/dungeons/FIRE_bs/FIRE_bs_room_1.o" + address SEGMENT_ROOM endseg beginseg name "hut_scene" romalign 0x1000 - include "build/baserom/hut_scene.o" + include "build/scenes/indoors/hut/hut_scene.o" + address SEGMENT_SCENE endseg beginseg name "hut_room_0" romalign 0x1000 - include "build/baserom/hut_room_0.o" + include "build/scenes/indoors/hut/hut_room_0.o" + address SEGMENT_ROOM endseg beginseg name "daiyousei_izumi_scene" romalign 0x1000 - include "build/baserom/daiyousei_izumi_scene.o" + include "build/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.o" + address SEGMENT_SCENE endseg beginseg name "daiyousei_izumi_room_0" romalign 0x1000 - include "build/baserom/daiyousei_izumi_room_0.o" + include "build/scenes/indoors/daiyousei_izumi/daiyousei_izumi_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hakaana_scene" romalign 0x1000 - include "build/baserom/hakaana_scene.o" + include "build/scenes/misc/hakaana/hakaana_scene.o" + address SEGMENT_SCENE endseg beginseg name "hakaana_room_0" romalign 0x1000 - include "build/baserom/hakaana_room_0.o" + include "build/scenes/misc/hakaana/hakaana_room_0.o" + address SEGMENT_ROOM endseg beginseg name "yousei_izumi_tate_scene" romalign 0x1000 - include "build/baserom/yousei_izumi_tate_scene.o" + include "build/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_scene.o" + address SEGMENT_SCENE endseg beginseg name "yousei_izumi_tate_room_0" romalign 0x1000 - include "build/baserom/yousei_izumi_tate_room_0.o" + include "build/scenes/indoors/yousei_izumi_tate/yousei_izumi_tate_room_0.o" + address SEGMENT_ROOM endseg beginseg name "yousei_izumi_yoko_scene" romalign 0x1000 - include "build/baserom/yousei_izumi_yoko_scene.o" + include "build/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.o" + address SEGMENT_SCENE endseg beginseg name "yousei_izumi_yoko_room_0" romalign 0x1000 - include "build/baserom/yousei_izumi_yoko_room_0.o" + include "build/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_room_0.o" + address SEGMENT_ROOM endseg beginseg name "golon_scene" romalign 0x1000 - include "build/baserom/golon_scene.o" + include "build/scenes/shops/golon/golon_scene.o" + address SEGMENT_SCENE endseg beginseg name "golon_room_0" romalign 0x1000 - include "build/baserom/golon_room_0.o" + include "build/scenes/shops/golon/golon_room_0.o" + address SEGMENT_ROOM endseg beginseg name "zoora_scene" romalign 0x1000 - include "build/baserom/zoora_scene.o" + include "build/scenes/shops/zoora/zoora_scene.o" + address SEGMENT_SCENE endseg beginseg name "zoora_room_0" romalign 0x1000 - include "build/baserom/zoora_room_0.o" + include "build/scenes/shops/zoora/zoora_room_0.o" + address SEGMENT_ROOM endseg beginseg name "drag_scene" romalign 0x1000 - include "build/baserom/drag_scene.o" + include "build/scenes/shops/drag/drag_scene.o" + address SEGMENT_SCENE endseg beginseg name "drag_room_0" romalign 0x1000 - include "build/baserom/drag_room_0.o" + include "build/scenes/shops/drag/drag_room_0.o" + address SEGMENT_ROOM endseg beginseg name "alley_shop_scene" romalign 0x1000 - include "build/baserom/alley_shop_scene.o" + include "build/scenes/shops/alley_shop/alley_shop_scene.o" + address SEGMENT_SCENE endseg beginseg name "alley_shop_room_0" romalign 0x1000 - include "build/baserom/alley_shop_room_0.o" + include "build/scenes/shops/alley_shop/alley_shop_room_0.o" + address SEGMENT_ROOM endseg beginseg name "night_shop_scene" romalign 0x1000 - include "build/baserom/night_shop_scene.o" + include "build/scenes/shops/night_shop/night_shop_scene.o" + address SEGMENT_SCENE endseg beginseg name "night_shop_room_0" romalign 0x1000 - include "build/baserom/night_shop_room_0.o" + include "build/scenes/shops/night_shop/night_shop_room_0.o" + address SEGMENT_ROOM endseg beginseg name "impa_scene" romalign 0x1000 - include "build/baserom/impa_scene.o" + include "build/scenes/indoors/impa/impa_scene.o" + address SEGMENT_SCENE endseg beginseg name "impa_room_0" romalign 0x1000 - include "build/baserom/impa_room_0.o" + include "build/scenes/indoors/impa/impa_room_0.o" + address SEGMENT_ROOM endseg beginseg name "labo_scene" romalign 0x1000 - include "build/baserom/labo_scene.o" + include "build/scenes/indoors/labo/labo_scene.o" + address SEGMENT_SCENE endseg beginseg name "labo_room_0" romalign 0x1000 - include "build/baserom/labo_room_0.o" + include "build/scenes/indoors/labo/labo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "tent_scene" romalign 0x1000 - include "build/baserom/tent_scene.o" + include "build/scenes/indoors/tent/tent_scene.o" + address SEGMENT_SCENE endseg beginseg name "tent_room_0" romalign 0x1000 - include "build/baserom/tent_room_0.o" + include "build/scenes/indoors/tent/tent_room_0.o" + address SEGMENT_ROOM endseg beginseg name "nakaniwa_scene" romalign 0x1000 - include "build/baserom/nakaniwa_scene.o" + include "build/scenes/indoors/nakaniwa/nakaniwa_scene.o" + address SEGMENT_SCENE endseg beginseg name "nakaniwa_room_0" romalign 0x1000 - include "build/baserom/nakaniwa_room_0.o" + include "build/scenes/indoors/nakaniwa/nakaniwa_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ddan_boss_scene" romalign 0x1000 - include "build/baserom/ddan_boss_scene.o" - //include "build/scenes/dungeons/ddan_boss/ddan_boss_scene.o" - //address 0x02000000 + include "build/scenes/dungeons/ddan_boss/ddan_boss_scene.o" + address SEGMENT_SCENE endseg beginseg name "ddan_boss_room_0" romalign 0x1000 - include "build/baserom/ddan_boss_room_0.o" + include "build/scenes/dungeons/ddan_boss/ddan_boss_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ddan_boss_room_1" romalign 0x1000 - include "build/baserom/ddan_boss_room_1.o" + include "build/scenes/dungeons/ddan_boss/ddan_boss_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ydan_boss_scene" romalign 0x1000 - include "build/baserom/ydan_boss_scene.o" + include "build/scenes/dungeons/ydan_boss/ydan_boss_scene.o" + address SEGMENT_SCENE endseg beginseg name "ydan_boss_room_0" romalign 0x1000 - include "build/baserom/ydan_boss_room_0.o" + include "build/scenes/dungeons/ydan_boss/ydan_boss_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ydan_boss_room_1" romalign 0x1000 - include "build/baserom/ydan_boss_room_1.o" + include "build/scenes/dungeons/ydan_boss/ydan_boss_room_1.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_bs_scene" romalign 0x1000 - include "build/baserom/HAKAdan_bs_scene.o" + include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_scene.o" + address SEGMENT_SCENE endseg beginseg name "HAKAdan_bs_room_0" romalign 0x1000 - include "build/baserom/HAKAdan_bs_room_0.o" + include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_0.o" + address SEGMENT_ROOM endseg beginseg name "HAKAdan_bs_room_1" romalign 0x1000 - include "build/baserom/HAKAdan_bs_room_1.o" + include "build/scenes/dungeons/HAKAdan_bs/HAKAdan_bs_room_1.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_bs_scene" romalign 0x1000 - include "build/baserom/MIZUsin_bs_scene.o" + include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_scene.o" + address SEGMENT_SCENE endseg beginseg name "MIZUsin_bs_room_0" romalign 0x1000 - include "build/baserom/MIZUsin_bs_room_0.o" + include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_0.o" + address SEGMENT_ROOM endseg beginseg name "MIZUsin_bs_room_1" romalign 0x1000 - include "build/baserom/MIZUsin_bs_room_1.o" + include "build/scenes/dungeons/MIZUsin_bs/MIZUsin_bs_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ganon_scene" romalign 0x1000 - include "build/baserom/ganon_scene.o" + include "build/scenes/dungeons/ganon/ganon_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_room_0" romalign 0x1000 - include "build/baserom/ganon_room_0.o" + include "build/scenes/dungeons/ganon/ganon_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_1" romalign 0x1000 - include "build/baserom/ganon_room_1.o" + include "build/scenes/dungeons/ganon/ganon_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_2" romalign 0x1000 - include "build/baserom/ganon_room_2.o" + include "build/scenes/dungeons/ganon/ganon_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_3" romalign 0x1000 - include "build/baserom/ganon_room_3.o" + include "build/scenes/dungeons/ganon/ganon_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_4" romalign 0x1000 - include "build/baserom/ganon_room_4.o" + include "build/scenes/dungeons/ganon/ganon_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_5" romalign 0x1000 - include "build/baserom/ganon_room_5.o" + include "build/scenes/dungeons/ganon/ganon_room_5.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_6" romalign 0x1000 - include "build/baserom/ganon_room_6.o" + include "build/scenes/dungeons/ganon/ganon_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_7" romalign 0x1000 - include "build/baserom/ganon_room_7.o" + include "build/scenes/dungeons/ganon/ganon_room_7.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_8" romalign 0x1000 - include "build/baserom/ganon_room_8.o" + include "build/scenes/dungeons/ganon/ganon_room_8.o" + address SEGMENT_ROOM endseg beginseg name "ganon_room_9" romalign 0x1000 - include "build/baserom/ganon_room_9.o" + include "build/scenes/dungeons/ganon/ganon_room_9.o" + address SEGMENT_ROOM endseg beginseg name "ganon_boss_scene" romalign 0x1000 - include "build/baserom/ganon_boss_scene.o" + include "build/scenes/dungeons/ganon_boss/ganon_boss_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_boss_room_0" romalign 0x1000 - include "build/baserom/ganon_boss_room_0.o" + include "build/scenes/dungeons/ganon_boss/ganon_boss_room_0.o" + address SEGMENT_ROOM endseg beginseg name "jyasinboss_scene" romalign 0x1000 - include "build/baserom/jyasinboss_scene.o" + include "build/scenes/dungeons/jyasinboss/jyasinboss_scene.o" + address SEGMENT_SCENE endseg beginseg name "jyasinboss_room_0" romalign 0x1000 - include "build/baserom/jyasinboss_room_0.o" + include "build/scenes/dungeons/jyasinboss/jyasinboss_room_0.o" + address SEGMENT_ROOM endseg beginseg name "jyasinboss_room_1" romalign 0x1000 - include "build/baserom/jyasinboss_room_1.o" + include "build/scenes/dungeons/jyasinboss/jyasinboss_room_1.o" + address SEGMENT_ROOM endseg beginseg name "jyasinboss_room_2" romalign 0x1000 - include "build/baserom/jyasinboss_room_2.o" + include "build/scenes/dungeons/jyasinboss/jyasinboss_room_2.o" + address SEGMENT_ROOM endseg beginseg name "jyasinboss_room_3" romalign 0x1000 - include "build/baserom/jyasinboss_room_3.o" + include "build/scenes/dungeons/jyasinboss/jyasinboss_room_3.o" + address SEGMENT_ROOM endseg beginseg name "kokiri_home4_scene" romalign 0x1000 - include "build/baserom/kokiri_home4_scene.o" + include "build/scenes/indoors/kokiri_home4/kokiri_home4_scene.o" + address SEGMENT_SCENE endseg beginseg name "kokiri_home4_room_0" romalign 0x1000 - include "build/baserom/kokiri_home4_room_0.o" + include "build/scenes/indoors/kokiri_home4/kokiri_home4_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kokiri_home5_scene" romalign 0x1000 - include "build/baserom/kokiri_home5_scene.o" + include "build/scenes/indoors/kokiri_home5/kokiri_home5_scene.o" + address SEGMENT_SCENE endseg beginseg name "kokiri_home5_room_0" romalign 0x1000 - include "build/baserom/kokiri_home5_room_0.o" + include "build/scenes/indoors/kokiri_home5/kokiri_home5_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganon_final_scene" romalign 0x1000 - include "build/baserom/ganon_final_scene.o" + include "build/scenes/dungeons/ganon_final/ganon_final_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_final_room_0" romalign 0x1000 - include "build/baserom/ganon_final_room_0.o" + include "build/scenes/dungeons/ganon_final/ganon_final_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -9556,433 +9974,494 @@ endseg beginseg name "hakasitarelay_scene" romalign 0x1000 - include "build/baserom/hakasitarelay_scene.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_scene.o" + address SEGMENT_SCENE endseg beginseg name "hakasitarelay_room_0" romalign 0x1000 - include "build/baserom/hakasitarelay_room_0.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_1" romalign 0x1000 - include "build/baserom/hakasitarelay_room_1.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_1.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_2" romalign 0x1000 - include "build/baserom/hakasitarelay_room_2.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_2.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_3" romalign 0x1000 - include "build/baserom/hakasitarelay_room_3.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_3.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_4" romalign 0x1000 - include "build/baserom/hakasitarelay_room_4.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_4.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_5" romalign 0x1000 - include "build/baserom/hakasitarelay_room_5.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_5.o" + address SEGMENT_ROOM endseg beginseg name "hakasitarelay_room_6" romalign 0x1000 - include "build/baserom/hakasitarelay_room_6.o" + include "build/scenes/indoors/hakasitarelay/hakasitarelay_room_6.o" + address SEGMENT_ROOM endseg beginseg name "shrine_scene" romalign 0x1000 - include "build/baserom/shrine_scene.o" + include "build/scenes/misc/shrine/shrine_scene.o" + address SEGMENT_SCENE endseg beginseg name "shrine_room_0" romalign 0x1000 include "build/baserom/shrine_room_0.o" + //include "build/scenes/misc/shrine/shrine_room_0.o" + //address SEGMENT_ROOM endseg beginseg name "turibori_scene" romalign 0x1000 - include "build/baserom/turibori_scene.o" + include "build/scenes/misc/turibori/turibori_scene.o" + address SEGMENT_SCENE endseg beginseg name "turibori_room_0" romalign 0x1000 - include "build/baserom/turibori_room_0.o" + include "build/scenes/misc/turibori/turibori_room_0.o" + address SEGMENT_ROOM endseg beginseg name "shrine_n_scene" romalign 0x1000 - include "build/baserom/shrine_n_scene.o" + include "build/scenes/misc/shrine_n/shrine_n_scene.o" + address SEGMENT_SCENE endseg beginseg name "shrine_n_room_0" romalign 0x1000 include "build/baserom/shrine_n_room_0.o" + //include "build/scenes/misc/shrine_n/shrine_n_room_0.o" + //address SEGMENT_ROOM endseg beginseg name "shrine_r_scene" romalign 0x1000 - include "build/baserom/shrine_r_scene.o" + include "build/scenes/misc/shrine_r/shrine_r_scene.o" + address SEGMENT_SCENE endseg beginseg name "shrine_r_room_0" romalign 0x1000 include "build/baserom/shrine_r_room_0.o" + //include "build/scenes/misc/shrine_r/shrine_r_room_0.o" + //address SEGMENT_ROOM endseg beginseg name "hakaana2_scene" romalign 0x1000 - include "build/baserom/hakaana2_scene.o" + include "build/scenes/misc/hakaana2/hakaana2_scene.o" + address SEGMENT_SCENE endseg beginseg name "hakaana2_room_0" romalign 0x1000 - include "build/baserom/hakaana2_room_0.o" + include "build/scenes/misc/hakaana2/hakaana2_room_0.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_scene" romalign 0x1000 - include "build/baserom/gerudoway_scene.o" + include "build/scenes/dungeons/gerudoway/gerudoway_scene.o" + address SEGMENT_SCENE endseg beginseg name "gerudoway_room_0" romalign 0x1000 - include "build/baserom/gerudoway_room_0.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_0.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_room_1" romalign 0x1000 - include "build/baserom/gerudoway_room_1.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_1.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_room_2" romalign 0x1000 - include "build/baserom/gerudoway_room_2.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_2.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_room_3" romalign 0x1000 - include "build/baserom/gerudoway_room_3.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_3.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_room_4" romalign 0x1000 - include "build/baserom/gerudoway_room_4.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_4.o" + address SEGMENT_ROOM endseg beginseg name "gerudoway_room_5" romalign 0x1000 - include "build/baserom/gerudoway_room_5.o" + include "build/scenes/dungeons/gerudoway/gerudoway_room_5.o" + address SEGMENT_ROOM endseg beginseg name "hairal_niwa_n_scene" romalign 0x1000 - include "build/baserom/hairal_niwa_n_scene.o" + include "build/scenes/indoors/hairal_niwa_n/hairal_niwa_n_scene.o" + address SEGMENT_SCENE endseg beginseg name "hairal_niwa_n_room_0" romalign 0x1000 - include "build/baserom/hairal_niwa_n_room_0.o" + include "build/scenes/indoors/hairal_niwa_n/hairal_niwa_n_room_0.o" + address SEGMENT_ROOM endseg beginseg name "bowling_scene" romalign 0x1000 - include "build/baserom/bowling_scene.o" + include "build/scenes/indoors/bowling/bowling_scene.o" + address SEGMENT_SCENE endseg beginseg name "bowling_room_0" romalign 0x1000 - include "build/baserom/bowling_room_0.o" + include "build/scenes/indoors/bowling/bowling_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hakaana_ouke_scene" romalign 0x1000 - include "build/baserom/hakaana_ouke_scene.o" + include "build/scenes/misc/hakaana_ouke/hakaana_ouke_scene.o" + address SEGMENT_SCENE endseg beginseg name "hakaana_ouke_room_0" romalign 0x1000 - include "build/baserom/hakaana_ouke_room_0.o" + include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hakaana_ouke_room_1" romalign 0x1000 - include "build/baserom/hakaana_ouke_room_1.o" + include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_1.o" + address SEGMENT_ROOM endseg beginseg name "hakaana_ouke_room_2" romalign 0x1000 - include "build/baserom/hakaana_ouke_room_2.o" + include "build/scenes/misc/hakaana_ouke/hakaana_ouke_room_2.o" + address SEGMENT_ROOM endseg beginseg name "hylia_labo_scene" romalign 0x1000 - include "build/baserom/hylia_labo_scene.o" + include "build/scenes/indoors/hylia_labo/hylia_labo_scene.o" + address SEGMENT_SCENE endseg beginseg name "hylia_labo_room_0" romalign 0x1000 - include "build/baserom/hylia_labo_room_0.o" + include "build/scenes/indoors/hylia_labo/hylia_labo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "souko_scene" romalign 0x1000 - include "build/baserom/souko_scene.o" + include "build/scenes/overworld/souko/souko_scene.o" + address SEGMENT_SCENE endseg beginseg name "souko_room_0" romalign 0x1000 - include "build/baserom/souko_room_0.o" + include "build/scenes/overworld/souko/souko_room_0.o" + address SEGMENT_ROOM endseg beginseg name "souko_room_1" romalign 0x1000 - include "build/baserom/souko_room_1.o" + include "build/scenes/overworld/souko/souko_room_1.o" + address SEGMENT_ROOM endseg beginseg name "souko_room_2" romalign 0x1000 - include "build/baserom/souko_room_2.o" + include "build/scenes/overworld/souko/souko_room_2.o" + address SEGMENT_ROOM endseg beginseg name "miharigoya_scene" romalign 0x1000 - //include "build/baserom/miharigoya_scene.o" - include "build/scenes/misc/miharigoya/miharigoya_scene.o" - address 0x02000000 + include "build/scenes/indoors/miharigoya/miharigoya_scene.o" + address SEGMENT_SCENE endseg beginseg name "miharigoya_room_0" romalign 0x1000 - //include "build/baserom/miharigoya_room_0.o" - include "build/scenes/misc/miharigoya/miharigoya_room_0.o" - address 0x03000000 + include "build/scenes/indoors/miharigoya/miharigoya_room_0.o" + address SEGMENT_ROOM endseg beginseg name "mahouya_scene" romalign 0x1000 - include "build/baserom/mahouya_scene.o" + include "build/scenes/indoors/mahouya/mahouya_scene.o" + address SEGMENT_SCENE endseg beginseg name "mahouya_room_0" romalign 0x1000 - include "build/baserom/mahouya_room_0.o" + include "build/scenes/indoors/mahouya/mahouya_room_0.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_scene" romalign 0x1000 - include "build/baserom/takaraya_scene.o" + include "build/scenes/indoors/takaraya/takaraya_scene.o" + address SEGMENT_SCENE endseg beginseg name "takaraya_room_0" romalign 0x1000 - include "build/baserom/takaraya_room_0.o" + include "build/scenes/indoors/takaraya/takaraya_room_0.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_1" romalign 0x1000 - include "build/baserom/takaraya_room_1.o" + include "build/scenes/indoors/takaraya/takaraya_room_1.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_2" romalign 0x1000 - include "build/baserom/takaraya_room_2.o" + include "build/scenes/indoors/takaraya/takaraya_room_2.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_3" romalign 0x1000 - include "build/baserom/takaraya_room_3.o" + include "build/scenes/indoors/takaraya/takaraya_room_3.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_4" romalign 0x1000 - include "build/baserom/takaraya_room_4.o" + include "build/scenes/indoors/takaraya/takaraya_room_4.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_5" romalign 0x1000 - include "build/baserom/takaraya_room_5.o" + include "build/scenes/indoors/takaraya/takaraya_room_5.o" + address SEGMENT_ROOM endseg beginseg name "takaraya_room_6" romalign 0x1000 - include "build/baserom/takaraya_room_6.o" + include "build/scenes/indoors/takaraya/takaraya_room_6.o" + address SEGMENT_ROOM endseg beginseg name "ganon_sonogo_scene" romalign 0x1000 - include "build/baserom/ganon_sonogo_scene.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_sonogo_room_0" romalign 0x1000 - include "build/baserom/ganon_sonogo_room_0.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganon_sonogo_room_1" romalign 0x1000 - include "build/baserom/ganon_sonogo_room_1.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_1.o" + address SEGMENT_ROOM endseg beginseg name "ganon_sonogo_room_2" romalign 0x1000 - include "build/baserom/ganon_sonogo_room_2.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_2.o" + address SEGMENT_ROOM endseg beginseg name "ganon_sonogo_room_3" romalign 0x1000 - include "build/baserom/ganon_sonogo_room_3.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_3.o" + address SEGMENT_ROOM endseg beginseg name "ganon_sonogo_room_4" romalign 0x1000 - include "build/baserom/ganon_sonogo_room_4.o" + include "build/scenes/dungeons/ganon_sonogo/ganon_sonogo_room_4.o" + address SEGMENT_ROOM endseg beginseg name "ganon_demo_scene" romalign 0x1000 - include "build/baserom/ganon_demo_scene.o" + include "build/scenes/dungeons/ganon_demo/ganon_demo_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganon_demo_room_0" romalign 0x1000 - include "build/baserom/ganon_demo_room_0.o" + include "build/scenes/dungeons/ganon_demo/ganon_demo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "besitu_scene" romalign 0x1000 - include "build/baserom/besitu_scene.o" + include "build/scenes/test_levels/besitu/besitu_scene.o" + address SEGMENT_SCENE endseg beginseg name "besitu_room_0" romalign 0x1000 - include "build/baserom/besitu_room_0.o" + include "build/scenes/test_levels/besitu/besitu_room_0.o" + address SEGMENT_ROOM endseg beginseg name "face_shop_scene" romalign 0x1000 - include "build/baserom/face_shop_scene.o" + include "build/scenes/shops/face_shop/face_shop_scene.o" + address SEGMENT_SCENE endseg beginseg name "face_shop_room_0" romalign 0x1000 - include "build/baserom/face_shop_room_0.o" + include "build/scenes/shops/face_shop/face_shop_room_0.o" + address SEGMENT_ROOM endseg beginseg name "kinsuta_scene" romalign 0x1000 - //include "build/baserom/kinsuta_scene.o" include "build/scenes/misc/kinsuta/kinsuta_scene.o" - address 0x02000000 + address SEGMENT_SCENE endseg beginseg name "kinsuta_room_0" romalign 0x1000 - //include "build/baserom/kinsuta_room_0.o" include "build/scenes/misc/kinsuta/kinsuta_room_0.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg name "ganontikasonogo_scene" romalign 0x1000 - include "build/baserom/ganontikasonogo_scene.o" + include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_scene.o" + address SEGMENT_SCENE endseg beginseg name "ganontikasonogo_room_0" romalign 0x1000 - include "build/baserom/ganontikasonogo_room_0.o" + include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_0.o" + address SEGMENT_ROOM endseg beginseg name "ganontikasonogo_room_1" romalign 0x1000 - include "build/baserom/ganontikasonogo_room_1.o" + include "build/scenes/dungeons/ganontikasonogo/ganontikasonogo_room_1.o" + address SEGMENT_ROOM endseg beginseg name "test01_scene" romalign 0x1000 - //include "build/baserom/test01_scene.o" include "build/scenes/test_levels/test01/test01_scene.o" - address 0x02000000 + address SEGMENT_SCENE endseg beginseg name "test01_room_0" romalign 0x1000 - //include "build/baserom/test01_room_0.o" include "build/scenes/test_levels/test01/test01_room_0.o" - address 0x03000000 + address SEGMENT_ROOM endseg beginseg diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 36b47ee591..3bec7c80ae 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -2063,4 +2063,4 @@ void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) { } else { globalCtx->csCtx.segment = (void*)segment; } -} +} \ No newline at end of file diff --git a/tools/ZAP2 b/tools/ZAP2 index 72e492e908..921a5716a6 160000 --- a/tools/ZAP2 +++ b/tools/ZAP2 @@ -1 +1 @@ -Subproject commit 72e492e908c1231b4b6269492a513bbdcc75498e +Subproject commit 921a5716a610c62ca491b694c1c7edcdf0f3aa3e