From 6d4558542a941b558c84854bc609de7360828cc6 Mon Sep 17 00:00:00 2001 From: Nicholas Estelami Date: Fri, 29 May 2020 17:59:10 -0400 Subject: [PATCH] All 110 scenes decompiled. (#175) * Auto stash before rebase of "upstream/master" * A large number of scenes have been decompiled. * Fixed makefile * Decompiled around 40 scenes. * Removed old file * Updated to newer version of ZAP2 * Finished matching remaining scenes. * Added back ZAP2 * Removed old commented out spec lines Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> --- Makefile | 2 +- extract_assets.py | 5 +++ scenes/xml/indoors/hairal_niwa2.xml | 8 ++++ scenes/xml/misc/kakariko3.xml | 9 +++++ scenes/xml/misc/market_day.xml | 9 +++++ scenes/xml/misc/market_night.xml | 9 +++++ scenes/xml/test_levels/syotes.xml | 10 +++++ spec | 61 +++++++++++++++-------------- tools/ZAP2 | 2 +- 9 files changed, 83 insertions(+), 32 deletions(-) create mode 100644 scenes/xml/indoors/hairal_niwa2.xml create mode 100644 scenes/xml/misc/kakariko3.xml create mode 100644 scenes/xml/misc/market_day.xml create mode 100644 scenes/xml/misc/market_night.xml create mode 100644 scenes/xml/test_levels/syotes.xml diff --git a/Makefile b/Makefile index bc0d80338b..d1f39793b7 100644 --- a/Makefile +++ b/Makefile @@ -231,4 +231,4 @@ build/src/libultra_code/llcvt.o: src/libultra_code/llcvt.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 10c00d23f1..4a997b9ca7 100644 --- a/extract_assets.py +++ b/extract_assets.py @@ -26,6 +26,7 @@ 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/syotes.xml", "scenes/test_levels/syotes") ExtractFile("scenes/xml/test_levels/syotes2.xml", "scenes/test_levels/syotes2") ExtractFile("scenes/xml/test_levels/besitu.xml", "scenes/test_levels/besitu") ExtractFile("scenes/xml/test_levels/sasatest.xml", "scenes/test_levels/sasatest") @@ -37,9 +38,12 @@ ExtractFile("scenes/xml/misc/hakaana.xml", "scenes/misc/hakaana") ExtractFile("scenes/xml/misc/hakaana2.xml", "scenes/misc/hakaana2") ExtractFile("scenes/xml/misc/hakaana_ouke.xml", "scenes/misc/hakaana_ouke") ExtractFile("scenes/xml/misc/hiral_demo.xml", "scenes/misc/hiral_demo") +ExtractFile("scenes/xml/misc/market_day.xml", "scenes/misc/market_day") +ExtractFile("scenes/xml/misc/market_night.xml", "scenes/misc/market_night") ExtractFile("scenes/xml/misc/market_ruins.xml", "scenes/misc/market_ruins") ExtractFile("scenes/xml/misc/market_alley.xml", "scenes/misc/market_alley") ExtractFile("scenes/xml/misc/market_alley_n.xml", "scenes/misc/market_alley_n") +ExtractFile("scenes/xml/misc/kakariko3.xml", "scenes/misc/kakariko3") ExtractFile("scenes/xml/misc/turibori.xml", "scenes/misc/turibori") ExtractFile("scenes/xml/misc/shrine.xml", "scenes/misc/shrine") ExtractFile("scenes/xml/misc/shrine_n.xml", "scenes/misc/shrine_n") @@ -77,6 +81,7 @@ ExtractFile("scenes/xml/indoors/miharigoya.xml", "scenes/indoors/miharigoya") ExtractFile("scenes/xml/indoors/mahouya.xml", "scenes/indoors/mahouya") ExtractFile("scenes/xml/indoors/syatekijyou.xml", "scenes/indoors/syatekijyou") ExtractFile("scenes/xml/indoors/hairal_niwa.xml", "scenes/indoors/hairal_niwa") +ExtractFile("scenes/xml/indoors/hairal_niwa2.xml", "scenes/indoors/hairal_niwa2") ExtractFile("scenes/xml/indoors/hairal_niwa_n.xml", "scenes/indoors/hairal_niwa_n") ExtractFile("scenes/xml/indoors/labo.xml", "scenes/indoors/labo") ExtractFile("scenes/xml/indoors/tent.xml", "scenes/indoors/tent") diff --git a/scenes/xml/indoors/hairal_niwa2.xml b/scenes/xml/indoors/hairal_niwa2.xml new file mode 100644 index 0000000000..7e0648a8fc --- /dev/null +++ b/scenes/xml/indoors/hairal_niwa2.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/kakariko3.xml b/scenes/xml/misc/kakariko3.xml new file mode 100644 index 0000000000..fcf9fcac2f --- /dev/null +++ b/scenes/xml/misc/kakariko3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/market_day.xml b/scenes/xml/misc/market_day.xml new file mode 100644 index 0000000000..a4bf8e3640 --- /dev/null +++ b/scenes/xml/misc/market_day.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/misc/market_night.xml b/scenes/xml/misc/market_night.xml new file mode 100644 index 0000000000..b322d35859 --- /dev/null +++ b/scenes/xml/misc/market_night.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/scenes/xml/test_levels/syotes.xml b/scenes/xml/test_levels/syotes.xml new file mode 100644 index 0000000000..c3c24642da --- /dev/null +++ b/scenes/xml/test_levels/syotes.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/spec b/spec index 6337e150a1..fb12f035d7 100644 --- a/spec +++ b/spec @@ -142,28 +142,24 @@ endseg beginseg name "icon_item_static" romalign 0x1000 - //include "build/baserom/icon_item_static.o" include "build/assets/textures/icon_item_static/icon_item_static.o" endseg beginseg name "icon_item_24_static" romalign 0x1000 - //include "build/baserom/icon_item_24_static.o" include "build/assets/textures/icon_item_24_static/icon_item_24_static.o" endseg beginseg name "icon_item_field_static" romalign 0x1000 - //include "build/baserom/icon_item_field_static.o" include "build/assets/textures/icon_item_field_static/icon_item_field_static.o" endseg beginseg name "icon_item_dungeon_static" romalign 0x1000 - //include "build/baserom/icon_item_dungeon_static.o" include "build/assets/textures/icon_item_dungeon_static/icon_item_dungeon_static.o" endseg @@ -8510,13 +8506,15 @@ endseg beginseg name "syotes_scene" romalign 0x1000 - include "build/baserom/syotes_scene.o" + include "build/scenes/test_levels/syotes/syotes_scene.o" + address SEGMENT_SCENE endseg beginseg name "syotes_room_0" romalign 0x1000 - include "build/baserom/syotes_room_0.o" + include "build/scenes/test_levels/syotes/syotes_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -8935,32 +8933,36 @@ endseg beginseg name "spot18_room_3" romalign 0x1000 - include "build/scenes/overworld/spot18/spot18_room_3.o" + include "build/scenes/overworld/spot18/spot18_room_3.o" address SEGMENT_ROOM endseg beginseg name "market_day_scene" romalign 0x1000 - include "build/baserom/market_day_scene.o" + include "build/scenes/misc/market_day/market_day_scene.o" + address SEGMENT_SCENE endseg beginseg name "market_day_room_0" romalign 0x1000 - include "build/baserom/market_day_room_0.o" + include "build/scenes/misc/market_day/market_day_room_0.o" + address SEGMENT_ROOM endseg beginseg name "market_night_scene" romalign 0x1000 - include "build/baserom/market_night_scene.o" + include "build/scenes/misc/market_night/market_night_scene.o" + address SEGMENT_SCENE endseg beginseg name "market_night_room_0" romalign 0x1000 - include "build/baserom/market_night_room_0.o" + include "build/scenes/misc/market_night/market_night_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -9316,9 +9318,8 @@ 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 + include "build/scenes/misc/market_alley/market_alley_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -9387,9 +9388,8 @@ 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 + include "build/scenes/misc/market_alley_n/market_alley_n_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -9941,25 +9941,29 @@ endseg beginseg name "kakariko3_scene" romalign 0x1000 - include "build/baserom/kakariko3_scene.o" + include "build/scenes/misc/kakariko3/kakariko3_scene.o" + address SEGMENT_SCENE endseg beginseg name "kakariko3_room_0" romalign 0x1000 - include "build/baserom/kakariko3_room_0.o" + include "build/scenes/misc/kakariko3/kakariko3_room_0.o" + address SEGMENT_ROOM endseg beginseg name "hairal_niwa2_scene" romalign 0x1000 - include "build/baserom/hairal_niwa2_scene.o" + include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_scene.o" + address SEGMENT_SCENE endseg beginseg name "hairal_niwa2_room_0" romalign 0x1000 - include "build/baserom/hairal_niwa2_room_0.o" + include "build/scenes/indoors/hairal_niwa2/hairal_niwa2_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -10028,9 +10032,8 @@ 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 + include "build/scenes/misc/shrine/shrine_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -10057,9 +10060,8 @@ 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 + include "build/scenes/misc/shrine_n/shrine_n_room_0.o" + address SEGMENT_ROOM endseg beginseg @@ -10072,9 +10074,8 @@ 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 + include "build/scenes/misc/shrine_r/shrine_r_room_0.o" + address SEGMENT_ROOM endseg beginseg diff --git a/tools/ZAP2 b/tools/ZAP2 index 921a5716a6..5685472826 160000 --- a/tools/ZAP2 +++ b/tools/ZAP2 @@ -1 +1 @@ -Subproject commit 921a5716a610c62ca491b694c1c7edcdf0f3aa3e +Subproject commit 5685472826f809702314387dc1a97bd048e82c76