diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-24 13:02:16 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-11-24 13:02:16 +0100 |
| commit | bb425249204147db4aa2c22ff20b68909478ad26 (patch) | |
| tree | 44e212e150efd808c31b45c3deeeab26762bd014 | |
| parent | 794d5fc97cb01a70c8579dc08962b667edf5a29e (diff) | |
Fix offset calculation for asset build mode
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | assets/assets.json | 133 | ||||
| -rw-r--r-- | assets/gfx.json | 116 | ||||
| -rw-r--r-- | assets/map.json | 696 | ||||
| -rw-r--r-- | data/gfx/gfx_and_palettes.s | 47 | ||||
| -rw-r--r-- | data/map/map_data.s | 249 | ||||
| -rw-r--r-- | tools/src/asset_processor/main.cpp | 34 | ||||
| -rw-r--r-- | tools/src/asset_processor/offsets.cpp | 2 | ||||
| -rw-r--r-- | tools/src/asset_processor/offsets.h | 9 |
9 files changed, 789 insertions, 510 deletions
@@ -149,7 +149,7 @@ SUBDIRS := $(sort $(dir $(OBJS))) $(shell mkdir -p $(SUBDIRS)) -.PHONY: all setup clean-tools mostlyclean clean tidy tools extractassets +.PHONY: all setup clean-tools mostlyclean clean tidy tools extractassets buildassets custom MAKEFLAGS += --no-print-directory @@ -162,6 +162,9 @@ all: build/extracted_assets_$(GAME_VERSION) target: $(ROM) @$(SHA1) $(BUILD_NAME).sha1 +custom: buildassets + @$(MAKE) target GAME_VERSION=$(GAME_VERSION) + # kept for backwards compat compare: $(ROM) @$(SHA1) $(BUILD_NAME).sha1 @@ -173,11 +176,11 @@ setup: tools tools: $(GFX) $(GFX) $(AIF) $(MID) $(SCANINC) $(PREPROC) $(FIX) $(ASSET_PROCESSOR) tools/bin/agb2mid tools/bin/tmc_strings tools/bin/bin2c &: - mkdir tools/cmake-build + mkdir -p tools/cmake-build unset CC CXX AS LD && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=tools -S tools -B tools/cmake-build cmake --build tools/cmake-build -j cmake --install tools/cmake-build - + # Automatically extract binary data build/extracted_assets_%: $(ASSET_CONFIGS) $(TRANSLATIONS) $(ASSET_PROCESSOR) extract $(GAME_VERSION) $(ASSET_BUILDDIR) @@ -187,6 +190,10 @@ build/extracted_assets_%: $(ASSET_CONFIGS) $(TRANSLATIONS) extractassets: $(ASSET_PROCESSOR) convert $(GAME_VERSION) $(ASSET_BUILDDIR) +# Build the assets from the human readable form +buildassets: + $(ASSET_PROCESSOR) build $(GAME_VERSION) $(ASSET_BUILDDIR) + mostlyclean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) $(MID_SUBDIR)/*.s diff --git a/assets/assets.json b/assets/assets.json index d00b1836..4a3bbbdc 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -51750,28 +51750,19 @@ "path": "sprites/gSprite_Link.4bpp", "start": 1289748, "size": 581216, - "type": "gfx", - "options": { - "width": 4 - } + "type": "gfx" }, { "path": "sprites/gSprite_081C8C74.4bpp", "start": 1870964, "size": 59904, - "type": "gfx", - "options": { - "width": 4 - } + "type": "gfx" }, { "path": "sprites/gSprite_081D7674.4bpp", "start": 1930868, "size": 33216, - "type": "gfx", - "options": { - "width": 4 - } + "type": "gfx" }, { "path": "sprites/gSprite_081DF834/unk_0.4bpp", @@ -52015,18 +52006,18 @@ { "path": "sprites/gSprite_081FF1B4/unk_3_1.4bpp", "start": 2243508, - "size": 4986, + "size": 4960, "type": "gfx" }, { "path": "sprites/gSprite_081FF1B4/config_1.txt", - "start": 2248494, + "start": 2248468, "size": 1024 }, { "path": "sprites/gSprite_081FF1B4/unk_3_2.4bpp", - "start": 2249518, - "size": 4198, + "start": 2249492, + "size": 4224, "type": "gfx" }, { @@ -52516,116 +52507,6 @@ } }, { - "path": "data_08132B30/gUnk_086926A0.bin", - "start": 6891168, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692780.bin", - "start": 6891392, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692860.bin", - "start": 6891616, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692940.bin", - "start": 6891840, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692A20.bin", - "start": 6892064, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692B00.bin", - "start": 6892288, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692BE0.bin", - "start": 6892512, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692CC0.bin", - "start": 6892736, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692DA0.bin", - "start": 6892960, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692E80.bin", - "start": 6893184, - "size": 224 - }, - { - "path": "data_08132B30/gUnk_08692F60.bin", - "start": 6893408, - "size": 64 - }, - { - "path": "data_08132B30/gUnk_08692F60_1.bin", - "start": 6893472, - "size": 16320 - }, - { - "path": "data_08132B30/gUnk_08696F60.bin", - "start": 6909792, - "size": 2432 - }, - { - "path": "data_08132B30/gUnk_086978E0.bin", - "start": 6912224, - "size": 8192 - }, - { - "path": "data_08132B30/gUnk_086998E0.bin", - "start": 6920416, - "size": 32768 - }, - { - "path": "data_08132B30/gUnk_086A18E0.bin", - "start": 6953184, - "size": 4448 - }, - { - "path": "data_08132B30/gUnk_086A18E0_1.bin", - "start": 6957632, - "size": 32 - }, - { - "path": "data_08132B30/gUnk_086A2A60.bin", - "start": 6957664, - "size": 1152 - }, - { - "path": "data_08132B30/gUnk_086A2EE0.bin", - "start": 6958816, - "size": 32768 - }, - { - "path": "data_08132B30/gUnk_086AAEE0.bin", - "start": 6991584, - "size": 169344 - }, - { - "path": "data_08132B30/gUnk_086D4460.bin", - "start": 7160928, - "size": 81920 - }, - { - "path": "data_08132B30/gUnk_086E8460.bin", - "start": 7242848, - "size": 161088 - }, - { "path": "strings/translation_DEMO_JP.bin", "variants": [ "DEMO_JP" diff --git a/assets/gfx.json b/assets/gfx.json index 5c1c3a70..fb11973e 100644 --- a/assets/gfx.json +++ b/assets/gfx.json @@ -16485,6 +16485,116 @@ "type": "gfx" }, { + "path": "gfx/gUnk_086926A0.bin", + "start": 6891168, + "size": 224 + }, + { + "path": "gfx/gUnk_08692780.bin", + "start": 6891392, + "size": 224 + }, + { + "path": "gfx/gUnk_08692860.bin", + "start": 6891616, + "size": 224 + }, + { + "path": "gfx/gUnk_08692940.bin", + "start": 6891840, + "size": 224 + }, + { + "path": "gfx/gUnk_08692A20.bin", + "start": 6892064, + "size": 224 + }, + { + "path": "gfx/gUnk_08692B00.bin", + "start": 6892288, + "size": 224 + }, + { + "path": "gfx/gUnk_08692BE0.bin", + "start": 6892512, + "size": 224 + }, + { + "path": "gfx/gUnk_08692CC0.bin", + "start": 6892736, + "size": 224 + }, + { + "path": "gfx/gUnk_08692DA0.bin", + "start": 6892960, + "size": 224 + }, + { + "path": "gfx/gUnk_08692E80.bin", + "start": 6893184, + "size": 224 + }, + { + "path": "gfx/gUnk_08692F60.bin", + "start": 6893408, + "size": 64 + }, + { + "path": "gfx/gUnk_08692F60_1.bin", + "start": 6893472, + "size": 16320 + }, + { + "path": "gfx/gUnk_08696F60.bin", + "start": 6909792, + "size": 2432 + }, + { + "path": "gfx/gUnk_086978E0.bin", + "start": 6912224, + "size": 8192 + }, + { + "path": "gfx/gUnk_086998E0.bin", + "start": 6920416, + "size": 32768 + }, + { + "path": "gfx/gUnk_086A18E0.bin", + "start": 6953184, + "size": 4448 + }, + { + "path": "gfx/gUnk_086A18E0_1.bin", + "start": 6957632, + "size": 32 + }, + { + "path": "gfx/gUnk_086A2A60.bin", + "start": 6957664, + "size": 1152 + }, + { + "path": "gfx/gUnk_086A2EE0.bin", + "start": 6958816, + "size": 32768 + }, + { + "path": "gfx/gUnk_086AAEE0.bin", + "start": 6991584, + "size": 169344 + }, + { + "path": "gfx/gUnk_086D4460.bin", + "start": 7160928, + "size": 81920 + }, + { + "path": "gfx/gUnk_086E8460.bin", + "start": 7242848, + "size": 161088 + }, + { "path": "gfx/gGfx_38_0.4bpp", "start": 7403936, "size": 2048, @@ -19326,13 +19436,13 @@ { "path": "gfx/fixedTypeGfx_214.4bpp.lz", "start": 10163804, - "size": 1024, + "size": 628, "type": "gfx" }, { "path": "assets/gfx_unknown_49.bin", - "start": 10164828, - "size": 820, + "start": 10164432, + "size": 1216, "type": "unknown" } ]
\ No newline at end of file diff --git a/assets/map.json b/assets/map.json index 85f14e8b..7c9e9f3f 100644 --- a/assets/map.json +++ b/assets/map.json @@ -73,8 +73,8 @@ }, { "path": "assets/unknown_0.bin", - "start": 3344533, - "size": 2179, + "start": 3344536, + "size": 2176, "type": "unknown" }, { @@ -133,8 +133,8 @@ }, { "path": "assets/unknown_1.bin", - "start": 3388143, - "size": 761, + "start": 3388144, + "size": 760, "type": "unknown" }, { @@ -225,8 +225,8 @@ }, { "path": "assets/unknown_2.bin", - "start": 3434606, - "size": 966, + "start": 3434608, + "size": 964, "type": "unknown" }, { @@ -303,8 +303,8 @@ }, { "path": "assets/unknown_3.bin", - "start": 3439487, - "size": 26329, + "start": 3439488, + "size": 26328, "type": "unknown" }, { @@ -651,8 +651,8 @@ }, { "path": "assets/unknown_6.bin", - "start": 3701502, - "size": 298, + "start": 3701504, + "size": 296, "type": "unknown" }, { @@ -669,8 +669,8 @@ }, { "path": "assets/unknown_7.bin", - "start": 3705973, - "size": 687, + "start": 3705976, + "size": 684, "type": "unknown" }, { @@ -699,8 +699,8 @@ }, { "path": "assets/unknown_8.bin", - "start": 3713807, - "size": 481, + "start": 3713808, + "size": 480, "type": "unknown" }, { @@ -921,8 +921,8 @@ }, { "path": "assets/unknown_9.bin", - "start": 3817945, - "size": 515, + "start": 3817948, + "size": 512, "type": "unknown" }, { @@ -969,8 +969,8 @@ }, { "path": "assets/unknown_10.bin", - "start": 3846749, - "size": 523, + "start": 3846752, + "size": 520, "type": "unknown" }, { @@ -2529,8 +2529,8 @@ }, { "path": "assets/unknown_14.bin", - "start": 4143118, - "size": 462, + "start": 4143120, + "size": 460, "type": "unknown" }, { @@ -2565,8 +2565,8 @@ }, { "path": "assets/unknown_16.bin", - "start": 4148967, - "size": 957, + "start": 4148968, + "size": 956, "type": "unknown" }, { @@ -2583,8 +2583,8 @@ }, { "path": "assets/unknown_17.bin", - "start": 4152073, - "size": 283, + "start": 4152076, + "size": 280, "type": "unknown" }, { @@ -2619,8 +2619,8 @@ }, { "path": "assets/unknown_19.bin", - "start": 4154927, - "size": 481, + "start": 4154928, + "size": 480, "type": "unknown" }, { @@ -2637,8 +2637,8 @@ }, { "path": "assets/unknown_20.bin", - "start": 4156886, - "size": 522, + "start": 4156888, + "size": 520, "type": "unknown" }, { @@ -2655,8 +2655,8 @@ }, { "path": "assets/unknown_21.bin", - "start": 4158515, - "size": 193, + "start": 4158516, + "size": 192, "type": "unknown" }, { @@ -2673,8 +2673,8 @@ }, { "path": "assets/unknown_22.bin", - "start": 4159685, - "size": 299, + "start": 4159688, + "size": 296, "type": "unknown" }, { @@ -2691,8 +2691,8 @@ }, { "path": "assets/unknown_23.bin", - "start": 4161110, - "size": 194, + "start": 4161112, + "size": 192, "type": "unknown" }, { @@ -2709,8 +2709,8 @@ }, { "path": "assets/unknown_24.bin", - "start": 4161949, - "size": 79, + "start": 4161952, + "size": 76, "type": "unknown" }, { @@ -2727,8 +2727,8 @@ }, { "path": "assets/unknown_25.bin", - "start": 4162470, - "size": 62, + "start": 4162472, + "size": 60, "type": "unknown" }, { @@ -3267,8 +3267,8 @@ }, { "path": "assets/unknown_26.bin", - "start": 4523010, - "size": 594, + "start": 4523012, + "size": 592, "type": "unknown" }, { @@ -4779,8 +4779,8 @@ }, { "path": "assets/unknown_28.bin", - "start": 4751823, - "size": 23533, + "start": 4751824, + "size": 23532, "type": "unknown" }, { @@ -5463,8 +5463,8 @@ }, { "path": "assets/unknown_29.bin", - "start": 5127433, - "size": 79, + "start": 5127436, + "size": 76, "type": "unknown" }, { @@ -5481,8 +5481,8 @@ }, { "path": "assets/unknown_30.bin", - "start": 5128226, - "size": 110, + "start": 5128228, + "size": 108, "type": "unknown" }, { @@ -5499,8 +5499,8 @@ }, { "path": "assets/unknown_31.bin", - "start": 5128994, - "size": 94, + "start": 5128996, + "size": 92, "type": "unknown" }, { @@ -5517,8 +5517,8 @@ }, { "path": "assets/unknown_32.bin", - "start": 5129674, - "size": 78, + "start": 5129676, + "size": 76, "type": "unknown" }, { @@ -5535,8 +5535,8 @@ }, { "path": "assets/unknown_33.bin", - "start": 5130206, - "size": 54, + "start": 5130208, + "size": 52, "type": "unknown" }, { @@ -5553,8 +5553,8 @@ }, { "path": "assets/unknown_34.bin", - "start": 5131097, - "size": 131, + "start": 5131100, + "size": 128, "type": "unknown" }, { @@ -5571,8 +5571,8 @@ }, { "path": "assets/unknown_35.bin", - "start": 5132375, - "size": 201, + "start": 5132376, + "size": 200, "type": "unknown" }, { @@ -5625,8 +5625,8 @@ }, { "path": "assets/unknown_38.bin", - "start": 5134543, - "size": 69, + "start": 5134544, + "size": 68, "type": "unknown" }, { @@ -5643,8 +5643,8 @@ }, { "path": "assets/unknown_39.bin", - "start": 5135310, - "size": 106, + "start": 5135312, + "size": 104, "type": "unknown" }, { @@ -5661,8 +5661,8 @@ }, { "path": "assets/unknown_40.bin", - "start": 5136223, - "size": 105, + "start": 5136224, + "size": 104, "type": "unknown" }, { @@ -5697,8 +5697,8 @@ }, { "path": "assets/unknown_42.bin", - "start": 5137797, - "size": 111, + "start": 5137800, + "size": 108, "type": "unknown" }, { @@ -5715,8 +5715,8 @@ }, { "path": "assets/unknown_43.bin", - "start": 5138529, - "size": 95, + "start": 5138532, + "size": 92, "type": "unknown" }, { @@ -5733,8 +5733,8 @@ }, { "path": "assets/unknown_44.bin", - "start": 5139033, - "size": 63, + "start": 5139036, + "size": 60, "type": "unknown" }, { @@ -5769,8 +5769,8 @@ }, { "path": "assets/unknown_46.bin", - "start": 5140851, - "size": 93, + "start": 5140852, + "size": 92, "type": "unknown" }, { @@ -5787,8 +5787,8 @@ }, { "path": "assets/unknown_47.bin", - "start": 5141506, - "size": 78, + "start": 5141508, + "size": 76, "type": "unknown" }, { @@ -5805,8 +5805,8 @@ }, { "path": "assets/unknown_48.bin", - "start": 5142382, - "size": 106, + "start": 5142384, + "size": 104, "type": "unknown" }, { @@ -5823,8 +5823,8 @@ }, { "path": "assets/unknown_49.bin", - "start": 5142587, - "size": 41, + "start": 5142588, + "size": 40, "type": "unknown" }, { @@ -5961,8 +5961,8 @@ }, { "path": "assets/unknown_51.bin", - "start": 5223770, - "size": 106, + "start": 5223772, + "size": 104, "type": "unknown" }, { @@ -5997,8 +5997,8 @@ }, { "path": "assets/unknown_53.bin", - "start": 5225331, - "size": 69, + "start": 5225332, + "size": 68, "type": "unknown" }, { @@ -6015,8 +6015,8 @@ }, { "path": "assets/unknown_54.bin", - "start": 5226715, - "size": 241, + "start": 5226716, + "size": 240, "type": "unknown" }, { @@ -6033,8 +6033,8 @@ }, { "path": "assets/unknown_55.bin", - "start": 5227371, - "size": 69, + "start": 5227372, + "size": 68, "type": "unknown" }, { @@ -6051,8 +6051,8 @@ }, { "path": "assets/unknown_56.bin", - "start": 5228317, - "size": 191, + "start": 5228320, + "size": 188, "type": "unknown" }, { @@ -6069,8 +6069,8 @@ }, { "path": "assets/unknown_57.bin", - "start": 5228959, - "size": 69, + "start": 5228960, + "size": 68, "type": "unknown" }, { @@ -6087,8 +6087,8 @@ }, { "path": "assets/unknown_58.bin", - "start": 5230171, - "size": 169, + "start": 5230172, + "size": 168, "type": "unknown" }, { @@ -6105,8 +6105,8 @@ }, { "path": "assets/unknown_59.bin", - "start": 5231481, - "size": 171, + "start": 5231484, + "size": 168, "type": "unknown" }, { @@ -6123,8 +6123,8 @@ }, { "path": "assets/unknown_60.bin", - "start": 5233193, - "size": 335, + "start": 5233196, + "size": 332, "type": "unknown" }, { @@ -6177,8 +6177,8 @@ }, { "path": "assets/unknown_63.bin", - "start": 5235635, - "size": 93, + "start": 5235636, + "size": 92, "type": "unknown" }, { @@ -6213,8 +6213,8 @@ }, { "path": "assets/unknown_65.bin", - "start": 5236725, - "size": 55, + "start": 5236728, + "size": 52, "type": "unknown" }, { @@ -6249,8 +6249,8 @@ }, { "path": "assets/unknown_67.bin", - "start": 5238911, - "size": 333, + "start": 5238912, + "size": 332, "type": "unknown" }, { @@ -6411,8 +6411,8 @@ }, { "path": "assets/unknown_69.bin", - "start": 5334635, - "size": 69, + "start": 5334636, + "size": 68, "type": "unknown" }, { @@ -6429,8 +6429,8 @@ }, { "path": "assets/unknown_70.bin", - "start": 5335147, - "size": 69, + "start": 5335148, + "size": 68, "type": "unknown" }, { @@ -6465,8 +6465,8 @@ }, { "path": "assets/unknown_72.bin", - "start": 5337241, - "size": 75, + "start": 5337244, + "size": 72, "type": "unknown" }, { @@ -6483,8 +6483,8 @@ }, { "path": "assets/unknown_73.bin", - "start": 5338110, - "size": 250, + "start": 5338112, + "size": 248, "type": "unknown" }, { @@ -6501,8 +6501,8 @@ }, { "path": "assets/unknown_74.bin", - "start": 5338803, - "size": 69, + "start": 5338804, + "size": 68, "type": "unknown" }, { @@ -6519,8 +6519,8 @@ }, { "path": "assets/unknown_75.bin", - "start": 5339306, - "size": 70, + "start": 5339308, + "size": 68, "type": "unknown" }, { @@ -6537,8 +6537,8 @@ }, { "path": "assets/unknown_76.bin", - "start": 5340113, - "size": 135, + "start": 5340116, + "size": 132, "type": "unknown" }, { @@ -6555,8 +6555,8 @@ }, { "path": "assets/unknown_77.bin", - "start": 5340606, - "size": 70, + "start": 5340608, + "size": 68, "type": "unknown" }, { @@ -6573,8 +6573,8 @@ }, { "path": "assets/unknown_78.bin", - "start": 5341341, - "size": 135, + "start": 5341344, + "size": 132, "type": "unknown" }, { @@ -6591,8 +6591,8 @@ }, { "path": "assets/unknown_79.bin", - "start": 5341898, - "size": 70, + "start": 5341900, + "size": 68, "type": "unknown" }, { @@ -6609,8 +6609,8 @@ }, { "path": "assets/unknown_80.bin", - "start": 5342418, - "size": 82, + "start": 5342420, + "size": 80, "type": "unknown" }, { @@ -6627,8 +6627,8 @@ }, { "path": "assets/unknown_81.bin", - "start": 5342935, - "size": 69, + "start": 5342936, + "size": 68, "type": "unknown" }, { @@ -6663,8 +6663,8 @@ }, { "path": "assets/unknown_83.bin", - "start": 5344289, - "size": 135, + "start": 5344292, + "size": 132, "type": "unknown" }, { @@ -6681,8 +6681,8 @@ }, { "path": "assets/unknown_84.bin", - "start": 5344821, - "size": 71, + "start": 5344824, + "size": 68, "type": "unknown" }, { @@ -6699,8 +6699,8 @@ }, { "path": "assets/unknown_85.bin", - "start": 5345321, - "size": 71, + "start": 5345324, + "size": 68, "type": "unknown" }, { @@ -6717,8 +6717,8 @@ }, { "path": "assets/unknown_86.bin", - "start": 5345787, - "size": 69, + "start": 5345788, + "size": 68, "type": "unknown" }, { @@ -6753,8 +6753,8 @@ }, { "path": "assets/unknown_88.bin", - "start": 5346706, - "size": 54, + "start": 5346708, + "size": 52, "type": "unknown" }, { @@ -6771,8 +6771,8 @@ }, { "path": "assets/unknown_89.bin", - "start": 5347130, - "size": 54, + "start": 5347132, + "size": 52, "type": "unknown" }, { @@ -6807,8 +6807,8 @@ }, { "path": "assets/unknown_91.bin", - "start": 5347937, - "size": 55, + "start": 5347940, + "size": 52, "type": "unknown" }, { @@ -6825,8 +6825,8 @@ }, { "path": "assets/unknown_92.bin", - "start": 5348345, - "size": 55, + "start": 5348348, + "size": 52, "type": "unknown" }, { @@ -6963,8 +6963,8 @@ }, { "path": "assets/unknown_93.bin", - "start": 5414707, - "size": 69, + "start": 5414708, + "size": 68, "type": "unknown" }, { @@ -6981,8 +6981,8 @@ }, { "path": "assets/unknown_94.bin", - "start": 5415191, - "size": 69, + "start": 5415192, + "size": 68, "type": "unknown" }, { @@ -7017,8 +7017,8 @@ }, { "path": "assets/unknown_96.bin", - "start": 5416853, - "size": 239, + "start": 5416856, + "size": 236, "type": "unknown" }, { @@ -7053,8 +7053,8 @@ }, { "path": "assets/unknown_98.bin", - "start": 5417965, - "size": 71, + "start": 5417968, + "size": 68, "type": "unknown" }, { @@ -7071,8 +7071,8 @@ }, { "path": "assets/unknown_99.bin", - "start": 5418731, - "size": 105, + "start": 5418732, + "size": 104, "type": "unknown" }, { @@ -7107,8 +7107,8 @@ }, { "path": "assets/unknown_101.bin", - "start": 5421187, - "size": 325, + "start": 5421188, + "size": 324, "type": "unknown" }, { @@ -7125,8 +7125,8 @@ }, { "path": "assets/unknown_102.bin", - "start": 5421919, - "size": 69, + "start": 5421920, + "size": 68, "type": "unknown" }, { @@ -7143,8 +7143,8 @@ }, { "path": "assets/unknown_103.bin", - "start": 5422893, - "size": 159, + "start": 5422896, + "size": 156, "type": "unknown" }, { @@ -7161,8 +7161,8 @@ }, { "path": "assets/unknown_104.bin", - "start": 5423535, - "size": 69, + "start": 5423536, + "size": 68, "type": "unknown" }, { @@ -7197,8 +7197,8 @@ }, { "path": "assets/unknown_106.bin", - "start": 5424698, - "size": 134, + "start": 5424700, + "size": 132, "type": "unknown" }, { @@ -7269,8 +7269,8 @@ }, { "path": "assets/unknown_110.bin", - "start": 5426622, - "size": 54, + "start": 5426624, + "size": 52, "type": "unknown" }, { @@ -7287,8 +7287,8 @@ }, { "path": "assets/unknown_111.bin", - "start": 5427237, - "size": 123, + "start": 5427240, + "size": 120, "type": "unknown" }, { @@ -7305,8 +7305,8 @@ }, { "path": "assets/unknown_112.bin", - "start": 5427795, - "size": 69, + "start": 5427796, + "size": 68, "type": "unknown" }, { @@ -7323,8 +7323,8 @@ }, { "path": "assets/unknown_113.bin", - "start": 5428391, - "size": 121, + "start": 5428392, + "size": 120, "type": "unknown" }, { @@ -7359,8 +7359,8 @@ }, { "path": "assets/unknown_115.bin", - "start": 5429845, - "size": 135, + "start": 5429848, + "size": 132, "type": "unknown" }, { @@ -7377,8 +7377,8 @@ }, { "path": "assets/unknown_116.bin", - "start": 5430459, - "size": 69, + "start": 5430460, + "size": 68, "type": "unknown" }, { @@ -7395,8 +7395,8 @@ }, { "path": "assets/unknown_117.bin", - "start": 5431390, - "size": 162, + "start": 5431392, + "size": 160, "type": "unknown" }, { @@ -7413,8 +7413,8 @@ }, { "path": "assets/unknown_118.bin", - "start": 5431918, - "size": 58, + "start": 5431920, + "size": 56, "type": "unknown" }, { @@ -7487,8 +7487,8 @@ }, { "path": "assets/unknown_121.bin", - "start": 5434745, - "size": 55, + "start": 5434748, + "size": 52, "type": "unknown" }, { @@ -7505,8 +7505,8 @@ }, { "path": "assets/unknown_122.bin", - "start": 5435483, - "size": 157, + "start": 5435484, + "size": 156, "type": "unknown" }, { @@ -7577,8 +7577,8 @@ }, { "path": "assets/unknown_126.bin", - "start": 5437283, - "size": 53, + "start": 5437284, + "size": 52, "type": "unknown" }, { @@ -7595,8 +7595,8 @@ }, { "path": "assets/unknown_127.bin", - "start": 5437674, - "size": 54, + "start": 5437676, + "size": 52, "type": "unknown" }, { @@ -7613,8 +7613,8 @@ }, { "path": "assets/unknown_128.bin", - "start": 5438434, - "size": 138, + "start": 5438436, + "size": 136, "type": "unknown" }, { @@ -7631,8 +7631,8 @@ }, { "path": "assets/unknown_129.bin", - "start": 5439027, - "size": 69, + "start": 5439028, + "size": 68, "type": "unknown" }, { @@ -7685,8 +7685,8 @@ }, { "path": "assets/unknown_132.bin", - "start": 5440677, - "size": 75, + "start": 5440680, + "size": 72, "type": "unknown" }, { @@ -8117,8 +8117,8 @@ }, { "path": "assets/unknown_134.bin", - "start": 5538129, - "size": 3631, + "start": 5538132, + "size": 3628, "type": "unknown" }, { @@ -8141,8 +8141,8 @@ }, { "path": "assets/unknown_135.bin", - "start": 5543566, - "size": 362, + "start": 5543568, + "size": 360, "type": "unknown" }, { @@ -8159,8 +8159,8 @@ }, { "path": "assets/unknown_136.bin", - "start": 5544221, - "size": 43, + "start": 5544224, + "size": 40, "type": "unknown" }, { @@ -8177,8 +8177,8 @@ }, { "path": "assets/unknown_137.bin", - "start": 5544709, - "size": 59, + "start": 5544712, + "size": 56, "type": "unknown" }, { @@ -8213,8 +8213,8 @@ }, { "path": "assets/unknown_139.bin", - "start": 5545949, - "size": 43, + "start": 5545952, + "size": 40, "type": "unknown" }, { @@ -8231,8 +8231,8 @@ }, { "path": "assets/unknown_140.bin", - "start": 5546681, - "size": 123, + "start": 5546684, + "size": 120, "type": "unknown" }, { @@ -8249,8 +8249,8 @@ }, { "path": "assets/unknown_141.bin", - "start": 5547466, - "size": 122, + "start": 5547468, + "size": 120, "type": "unknown" }, { @@ -8267,8 +8267,8 @@ }, { "path": "assets/unknown_142.bin", - "start": 5548291, - "size": 121, + "start": 5548292, + "size": 120, "type": "unknown" }, { @@ -8285,8 +8285,8 @@ }, { "path": "assets/unknown_143.bin", - "start": 5548986, - "size": 82, + "start": 5548988, + "size": 80, "type": "unknown" }, { @@ -8321,8 +8321,8 @@ }, { "path": "assets/unknown_145.bin", - "start": 5549767, - "size": 53, + "start": 5549768, + "size": 52, "type": "unknown" }, { @@ -8339,8 +8339,8 @@ }, { "path": "assets/unknown_146.bin", - "start": 5550129, - "size": 43, + "start": 5550132, + "size": 40, "type": "unknown" }, { @@ -8375,8 +8375,8 @@ }, { "path": "assets/unknown_148.bin", - "start": 5550803, - "size": 41, + "start": 5550804, + "size": 40, "type": "unknown" }, { @@ -8393,8 +8393,8 @@ }, { "path": "assets/unknown_149.bin", - "start": 5551237, - "size": 83, + "start": 5551240, + "size": 80, "type": "unknown" }, { @@ -8411,8 +8411,8 @@ }, { "path": "assets/unknown_150.bin", - "start": 5552225, - "size": 243, + "start": 5552228, + "size": 240, "type": "unknown" }, { @@ -8429,8 +8429,8 @@ }, { "path": "assets/unknown_151.bin", - "start": 5553622, - "size": 362, + "start": 5553624, + "size": 360, "type": "unknown" }, { @@ -8447,8 +8447,8 @@ }, { "path": "assets/unknown_152.bin", - "start": 5554655, - "size": 121, + "start": 5554656, + "size": 120, "type": "unknown" }, { @@ -8483,8 +8483,8 @@ }, { "path": "assets/unknown_154.bin", - "start": 5556087, - "size": 161, + "start": 5556088, + "size": 160, "type": "unknown" }, { @@ -8501,8 +8501,8 @@ }, { "path": "assets/unknown_155.bin", - "start": 5556699, - "size": 81, + "start": 5556700, + "size": 80, "type": "unknown" }, { @@ -8519,8 +8519,8 @@ }, { "path": "assets/unknown_156.bin", - "start": 5558109, - "size": 243, + "start": 5558112, + "size": 240, "type": "unknown" }, { @@ -8537,8 +8537,8 @@ }, { "path": "assets/unknown_157.bin", - "start": 5559241, - "size": 163, + "start": 5559244, + "size": 160, "type": "unknown" }, { @@ -8555,8 +8555,8 @@ }, { "path": "assets/unknown_158.bin", - "start": 5559695, - "size": 81, + "start": 5559696, + "size": 80, "type": "unknown" }, { @@ -8573,8 +8573,8 @@ }, { "path": "assets/unknown_159.bin", - "start": 5560358, - "size": 162, + "start": 5560360, + "size": 160, "type": "unknown" }, { @@ -8609,8 +8609,8 @@ }, { "path": "assets/unknown_161.bin", - "start": 5562294, - "size": 162, + "start": 5562296, + "size": 160, "type": "unknown" }, { @@ -8627,8 +8627,8 @@ }, { "path": "assets/unknown_162.bin", - "start": 5562769, - "size": 43, + "start": 5562772, + "size": 40, "type": "unknown" }, { @@ -8645,8 +8645,8 @@ }, { "path": "assets/unknown_163.bin", - "start": 5563099, - "size": 41, + "start": 5563100, + "size": 40, "type": "unknown" }, { @@ -8681,8 +8681,8 @@ }, { "path": "assets/unknown_165.bin", - "start": 5563789, - "size": 43, + "start": 5563792, + "size": 40, "type": "unknown" }, { @@ -8699,8 +8699,8 @@ }, { "path": "assets/unknown_166.bin", - "start": 5564110, - "size": 42, + "start": 5564112, + "size": 40, "type": "unknown" }, { @@ -8717,8 +8717,8 @@ }, { "path": "assets/unknown_167.bin", - "start": 5564439, - "size": 41, + "start": 5564440, + "size": 40, "type": "unknown" }, { @@ -8735,8 +8735,8 @@ }, { "path": "assets/unknown_168.bin", - "start": 5565902, - "size": 362, + "start": 5565904, + "size": 360, "type": "unknown" }, { @@ -8771,8 +8771,8 @@ }, { "path": "assets/unknown_170.bin", - "start": 5568131, - "size": 81, + "start": 5568132, + "size": 80, "type": "unknown" }, { @@ -8807,8 +8807,8 @@ }, { "path": "assets/unknown_172.bin", - "start": 5569269, - "size": 43, + "start": 5569272, + "size": 40, "type": "unknown" }, { @@ -8825,8 +8825,8 @@ }, { "path": "assets/unknown_173.bin", - "start": 5569643, - "size": 41, + "start": 5569644, + "size": 40, "type": "unknown" }, { @@ -8843,8 +8843,8 @@ }, { "path": "assets/unknown_174.bin", - "start": 5570013, - "size": 43, + "start": 5570016, + "size": 40, "type": "unknown" }, { @@ -8861,8 +8861,8 @@ }, { "path": "assets/unknown_175.bin", - "start": 5570387, - "size": 41, + "start": 5570388, + "size": 40, "type": "unknown" }, { @@ -8879,8 +8879,8 @@ }, { "path": "assets/unknown_176.bin", - "start": 5570726, - "size": 42, + "start": 5570728, + "size": 40, "type": "unknown" }, { @@ -8897,8 +8897,8 @@ }, { "path": "assets/unknown_177.bin", - "start": 5571091, - "size": 41, + "start": 5571092, + "size": 40, "type": "unknown" }, { @@ -8966,8 +8966,8 @@ }, { "path": "assets/unknown_180.bin", - "start": 5573879, - "size": 241, + "start": 5573880, + "size": 240, "type": "unknown" }, { @@ -9002,8 +9002,8 @@ }, { "path": "assets/unknown_182.bin", - "start": 5575127, - "size": 41, + "start": 5575128, + "size": 40, "type": "unknown" }, { @@ -9020,8 +9020,8 @@ }, { "path": "assets/unknown_183.bin", - "start": 5576003, - "size": 161, + "start": 5576004, + "size": 160, "type": "unknown" }, { @@ -9038,8 +9038,8 @@ }, { "path": "assets/unknown_184.bin", - "start": 5576653, - "size": 135, + "start": 5576656, + "size": 132, "type": "unknown" }, { @@ -9056,8 +9056,8 @@ }, { "path": "assets/unknown_185.bin", - "start": 5577898, - "size": 242, + "start": 5577900, + "size": 240, "type": "unknown" }, { @@ -9278,8 +9278,8 @@ }, { "path": "assets/unknown_187.bin", - "start": 5664131, - "size": 285, + "start": 5664132, + "size": 284, "type": "unknown" }, { @@ -9560,8 +9560,8 @@ }, { "path": "assets/unknown_188.bin", - "start": 5808342, - "size": 470, + "start": 5808344, + "size": 468, "type": "unknown" }, { @@ -9578,8 +9578,8 @@ }, { "path": "assets/unknown_189.bin", - "start": 5809155, - "size": 69, + "start": 5809156, + "size": 68, "type": "unknown" }, { @@ -9596,8 +9596,8 @@ }, { "path": "assets/unknown_190.bin", - "start": 5809590, - "size": 70, + "start": 5809592, + "size": 68, "type": "unknown" }, { @@ -9614,8 +9614,8 @@ }, { "path": "assets/unknown_191.bin", - "start": 5810035, - "size": 69, + "start": 5810036, + "size": 68, "type": "unknown" }, { @@ -9632,8 +9632,8 @@ }, { "path": "assets/unknown_192.bin", - "start": 5810486, - "size": 70, + "start": 5810488, + "size": 68, "type": "unknown" }, { @@ -9650,8 +9650,8 @@ }, { "path": "assets/unknown_193.bin", - "start": 5811281, - "size": 159, + "start": 5811284, + "size": 156, "type": "unknown" }, { @@ -9668,8 +9668,8 @@ }, { "path": "assets/unknown_194.bin", - "start": 5812001, - "size": 99, + "start": 5812004, + "size": 96, "type": "unknown" }, { @@ -9722,8 +9722,8 @@ }, { "path": "assets/unknown_197.bin", - "start": 5814030, - "size": 78, + "start": 5814032, + "size": 76, "type": "unknown" }, { @@ -9740,8 +9740,8 @@ }, { "path": "assets/unknown_198.bin", - "start": 5814541, - "size": 71, + "start": 5814544, + "size": 68, "type": "unknown" }, { @@ -9758,8 +9758,8 @@ }, { "path": "assets/unknown_199.bin", - "start": 5814971, - "size": 69, + "start": 5814972, + "size": 68, "type": "unknown" }, { @@ -9776,8 +9776,8 @@ }, { "path": "assets/unknown_200.bin", - "start": 5815419, - "size": 69, + "start": 5815420, + "size": 68, "type": "unknown" }, { @@ -9794,8 +9794,8 @@ }, { "path": "assets/unknown_201.bin", - "start": 5815891, - "size": 69, + "start": 5815892, + "size": 68, "type": "unknown" }, { @@ -9812,8 +9812,8 @@ }, { "path": "assets/unknown_202.bin", - "start": 5816434, - "size": 70, + "start": 5816436, + "size": 68, "type": "unknown" }, { @@ -9830,8 +9830,8 @@ }, { "path": "assets/unknown_203.bin", - "start": 5816921, - "size": 71, + "start": 5816924, + "size": 68, "type": "unknown" }, { @@ -9848,8 +9848,8 @@ }, { "path": "assets/unknown_204.bin", - "start": 5817455, - "size": 69, + "start": 5817456, + "size": 68, "type": "unknown" }, { @@ -9866,8 +9866,8 @@ }, { "path": "assets/unknown_205.bin", - "start": 5818135, - "size": 101, + "start": 5818136, + "size": 100, "type": "unknown" }, { @@ -9902,8 +9902,8 @@ }, { "path": "assets/unknown_207.bin", - "start": 5819399, - "size": 69, + "start": 5819400, + "size": 68, "type": "unknown" }, { @@ -9938,8 +9938,8 @@ }, { "path": "assets/unknown_209.bin", - "start": 5820487, - "size": 69, + "start": 5820488, + "size": 68, "type": "unknown" }, { @@ -9956,8 +9956,8 @@ }, { "path": "assets/unknown_210.bin", - "start": 5820938, - "size": 70, + "start": 5820940, + "size": 68, "type": "unknown" }, { @@ -9992,8 +9992,8 @@ }, { "path": "assets/unknown_212.bin", - "start": 5822385, - "size": 135, + "start": 5822388, + "size": 132, "type": "unknown" }, { @@ -10010,8 +10010,8 @@ }, { "path": "assets/unknown_213.bin", - "start": 5822889, - "size": 71, + "start": 5822892, + "size": 68, "type": "unknown" }, { @@ -10118,8 +10118,8 @@ }, { "path": "assets/unknown_219.bin", - "start": 5825627, - "size": 69, + "start": 5825628, + "size": 68, "type": "unknown" }, { @@ -10136,8 +10136,8 @@ }, { "path": "assets/unknown_220.bin", - "start": 5826165, - "size": 71, + "start": 5826168, + "size": 68, "type": "unknown" }, { @@ -10172,8 +10172,8 @@ }, { "path": "assets/unknown_222.bin", - "start": 5827145, - "size": 71, + "start": 5827148, + "size": 68, "type": "unknown" }, { @@ -10226,8 +10226,8 @@ }, { "path": "assets/unknown_225.bin", - "start": 5828415, - "size": 69, + "start": 5828416, + "size": 68, "type": "unknown" }, { @@ -10244,8 +10244,8 @@ }, { "path": "assets/unknown_226.bin", - "start": 5829001, - "size": 103, + "start": 5829004, + "size": 100, "type": "unknown" }, { @@ -10298,8 +10298,8 @@ }, { "path": "assets/unknown_229.bin", - "start": 5830423, - "size": 69, + "start": 5830424, + "size": 68, "type": "unknown" }, { @@ -10316,8 +10316,8 @@ }, { "path": "assets/unknown_230.bin", - "start": 5830837, - "size": 71, + "start": 5830840, + "size": 68, "type": "unknown" }, { @@ -10352,8 +10352,8 @@ }, { "path": "assets/unknown_232.bin", - "start": 5831673, - "size": 71, + "start": 5831676, + "size": 68, "type": "unknown" }, { @@ -10370,8 +10370,8 @@ }, { "path": "assets/unknown_233.bin", - "start": 5832081, - "size": 71, + "start": 5832084, + "size": 68, "type": "unknown" }, { @@ -10388,8 +10388,8 @@ }, { "path": "assets/unknown_234.bin", - "start": 5832538, - "size": 70, + "start": 5832540, + "size": 68, "type": "unknown" }, { @@ -10442,8 +10442,8 @@ }, { "path": "assets/unknown_237.bin", - "start": 5833761, - "size": 71, + "start": 5833764, + "size": 68, "type": "unknown" }, { @@ -10460,8 +10460,8 @@ }, { "path": "assets/unknown_238.bin", - "start": 5834194, - "size": 70, + "start": 5834196, + "size": 68, "type": "unknown" }, { @@ -10514,8 +10514,8 @@ }, { "path": "assets/unknown_241.bin", - "start": 5835823, - "size": 69, + "start": 5835824, + "size": 68, "type": "unknown" }, { @@ -10550,8 +10550,8 @@ }, { "path": "assets/unknown_243.bin", - "start": 5837994, - "size": 342, + "start": 5837996, + "size": 340, "type": "unknown" }, { @@ -10604,8 +10604,8 @@ }, { "path": "assets/unknown_246.bin", - "start": 5839897, - "size": 95, + "start": 5839900, + "size": 92, "type": "unknown" }, { @@ -10640,8 +10640,8 @@ }, { "path": "assets/unknown_248.bin", - "start": 5840867, - "size": 101, + "start": 5840868, + "size": 100, "type": "unknown" }, { diff --git a/data/gfx/gfx_and_palettes.s b/data/gfx/gfx_and_palettes.s index 7d788c34..3d7e159a 100644 --- a/data/gfx/gfx_and_palettes.s +++ b/data/gfx/gfx_and_palettes.s @@ -5487,69 +5487,68 @@ fixedTypeGfx_197:: fixedTypeGfx_198:: .incbin "gfx/fixedTypeGfx_198.4bpp" gfx_unknown_20:: -@ TODO move those imports to gfx.json and assets/folder? gUnk_086926A0:: @ 086926A0 - .incbin "data_08132B30/gUnk_086926A0.bin" + .incbin "gfx/gUnk_086926A0.bin" gUnk_08692780:: @ 08692780 - .incbin "data_08132B30/gUnk_08692780.bin" + .incbin "gfx/gUnk_08692780.bin" gUnk_08692860:: @ 08692860 - .incbin "data_08132B30/gUnk_08692860.bin" + .incbin "gfx/gUnk_08692860.bin" gUnk_08692940:: @ 08692940 - .incbin "data_08132B30/gUnk_08692940.bin" + .incbin "gfx/gUnk_08692940.bin" gUnk_08692A20:: @ 08692A20 - .incbin "data_08132B30/gUnk_08692A20.bin" + .incbin "gfx/gUnk_08692A20.bin" gUnk_08692B00:: @ 08692B00 - .incbin "data_08132B30/gUnk_08692B00.bin" + .incbin "gfx/gUnk_08692B00.bin" gUnk_08692BE0:: @ 08692BE0 - .incbin "data_08132B30/gUnk_08692BE0.bin" + .incbin "gfx/gUnk_08692BE0.bin" gUnk_08692CC0:: @ 08692CC0 - .incbin "data_08132B30/gUnk_08692CC0.bin" + .incbin "gfx/gUnk_08692CC0.bin" gUnk_08692DA0:: @ 08692DA0 - .incbin "data_08132B30/gUnk_08692DA0.bin" + .incbin "gfx/gUnk_08692DA0.bin" gUnk_08692E80:: @ 08692E80 - .incbin "data_08132B30/gUnk_08692E80.bin" + .incbin "gfx/gUnk_08692E80.bin" gUnk_08692F60:: @ 08692F60 - .incbin "data_08132B30/gUnk_08692F60.bin" + .incbin "gfx/gUnk_08692F60.bin" @ TODO 08692FA0 to 086A2A3F is .incbin "graphics/font.4bpp" - .incbin "data_08132B30/gUnk_08692F60_1.bin" + .incbin "gfx/gUnk_08692F60_1.bin" gUnk_08696F60:: @ 08696F60 - .incbin "data_08132B30/gUnk_08696F60.bin" + .incbin "gfx/gUnk_08696F60.bin" gUnk_086978E0:: @ 086978E0 - .incbin "data_08132B30/gUnk_086978E0.bin" + .incbin "gfx/gUnk_086978E0.bin" gUnk_086998E0:: @ 086998E0 - .incbin "data_08132B30/gUnk_086998E0.bin" + .incbin "gfx/gUnk_086998E0.bin" gUnk_086A18E0:: @ 086A18E0 - .incbin "data_08132B30/gUnk_086A18E0.bin" + .incbin "gfx/gUnk_086A18E0.bin" - .incbin "data_08132B30/gUnk_086A18E0_1.bin" + .incbin "gfx/gUnk_086A18E0_1.bin" gUnk_086A2A60:: @ 086A2A60 - .incbin "data_08132B30/gUnk_086A2A60.bin" + .incbin "gfx/gUnk_086A2A60.bin" gUnk_086A2EE0:: @ 086A2EE0 - .incbin "data_08132B30/gUnk_086A2EE0.bin" + .incbin "gfx/gUnk_086A2EE0.bin" gUnk_086AAEE0:: @ 086AAEE0 - .incbin "data_08132B30/gUnk_086AAEE0.bin" + .incbin "gfx/gUnk_086AAEE0.bin" @ TODO background graphics? @ TODO check http://kylehalladay.com/blog/tutorial/gba/2017/04/11/GBA-By-Example-3.html @ TODO contains credits images? gUnk_086D4460:: @ 086D4460 - .incbin "data_08132B30/gUnk_086D4460.bin" + .incbin "gfx/gUnk_086D4460.bin" -@ TODO 0x800 of this might be backgrond? +@ TODO 0x800 of this might be background? gUnk_086E8460:: @ 086E8460 - .incbin "data_08132B30/gUnk_086E8460.bin" + .incbin "gfx/gUnk_086E8460.bin" gGfx_38_0:: .incbin "gfx/gGfx_38_0.4bpp" gGfx_36_0:: diff --git a/data/map/map_data.s b/data/map/map_data.s index 2243d838..1ec18483 100644 --- a/data/map/map_data.s +++ b/data/map/map_data.s @@ -33,6 +33,7 @@ gAreaRoomMap_MinishWoods_0_0:: .align 2 gAreaRoomMap_MinishWoods_0_1:: .incbin "assets/gAreaRoomMap_MinishWoods_0_1.bin" + .align 2 unknown_0:: .incbin "assets/unknown_0.bin" gAreaTileset_HyliaDigCaves_0_0:: @@ -61,6 +62,7 @@ gAreaRoomMap_LakeHylia_0_0:: .align 2 gAreaRoomMap_LakeHylia_0_1:: .incbin "assets/gAreaRoomMap_LakeHylia_0_1.bin" + .align 2 unknown_1:: .incbin "assets/unknown_1.bin" gAreaRoomMap_LakeHylia_1_0:: @@ -92,6 +94,7 @@ gAreaRoomMap_CastorWilds_0_0:: .align 2 gAreaRoomMap_CastorWilds_0_1:: .incbin "assets/gAreaRoomMap_CastorWilds_0_1.bin" + .align 2 unknown_2:: .incbin "assets/unknown_2.bin" gAreaRoomMap_Ruins_0_0:: @@ -126,6 +129,7 @@ gAreaRoomMap_Ruins_5_0:: .align 2 gAreaRoomMap_Ruins_5_1:: .incbin "assets/gAreaRoomMap_Ruins_5_1.bin" + .align 2 unknown_3:: .incbin "assets/unknown_3.bin" gAreaMetatiles_HyruleTown_0:: @@ -161,6 +165,7 @@ gAreaRoomMap_HyruleTown_0_0:: .align 2 gAreaRoomMap_HyruleTown_0_1:: .incbin "assets/gAreaRoomMap_HyruleTown_0_1.bin" + .align 2 unknown_4:: .incbin "assets/unknown_4.bin" gAreaRoomMap_FestivalTown_0_0:: @@ -197,6 +202,7 @@ gAreaRoomMap_MtCrenel_1_0:: .incbin "assets/gAreaRoomMap_MtCrenel_1_0.bin" gAreaRoomMap_MtCrenel_1_1:: .incbin "assets/gAreaRoomMap_MtCrenel_1_1.bin" + .align 2 unknown_5:: .incbin "assets/unknown_5.bin" gAreaRoomMap_MtCrenel_2_0:: @@ -277,12 +283,14 @@ gAreaRoomMap_HyruleField_4_3:: .incbin "assets/gAreaRoomMap_HyruleField_4_3.bin" gAreaRoomMap_HyruleField_4_4:: .incbin "assets/gAreaRoomMap_HyruleField_4_4.bin" + .align 2 unknown_6:: .incbin "assets/unknown_6.bin" gAreaRoomMap_HyruleField_5_3:: .incbin "assets/gAreaRoomMap_HyruleField_5_3.bin" gAreaRoomMap_HyruleField_5_4:: .incbin "assets/gAreaRoomMap_HyruleField_5_4.bin" + .align 2 unknown_7:: .incbin "assets/unknown_7.bin" gAreaRoomMap_HyruleField_6_3:: @@ -294,6 +302,7 @@ gAreaRoomMap_HyruleField_7_3:: .incbin "assets/gAreaRoomMap_HyruleField_7_3.bin" gAreaRoomMap_HyruleField_7_4:: .incbin "assets/gAreaRoomMap_HyruleField_7_4.bin" + .align 2 unknown_8:: .incbin "assets/unknown_8.bin" gAreaRoomMap_HyruleField_8_0:: @@ -393,6 +402,7 @@ gAreaRoomMap_RoyalValley_0_0:: .align 2 gAreaRoomMap_RoyalValley_0_1:: .incbin "assets/gAreaRoomMap_RoyalValley_0_1.bin" + .align 2 unknown_9:: .incbin "assets/unknown_9.bin" gAreaRoomMap_RoyalValley_1_0:: @@ -413,6 +423,7 @@ gAreaRoomMap_VeilFalls_0_0:: .align 2 gAreaRoomMap_VeilFalls_0_1:: .incbin "assets/gAreaRoomMap_VeilFalls_0_1.bin" + .align 2 unknown_10:: .incbin "assets/unknown_10.bin" gAreaTileset_VeilFallsTop_0_2:: @@ -453,6 +464,7 @@ gAreaRoomMap_Beanstalks_3_0:: .incbin "assets/gAreaRoomMap_Beanstalks_3_0.bin" gAreaRoomMap_Beanstalks_4_0:: .incbin "assets/gAreaRoomMap_Beanstalks_4_0.bin" + .align 2 unknown_11:: .incbin "assets/unknown_11.bin" gAreaRoomMap_Empty_0_0:: @@ -1093,6 +1105,7 @@ gAreaTileset_HyliaDigCaves_0_4:: .incbin "tilesets/gAreaTileset_HyliaDigCaves_0_4.4bpp.lz" gAreaRoomMap_LakeWoodsCave_0_0:: .incbin "assets/gAreaRoomMap_LakeWoodsCave_0_0.bin" + .align 2 unknown_12:: .incbin "assets/unknown_12.bin" gAreaRoomMap_LakeWoodsCave_0_1:: @@ -1100,6 +1113,7 @@ gAreaRoomMap_LakeWoodsCave_0_1:: .align 2 gAreaRoomMap_HyliaDigCaves_0_0:: .incbin "assets/gAreaRoomMap_HyliaDigCaves_0_0.bin" + .align 2 unknown_13:: .incbin "assets/unknown_13.bin" gAreaRoomMap_HyliaDigCaves_0_1:: @@ -1107,6 +1121,7 @@ gAreaRoomMap_HyliaDigCaves_0_1:: .align 2 gAreaRoomMap_HyliaDigCaves_1_0:: .incbin "assets/gAreaRoomMap_HyliaDigCaves_1_0.bin" + .align 2 unknown_14:: .incbin "assets/unknown_14.bin" gAreaRoomMap_HyliaDigCaves_1_1:: @@ -1114,6 +1129,7 @@ gAreaRoomMap_HyliaDigCaves_1_1:: .align 2 gAreaRoomMap_CastorWildsDigCave_0_0:: .incbin "assets/gAreaRoomMap_CastorWildsDigCave_0_0.bin" + .align 2 unknown_15:: .incbin "assets/unknown_15.bin" gAreaRoomMap_CastorWildsDigCave_0_1:: @@ -1121,6 +1137,7 @@ gAreaRoomMap_CastorWildsDigCave_0_1:: .align 2 gAreaRoomMap_HyruleDigCaves_0_0:: .incbin "assets/gAreaRoomMap_HyruleDigCaves_0_0.bin" + .align 2 unknown_16:: .incbin "assets/unknown_16.bin" gAreaRoomMap_HyruleDigCaves_0_1:: @@ -1128,6 +1145,7 @@ gAreaRoomMap_HyruleDigCaves_0_1:: .align 2 gAreaRoomMap_CrenelDigCave_0_0:: .incbin "assets/gAreaRoomMap_CrenelDigCave_0_0.bin" + .align 2 unknown_17:: .incbin "assets/unknown_17.bin" gAreaRoomMap_CrenelDigCave_0_1:: @@ -1135,6 +1153,7 @@ gAreaRoomMap_CrenelDigCave_0_1:: .align 2 gAreaRoomMap_DigCaves_0_0:: .incbin "assets/gAreaRoomMap_DigCaves_0_0.bin" + .align 2 unknown_18:: .incbin "assets/unknown_18.bin" gAreaRoomMap_DigCaves_0_1:: @@ -1142,6 +1161,7 @@ gAreaRoomMap_DigCaves_0_1:: .align 2 gAreaRoomMap_DigCaves_1_0:: .incbin "assets/gAreaRoomMap_DigCaves_1_0.bin" + .align 2 unknown_19:: .incbin "assets/unknown_19.bin" gAreaRoomMap_DigCaves_1_1:: @@ -1149,6 +1169,7 @@ gAreaRoomMap_DigCaves_1_1:: .align 2 gAreaRoomMap_VeilFallsDigCave_0_0:: .incbin "assets/gAreaRoomMap_VeilFallsDigCave_0_0.bin" + .align 2 unknown_20:: .incbin "assets/unknown_20.bin" gAreaRoomMap_VeilFallsDigCave_0_1:: @@ -1156,6 +1177,7 @@ gAreaRoomMap_VeilFallsDigCave_0_1:: .align 2 gAreaRoomMap_OuterFortressOfWinds_0_0:: .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_0_0.bin" + .align 2 unknown_21:: .incbin "assets/unknown_21.bin" gAreaRoomMap_OuterFortressOfWinds_0_1:: @@ -1163,6 +1185,7 @@ gAreaRoomMap_OuterFortressOfWinds_0_1:: .align 2 gAreaRoomMap_OuterFortressOfWinds_1_0:: .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_1_0.bin" + .align 2 unknown_22:: .incbin "assets/unknown_22.bin" gAreaRoomMap_OuterFortressOfWinds_1_1:: @@ -1170,6 +1193,7 @@ gAreaRoomMap_OuterFortressOfWinds_1_1:: .align 2 gAreaRoomMap_OuterFortressOfWinds_2_0:: .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_2_0.bin" + .align 2 unknown_23:: .incbin "assets/unknown_23.bin" gAreaRoomMap_OuterFortressOfWinds_2_1:: @@ -1177,6 +1201,7 @@ gAreaRoomMap_OuterFortressOfWinds_2_1:: .align 2 gAreaRoomMap_OuterFortressOfWinds_3_0:: .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_3_0.bin" + .align 2 unknown_24:: .incbin "assets/unknown_24.bin" gAreaRoomMap_OuterFortressOfWinds_3_1:: @@ -1184,6 +1209,7 @@ gAreaRoomMap_OuterFortressOfWinds_3_1:: .align 2 gAreaRoomMap_OuterFortressOfWinds_4_0:: .incbin "assets/gAreaRoomMap_OuterFortressOfWinds_4_0.bin" + .align 2 unknown_25:: .incbin "assets/unknown_25.bin" gAreaRoomMap_OuterFortressOfWinds_4_1:: @@ -1420,6 +1446,7 @@ gAreaMetatiles_WindTribeTowerRoof_2:: .align 2 gAreaMetatiles_WindTribeTowerRoof_3:: .incbin "assets/gAreaMetatiles_WindTribeTowerRoof_3.bin" + .align 2 unknown_26:: .incbin "assets/unknown_26.bin" gAreaTileset_EzloCutscene_0_0:: @@ -1431,6 +1458,7 @@ gAreaMetatiles_EzloCutscene_0:: .align 2 gAreaMetatiles_EzloCutscene_2:: .incbin "assets/gAreaMetatiles_EzloCutscene_2.bin" + .align 2 unknown_27:: .incbin "assets/unknown_27.bin" gAreaRoomMap_HouseInteriors2_0_0:: @@ -2084,6 +2112,7 @@ gAreaTileset_MinishHouseInteriors_11_0:: .align 2 gAreaRoomMap_MinishHouseInteriors_12_1:: .incbin "assets/gAreaRoomMap_MinishHouseInteriors_12_1.bin" + .align 2 unknown_28:: .incbin "assets/unknown_28.bin" gAreaRoomMap_MinishHouseInteriors_13_2:: @@ -2399,6 +2428,7 @@ gAreaRoomMap_DeepwoodShrine_0_0:: .align 2 gAreaRoomMap_DeepwoodShrine_0_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_0_1.bin" + .align 2 unknown_29:: .incbin "assets/unknown_29.bin" gAreaRoomMap_DeepwoodShrine_1_0:: @@ -2406,6 +2436,7 @@ gAreaRoomMap_DeepwoodShrine_1_0:: .align 2 gAreaRoomMap_DeepwoodShrine_1_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_1_1.bin" + .align 2 unknown_30:: .incbin "assets/unknown_30.bin" gAreaRoomMap_DeepwoodShrine_2_0:: @@ -2413,6 +2444,7 @@ gAreaRoomMap_DeepwoodShrine_2_0:: .align 2 gAreaRoomMap_DeepwoodShrine_2_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_2_1.bin" + .align 2 unknown_31:: .incbin "assets/unknown_31.bin" gAreaRoomMap_DeepwoodShrine_3_0:: @@ -2420,12 +2452,14 @@ gAreaRoomMap_DeepwoodShrine_3_0:: .align 2 gAreaRoomMap_DeepwoodShrine_3_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_3_1.bin" + .align 2 unknown_32:: .incbin "assets/unknown_32.bin" gAreaRoomMap_DeepwoodShrine_4_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_0.bin" gAreaRoomMap_DeepwoodShrine_4_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_4_1.bin" + .align 2 unknown_33:: .incbin "assets/unknown_33.bin" gAreaRoomMap_DeepwoodShrine_5_0:: @@ -2433,12 +2467,14 @@ gAreaRoomMap_DeepwoodShrine_5_0:: .align 2 gAreaRoomMap_DeepwoodShrine_5_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_5_1.bin" + .align 2 unknown_34:: .incbin "assets/unknown_34.bin" gAreaRoomMap_DeepwoodShrine_6_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_0.bin" gAreaRoomMap_DeepwoodShrine_6_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_6_1.bin" + .align 2 unknown_35:: .incbin "assets/unknown_35.bin" gAreaRoomMap_DeepwoodShrine_7_0:: @@ -2446,12 +2482,14 @@ gAreaRoomMap_DeepwoodShrine_7_0:: .align 2 gAreaRoomMap_DeepwoodShrine_7_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_7_1.bin" + .align 2 unknown_36:: .incbin "assets/unknown_36.bin" gAreaRoomMap_DeepwoodShrine_8_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_0.bin" gAreaRoomMap_DeepwoodShrine_8_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_8_1.bin" + .align 2 unknown_37:: .incbin "assets/unknown_37.bin" gAreaRoomMap_DeepwoodShrine_9_0:: @@ -2459,6 +2497,7 @@ gAreaRoomMap_DeepwoodShrine_9_0:: .align 2 gAreaRoomMap_DeepwoodShrine_9_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_9_1.bin" + .align 2 unknown_38:: .incbin "assets/unknown_38.bin" gAreaRoomMap_DeepwoodShrine_10_0:: @@ -2466,6 +2505,7 @@ gAreaRoomMap_DeepwoodShrine_10_0:: .align 2 gAreaRoomMap_DeepwoodShrine_10_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_10_1.bin" + .align 2 unknown_39:: .incbin "assets/unknown_39.bin" gAreaRoomMap_DeepwoodShrine_11_0:: @@ -2473,6 +2513,7 @@ gAreaRoomMap_DeepwoodShrine_11_0:: .align 2 gAreaRoomMap_DeepwoodShrine_11_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_11_1.bin" + .align 2 unknown_40:: .incbin "assets/unknown_40.bin" gAreaRoomMap_DeepwoodShrine_12_0:: @@ -2480,18 +2521,21 @@ gAreaRoomMap_DeepwoodShrine_12_0:: .align 2 gAreaRoomMap_DeepwoodShrine_12_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_12_1.bin" + .align 2 unknown_41:: .incbin "assets/unknown_41.bin" gAreaRoomMap_DeepwoodShrine_13_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_0.bin" gAreaRoomMap_DeepwoodShrine_13_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_13_1.bin" + .align 2 unknown_42:: .incbin "assets/unknown_42.bin" gAreaRoomMap_DeepwoodShrine_14_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_0.bin" gAreaRoomMap_DeepwoodShrine_14_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_14_1.bin" + .align 2 unknown_43:: .incbin "assets/unknown_43.bin" gAreaRoomMap_DeepwoodShrine_15_0:: @@ -2499,6 +2543,7 @@ gAreaRoomMap_DeepwoodShrine_15_0:: .align 2 gAreaRoomMap_DeepwoodShrine_15_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_15_1.bin" + .align 2 unknown_44:: .incbin "assets/unknown_44.bin" gAreaRoomMap_DeepwoodShrine_16_0:: @@ -2506,6 +2551,7 @@ gAreaRoomMap_DeepwoodShrine_16_0:: .align 2 gAreaRoomMap_DeepwoodShrine_16_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_16_1.bin" + .align 2 unknown_45:: .incbin "assets/unknown_45.bin" gAreaRoomMap_DeepwoodShrine_17_0:: @@ -2513,12 +2559,14 @@ gAreaRoomMap_DeepwoodShrine_17_0:: .align 2 gAreaRoomMap_DeepwoodShrine_17_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_17_1.bin" + .align 2 unknown_46:: .incbin "assets/unknown_46.bin" gAreaRoomMap_DeepwoodShrineBoss_0_0:: .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_0.bin" gAreaRoomMap_DeepwoodShrineBoss_0_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrineBoss_0_1.bin" + .align 2 unknown_47:: .incbin "assets/unknown_47.bin" gAreaRoomMap_DeepwoodShrine_18_0:: @@ -2526,6 +2574,7 @@ gAreaRoomMap_DeepwoodShrine_18_0:: .align 2 gAreaRoomMap_DeepwoodShrine_18_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_18_1.bin" + .align 2 unknown_48:: .incbin "assets/unknown_48.bin" gAreaRoomMap_DeepwoodShrine_19_0:: @@ -2533,6 +2582,7 @@ gAreaRoomMap_DeepwoodShrine_19_0:: .align 2 gAreaRoomMap_DeepwoodShrine_19_1:: .incbin "assets/gAreaRoomMap_DeepwoodShrine_19_1.bin" + .align 2 unknown_49:: .incbin "assets/unknown_49.bin" gAreaRoomMap_DeepwoodShrineEntry_0_0:: @@ -2589,12 +2639,14 @@ gAreaRoomMap_CaveOfFlames_0_0:: .align 2 gAreaRoomMap_CaveOfFlames_0_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_0_1.bin" + .align 2 unknown_50:: .incbin "assets/unknown_50.bin" gAreaRoomMap_CaveOfFlames_1_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_1_0.bin" gAreaRoomMap_CaveOfFlames_1_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_1_1.bin" + .align 2 unknown_51:: .incbin "assets/unknown_51.bin" gAreaRoomMap_CaveOfFlames_2_0:: @@ -2602,12 +2654,14 @@ gAreaRoomMap_CaveOfFlames_2_0:: .align 2 gAreaRoomMap_CaveOfFlames_2_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_2_1.bin" + .align 2 unknown_52:: .incbin "assets/unknown_52.bin" gAreaRoomMap_CaveOfFlames_3_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_3_0.bin" gAreaRoomMap_CaveOfFlames_3_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_3_1.bin" + .align 2 unknown_53:: .incbin "assets/unknown_53.bin" gAreaRoomMap_CaveOfFlames_4_0:: @@ -2615,12 +2669,14 @@ gAreaRoomMap_CaveOfFlames_4_0:: .align 2 gAreaRoomMap_CaveOfFlames_4_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_4_1.bin" + .align 2 unknown_54:: .incbin "assets/unknown_54.bin" gAreaRoomMap_CaveOfFlames_5_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_5_0.bin" gAreaRoomMap_CaveOfFlames_5_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_5_1.bin" + .align 2 unknown_55:: .incbin "assets/unknown_55.bin" gAreaRoomMap_CaveOfFlames_6_0:: @@ -2628,18 +2684,21 @@ gAreaRoomMap_CaveOfFlames_6_0:: .align 2 gAreaRoomMap_CaveOfFlames_6_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_6_1.bin" + .align 2 unknown_56:: .incbin "assets/unknown_56.bin" gAreaRoomMap_CaveOfFlames_7_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_7_0.bin" gAreaRoomMap_CaveOfFlames_7_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_7_1.bin" + .align 2 unknown_57:: .incbin "assets/unknown_57.bin" gAreaRoomMap_CaveOfFlames_8_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_8_0.bin" gAreaRoomMap_CaveOfFlames_8_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_8_1.bin" + .align 2 unknown_58:: .incbin "assets/unknown_58.bin" gAreaRoomMap_CaveOfFlames_9_0:: @@ -2647,24 +2706,28 @@ gAreaRoomMap_CaveOfFlames_9_0:: .align 2 gAreaRoomMap_CaveOfFlames_9_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_9_1.bin" + .align 2 unknown_59:: .incbin "assets/unknown_59.bin" gAreaRoomMap_CaveOfFlames_10_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_10_0.bin" gAreaRoomMap_CaveOfFlames_10_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_10_1.bin" + .align 2 unknown_60:: .incbin "assets/unknown_60.bin" gAreaRoomMap_CaveOfFlames_11_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_11_0.bin" gAreaRoomMap_CaveOfFlames_11_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_11_1.bin" + .align 2 unknown_61:: .incbin "assets/unknown_61.bin" gAreaRoomMap_CaveOfFlames_12_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_12_0.bin" gAreaRoomMap_CaveOfFlames_12_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_12_1.bin" + .align 2 unknown_62:: .incbin "assets/unknown_62.bin" gAreaRoomMap_CaveOfFlames_13_0:: @@ -2672,12 +2735,14 @@ gAreaRoomMap_CaveOfFlames_13_0:: .align 2 gAreaRoomMap_CaveOfFlames_13_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_13_1.bin" + .align 2 unknown_63:: .incbin "assets/unknown_63.bin" gAreaRoomMap_CaveOfFlames_14_0:: .incbin "assets/gAreaRoomMap_CaveOfFlames_14_0.bin" gAreaRoomMap_CaveOfFlames_14_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_14_1.bin" + .align 2 unknown_64:: .incbin "assets/unknown_64.bin" gAreaRoomMap_CaveOfFlames_15_0:: @@ -2685,6 +2750,7 @@ gAreaRoomMap_CaveOfFlames_15_0:: .align 2 gAreaRoomMap_CaveOfFlames_15_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_15_1.bin" + .align 2 unknown_65:: .incbin "assets/unknown_65.bin" gAreaRoomMap_CaveOfFlames_16_0:: @@ -2692,6 +2758,7 @@ gAreaRoomMap_CaveOfFlames_16_0:: .align 2 gAreaRoomMap_CaveOfFlames_16_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_16_1.bin" + .align 2 unknown_66:: .incbin "assets/unknown_66.bin" gAreaRoomMap_CaveOfFlames_17_0:: @@ -2699,12 +2766,14 @@ gAreaRoomMap_CaveOfFlames_17_0:: .align 2 gAreaRoomMap_CaveOfFlames_17_1:: .incbin "assets/gAreaRoomMap_CaveOfFlames_17_1.bin" + .align 2 unknown_67:: .incbin "assets/unknown_67.bin" gAreaRoomMap_CaveOfFlamesBoss_0_0:: .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_0.bin" gAreaRoomMap_CaveOfFlamesBoss_0_1:: .incbin "assets/gAreaRoomMap_CaveOfFlamesBoss_0_1.bin" + .align 2 unknown_68:: .incbin "assets/unknown_68.bin" gAreaTileset_CastorDarknut_0_0:: @@ -2773,6 +2842,7 @@ gAreaRoomMap_FortressOfWinds_0_0:: .align 2 gAreaRoomMap_FortressOfWinds_0_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_0_1.bin" + .align 2 unknown_69:: .incbin "assets/unknown_69.bin" gAreaRoomMap_FortressOfWinds_1_0:: @@ -2780,6 +2850,7 @@ gAreaRoomMap_FortressOfWinds_1_0:: .align 2 gAreaRoomMap_FortressOfWinds_1_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_1_1.bin" + .align 2 unknown_70:: .incbin "assets/unknown_70.bin" gAreaRoomMap_FortressOfWinds_2_0:: @@ -2787,6 +2858,7 @@ gAreaRoomMap_FortressOfWinds_2_0:: .align 2 gAreaRoomMap_FortressOfWinds_2_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_2_1.bin" + .align 2 unknown_71:: .incbin "assets/unknown_71.bin" gAreaRoomMap_FortressOfWinds_3_0:: @@ -2794,18 +2866,21 @@ gAreaRoomMap_FortressOfWinds_3_0:: .align 2 gAreaRoomMap_FortressOfWinds_3_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_3_1.bin" + .align 2 unknown_72:: .incbin "assets/unknown_72.bin" gAreaRoomMap_FortressOfWinds_4_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_4_0.bin" gAreaRoomMap_FortressOfWinds_4_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_4_1.bin" + .align 2 unknown_73:: .incbin "assets/unknown_73.bin" gAreaRoomMap_FortressOfWinds_5_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_5_0.bin" gAreaRoomMap_FortressOfWinds_5_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_5_1.bin" + .align 2 unknown_74:: .incbin "assets/unknown_74.bin" gAreaRoomMap_FortressOfWinds_6_0:: @@ -2813,18 +2888,21 @@ gAreaRoomMap_FortressOfWinds_6_0:: .align 2 gAreaRoomMap_FortressOfWinds_6_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_6_1.bin" + .align 2 unknown_75:: .incbin "assets/unknown_75.bin" gAreaRoomMap_FortressOfWinds_7_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_7_0.bin" gAreaRoomMap_FortressOfWinds_7_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_7_1.bin" + .align 2 unknown_76:: .incbin "assets/unknown_76.bin" gAreaRoomMap_FortressOfWinds_8_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_8_0.bin" gAreaRoomMap_FortressOfWinds_8_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_8_1.bin" + .align 2 unknown_77:: .incbin "assets/unknown_77.bin" gAreaRoomMap_FortressOfWinds_9_0:: @@ -2832,18 +2910,21 @@ gAreaRoomMap_FortressOfWinds_9_0:: .align 2 gAreaRoomMap_FortressOfWinds_9_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_9_1.bin" + .align 2 unknown_78:: .incbin "assets/unknown_78.bin" gAreaRoomMap_FortressOfWinds_10_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_10_0.bin" gAreaRoomMap_FortressOfWinds_10_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_10_1.bin" + .align 2 unknown_79:: .incbin "assets/unknown_79.bin" gAreaRoomMap_FortressOfWinds_11_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_11_0.bin" gAreaRoomMap_FortressOfWinds_11_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_11_1.bin" + .align 2 unknown_80:: .incbin "assets/unknown_80.bin" gAreaRoomMap_FortressOfWinds_12_0:: @@ -2851,6 +2932,7 @@ gAreaRoomMap_FortressOfWinds_12_0:: .align 2 gAreaRoomMap_FortressOfWinds_12_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_12_1.bin" + .align 2 unknown_81:: .incbin "assets/unknown_81.bin" gAreaRoomMap_FortressOfWinds_13_0:: @@ -2858,6 +2940,7 @@ gAreaRoomMap_FortressOfWinds_13_0:: .align 2 gAreaRoomMap_FortressOfWinds_13_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_13_1.bin" + .align 2 unknown_82:: .incbin "assets/unknown_82.bin" gAreaRoomMap_FortressOfWinds_14_0:: @@ -2865,12 +2948,14 @@ gAreaRoomMap_FortressOfWinds_14_0:: .align 2 gAreaRoomMap_FortressOfWinds_14_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_14_1.bin" + .align 2 unknown_83:: .incbin "assets/unknown_83.bin" gAreaRoomMap_FortressOfWinds_15_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_15_0.bin" gAreaRoomMap_FortressOfWinds_15_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_15_1.bin" + .align 2 unknown_84:: .incbin "assets/unknown_84.bin" gAreaRoomMap_FortressOfWinds_16_0:: @@ -2878,18 +2963,21 @@ gAreaRoomMap_FortressOfWinds_16_0:: .align 2 gAreaRoomMap_FortressOfWinds_16_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_16_1.bin" + .align 2 unknown_85:: .incbin "assets/unknown_85.bin" gAreaRoomMap_FortressOfWinds_17_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_17_0.bin" gAreaRoomMap_FortressOfWinds_17_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_17_1.bin" + .align 2 unknown_86:: .incbin "assets/unknown_86.bin" gAreaRoomMap_FortressOfWinds_18_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_18_0.bin" gAreaRoomMap_FortressOfWinds_18_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_18_1.bin" + .align 2 unknown_87:: .incbin "assets/unknown_87.bin" gAreaRoomMap_FortressOfWinds_19_0:: @@ -2897,12 +2985,14 @@ gAreaRoomMap_FortressOfWinds_19_0:: .align 2 gAreaRoomMap_FortressOfWinds_19_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_19_1.bin" + .align 2 unknown_88:: .incbin "assets/unknown_88.bin" gAreaRoomMap_FortressOfWinds_20_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_20_0.bin" gAreaRoomMap_FortressOfWinds_20_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_20_1.bin" + .align 2 unknown_89:: .incbin "assets/unknown_89.bin" gAreaRoomMap_FortressOfWinds_21_0:: @@ -2910,12 +3000,14 @@ gAreaRoomMap_FortressOfWinds_21_0:: .align 2 gAreaRoomMap_FortressOfWinds_21_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_21_1.bin" + .align 2 unknown_90:: .incbin "assets/unknown_90.bin" gAreaRoomMap_FortressOfWinds_22_0:: .incbin "assets/gAreaRoomMap_FortressOfWinds_22_0.bin" gAreaRoomMap_FortressOfWinds_22_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_22_1.bin" + .align 2 unknown_91:: .incbin "assets/unknown_91.bin" gAreaRoomMap_FortressOfWinds_23_0:: @@ -2923,6 +3015,7 @@ gAreaRoomMap_FortressOfWinds_23_0:: .align 2 gAreaRoomMap_FortressOfWinds_23_1:: .incbin "assets/gAreaRoomMap_FortressOfWinds_23_1.bin" + .align 2 unknown_92:: .incbin "assets/unknown_92.bin" gAreaRoomMap_InnerMazaal_0_0:: @@ -2985,18 +3078,21 @@ gAreaRoomMap_TempleOfDroplets_0_0:: .align 2 gAreaRoomMap_TempleOfDroplets_0_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_0_1.bin" + .align 2 unknown_93:: .incbin "assets/unknown_93.bin" gAreaRoomMap_TempleOfDroplets_1_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_0.bin" gAreaRoomMap_TempleOfDroplets_1_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_1_1.bin" + .align 2 unknown_94:: .incbin "assets/unknown_94.bin" gAreaRoomMap_TempleOfDroplets_2_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_0.bin" gAreaRoomMap_TempleOfDroplets_2_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_2_1.bin" + .align 2 unknown_95:: .incbin "assets/unknown_95.bin" gAreaRoomMap_TempleOfDroplets_3_0:: @@ -3004,18 +3100,21 @@ gAreaRoomMap_TempleOfDroplets_3_0:: .align 2 gAreaRoomMap_TempleOfDroplets_3_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_3_1.bin" + .align 2 unknown_96:: .incbin "assets/unknown_96.bin" gAreaRoomMap_TempleOfDroplets_4_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_0.bin" gAreaRoomMap_TempleOfDroplets_4_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_4_1.bin" + .align 2 unknown_97:: .incbin "assets/unknown_97.bin" gAreaRoomMap_TempleOfDroplets_5_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_0.bin" gAreaRoomMap_TempleOfDroplets_5_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_5_1.bin" + .align 2 unknown_98:: .incbin "assets/unknown_98.bin" gAreaRoomMap_TempleOfDroplets_6_0:: @@ -3023,6 +3122,7 @@ gAreaRoomMap_TempleOfDroplets_6_0:: .align 2 gAreaRoomMap_TempleOfDroplets_6_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_6_1.bin" + .align 2 unknown_99:: .incbin "assets/unknown_99.bin" gAreaRoomMap_TempleOfDroplets_7_0:: @@ -3030,6 +3130,7 @@ gAreaRoomMap_TempleOfDroplets_7_0:: .align 2 gAreaRoomMap_TempleOfDroplets_7_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_7_1.bin" + .align 2 unknown_100:: .incbin "assets/unknown_100.bin" gAreaRoomMap_TempleOfDroplets_8_0:: @@ -3037,6 +3138,7 @@ gAreaRoomMap_TempleOfDroplets_8_0:: .align 2 gAreaRoomMap_TempleOfDroplets_8_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_8_1.bin" + .align 2 unknown_101:: .incbin "assets/unknown_101.bin" gAreaRoomMap_TempleOfDroplets_9_0:: @@ -3044,6 +3146,7 @@ gAreaRoomMap_TempleOfDroplets_9_0:: .align 2 gAreaRoomMap_TempleOfDroplets_9_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_9_1.bin" + .align 2 unknown_102:: .incbin "assets/unknown_102.bin" gAreaRoomMap_TempleOfDroplets_10_0:: @@ -3051,12 +3154,14 @@ gAreaRoomMap_TempleOfDroplets_10_0:: .align 2 gAreaRoomMap_TempleOfDroplets_10_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_10_1.bin" + .align 2 unknown_103:: .incbin "assets/unknown_103.bin" gAreaRoomMap_TempleOfDroplets_11_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_0.bin" gAreaRoomMap_TempleOfDroplets_11_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_11_1.bin" + .align 2 unknown_104:: .incbin "assets/unknown_104.bin" gAreaRoomMap_TempleOfDroplets_12_0:: @@ -3064,6 +3169,7 @@ gAreaRoomMap_TempleOfDroplets_12_0:: .align 2 gAreaRoomMap_TempleOfDroplets_12_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_12_1.bin" + .align 2 unknown_105:: .incbin "assets/unknown_105.bin" gAreaRoomMap_TempleOfDroplets_13_0:: @@ -3071,6 +3177,7 @@ gAreaRoomMap_TempleOfDroplets_13_0:: .align 2 gAreaRoomMap_TempleOfDroplets_13_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_13_1.bin" + .align 2 unknown_106:: .incbin "assets/unknown_106.bin" gAreaRoomMap_TempleOfDroplets_14_0:: @@ -3078,6 +3185,7 @@ gAreaRoomMap_TempleOfDroplets_14_0:: .align 2 gAreaRoomMap_TempleOfDroplets_14_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_14_1.bin" + .align 2 unknown_107:: .incbin "assets/unknown_107.bin" gAreaRoomMap_TempleOfDroplets_15_0:: @@ -3085,6 +3193,7 @@ gAreaRoomMap_TempleOfDroplets_15_0:: .align 2 gAreaRoomMap_TempleOfDroplets_15_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_15_1.bin" + .align 2 unknown_108:: .incbin "assets/unknown_108.bin" gAreaRoomMap_TempleOfDroplets_16_0:: @@ -3092,6 +3201,7 @@ gAreaRoomMap_TempleOfDroplets_16_0:: .align 2 gAreaRoomMap_TempleOfDroplets_16_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_16_1.bin" + .align 2 unknown_109:: .incbin "assets/unknown_109.bin" gAreaRoomMap_TempleOfDroplets_17_0:: @@ -3099,6 +3209,7 @@ gAreaRoomMap_TempleOfDroplets_17_0:: .align 2 gAreaRoomMap_TempleOfDroplets_17_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_17_1.bin" + .align 2 unknown_110:: .incbin "assets/unknown_110.bin" gAreaRoomMap_TempleOfDroplets_18_0:: @@ -3106,6 +3217,7 @@ gAreaRoomMap_TempleOfDroplets_18_0:: .align 2 gAreaRoomMap_TempleOfDroplets_18_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_18_1.bin" + .align 2 unknown_111:: .incbin "assets/unknown_111.bin" gAreaRoomMap_TempleOfDroplets_19_0:: @@ -3113,6 +3225,7 @@ gAreaRoomMap_TempleOfDroplets_19_0:: .align 2 gAreaRoomMap_TempleOfDroplets_19_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_19_1.bin" + .align 2 unknown_112:: .incbin "assets/unknown_112.bin" gAreaRoomMap_TempleOfDroplets_20_0:: @@ -3120,6 +3233,7 @@ gAreaRoomMap_TempleOfDroplets_20_0:: .align 2 gAreaRoomMap_TempleOfDroplets_20_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_20_1.bin" + .align 2 unknown_113:: .incbin "assets/unknown_113.bin" gAreaRoomMap_TempleOfDroplets_21_0:: @@ -3127,6 +3241,7 @@ gAreaRoomMap_TempleOfDroplets_21_0:: .align 2 gAreaRoomMap_TempleOfDroplets_21_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_21_1.bin" + .align 2 unknown_114:: .incbin "assets/unknown_114.bin" gAreaRoomMap_TempleOfDroplets_22_0:: @@ -3134,6 +3249,7 @@ gAreaRoomMap_TempleOfDroplets_22_0:: .align 2 gAreaRoomMap_TempleOfDroplets_22_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_22_1.bin" + .align 2 unknown_115:: .incbin "assets/unknown_115.bin" gAreaRoomMap_TempleOfDroplets_23_0:: @@ -3141,6 +3257,7 @@ gAreaRoomMap_TempleOfDroplets_23_0:: .align 2 gAreaRoomMap_TempleOfDroplets_23_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_23_1.bin" + .align 2 unknown_116:: .incbin "assets/unknown_116.bin" gAreaRoomMap_TempleOfDroplets_24_0:: @@ -3148,6 +3265,7 @@ gAreaRoomMap_TempleOfDroplets_24_0:: .align 2 gAreaRoomMap_TempleOfDroplets_24_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_24_1.bin" + .align 2 unknown_117:: .incbin "assets/unknown_117.bin" gAreaRoomMap_TempleOfDroplets_25_0:: @@ -3155,6 +3273,7 @@ gAreaRoomMap_TempleOfDroplets_25_0:: .align 2 gAreaRoomMap_TempleOfDroplets_25_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_25_1.bin" + .align 2 unknown_118:: .incbin "assets/unknown_118.bin" gAreaRoomMap_TempleOfDroplets_26_0:: @@ -3162,12 +3281,14 @@ gAreaRoomMap_TempleOfDroplets_26_0:: .align 2 gAreaRoomMap_TempleOfDroplets_26_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_26_1.bin" + .align 2 unknown_119:: .incbin "assets/unknown_119.bin" gAreaRoomMap_TempleOfDroplets_27_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_0.bin" gAreaRoomMap_TempleOfDroplets_27_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_27_1.bin" + .align 2 unknown_120:: .incbin "assets/unknown_120.bin" gAreaRoomMap_TempleOfDroplets_28_0:: @@ -3175,6 +3296,7 @@ gAreaRoomMap_TempleOfDroplets_28_0:: .align 2 gAreaRoomMap_TempleOfDroplets_28_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_28_1.bin" + .align 2 unknown_121:: .incbin "assets/unknown_121.bin" gAreaRoomMap_TempleOfDroplets_29_0:: @@ -3182,6 +3304,7 @@ gAreaRoomMap_TempleOfDroplets_29_0:: .align 2 gAreaRoomMap_TempleOfDroplets_29_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_29_1.bin" + .align 2 unknown_122:: .incbin "assets/unknown_122.bin" gAreaRoomMap_TempleOfDroplets_30_0:: @@ -3189,6 +3312,7 @@ gAreaRoomMap_TempleOfDroplets_30_0:: .align 2 gAreaRoomMap_TempleOfDroplets_30_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_30_1.bin" + .align 2 unknown_123:: .incbin "assets/unknown_123.bin" gAreaRoomMap_TempleOfDroplets_31_0:: @@ -3196,6 +3320,7 @@ gAreaRoomMap_TempleOfDroplets_31_0:: .align 2 gAreaRoomMap_TempleOfDroplets_31_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_31_1.bin" + .align 2 unknown_124:: .incbin "assets/unknown_124.bin" gAreaRoomMap_TempleOfDroplets_32_0:: @@ -3203,6 +3328,7 @@ gAreaRoomMap_TempleOfDroplets_32_0:: .align 2 gAreaRoomMap_TempleOfDroplets_32_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_32_1.bin" + .align 2 unknown_125:: .incbin "assets/unknown_125.bin" gAreaRoomMap_TempleOfDroplets_33_0:: @@ -3210,6 +3336,7 @@ gAreaRoomMap_TempleOfDroplets_33_0:: .align 2 gAreaRoomMap_TempleOfDroplets_33_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_33_1.bin" + .align 2 unknown_126:: .incbin "assets/unknown_126.bin" gAreaRoomMap_TempleOfDroplets_34_0:: @@ -3217,18 +3344,21 @@ gAreaRoomMap_TempleOfDroplets_34_0:: .align 2 gAreaRoomMap_TempleOfDroplets_34_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_34_1.bin" + .align 2 unknown_127:: .incbin "assets/unknown_127.bin" gAreaRoomMap_TempleOfDroplets_35_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_0.bin" gAreaRoomMap_TempleOfDroplets_35_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_35_1.bin" + .align 2 unknown_128:: .incbin "assets/unknown_128.bin" gAreaRoomMap_TempleOfDroplets_36_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_0.bin" gAreaRoomMap_TempleOfDroplets_36_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_36_1.bin" + .align 2 unknown_129:: .incbin "assets/unknown_129.bin" gAreaRoomMap_TempleOfDroplets_37_0:: @@ -3236,12 +3366,14 @@ gAreaRoomMap_TempleOfDroplets_37_0:: .align 2 gAreaRoomMap_TempleOfDroplets_37_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_37_1.bin" + .align 2 unknown_130:: .incbin "assets/unknown_130.bin" gAreaRoomMap_TempleOfDroplets_38_0:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_0.bin" gAreaRoomMap_TempleOfDroplets_38_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_38_1.bin" + .align 2 unknown_131:: .incbin "assets/unknown_131.bin" gAreaRoomMap_TempleOfDroplets_39_0:: @@ -3249,6 +3381,7 @@ gAreaRoomMap_TempleOfDroplets_39_0:: .align 2 gAreaRoomMap_TempleOfDroplets_39_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_39_1.bin" + .align 2 unknown_132:: .incbin "assets/unknown_132.bin" gAreaRoomMap_TempleOfDroplets_40_0:: @@ -3256,6 +3389,7 @@ gAreaRoomMap_TempleOfDroplets_40_0:: .align 2 gAreaRoomMap_TempleOfDroplets_40_1:: .incbin "assets/gAreaRoomMap_TempleOfDroplets_40_1.bin" + .align 2 unknown_133:: .incbin "assets/unknown_133.bin" gAreaRoomMap_61_0_0:: @@ -3423,6 +3557,7 @@ gAreaMetatiles_PalaceOfWindsBoss_0:: .align 2 gAreaMetatiles_PalaceOfWindsBoss_1:: .incbin "assets/gAreaMetatiles_PalaceOfWindsBoss_1.bin" + .align 2 unknown_134:: .incbin "assets/unknown_134.bin" gAreaTileset_PalaceOfWindsBoss_0_2:: @@ -3432,6 +3567,7 @@ gAreaRoomMap_PalaceOfWinds_0_0:: .align 2 gAreaRoomMap_PalaceOfWinds_0_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_0_1.bin" + .align 2 unknown_135:: .incbin "assets/unknown_135.bin" gAreaRoomMap_PalaceOfWinds_1_0:: @@ -3439,12 +3575,14 @@ gAreaRoomMap_PalaceOfWinds_1_0:: .align 2 gAreaRoomMap_PalaceOfWinds_1_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_1_1.bin" + .align 2 unknown_136:: .incbin "assets/unknown_136.bin" gAreaRoomMap_PalaceOfWinds_2_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_2_0.bin" gAreaRoomMap_PalaceOfWinds_2_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_2_1.bin" + .align 2 unknown_137:: .incbin "assets/unknown_137.bin" gAreaRoomMap_PalaceOfWinds_3_0:: @@ -3452,6 +3590,7 @@ gAreaRoomMap_PalaceOfWinds_3_0:: .align 2 gAreaRoomMap_PalaceOfWinds_3_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_3_1.bin" + .align 2 unknown_138:: .incbin "assets/unknown_138.bin" gAreaRoomMap_PalaceOfWinds_4_0:: @@ -3459,6 +3598,7 @@ gAreaRoomMap_PalaceOfWinds_4_0:: .align 2 gAreaRoomMap_PalaceOfWinds_4_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_4_1.bin" + .align 2 unknown_139:: .incbin "assets/unknown_139.bin" gAreaRoomMap_PalaceOfWinds_5_0:: @@ -3466,6 +3606,7 @@ gAreaRoomMap_PalaceOfWinds_5_0:: .align 2 gAreaRoomMap_PalaceOfWinds_5_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_5_1.bin" + .align 2 unknown_140:: .incbin "assets/unknown_140.bin" gAreaRoomMap_PalaceOfWinds_6_0:: @@ -3473,6 +3614,7 @@ gAreaRoomMap_PalaceOfWinds_6_0:: .align 2 gAreaRoomMap_PalaceOfWinds_6_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_6_1.bin" + .align 2 unknown_141:: .incbin "assets/unknown_141.bin" gAreaRoomMap_PalaceOfWinds_7_0:: @@ -3480,6 +3622,7 @@ gAreaRoomMap_PalaceOfWinds_7_0:: .align 2 gAreaRoomMap_PalaceOfWinds_7_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_7_1.bin" + .align 2 unknown_142:: .incbin "assets/unknown_142.bin" gAreaRoomMap_PalaceOfWinds_8_0:: @@ -3487,6 +3630,7 @@ gAreaRoomMap_PalaceOfWinds_8_0:: .align 2 gAreaRoomMap_PalaceOfWinds_8_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_8_1.bin" + .align 2 unknown_143:: .incbin "assets/unknown_143.bin" gAreaRoomMap_PalaceOfWinds_9_0:: @@ -3494,6 +3638,7 @@ gAreaRoomMap_PalaceOfWinds_9_0:: .align 2 gAreaRoomMap_PalaceOfWinds_9_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_9_1.bin" + .align 2 unknown_144:: .incbin "assets/unknown_144.bin" gAreaRoomMap_PalaceOfWinds_10_0:: @@ -3501,6 +3646,7 @@ gAreaRoomMap_PalaceOfWinds_10_0:: .align 2 gAreaRoomMap_PalaceOfWinds_10_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_10_1.bin" + .align 2 unknown_145:: .incbin "assets/unknown_145.bin" gAreaRoomMap_PalaceOfWinds_11_0:: @@ -3508,6 +3654,7 @@ gAreaRoomMap_PalaceOfWinds_11_0:: .align 2 gAreaRoomMap_PalaceOfWinds_11_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_11_1.bin" + .align 2 unknown_146:: .incbin "assets/unknown_146.bin" gAreaRoomMap_PalaceOfWinds_12_0:: @@ -3515,6 +3662,7 @@ gAreaRoomMap_PalaceOfWinds_12_0:: .align 2 gAreaRoomMap_PalaceOfWinds_12_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_12_1.bin" + .align 2 unknown_147:: .incbin "assets/unknown_147.bin" gAreaRoomMap_PalaceOfWinds_13_0:: @@ -3522,12 +3670,14 @@ gAreaRoomMap_PalaceOfWinds_13_0:: .align 2 gAreaRoomMap_PalaceOfWinds_13_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_13_1.bin" + .align 2 unknown_148:: .incbin "assets/unknown_148.bin" gAreaRoomMap_PalaceOfWinds_14_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_14_0.bin" gAreaRoomMap_PalaceOfWinds_14_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_14_1.bin" + .align 2 unknown_149:: .incbin "assets/unknown_149.bin" gAreaRoomMap_PalaceOfWinds_15_0:: @@ -3535,6 +3685,7 @@ gAreaRoomMap_PalaceOfWinds_15_0:: .align 2 gAreaRoomMap_PalaceOfWinds_15_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_15_1.bin" + .align 2 unknown_150:: .incbin "assets/unknown_150.bin" gAreaRoomMap_PalaceOfWinds_16_0:: @@ -3542,6 +3693,7 @@ gAreaRoomMap_PalaceOfWinds_16_0:: .align 2 gAreaRoomMap_PalaceOfWinds_16_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_16_1.bin" + .align 2 unknown_151:: .incbin "assets/unknown_151.bin" gAreaRoomMap_PalaceOfWinds_17_0:: @@ -3549,6 +3701,7 @@ gAreaRoomMap_PalaceOfWinds_17_0:: .align 2 gAreaRoomMap_PalaceOfWinds_17_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_17_1.bin" + .align 2 unknown_152:: .incbin "assets/unknown_152.bin" gAreaRoomMap_PalaceOfWinds_18_0:: @@ -3556,6 +3709,7 @@ gAreaRoomMap_PalaceOfWinds_18_0:: .align 2 gAreaRoomMap_PalaceOfWinds_18_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_18_1.bin" + .align 2 unknown_153:: .incbin "assets/unknown_153.bin" gAreaRoomMap_PalaceOfWinds_19_0:: @@ -3563,6 +3717,7 @@ gAreaRoomMap_PalaceOfWinds_19_0:: .align 2 gAreaRoomMap_PalaceOfWinds_19_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_19_1.bin" + .align 2 unknown_154:: .incbin "assets/unknown_154.bin" gAreaRoomMap_PalaceOfWinds_20_0:: @@ -3570,6 +3725,7 @@ gAreaRoomMap_PalaceOfWinds_20_0:: .align 2 gAreaRoomMap_PalaceOfWinds_20_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_20_1.bin" + .align 2 unknown_155:: .incbin "assets/unknown_155.bin" gAreaRoomMap_PalaceOfWinds_21_0:: @@ -3577,12 +3733,14 @@ gAreaRoomMap_PalaceOfWinds_21_0:: .align 2 gAreaRoomMap_PalaceOfWinds_21_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_21_1.bin" + .align 2 unknown_156:: .incbin "assets/unknown_156.bin" gAreaRoomMap_PalaceOfWinds_22_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_22_0.bin" gAreaRoomMap_PalaceOfWinds_22_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_22_1.bin" + .align 2 unknown_157:: .incbin "assets/unknown_157.bin" gAreaRoomMap_PalaceOfWinds_23_0:: @@ -3590,6 +3748,7 @@ gAreaRoomMap_PalaceOfWinds_23_0:: .align 2 gAreaRoomMap_PalaceOfWinds_23_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_23_1.bin" + .align 2 unknown_158:: .incbin "assets/unknown_158.bin" gAreaRoomMap_PalaceOfWinds_24_0:: @@ -3597,6 +3756,7 @@ gAreaRoomMap_PalaceOfWinds_24_0:: .align 2 gAreaRoomMap_PalaceOfWinds_24_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_24_1.bin" + .align 2 unknown_159:: .incbin "assets/unknown_159.bin" gAreaRoomMap_PalaceOfWinds_25_0:: @@ -3604,12 +3764,14 @@ gAreaRoomMap_PalaceOfWinds_25_0:: .align 2 gAreaRoomMap_PalaceOfWinds_25_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_25_1.bin" + .align 2 unknown_160:: .incbin "assets/unknown_160.bin" gAreaRoomMap_PalaceOfWinds_26_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_26_0.bin" gAreaRoomMap_PalaceOfWinds_26_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_26_1.bin" + .align 2 unknown_161:: .incbin "assets/unknown_161.bin" gAreaRoomMap_PalaceOfWinds_27_0:: @@ -3617,12 +3779,14 @@ gAreaRoomMap_PalaceOfWinds_27_0:: .align 2 gAreaRoomMap_PalaceOfWinds_27_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_27_1.bin" + .align 2 unknown_162:: .incbin "assets/unknown_162.bin" gAreaRoomMap_PalaceOfWinds_28_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_28_0.bin" gAreaRoomMap_PalaceOfWinds_28_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_28_1.bin" + .align 2 unknown_163:: .incbin "assets/unknown_163.bin" gAreaRoomMap_PalaceOfWinds_29_0:: @@ -3630,6 +3794,7 @@ gAreaRoomMap_PalaceOfWinds_29_0:: .align 2 gAreaRoomMap_PalaceOfWinds_29_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_29_1.bin" + .align 2 unknown_164:: .incbin "assets/unknown_164.bin" gAreaRoomMap_PalaceOfWinds_30_0:: @@ -3637,6 +3802,7 @@ gAreaRoomMap_PalaceOfWinds_30_0:: .align 2 gAreaRoomMap_PalaceOfWinds_30_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_30_1.bin" + .align 2 unknown_165:: .incbin "assets/unknown_165.bin" gAreaRoomMap_PalaceOfWinds_31_0:: @@ -3644,6 +3810,7 @@ gAreaRoomMap_PalaceOfWinds_31_0:: .align 2 gAreaRoomMap_PalaceOfWinds_31_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_31_1.bin" + .align 2 unknown_166:: .incbin "assets/unknown_166.bin" gAreaRoomMap_PalaceOfWinds_32_0:: @@ -3651,12 +3818,14 @@ gAreaRoomMap_PalaceOfWinds_32_0:: .align 2 gAreaRoomMap_PalaceOfWinds_32_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_32_1.bin" + .align 2 unknown_167:: .incbin "assets/unknown_167.bin" gAreaRoomMap_PalaceOfWinds_33_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_33_0.bin" gAreaRoomMap_PalaceOfWinds_33_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_33_1.bin" + .align 2 unknown_168:: .incbin "assets/unknown_168.bin" gAreaRoomMap_PalaceOfWinds_34_0:: @@ -3664,6 +3833,7 @@ gAreaRoomMap_PalaceOfWinds_34_0:: .align 2 gAreaRoomMap_PalaceOfWinds_34_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_34_1.bin" + .align 2 unknown_169:: .incbin "assets/unknown_169.bin" gAreaRoomMap_PalaceOfWinds_35_0:: @@ -3671,6 +3841,7 @@ gAreaRoomMap_PalaceOfWinds_35_0:: .align 2 gAreaRoomMap_PalaceOfWinds_35_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_35_1.bin" + .align 2 unknown_170:: .incbin "assets/unknown_170.bin" gAreaRoomMap_PalaceOfWinds_36_0:: @@ -3678,6 +3849,7 @@ gAreaRoomMap_PalaceOfWinds_36_0:: .align 2 gAreaRoomMap_PalaceOfWinds_36_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_36_1.bin" + .align 2 unknown_171:: .incbin "assets/unknown_171.bin" gAreaRoomMap_PalaceOfWinds_37_0:: @@ -3685,6 +3857,7 @@ gAreaRoomMap_PalaceOfWinds_37_0:: .align 2 gAreaRoomMap_PalaceOfWinds_37_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_37_1.bin" + .align 2 unknown_172:: .incbin "assets/unknown_172.bin" gAreaRoomMap_PalaceOfWinds_38_0:: @@ -3692,12 +3865,14 @@ gAreaRoomMap_PalaceOfWinds_38_0:: .align 2 gAreaRoomMap_PalaceOfWinds_38_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_38_1.bin" + .align 2 unknown_173:: .incbin "assets/unknown_173.bin" gAreaRoomMap_PalaceOfWinds_39_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_39_0.bin" gAreaRoomMap_PalaceOfWinds_39_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_39_1.bin" + .align 2 unknown_174:: .incbin "assets/unknown_174.bin" gAreaRoomMap_PalaceOfWinds_40_0:: @@ -3705,6 +3880,7 @@ gAreaRoomMap_PalaceOfWinds_40_0:: .align 2 gAreaRoomMap_PalaceOfWinds_40_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_40_1.bin" + .align 2 unknown_175:: .incbin "assets/unknown_175.bin" gAreaRoomMap_PalaceOfWinds_41_0:: @@ -3712,6 +3888,7 @@ gAreaRoomMap_PalaceOfWinds_41_0:: .align 2 gAreaRoomMap_PalaceOfWinds_41_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_41_1.bin" + .align 2 unknown_176:: .incbin "assets/unknown_176.bin" gAreaRoomMap_PalaceOfWinds_42_0:: @@ -3719,6 +3896,7 @@ gAreaRoomMap_PalaceOfWinds_42_0:: .align 2 gAreaRoomMap_PalaceOfWinds_42_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_42_1.bin" + .align 2 unknown_177:: .incbin "assets/unknown_177.bin" gAreaRoomMap_PalaceOfWinds_43_0:: @@ -3726,6 +3904,7 @@ gAreaRoomMap_PalaceOfWinds_43_0:: .align 2 gAreaRoomMap_PalaceOfWinds_43_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_43_1.bin" + .align 2 unknown_178:: .incbin "assets/unknown_178.bin" gAreaRoomMap_PalaceOfWinds_44_0:: @@ -3733,6 +3912,7 @@ gAreaRoomMap_PalaceOfWinds_44_0:: .align 2 gAreaRoomMap_PalaceOfWinds_44_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_44_1.bin" + .align 2 unknown_179:: .incbin "assets/unknown_179.bin" gAreaRoomMap_PalaceOfWinds_45_0:: @@ -3740,6 +3920,7 @@ gAreaRoomMap_PalaceOfWinds_45_0:: .align 2 gAreaRoomMap_PalaceOfWinds_45_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_45_1.bin" + .align 2 unknown_180:: .incbin "assets/unknown_180.bin" gAreaRoomMap_PalaceOfWinds_46_0:: @@ -3747,6 +3928,7 @@ gAreaRoomMap_PalaceOfWinds_46_0:: .align 2 gAreaRoomMap_PalaceOfWinds_46_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_46_1.bin" + .align 2 unknown_181:: .incbin "assets/unknown_181.bin" gAreaRoomMap_PalaceOfWinds_47_0:: @@ -3754,12 +3936,14 @@ gAreaRoomMap_PalaceOfWinds_47_0:: .align 2 gAreaRoomMap_PalaceOfWinds_47_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_47_1.bin" + .align 2 unknown_182:: .incbin "assets/unknown_182.bin" gAreaRoomMap_PalaceOfWinds_48_0:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_48_0.bin" gAreaRoomMap_PalaceOfWinds_48_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_48_1.bin" + .align 2 unknown_183:: .incbin "assets/unknown_183.bin" gAreaRoomMap_PalaceOfWinds_49_0:: @@ -3767,6 +3951,7 @@ gAreaRoomMap_PalaceOfWinds_49_0:: .align 2 gAreaRoomMap_PalaceOfWinds_49_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_49_1.bin" + .align 2 unknown_184:: .incbin "assets/unknown_184.bin" gAreaRoomMap_PalaceOfWinds_50_0:: @@ -3774,10 +3959,12 @@ gAreaRoomMap_PalaceOfWinds_50_0:: .align 2 gAreaRoomMap_PalaceOfWinds_50_1:: .incbin "assets/gAreaRoomMap_PalaceOfWinds_50_1.bin" + .align 2 unknown_185:: .incbin "assets/unknown_185.bin" gAreaRoomMap_PalaceOfWindsBoss_0_0:: .incbin "assets/gAreaRoomMap_PalaceOfWindsBoss_0_0.bin" + .align 2 unknown_186:: .incbin "assets/unknown_186.bin" gAreaTileset_Sanctuary_0_0:: @@ -3875,6 +4062,7 @@ gAreaRoomMap_HyruleCastle_6_0:: .align 2 gAreaRoomMap_HyruleCastle_6_1:: .incbin "assets/gAreaRoomMap_HyruleCastle_6_1.bin" + .align 2 unknown_187:: .incbin "assets/unknown_187.bin" gAreaTileset_SanctuaryEntrance_0_0:: @@ -4008,6 +4196,7 @@ gAreaRoomMap_DarkHyruleCastle_0_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_0_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_0_1.bin" + .align 2 unknown_188:: .incbin "assets/unknown_188.bin" gAreaRoomMap_DarkHyruleCastle_1_0:: @@ -4015,6 +4204,7 @@ gAreaRoomMap_DarkHyruleCastle_1_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_1_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_1_1.bin" + .align 2 unknown_189:: .incbin "assets/unknown_189.bin" gAreaRoomMap_DarkHyruleCastle_2_0:: @@ -4022,6 +4212,7 @@ gAreaRoomMap_DarkHyruleCastle_2_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_2_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_2_1.bin" + .align 2 unknown_190:: .incbin "assets/unknown_190.bin" gAreaRoomMap_DarkHyruleCastle_3_0:: @@ -4029,12 +4220,14 @@ gAreaRoomMap_DarkHyruleCastle_3_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_3_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_3_1.bin" + .align 2 unknown_191:: .incbin "assets/unknown_191.bin" gAreaRoomMap_DarkHyruleCastle_4_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_4_0.bin" gAreaRoomMap_DarkHyruleCastle_4_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_4_1.bin" + .align 2 unknown_192:: .incbin "assets/unknown_192.bin" gAreaRoomMap_DarkHyruleCastle_5_0:: @@ -4042,12 +4235,14 @@ gAreaRoomMap_DarkHyruleCastle_5_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_5_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_5_1.bin" + .align 2 unknown_193:: .incbin "assets/unknown_193.bin" gAreaRoomMap_DarkHyruleCastle_6_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_6_0.bin" gAreaRoomMap_DarkHyruleCastle_6_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_6_1.bin" + .align 2 unknown_194:: .incbin "assets/unknown_194.bin" gAreaRoomMap_DarkHyruleCastle_7_0:: @@ -4055,6 +4250,7 @@ gAreaRoomMap_DarkHyruleCastle_7_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_7_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_7_1.bin" + .align 2 unknown_195:: .incbin "assets/unknown_195.bin" gAreaRoomMap_DarkHyruleCastle_8_0:: @@ -4062,6 +4258,7 @@ gAreaRoomMap_DarkHyruleCastle_8_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_8_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_8_1.bin" + .align 2 unknown_196:: .incbin "assets/unknown_196.bin" gAreaRoomMap_DarkHyruleCastle_9_0:: @@ -4069,6 +4266,7 @@ gAreaRoomMap_DarkHyruleCastle_9_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_9_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_9_1.bin" + .align 2 unknown_197:: .incbin "assets/unknown_197.bin" gAreaRoomMap_DarkHyruleCastle_10_0:: @@ -4076,6 +4274,7 @@ gAreaRoomMap_DarkHyruleCastle_10_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_10_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_10_1.bin" + .align 2 unknown_198:: .incbin "assets/unknown_198.bin" gAreaRoomMap_DarkHyruleCastle_11_0:: @@ -4083,6 +4282,7 @@ gAreaRoomMap_DarkHyruleCastle_11_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_11_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_11_1.bin" + .align 2 unknown_199:: .incbin "assets/unknown_199.bin" gAreaRoomMap_DarkHyruleCastle_12_0:: @@ -4090,6 +4290,7 @@ gAreaRoomMap_DarkHyruleCastle_12_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_12_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_12_1.bin" + .align 2 unknown_200:: .incbin "assets/unknown_200.bin" gAreaRoomMap_DarkHyruleCastle_13_0:: @@ -4097,6 +4298,7 @@ gAreaRoomMap_DarkHyruleCastle_13_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_13_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_13_1.bin" + .align 2 unknown_201:: .incbin "assets/unknown_201.bin" gAreaRoomMap_DarkHyruleCastle_14_0:: @@ -4104,12 +4306,14 @@ gAreaRoomMap_DarkHyruleCastle_14_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_14_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_14_1.bin" + .align 2 unknown_202:: .incbin "assets/unknown_202.bin" gAreaRoomMap_DarkHyruleCastle_15_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_15_0.bin" gAreaRoomMap_DarkHyruleCastle_15_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_15_1.bin" + .align 2 unknown_203:: .incbin "assets/unknown_203.bin" gAreaRoomMap_DarkHyruleCastle_16_0:: @@ -4117,6 +4321,7 @@ gAreaRoomMap_DarkHyruleCastle_16_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_16_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_16_1.bin" + .align 2 unknown_204:: .incbin "assets/unknown_204.bin" gAreaRoomMap_DarkHyruleCastle_17_0:: @@ -4124,12 +4329,14 @@ gAreaRoomMap_DarkHyruleCastle_17_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_17_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_17_1.bin" + .align 2 unknown_205:: .incbin "assets/unknown_205.bin" gAreaRoomMap_DarkHyruleCastle_18_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_18_0.bin" gAreaRoomMap_DarkHyruleCastle_18_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_18_1.bin" + .align 2 unknown_206:: .incbin "assets/unknown_206.bin" gAreaRoomMap_DarkHyruleCastle_19_0:: @@ -4137,6 +4344,7 @@ gAreaRoomMap_DarkHyruleCastle_19_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_19_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_19_1.bin" + .align 2 unknown_207:: .incbin "assets/unknown_207.bin" gAreaRoomMap_DarkHyruleCastle_20_0:: @@ -4144,12 +4352,14 @@ gAreaRoomMap_DarkHyruleCastle_20_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_20_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_20_1.bin" + .align 2 unknown_208:: .incbin "assets/unknown_208.bin" gAreaRoomMap_DarkHyruleCastle_21_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_21_0.bin" gAreaRoomMap_DarkHyruleCastle_21_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_21_1.bin" + .align 2 unknown_209:: .incbin "assets/unknown_209.bin" gAreaRoomMap_DarkHyruleCastle_22_0:: @@ -4157,6 +4367,7 @@ gAreaRoomMap_DarkHyruleCastle_22_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_22_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_22_1.bin" + .align 2 unknown_210:: .incbin "assets/unknown_210.bin" gAreaRoomMap_DarkHyruleCastle_23_0:: @@ -4164,6 +4375,7 @@ gAreaRoomMap_DarkHyruleCastle_23_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_23_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_23_1.bin" + .align 2 unknown_211:: .incbin "assets/unknown_211.bin" gAreaRoomMap_DarkHyruleCastle_24_0:: @@ -4171,12 +4383,14 @@ gAreaRoomMap_DarkHyruleCastle_24_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_24_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_24_1.bin" + .align 2 unknown_212:: .incbin "assets/unknown_212.bin" gAreaRoomMap_DarkHyruleCastle_25_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_25_0.bin" gAreaRoomMap_DarkHyruleCastle_25_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_25_1.bin" + .align 2 unknown_213:: .incbin "assets/unknown_213.bin" gAreaRoomMap_DarkHyruleCastle_26_0:: @@ -4184,12 +4398,14 @@ gAreaRoomMap_DarkHyruleCastle_26_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_26_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_26_1.bin" + .align 2 unknown_214:: .incbin "assets/unknown_214.bin" gAreaRoomMap_DarkHyruleCastle_27_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_27_0.bin" gAreaRoomMap_DarkHyruleCastle_27_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_27_1.bin" + .align 2 unknown_215:: .incbin "assets/unknown_215.bin" gAreaRoomMap_DarkHyruleCastle_28_0:: @@ -4197,6 +4413,7 @@ gAreaRoomMap_DarkHyruleCastle_28_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_28_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_28_1.bin" + .align 2 unknown_216:: .incbin "assets/unknown_216.bin" gAreaRoomMap_DarkHyruleCastle_29_0:: @@ -4204,12 +4421,14 @@ gAreaRoomMap_DarkHyruleCastle_29_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_29_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_29_1.bin" + .align 2 unknown_217:: .incbin "assets/unknown_217.bin" gAreaRoomMap_DarkHyruleCastle_30_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_30_0.bin" gAreaRoomMap_DarkHyruleCastle_30_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_30_1.bin" + .align 2 unknown_218:: .incbin "assets/unknown_218.bin" gAreaRoomMap_DarkHyruleCastle_31_0:: @@ -4217,6 +4436,7 @@ gAreaRoomMap_DarkHyruleCastle_31_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_31_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_31_1.bin" + .align 2 unknown_219:: .incbin "assets/unknown_219.bin" gAreaRoomMap_DarkHyruleCastle_32_0:: @@ -4224,6 +4444,7 @@ gAreaRoomMap_DarkHyruleCastle_32_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_32_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_32_1.bin" + .align 2 unknown_220:: .incbin "assets/unknown_220.bin" gAreaRoomMap_DarkHyruleCastle_33_0:: @@ -4231,6 +4452,7 @@ gAreaRoomMap_DarkHyruleCastle_33_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_33_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_33_1.bin" + .align 2 unknown_221:: .incbin "assets/unknown_221.bin" gAreaRoomMap_DarkHyruleCastle_34_0:: @@ -4238,30 +4460,35 @@ gAreaRoomMap_DarkHyruleCastle_34_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_34_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_34_1.bin" + .align 2 unknown_222:: .incbin "assets/unknown_222.bin" gAreaRoomMap_DarkHyruleCastle_35_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_35_0.bin" gAreaRoomMap_DarkHyruleCastle_35_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_35_1.bin" + .align 2 unknown_223:: .incbin "assets/unknown_223.bin" gAreaRoomMap_DarkHyruleCastle_36_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_36_0.bin" gAreaRoomMap_DarkHyruleCastle_36_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_36_1.bin" + .align 2 unknown_224:: .incbin "assets/unknown_224.bin" gAreaRoomMap_DarkHyruleCastle_37_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_37_0.bin" gAreaRoomMap_DarkHyruleCastle_37_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_37_1.bin" + .align 2 unknown_225:: .incbin "assets/unknown_225.bin" gAreaRoomMap_DarkHyruleCastle_38_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_38_0.bin" gAreaRoomMap_DarkHyruleCastle_38_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_38_1.bin" + .align 2 unknown_226:: .incbin "assets/unknown_226.bin" gAreaRoomMap_DarkHyruleCastle_39_0:: @@ -4269,6 +4496,7 @@ gAreaRoomMap_DarkHyruleCastle_39_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_39_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_39_1.bin" + .align 2 unknown_227:: .incbin "assets/unknown_227.bin" gAreaRoomMap_DarkHyruleCastle_40_0:: @@ -4276,6 +4504,7 @@ gAreaRoomMap_DarkHyruleCastle_40_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_40_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_40_1.bin" + .align 2 unknown_228:: .incbin "assets/unknown_228.bin" gAreaRoomMap_DarkHyruleCastle_41_0:: @@ -4283,6 +4512,7 @@ gAreaRoomMap_DarkHyruleCastle_41_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_41_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_41_1.bin" + .align 2 unknown_229:: .incbin "assets/unknown_229.bin" gAreaRoomMap_DarkHyruleCastle_42_0:: @@ -4290,6 +4520,7 @@ gAreaRoomMap_DarkHyruleCastle_42_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_42_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_42_1.bin" + .align 2 unknown_230:: .incbin "assets/unknown_230.bin" gAreaRoomMap_DarkHyruleCastle_43_0:: @@ -4297,18 +4528,21 @@ gAreaRoomMap_DarkHyruleCastle_43_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_43_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_43_1.bin" + .align 2 unknown_231:: .incbin "assets/unknown_231.bin" gAreaRoomMap_DarkHyruleCastle_44_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_44_0.bin" gAreaRoomMap_DarkHyruleCastle_44_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_44_1.bin" + .align 2 unknown_232:: .incbin "assets/unknown_232.bin" gAreaRoomMap_DarkHyruleCastle_45_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_45_0.bin" gAreaRoomMap_DarkHyruleCastle_45_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_45_1.bin" + .align 2 unknown_233:: .incbin "assets/unknown_233.bin" gAreaRoomMap_DarkHyruleCastle_46_0:: @@ -4316,30 +4550,35 @@ gAreaRoomMap_DarkHyruleCastle_46_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_46_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_46_1.bin" + .align 2 unknown_234:: .incbin "assets/unknown_234.bin" gAreaRoomMap_DarkHyruleCastle_47_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_47_0.bin" gAreaRoomMap_DarkHyruleCastle_47_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_47_1.bin" + .align 2 unknown_235:: .incbin "assets/unknown_235.bin" gAreaRoomMap_DarkHyruleCastle_48_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_48_0.bin" gAreaRoomMap_DarkHyruleCastle_48_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_48_1.bin" + .align 2 unknown_236:: .incbin "assets/unknown_236.bin" gAreaRoomMap_DarkHyruleCastle_49_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_49_0.bin" gAreaRoomMap_DarkHyruleCastle_49_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_49_1.bin" + .align 2 unknown_237:: .incbin "assets/unknown_237.bin" gAreaRoomMap_DarkHyruleCastle_50_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_50_0.bin" gAreaRoomMap_DarkHyruleCastle_50_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_50_1.bin" + .align 2 unknown_238:: .incbin "assets/unknown_238.bin" gAreaRoomMap_DarkHyruleCastle_51_0:: @@ -4347,6 +4586,7 @@ gAreaRoomMap_DarkHyruleCastle_51_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_51_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_51_1.bin" + .align 2 unknown_239:: .incbin "assets/unknown_239.bin" gAreaRoomMap_DarkHyruleCastle_52_0:: @@ -4354,6 +4594,7 @@ gAreaRoomMap_DarkHyruleCastle_52_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_52_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_52_1.bin" + .align 2 unknown_240:: .incbin "assets/unknown_240.bin" gAreaRoomMap_DarkHyruleCastle_53_0:: @@ -4361,6 +4602,7 @@ gAreaRoomMap_DarkHyruleCastle_53_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_53_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_53_1.bin" + .align 2 unknown_241:: .incbin "assets/unknown_241.bin" gAreaRoomMap_DarkHyruleCastle_54_0:: @@ -4368,6 +4610,7 @@ gAreaRoomMap_DarkHyruleCastle_54_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_54_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_54_1.bin" + .align 2 unknown_242:: .incbin "assets/unknown_242.bin" gAreaRoomMap_DarkHyruleCastle_55_0:: @@ -4375,6 +4618,7 @@ gAreaRoomMap_DarkHyruleCastle_55_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_55_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_55_1.bin" + .align 2 unknown_243:: .incbin "assets/unknown_243.bin" gAreaRoomMap_DarkHyruleCastle_56_0:: @@ -4382,6 +4626,7 @@ gAreaRoomMap_DarkHyruleCastle_56_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_56_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_56_1.bin" + .align 2 unknown_244:: .incbin "assets/unknown_244.bin" gAreaRoomMap_DarkHyruleCastle_57_0:: @@ -4389,6 +4634,7 @@ gAreaRoomMap_DarkHyruleCastle_57_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_57_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_57_1.bin" + .align 2 unknown_245:: .incbin "assets/unknown_245.bin" gAreaRoomMap_DarkHyruleCastle_58_0:: @@ -4396,12 +4642,14 @@ gAreaRoomMap_DarkHyruleCastle_58_0:: .align 2 gAreaRoomMap_DarkHyruleCastle_58_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_58_1.bin" + .align 2 unknown_246:: .incbin "assets/unknown_246.bin" gAreaRoomMap_DarkHyruleCastle_59_0:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_59_0.bin" gAreaRoomMap_DarkHyruleCastle_59_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastle_59_1.bin" + .align 2 unknown_247:: .incbin "assets/unknown_247.bin" gAreaRoomMap_DarkHyruleCastleBridge_0_0:: @@ -4409,6 +4657,7 @@ gAreaRoomMap_DarkHyruleCastleBridge_0_0:: .align 2 gAreaRoomMap_DarkHyruleCastleBridge_0_1:: .incbin "assets/gAreaRoomMap_DarkHyruleCastleBridge_0_1.bin" + .align 2 unknown_248:: .incbin "assets/unknown_248.bin" gAreaRoomMap_Vaati3_0_0:: diff --git a/tools/src/asset_processor/main.cpp b/tools/src/asset_processor/main.cpp index c62860a0..c04ab3d1 100644 --- a/tools/src/asset_processor/main.cpp +++ b/tools/src/asset_processor/main.cpp @@ -149,10 +149,16 @@ int main(int argc, char** argv) { currentOffset = asset["offsets"][gVariant]; } } else if (asset.contains("calculateOffsets")) { // Start offset calculation - std::filesystem::path path = gAssetsFolder; - path = path / asset["calculateOffsets"]; - int baseOffset = asset["start"].get<int>() + currentOffset; - offsetCalculator = std::make_unique<OffsetCalculator>(path, baseOffset); + if (gMode == EXTRACT || gMode == BUILD) { + std::filesystem::path path = gAssetsFolder; + path = path / asset["calculateOffsets"]; + int baseOffset = 0; + // During build mode the offsets are calculated directly instead of from a base address. + if (gMode == EXTRACT) { + baseOffset = asset["start"].get<int>() + currentOffset; + } + offsetCalculator = std::make_unique<OffsetCalculator>(path, baseOffset); + } } else if (asset.contains("path")) { // Asset definition if (asset.contains("variants")) { @@ -182,6 +188,10 @@ int main(int argc, char** argv) { } case CONVERT: { std::unique_ptr<BaseAsset> assetHandler = getAssetHandlerByType(path, asset, currentOffset); + if (!std::filesystem::exists(assetHandler->getBuildPath())) { + std::cerr << "Error: Extracted binary file " << assetHandler->getBuildPath() << " does not exist. Run `make` first." << std::endl; + std::exit(1); + } if (shouldConvertAsset(assetHandler)) { if (gVerbose) { std::cout << "Converting " << assetHandler->getAssetPath() << "..." << std::endl; @@ -192,12 +202,28 @@ int main(int argc, char** argv) { } case BUILD: { std::unique_ptr<BaseAsset> assetHandler = getAssetHandlerByType(path, asset, currentOffset); + if (!std::filesystem::exists(assetHandler->getAssetPath())) { + std::cerr << "Error: Extracted asset file " << assetHandler->getAssetPath() << " does not exist. Run `make extractassets` first." << std::endl; + std::exit(1); + } if (shouldBuildAsset(assetHandler)) { if (gVerbose) { std::cout << "Building " << assetHandler->getAssetPath() << "..." << std::endl; } buildAsset(assetHandler); } + if (offsetCalculator != nullptr) { + // New start is the end of the previous asset. + int start = offsetCalculator->getLastEnd(); + // Get the size of the current asset and calculate the end position. + int filesize = static_cast<int>(std::filesystem::file_size(assetHandler->getBuildPath())); + // Align by four bytes. + if (filesize % 4 != 0) { + filesize += 4 - (filesize % 4); + } + offsetCalculator->setLastEnd(start + filesize); + offsetCalculator->addAsset(start, assetHandler->getSymbol()); + } break; } } diff --git a/tools/src/asset_processor/offsets.cpp b/tools/src/asset_processor/offsets.cpp index bff5b1a5..827fe7a6 100644 --- a/tools/src/asset_processor/offsets.cpp +++ b/tools/src/asset_processor/offsets.cpp @@ -1,7 +1,7 @@ #include "offsets.h" OffsetCalculator::OffsetCalculator(const std::filesystem::path& outputFile, int baseOffset_) - : output(outputFile), baseOffset(baseOffset_) { + : output(outputFile), baseOffset(baseOffset_), lastEnd(0) { } void OffsetCalculator::addAsset(int start, const std::string& symbol) { diff --git a/tools/src/asset_processor/offsets.h b/tools/src/asset_processor/offsets.h index 8a90cfea..2117e804 100644 --- a/tools/src/asset_processor/offsets.h +++ b/tools/src/asset_processor/offsets.h @@ -9,10 +9,17 @@ class OffsetCalculator { public: OffsetCalculator(const std::filesystem::path& offsetsFile, int baseOffset_); void addAsset(int start, const std::string& symbol); - + int getLastEnd() const { + return lastEnd; + } + void setLastEnd(int lastEnd_) { + this->lastEnd = lastEnd_; + } private: std::ofstream output; int baseOffset; + // Store the end of the previously added asset + int lastEnd; }; #endif
\ No newline at end of file |