378 files changed, 22 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index a6fd5e69..f70d51b8 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ LD_SCRIPT := pokediamond.lcf
 
 # Directories containing source files
 SRC_DIRS := src
-ASM_DIRS := asm
+ASM_DIRS := asm data files
 
 C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))
 S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
diff --git a/asm/FILE_3B3A00_dt_test_res_cellanm.txt.s b/asm/FILE_3B3A00_dt_test_res_cellanm.txt.s
deleted file mode 100644
index 9e0ec43a..00000000
--- a/asm/FILE_3B3A00_dt_test_res_cellanm.txt.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.include "asm/macros.inc"
-	.text
-	.incbin "asm/FILE_3B3A00_dt_test_res_cellanm.txt"
-	.balign 512, 255
diff --git a/asm/FILE_3B4000_dt_test_res_multianm.txt.s b/asm/FILE_3B4000_dt_test_res_multianm.txt.s
deleted file mode 100644
index 96b28936..00000000
--- a/asm/FILE_3B4000_dt_test_res_multianm.txt.s
+++ /dev/null
@@ -1,4 +0,0 @@
-	.include "asm/macros.inc"
-	.text
-	.incbin "asm/FILE_3B4000_dt_test_res_multianm.txt"
-	.balign 512, 255
diff --git a/asm/fat.s b/data/fat.s
index 7188a59a..7188a59a 100644
--- a/asm/fat.s
+++ b/data/fat.s
diff --git a/asm/filenametable.s b/data/filenametable.s
index c5699171..c5699171 100644
--- a/asm/filenametable.s
+++ b/data/filenametable.s
diff --git a/asm/icon.s b/data/icon.s
index 976077b0..976077b0 100644
--- a/asm/icon.s
+++ b/data/icon.s
diff --git a/asm/title.s b/data/title.s
index 56b16107..56b16107 100644
--- a/asm/title.s
+++ b/data/title.s
diff --git a/asm/FILE_102EC00_poke_shadow.narc.s b/files/FILE_102EC00_poke_shadow.narc.s
index e012cd7c..e012cd7c 100644
--- a/asm/FILE_102EC00_poke_shadow.narc.s
+++ b/files/FILE_102EC00_poke_shadow.narc.s
diff --git a/asm/FILE_102F000_poke_shadow_ofx.narc.s b/files/FILE_102F000_poke_shadow_ofx.narc.s
index d6ba4d61..d6ba4d61 100644
--- a/asm/FILE_102F000_poke_shadow_ofx.narc.s
+++ b/files/FILE_102F000_poke_shadow_ofx.narc.s
diff --git a/asm/FILE_102F400_poke_yofs.narc.s b/files/FILE_102F400_poke_yofs.narc.s
index ccd706a2..ccd706a2 100644
--- a/asm/FILE_102F400_poke_yofs.narc.s
+++ b/files/FILE_102F400_poke_yofs.narc.s
diff --git a/asm/FILE_102F800_pokegra.narc.s b/files/FILE_102F800_pokegra.narc.s
index 15f33243..15f33243 100644
--- a/asm/FILE_102F800_pokegra.narc.s
+++ b/files/FILE_102F800_pokegra.narc.s
diff --git a/asm/FILE_10C400.s b/files/FILE_10C400.s
index 5cf27f33..5cf27f33 100644
--- a/asm/FILE_10C400.s
+++ b/files/FILE_10C400.s
diff --git a/asm/FILE_10C600.s b/files/FILE_10C600.s
index d2608c8c..d2608c8c 100644
--- a/asm/FILE_10C600.s
+++ b/files/FILE_10C600.s
diff --git a/asm/FILE_10C800.s b/files/FILE_10C800.s
index 8cb22116..8cb22116 100644
--- a/asm/FILE_10C800.s
+++ b/files/FILE_10C800.s
diff --git a/asm/FILE_10CA00.s b/files/FILE_10CA00.s
index 46e1e03b..46e1e03b 100644
--- a/asm/FILE_10CA00.s
+++ b/files/FILE_10CA00.s
diff --git a/asm/FILE_10CC00.s b/files/FILE_10CC00.s
index 2876942a..2876942a 100644
--- a/asm/FILE_10CC00.s
+++ b/files/FILE_10CC00.s
diff --git a/asm/FILE_145400.s b/files/FILE_145400.s
index 31de6e12..31de6e12 100644
--- a/asm/FILE_145400.s
+++ b/files/FILE_145400.s
diff --git a/asm/FILE_16B600.s b/files/FILE_16B600.s
index 33e75c23..33e75c23 100644
--- a/asm/FILE_16B600.s
+++ b/files/FILE_16B600.s
diff --git a/asm/FILE_184400.s b/files/FILE_184400.s
index 936860c0..936860c0 100644
--- a/asm/FILE_184400.s
+++ b/files/FILE_184400.s
diff --git a/asm/FILE_187800.s b/files/FILE_187800.s
index 38b64eec..38b64eec 100644
--- a/asm/FILE_187800.s
+++ b/files/FILE_187800.s
diff --git a/asm/FILE_1A3000.s b/files/FILE_1A3000.s
index 3febcf47..3febcf47 100644
--- a/asm/FILE_1A3000.s
+++ b/files/FILE_1A3000.s
diff --git a/asm/FILE_1AD200.s b/files/FILE_1AD200.s
index 24bfcb9b..24bfcb9b 100644
--- a/asm/FILE_1AD200.s
+++ b/files/FILE_1AD200.s
diff --git a/asm/FILE_1AD400.s b/files/FILE_1AD400.s
index f66becc6..f66becc6 100644
--- a/asm/FILE_1AD400.s
+++ b/files/FILE_1AD400.s
diff --git a/asm/FILE_1B6B400_trbgra.narc.s b/files/FILE_1B6B400_trbgra.narc.s
index 318dc72d..318dc72d 100644
--- a/asm/FILE_1B6B400_trbgra.narc.s
+++ b/files/FILE_1B6B400_trbgra.narc.s
diff --git a/asm/FILE_1B78200_trfgra.narc.s b/files/FILE_1B78200_trfgra.narc.s
index a374dafe..a374dafe 100644
--- a/asm/FILE_1B78200_trfgra.narc.s
+++ b/files/FILE_1B78200_trfgra.narc.s
diff --git a/asm/FILE_1C14A00_personal.narc.s b/files/FILE_1C14A00_personal.narc.s
index 5150e22a..5150e22a 100644
--- a/asm/FILE_1C14A00_personal.narc.s
+++ b/files/FILE_1C14A00_personal.narc.s
diff --git a/asm/FILE_1C1B000_evo.narc.s b/files/FILE_1C1B000_evo.narc.s
index dc8b999e..dc8b999e 100644
--- a/asm/FILE_1C1B000_evo.narc.s
+++ b/files/FILE_1C1B000_evo.narc.s
diff --git a/asm/FILE_1C21600_growtbl.narc.s b/files/FILE_1C21600_growtbl.narc.s
index 0744862e..0744862e 100644
--- a/asm/FILE_1C21600_growtbl.narc.s
+++ b/files/FILE_1C21600_growtbl.narc.s
diff --git a/asm/FILE_1C22400_pms.narc.s b/files/FILE_1C22400_pms.narc.s
index 90c7edcb..90c7edcb 100644
--- a/asm/FILE_1C22400_pms.narc.s
+++ b/files/FILE_1C22400_pms.narc.s
diff --git a/asm/FILE_1C22800_wotbl.narc.s b/files/FILE_1C22800_wotbl.narc.s
index d6e16de0..d6e16de0 100644
--- a/asm/FILE_1C22800_wotbl.narc.s
+++ b/files/FILE_1C22800_wotbl.narc.s
diff --git a/asm/FILE_1C27200_trdata.narc.s b/files/FILE_1C27200_trdata.narc.s
index f591339c..f591339c 100644
--- a/asm/FILE_1C27200_trdata.narc.s
+++ b/files/FILE_1C27200_trdata.narc.s
diff --git a/asm/FILE_1C2D000_trpoke.narc.s b/files/FILE_1C2D000_trpoke.narc.s
index c0556d66..c0556d66 100644
--- a/asm/FILE_1C2D000_trpoke.narc.s
+++ b/files/FILE_1C2D000_trpoke.narc.s
diff --git a/asm/FILE_1C32600_trtbl.narc.s b/files/FILE_1C32600_trtbl.narc.s
index b3c8b62a..b3c8b62a 100644
--- a/asm/FILE_1C32600_trtbl.narc.s
+++ b/files/FILE_1C32600_trtbl.narc.s
diff --git a/asm/FILE_1C34C00_trtblofs.narc.s b/files/FILE_1C34C00_trtblofs.narc.s
index cbed8993..cbed8993 100644
--- a/asm/FILE_1C34C00_trtblofs.narc.s
+++ b/files/FILE_1C34C00_trtblofs.narc.s
diff --git a/asm/FILE_1C35400_b_bag_gra.narc.s b/files/FILE_1C35400_b_bag_gra.narc.s
index 0d54fd18..0d54fd18 100644
--- a/asm/FILE_1C35400_b_bag_gra.narc.s
+++ b/files/FILE_1C35400_b_bag_gra.narc.s
diff --git a/asm/FILE_1C3A400_b_plist_gra.narc.s b/files/FILE_1C3A400_b_plist_gra.narc.s
index f76d6178..f76d6178 100644
--- a/asm/FILE_1C3A400_b_plist_gra.narc.s
+++ b/files/FILE_1C3A400_b_plist_gra.narc.s
diff --git a/asm/FILE_1C4C800_batt_bg.narc.s b/files/FILE_1C4C800_batt_bg.narc.s
index 93cb0727..93cb0727 100644
--- a/asm/FILE_1C4C800_batt_bg.narc.s
+++ b/files/FILE_1C4C800_batt_bg.narc.s
diff --git a/asm/FILE_1CE8E00_batt_obj.narc.s b/files/FILE_1CE8E00_batt_obj.narc.s
index cbbae4a3..cbbae4a3 100644
--- a/asm/FILE_1CE8E00_batt_obj.narc.s
+++ b/files/FILE_1CE8E00_batt_obj.narc.s
diff --git a/asm/FILE_1D09200_vs_demo_gra.narc.s b/files/FILE_1D09200_vs_demo_gra.narc.s
index 4d16c776..4d16c776 100644
--- a/asm/FILE_1D09200_vs_demo_gra.narc.s
+++ b/files/FILE_1D09200_vs_demo_gra.narc.s
diff --git a/asm/FILE_1D0E400_we.arc.s b/files/FILE_1D0E400_we.arc.s
index 36dac6ac..36dac6ac 100644
--- a/asm/FILE_1D0E400_we.arc.s
+++ b/files/FILE_1D0E400_we.arc.s
diff --git a/asm/FILE_1D4C600_we_sub.narc.s b/files/FILE_1D4C600_we_sub.narc.s
index e006ec53..e006ec53 100644
--- a/asm/FILE_1D4C600_we_sub.narc.s
+++ b/files/FILE_1D4C600_we_sub.narc.s
diff --git a/asm/FILE_1D4F800_be_seq.narc.s b/files/FILE_1D4F800_be_seq.narc.s
index c2a34f16..c2a34f16 100644
--- a/asm/FILE_1D4F800_be_seq.narc.s
+++ b/files/FILE_1D4F800_be_seq.narc.s
diff --git a/asm/FILE_1D53A00_sub_seq.narc.s b/files/FILE_1D53A00_sub_seq.narc.s
index 6ce37eca..6ce37eca 100644
--- a/asm/FILE_1D53A00_sub_seq.narc.s
+++ b/files/FILE_1D53A00_sub_seq.narc.s
diff --git a/asm/FILE_1D60200_waza_seq.narc.s b/files/FILE_1D60200_waza_seq.narc.s
index 99f1b8e7..99f1b8e7 100644
--- a/asm/FILE_1D60200_waza_seq.narc.s
+++ b/files/FILE_1D60200_waza_seq.narc.s
diff --git a/asm/FILE_1D61C00_wecell.narc.s b/files/FILE_1D61C00_wecell.narc.s
index 1b997051..1b997051 100644
--- a/asm/FILE_1D61C00_wecell.narc.s
+++ b/files/FILE_1D61C00_wecell.narc.s
diff --git a/asm/FILE_1D63200_wecellanm.narc.s b/files/FILE_1D63200_wecellanm.narc.s
index b44297f5..b44297f5 100644
--- a/asm/FILE_1D63200_wecellanm.narc.s
+++ b/files/FILE_1D63200_wecellanm.narc.s
diff --git a/asm/FILE_1D64600_wechar.narc.s b/files/FILE_1D64600_wechar.narc.s
index 50ef5df3..50ef5df3 100644
--- a/asm/FILE_1D64600_wechar.narc.s
+++ b/files/FILE_1D64600_wechar.narc.s
diff --git a/asm/FILE_1D6C800_wepltt.narc.s b/files/FILE_1D6C800_wepltt.narc.s
index 5d2b5c12..5d2b5c12 100644
--- a/asm/FILE_1D6C800_wepltt.narc.s
+++ b/files/FILE_1D6C800_wepltt.narc.s
diff --git a/asm/FILE_1D6DA00_waza_tbl.narc.s b/files/FILE_1D6DA00_waza_tbl.narc.s
index 51cfd242..51cfd242 100644
--- a/asm/FILE_1D6DA00_waza_tbl.narc.s
+++ b/files/FILE_1D6DA00_waza_tbl.narc.s
diff --git a/asm/FILE_1D70800_scr_seq_release.narc.s b/files/FILE_1D70800_scr_seq_release.narc.s
index 3f594019..3f594019 100644
--- a/asm/FILE_1D70800_scr_seq_release.narc.s
+++ b/files/FILE_1D70800_scr_seq_release.narc.s
diff --git a/asm/FILE_1DA6200_bag_gra.narc.s b/files/FILE_1DA6200_bag_gra.narc.s
index c5684b59..c5684b59 100644
--- a/asm/FILE_1DA6200_bag_gra.narc.s
+++ b/files/FILE_1DA6200_bag_gra.narc.s
diff --git a/asm/FILE_1DC0000_box.narc.s b/files/FILE_1DC0000_box.narc.s
index a66b692f..a66b692f 100644
--- a/asm/FILE_1DC0000_box.narc.s
+++ b/files/FILE_1DC0000_box.narc.s
diff --git a/asm/FILE_1DDBC00_btower.narc.s b/files/FILE_1DDBC00_btower.narc.s
index e05c86d0..e05c86d0 100644
--- a/asm/FILE_1DDBC00_btower.narc.s
+++ b/files/FILE_1DDBC00_btower.narc.s
diff --git a/asm/FILE_1DDFE00_config_gra.narc.s b/files/FILE_1DDFE00_config_gra.narc.s
index 138a4fba..138a4fba 100644
--- a/asm/FILE_1DDFE00_config_gra.narc.s
+++ b/files/FILE_1DDFE00_config_gra.narc.s
diff --git a/asm/FILE_1DE0200_demo_trade.narc.s b/files/FILE_1DE0200_demo_trade.narc.s
index 61989d32..61989d32 100644
--- a/asm/FILE_1DE0200_demo_trade.narc.s
+++ b/files/FILE_1DE0200_demo_trade.narc.s
diff --git a/asm/FILE_1DE7E00_dendou_demo.narc.s b/files/FILE_1DE7E00_dendou_demo.narc.s
index 74ede1d0..74ede1d0 100644
--- a/asm/FILE_1DE7E00_dendou_demo.narc.s
+++ b/files/FILE_1DE7E00_dendou_demo.narc.s
diff --git a/asm/FILE_1DE8600_dendou_pc.narc.s b/files/FILE_1DE8600_dendou_pc.narc.s
index ac27a920..ac27a920 100644
--- a/asm/FILE_1DE8600_dendou_pc.narc.s
+++ b/files/FILE_1DE8600_dendou_pc.narc.s
diff --git a/asm/FILE_1DE8A00_ending.narc.s b/files/FILE_1DE8A00_ending.narc.s
index 93bda42b..93bda42b 100644
--- a/asm/FILE_1DE8A00_ending.narc.s
+++ b/files/FILE_1DE8A00_ending.narc.s
diff --git a/asm/FILE_1DFE00.s b/files/FILE_1DFE00.s
index 5e5e8a7c..5e5e8a7c 100644
--- a/asm/FILE_1DFE00.s
+++ b/files/FILE_1DFE00.s
diff --git a/asm/FILE_1E3A200_ev_pokeselect.narc.s b/files/FILE_1E3A200_ev_pokeselect.narc.s
index 01d04322..01d04322 100644
--- a/asm/FILE_1E3A200_ev_pokeselect.narc.s
+++ b/files/FILE_1E3A200_ev_pokeselect.narc.s
diff --git a/asm/FILE_1E5C800_f_note_gra.narc.s b/files/FILE_1E5C800_f_note_gra.narc.s
index a6063816..a6063816 100644
--- a/asm/FILE_1E5C800_f_note_gra.narc.s
+++ b/files/FILE_1E5C800_f_note_gra.narc.s
diff --git a/asm/FILE_1E5F200_field_board.narc.s b/files/FILE_1E5F200_field_board.narc.s
index 17656158..17656158 100644
--- a/asm/FILE_1E5F200_field_board.narc.s
+++ b/files/FILE_1E5F200_field_board.narc.s
diff --git a/asm/FILE_1E69C00_field_encounteffect.narc.s b/files/FILE_1E69C00_field_encounteffect.narc.s
index d2fb6944..d2fb6944 100644
--- a/asm/FILE_1E69C00_field_encounteffect.narc.s
+++ b/files/FILE_1E69C00_field_encounteffect.narc.s
diff --git a/asm/FILE_1E73400_fld_comact.narc.s b/files/FILE_1E73400_fld_comact.narc.s
index 28ca9342..28ca9342 100644
--- a/asm/FILE_1E73400_fld_comact.narc.s
+++ b/files/FILE_1E73400_fld_comact.narc.s
diff --git a/asm/FILE_1E73800_font.narc.s b/files/FILE_1E73800_font.narc.s
index b6ee8a51..b6ee8a51 100644
--- a/asm/FILE_1E73800_font.narc.s
+++ b/files/FILE_1E73800_font.narc.s
diff --git a/asm/FILE_1E94800_fontoam.narc.s b/files/FILE_1E94800_fontoam.narc.s
index 81994b13..81994b13 100644
--- a/asm/FILE_1E94800_fontoam.narc.s
+++ b/files/FILE_1E94800_fontoam.narc.s
diff --git a/asm/FILE_1E94E00_hiden_effect.narc.s b/files/FILE_1E94E00_hiden_effect.narc.s
index 8b4c70ef..8b4c70ef 100644
--- a/asm/FILE_1E94E00_hiden_effect.narc.s
+++ b/files/FILE_1E94E00_hiden_effect.narc.s
diff --git a/asm/FILE_1E9CE00_imageclip.narc.s b/files/FILE_1E9CE00_imageclip.narc.s
index 5a0dc6a7..5a0dc6a7 100644
--- a/asm/FILE_1E9CE00_imageclip.narc.s
+++ b/files/FILE_1E9CE00_imageclip.narc.s
diff --git a/asm/FILE_1EDB600_mail_gra.narc.s b/files/FILE_1EDB600_mail_gra.narc.s
index eda183f4..eda183f4 100644
--- a/asm/FILE_1EDB600_mail_gra.narc.s
+++ b/files/FILE_1EDB600_mail_gra.narc.s
diff --git a/asm/FILE_1EF5800_menu_gra.narc.s b/files/FILE_1EF5800_menu_gra.narc.s
index f0bf699b..f0bf699b 100644
--- a/asm/FILE_1EF5800_menu_gra.narc.s
+++ b/files/FILE_1EF5800_menu_gra.narc.s
diff --git a/asm/FILE_1EFA400_mysign.narc.s b/files/FILE_1EFA400_mysign.narc.s
index 668d7afd..668d7afd 100644
--- a/asm/FILE_1EFA400_mysign.narc.s
+++ b/files/FILE_1EFA400_mysign.narc.s
diff --git a/asm/FILE_1EFB600_mystery.narc.s b/files/FILE_1EFB600_mystery.narc.s
index 0ce1becf..0ce1becf 100644
--- a/asm/FILE_1EFB600_mystery.narc.s
+++ b/files/FILE_1EFB600_mystery.narc.s
diff --git a/asm/FILE_1F03000_ntag_gra.narc.s b/files/FILE_1F03000_ntag_gra.narc.s
index 997bdfab..997bdfab 100644
--- a/asm/FILE_1F03000_ntag_gra.narc.s
+++ b/files/FILE_1F03000_ntag_gra.narc.s
diff --git a/asm/FILE_1F30000_nutmixer.narc.s b/files/FILE_1F30000_nutmixer.narc.s
index fd30a4f1..fd30a4f1 100644
--- a/asm/FILE_1F30000_nutmixer.narc.s
+++ b/files/FILE_1F30000_nutmixer.narc.s
diff --git a/asm/FILE_1F5C400_oekaki.narc.s b/files/FILE_1F5C400_oekaki.narc.s
index 337f7c65..337f7c65 100644
--- a/asm/FILE_1F5C400_oekaki.narc.s
+++ b/files/FILE_1F5C400_oekaki.narc.s
diff --git a/asm/FILE_1F5DA00_opening.narc.s b/files/FILE_1F5DA00_opening.narc.s
index 69a31aec..69a31aec 100644
--- a/asm/FILE_1F5DA00_opening.narc.s
+++ b/files/FILE_1F5DA00_opening.narc.s
diff --git a/asm/FILE_1F64600_plist_gra.narc.s b/files/FILE_1F64600_plist_gra.narc.s
index d524b89d..d524b89d 100644
--- a/asm/FILE_1F64600_plist_gra.narc.s
+++ b/files/FILE_1F64600_plist_gra.narc.s
diff --git a/asm/FILE_1F6E400_pmsi.narc.s b/files/FILE_1F6E400_pmsi.narc.s
index 42004fcd..42004fcd 100644
--- a/asm/FILE_1F6E400_pmsi.narc.s
+++ b/files/FILE_1F6E400_pmsi.narc.s
diff --git a/asm/FILE_1F71600_poketch.narc.s b/files/FILE_1F71600_poketch.narc.s
index 48411e15..48411e15 100644
--- a/asm/FILE_1F71600_poketch.narc.s
+++ b/files/FILE_1F71600_poketch.narc.s
diff --git a/asm/FILE_1F7FC00_poru_gra.narc.s b/files/FILE_1F7FC00_poru_gra.narc.s
index 2f7c3c8f..2f7c3c8f 100644
--- a/asm/FILE_1F7FC00_poru_gra.narc.s
+++ b/files/FILE_1F7FC00_poru_gra.narc.s
diff --git a/asm/FILE_1F86600_poruact.narc.s b/files/FILE_1F86600_poruact.narc.s
index 2c88337f..2c88337f 100644
--- a/asm/FILE_1F86600_poruact.narc.s
+++ b/files/FILE_1F86600_poruact.narc.s
diff --git a/asm/FILE_1F87C00_porudemo.narc.s b/files/FILE_1F87C00_porudemo.narc.s
index 313c0470..313c0470 100644
--- a/asm/FILE_1F87C00_porudemo.narc.s
+++ b/files/FILE_1F87C00_porudemo.narc.s
diff --git a/asm/FILE_1F8A000_pst_gra.narc.s b/files/FILE_1F8A000_pst_gra.narc.s
index 3b7f7bca..3b7f7bca 100644
--- a/asm/FILE_1F8A000_pst_gra.narc.s
+++ b/files/FILE_1F8A000_pst_gra.narc.s
diff --git a/asm/FILE_1F9200.s b/files/FILE_1F9200.s
index e2e33721..e2e33721 100644
--- a/asm/FILE_1F9200.s
+++ b/files/FILE_1F9200.s
diff --git a/asm/FILE_1FA9200_ranking.narc.s b/files/FILE_1FA9200_ranking.narc.s
index 02640f00..02640f00 100644
--- a/asm/FILE_1FA9200_ranking.narc.s
+++ b/files/FILE_1FA9200_ranking.narc.s
diff --git a/asm/FILE_1FAA800_record.narc.s b/files/FILE_1FAA800_record.narc.s
index 09c5cf41..09c5cf41 100644
--- a/asm/FILE_1FAA800_record.narc.s
+++ b/files/FILE_1FAA800_record.narc.s
diff --git a/asm/FILE_1FB0200_shop_gra.narc.s b/files/FILE_1FB0200_shop_gra.narc.s
index 46474c98..46474c98 100644
--- a/asm/FILE_1FB0200_shop_gra.narc.s
+++ b/files/FILE_1FB0200_shop_gra.narc.s
diff --git a/asm/FILE_1FB2A00_tmap_gra.narc.s b/files/FILE_1FB2A00_tmap_gra.narc.s
index e07e8c7c..e07e8c7c 100644
--- a/asm/FILE_1FB2A00_tmap_gra.narc.s
+++ b/files/FILE_1FB2A00_tmap_gra.narc.s
diff --git a/asm/FILE_1FC7A00_touch_subwindow.narc.s b/files/FILE_1FC7A00_touch_subwindow.narc.s
index 51f7433e..51f7433e 100644
--- a/asm/FILE_1FC7A00_touch_subwindow.narc.s
+++ b/files/FILE_1FC7A00_touch_subwindow.narc.s
diff --git a/asm/FILE_1FC8400_trainer_case.narc.s b/files/FILE_1FC8400_trainer_case.narc.s
index 741206c4..741206c4 100644
--- a/asm/FILE_1FC8400_trainer_case.narc.s
+++ b/files/FILE_1FC8400_trainer_case.narc.s
diff --git a/asm/FILE_2000000_unionroom.narc.s b/files/FILE_2000000_unionroom.narc.s
index b27e7316..b27e7316 100644
--- a/asm/FILE_2000000_unionroom.narc.s
+++ b/files/FILE_2000000_unionroom.narc.s
diff --git a/asm/FILE_2001400_waza_oshie_gra.narc.s b/files/FILE_2001400_waza_oshie_gra.narc.s
index 371b58c5..371b58c5 100644
--- a/asm/FILE_2001400_waza_oshie_gra.narc.s
+++ b/files/FILE_2001400_waza_oshie_gra.narc.s
diff --git a/asm/FILE_2004400_winframe.narc.s b/files/FILE_2004400_winframe.narc.s
index 5d53d314..5d53d314 100644
--- a/asm/FILE_2004400_winframe.narc.s
+++ b/files/FILE_2004400_winframe.narc.s
diff --git a/asm/FILE_200CE00_worldtrade.narc.s b/files/FILE_200CE00_worldtrade.narc.s
index a5d0fe44..a5d0fe44 100644
--- a/asm/FILE_200CE00_worldtrade.narc.s
+++ b/files/FILE_200CE00_worldtrade.narc.s
diff --git a/asm/FILE_2018600_item_data.narc.s b/files/FILE_2018600_item_data.narc.s
index 7c220e34..7c220e34 100644
--- a/asm/FILE_2018600_item_data.narc.s
+++ b/files/FILE_2018600_item_data.narc.s
diff --git a/asm/FILE_201D400_item_icon.narc.s b/files/FILE_201D400_item_icon.narc.s
index f1c46fdc..f1c46fdc 100644
--- a/asm/FILE_201D400_item_icon.narc.s
+++ b/files/FILE_201D400_item_icon.narc.s
diff --git a/asm/FILE_207DE00_nuts_data.narc.s b/files/FILE_207DE00_nuts_data.narc.s
index c59699f0..c59699f0 100644
--- a/asm/FILE_207DE00_nuts_data.narc.s
+++ b/files/FILE_207DE00_nuts_data.narc.s
diff --git a/asm/FILE_207E400_poke_icon.narc.s b/files/FILE_207E400_poke_icon.narc.s
index d1d4519c..d1d4519c 100644
--- a/asm/FILE_207E400_poke_icon.narc.s
+++ b/files/FILE_207E400_poke_icon.narc.s
diff --git a/asm/FILE_210B600_pokefoot.narc.s b/files/FILE_210B600_pokefoot.narc.s
index a0265766..a0265766 100644
--- a/asm/FILE_210B600_pokefoot.narc.s
+++ b/files/FILE_210B600_pokefoot.narc.s
diff --git a/asm/FILE_2119C00_mmodel.narc.s b/files/FILE_2119C00_mmodel.narc.s
index be61a3d6..be61a3d6 100644
--- a/asm/FILE_2119C00_mmodel.narc.s
+++ b/files/FILE_2119C00_mmodel.narc.s
diff --git a/asm/FILE_2242200_fldeff.narc.s b/files/FILE_2242200_fldeff.narc.s
index 10e957fe..10e957fe 100644
--- a/asm/FILE_2242200_fldeff.narc.s
+++ b/files/FILE_2242200_fldeff.narc.s
diff --git a/asm/FILE_225E200_ball_particle.narc.s b/files/FILE_225E200_ball_particle.narc.s
index 1a188f64..1a188f64 100644
--- a/asm/FILE_225E200_ball_particle.narc.s
+++ b/files/FILE_225E200_ball_particle.narc.s
diff --git a/asm/FILE_227E00.s b/files/FILE_227E00.s
index ab307e3a..ab307e3a 100644
--- a/asm/FILE_227E00.s
+++ b/files/FILE_227E00.s
diff --git a/asm/FILE_22ACC00_waza_particle.narc.s b/files/FILE_22ACC00_waza_particle.narc.s
index 3b8ac4cc..3b8ac4cc 100644
--- a/asm/FILE_22ACC00_waza_particle.narc.s
+++ b/files/FILE_22ACC00_waza_particle.narc.s
diff --git a/asm/FILE_237400.s b/files/FILE_237400.s
index 45907862..45907862 100644
--- a/asm/FILE_237400.s
+++ b/files/FILE_237400.s
diff --git a/asm/FILE_23BC00.s b/files/FILE_23BC00.s
index 72123ecb..72123ecb 100644
--- a/asm/FILE_23BC00.s
+++ b/files/FILE_23BC00.s
diff --git a/asm/FILE_24F2600_debug_particle.narc.s b/files/FILE_24F2600_debug_particle.narc.s
index 9b2a1196..9b2a1196 100644
--- a/asm/FILE_24F2600_debug_particle.narc.s
+++ b/files/FILE_24F2600_debug_particle.narc.s
diff --git a/asm/FILE_24F3200_zone_event_release.narc.s b/files/FILE_24F3200_zone_event_release.narc.s
index 3bb1817c..3bb1817c 100644
--- a/asm/FILE_24F3200_zone_event_release.narc.s
+++ b/files/FILE_24F3200_zone_event_release.narc.s
diff --git a/asm/FILE_2515600_d_enc_data.narc.s b/files/FILE_2515600_d_enc_data.narc.s
index 97eb8bec..97eb8bec 100644
--- a/asm/FILE_2515600_d_enc_data.narc.s
+++ b/files/FILE_2515600_d_enc_data.narc.s
diff --git a/asm/FILE_2528C00_p_enc_data.narc.s b/files/FILE_2528C00_p_enc_data.narc.s
index 50d8aa26..50d8aa26 100644
--- a/asm/FILE_2528C00_p_enc_data.narc.s
+++ b/files/FILE_2528C00_p_enc_data.narc.s
diff --git a/asm/FILE_253C200_build_model.narc.s b/files/FILE_253C200_build_model.narc.s
index 62d4006c..62d4006c 100644
--- a/asm/FILE_253C200_build_model.narc.s
+++ b/files/FILE_253C200_build_model.narc.s
diff --git a/asm/FILE_264200.s b/files/FILE_264200.s
index 5e654387..5e654387 100644
--- a/asm/FILE_264200.s
+++ b/files/FILE_264200.s
diff --git a/asm/FILE_26B200.s b/files/FILE_26B200.s
index 0c91220f..0c91220f 100644
--- a/asm/FILE_26B200.s
+++ b/files/FILE_26B200.s
diff --git a/asm/FILE_2710800_build_model_matshp.dat.s b/files/FILE_2710800_build_model_matshp.dat.s
index 936e81a5..936e81a5 100644
--- a/asm/FILE_2710800_build_model_matshp.dat.s
+++ b/files/FILE_2710800_build_model_matshp.dat.s
diff --git a/asm/FILE_2712000_map_matrix.narc.s b/files/FILE_2712000_map_matrix.narc.s
index a1329c6a..a1329c6a 100644
--- a/asm/FILE_2712000_map_matrix.narc.s
+++ b/files/FILE_2712000_map_matrix.narc.s
diff --git a/asm/FILE_2715000_area_data.narc.s b/files/FILE_2715000_area_data.narc.s
index f800633f..f800633f 100644
--- a/asm/FILE_2715000_area_data.narc.s
+++ b/files/FILE_2715000_area_data.narc.s
diff --git a/asm/FILE_2715400_area_build.narc.s b/files/FILE_2715400_area_build.narc.s
index 6d17c448..6d17c448 100644
--- a/asm/FILE_2715400_area_build.narc.s
+++ b/files/FILE_2715400_area_build.narc.s
diff --git a/asm/FILE_2716800_areabm_texset.narc.s b/files/FILE_2716800_areabm_texset.narc.s
index 004d26f4..004d26f4 100644
--- a/asm/FILE_2716800_areabm_texset.narc.s
+++ b/files/FILE_2716800_areabm_texset.narc.s
diff --git a/asm/FILE_283000.s b/files/FILE_283000.s
index 6b536136..6b536136 100644
--- a/asm/FILE_283000.s
+++ b/files/FILE_283000.s
diff --git a/asm/FILE_283200.s b/files/FILE_283200.s
index 461d9ac6..461d9ac6 100644
--- a/asm/FILE_283200.s
+++ b/files/FILE_283200.s
diff --git a/asm/FILE_283BE00_map_tex_set.narc.s b/files/FILE_283BE00_map_tex_set.narc.s
index a8597e0f..a8597e0f 100644
--- a/asm/FILE_283BE00_map_tex_set.narc.s
+++ b/files/FILE_283BE00_map_tex_set.narc.s
diff --git a/asm/FILE_285600.s b/files/FILE_285600.s
index 02c6eb09..02c6eb09 100644
--- a/asm/FILE_285600.s
+++ b/files/FILE_285600.s
diff --git a/asm/FILE_285C00.s b/files/FILE_285C00.s
index 70fab4a8..70fab4a8 100644
--- a/asm/FILE_285C00.s
+++ b/files/FILE_285C00.s
diff --git a/asm/FILE_286C00.s b/files/FILE_286C00.s
index 7d4ff42d..7d4ff42d 100644
--- a/asm/FILE_286C00.s
+++ b/files/FILE_286C00.s
diff --git a/asm/FILE_288600.s b/files/FILE_288600.s
index cdb33573..cdb33573 100644
--- a/asm/FILE_288600.s
+++ b/files/FILE_288600.s
diff --git a/asm/FILE_289000.s b/files/FILE_289000.s
index 0d794c29..0d794c29 100644
--- a/asm/FILE_289000.s
+++ b/files/FILE_289000.s
diff --git a/asm/FILE_289600.s b/files/FILE_289600.s
index 813f71fe..813f71fe 100644
--- a/asm/FILE_289600.s
+++ b/files/FILE_289600.s
diff --git a/asm/FILE_289E00.s b/files/FILE_289E00.s
index 34da6195..34da6195 100644
--- a/asm/FILE_289E00.s
+++ b/files/FILE_289E00.s
diff --git a/asm/FILE_28AA00.s b/files/FILE_28AA00.s
index d8827a3a..d8827a3a 100644
--- a/asm/FILE_28AA00.s
+++ b/files/FILE_28AA00.s
diff --git a/asm/FILE_28C200.s b/files/FILE_28C200.s
index b69d6856..b69d6856 100644
--- a/asm/FILE_28C200.s
+++ b/files/FILE_28C200.s
diff --git a/asm/FILE_28CC00.s b/files/FILE_28CC00.s
index 8b411001..8b411001 100644
--- a/asm/FILE_28CC00.s
+++ b/files/FILE_28CC00.s
diff --git a/asm/FILE_28D200.s b/files/FILE_28D200.s
index fe324802..fe324802 100644
--- a/asm/FILE_28D200.s
+++ b/files/FILE_28D200.s
diff --git a/asm/FILE_28D800.s b/files/FILE_28D800.s
index f787e794..f787e794 100644
--- a/asm/FILE_28D800.s
+++ b/files/FILE_28D800.s
diff --git a/asm/FILE_28DE00.s b/files/FILE_28DE00.s
index 6658c9fc..6658c9fc 100644
--- a/asm/FILE_28DE00.s
+++ b/files/FILE_28DE00.s
diff --git a/asm/FILE_28E200.s b/files/FILE_28E200.s
index d36e77ce..d36e77ce 100644
--- a/asm/FILE_28E200.s
+++ b/files/FILE_28E200.s
diff --git a/asm/FILE_28E800.s b/files/FILE_28E800.s
index bdc1ef52..bdc1ef52 100644
--- a/asm/FILE_28E800.s
+++ b/files/FILE_28E800.s
diff --git a/asm/FILE_28F200.s b/files/FILE_28F200.s
index f8b95b6a..f8b95b6a 100644
--- a/asm/FILE_28F200.s
+++ b/files/FILE_28F200.s
diff --git a/asm/FILE_290000.s b/files/FILE_290000.s
index 7e15ff90..7e15ff90 100644
--- a/asm/FILE_290000.s
+++ b/files/FILE_290000.s
diff --git a/asm/FILE_290600.s b/files/FILE_290600.s
index fda50640..fda50640 100644
--- a/asm/FILE_290600.s
+++ b/files/FILE_290600.s
diff --git a/asm/FILE_291200.s b/files/FILE_291200.s
index ce12a90a..ce12a90a 100644
--- a/asm/FILE_291200.s
+++ b/files/FILE_291200.s
diff --git a/asm/FILE_292000.s b/files/FILE_292000.s
index d50a3ef1..d50a3ef1 100644
--- a/asm/FILE_292000.s
+++ b/files/FILE_292000.s
diff --git a/asm/FILE_292E00.s b/files/FILE_292E00.s
index b5a8d36d..b5a8d36d 100644
--- a/asm/FILE_292E00.s
+++ b/files/FILE_292E00.s
diff --git a/asm/FILE_294000.s b/files/FILE_294000.s
index 8a03373c..8a03373c 100644
--- a/asm/FILE_294000.s
+++ b/files/FILE_294000.s
diff --git a/asm/FILE_294A00.s b/files/FILE_294A00.s
index 452c8165..452c8165 100644
--- a/asm/FILE_294A00.s
+++ b/files/FILE_294A00.s
diff --git a/asm/FILE_295400.s b/files/FILE_295400.s
index b21be08b..b21be08b 100644
--- a/asm/FILE_295400.s
+++ b/files/FILE_295400.s
diff --git a/asm/FILE_295A00.s b/files/FILE_295A00.s
index 1017f6aa..1017f6aa 100644
--- a/asm/FILE_295A00.s
+++ b/files/FILE_295A00.s
diff --git a/asm/FILE_296400.s b/files/FILE_296400.s
index 118ca39a..118ca39a 100644
--- a/asm/FILE_296400.s
+++ b/files/FILE_296400.s
diff --git a/asm/FILE_296800.s b/files/FILE_296800.s
index 68ac75b9..68ac75b9 100644
--- a/asm/FILE_296800.s
+++ b/files/FILE_296800.s
diff --git a/asm/FILE_296EC00_move_model_list.narc.s b/files/FILE_296EC00_move_model_list.narc.s
index 7a997274..7a997274 100644
--- a/asm/FILE_296EC00_move_model_list.narc.s
+++ b/files/FILE_296EC00_move_model_list.narc.s
diff --git a/asm/FILE_296F200_land_data_release.narc.s b/files/FILE_296F200_land_data_release.narc.s
index 80978683..80978683 100644
--- a/asm/FILE_296F200_land_data_release.narc.s
+++ b/files/FILE_296F200_land_data_release.narc.s
diff --git a/asm/FILE_297600.s b/files/FILE_297600.s
index 1887c4af..1887c4af 100644
--- a/asm/FILE_297600.s
+++ b/files/FILE_297600.s
diff --git a/asm/FILE_298000.s b/files/FILE_298000.s
index ffdcde2a..ffdcde2a 100644
--- a/asm/FILE_298000.s
+++ b/files/FILE_298000.s
diff --git a/asm/FILE_298600.s b/files/FILE_298600.s
index d4bef86c..d4bef86c 100644
--- a/asm/FILE_298600.s
+++ b/files/FILE_298600.s
diff --git a/asm/FILE_298A00.s b/files/FILE_298A00.s
index 258432c2..258432c2 100644
--- a/asm/FILE_298A00.s
+++ b/files/FILE_298A00.s
diff --git a/asm/FILE_299A00.s b/files/FILE_299A00.s
index 71432656..71432656 100644
--- a/asm/FILE_299A00.s
+++ b/files/FILE_299A00.s
diff --git a/asm/FILE_299E00.s b/files/FILE_299E00.s
index 4fb90fe1..4fb90fe1 100644
--- a/asm/FILE_299E00.s
+++ b/files/FILE_299E00.s
diff --git a/asm/FILE_29C400.s b/files/FILE_29C400.s
index 3b880c03..3b880c03 100644
--- a/asm/FILE_29C400.s
+++ b/files/FILE_29C400.s
diff --git a/asm/FILE_29E800.s b/files/FILE_29E800.s
index f3cf72cb..f3cf72cb 100644
--- a/asm/FILE_29E800.s
+++ b/files/FILE_29E800.s
diff --git a/asm/FILE_2A1A00.s b/files/FILE_2A1A00.s
index d917b776..d917b776 100644
--- a/asm/FILE_2A1A00.s
+++ b/files/FILE_2A1A00.s
diff --git a/asm/FILE_2A6200.s b/files/FILE_2A6200.s
index ae62fcc6..ae62fcc6 100644
--- a/asm/FILE_2A6200.s
+++ b/files/FILE_2A6200.s
diff --git a/asm/FILE_2A8800.s b/files/FILE_2A8800.s
index 967d96f3..967d96f3 100644
--- a/asm/FILE_2A8800.s
+++ b/files/FILE_2A8800.s
diff --git a/asm/FILE_2A9E00.s b/files/FILE_2A9E00.s
index 21839769..21839769 100644
--- a/asm/FILE_2A9E00.s
+++ b/files/FILE_2A9E00.s
diff --git a/asm/FILE_2ACC00.s b/files/FILE_2ACC00.s
index 2068bd4c..2068bd4c 100644
--- a/asm/FILE_2ACC00.s
+++ b/files/FILE_2ACC00.s
diff --git a/asm/FILE_2ADA00.s b/files/FILE_2ADA00.s
index 9f464dac..9f464dac 100644
--- a/asm/FILE_2ADA00.s
+++ b/files/FILE_2ADA00.s
diff --git a/asm/FILE_2AEC00.s b/files/FILE_2AEC00.s
index e6a54fb3..e6a54fb3 100644
--- a/asm/FILE_2AEC00.s
+++ b/files/FILE_2AEC00.s
diff --git a/asm/FILE_2B2A00.s b/files/FILE_2B2A00.s
index 44eba0d2..44eba0d2 100644
--- a/asm/FILE_2B2A00.s
+++ b/files/FILE_2B2A00.s
diff --git a/asm/FILE_2B7600.s b/files/FILE_2B7600.s
index 8258b44e..8258b44e 100644
--- a/asm/FILE_2B7600.s
+++ b/files/FILE_2B7600.s
diff --git a/asm/FILE_2B9400.s b/files/FILE_2B9400.s
index 17ffa8d8..17ffa8d8 100644
--- a/asm/FILE_2B9400.s
+++ b/files/FILE_2B9400.s
diff --git a/asm/FILE_2BC400.s b/files/FILE_2BC400.s
index e34ef7f4..e34ef7f4 100644
--- a/asm/FILE_2BC400.s
+++ b/files/FILE_2BC400.s
diff --git a/asm/FILE_2BEC00.s b/files/FILE_2BEC00.s
index c229a70e..c229a70e 100644
--- a/asm/FILE_2BEC00.s
+++ b/files/FILE_2BEC00.s
diff --git a/asm/FILE_2C1200.s b/files/FILE_2C1200.s
index f357627d..f357627d 100644
--- a/asm/FILE_2C1200.s
+++ b/files/FILE_2C1200.s
diff --git a/asm/FILE_2C2800.s b/files/FILE_2C2800.s
index bddd6f01..bddd6f01 100644
--- a/asm/FILE_2C2800.s
+++ b/files/FILE_2C2800.s
diff --git a/asm/FILE_2C4C00.s b/files/FILE_2C4C00.s
index d41910b0..d41910b0 100644
--- a/asm/FILE_2C4C00.s
+++ b/files/FILE_2C4C00.s
diff --git a/asm/FILE_2C5C00.s b/files/FILE_2C5C00.s
index c24ed641..c24ed641 100644
--- a/asm/FILE_2C5C00.s
+++ b/files/FILE_2C5C00.s
diff --git a/asm/FILE_2C9C00.s b/files/FILE_2C9C00.s
index 72b30caa..72b30caa 100644
--- a/asm/FILE_2C9C00.s
+++ b/files/FILE_2C9C00.s
diff --git a/asm/FILE_2C9E00.s b/files/FILE_2C9E00.s
index 91cc4599..91cc4599 100644
--- a/asm/FILE_2C9E00.s
+++ b/files/FILE_2C9E00.s
diff --git a/asm/FILE_2CEA00.s b/files/FILE_2CEA00.s
index e9a4ed70..e9a4ed70 100644
--- a/asm/FILE_2CEA00.s
+++ b/files/FILE_2CEA00.s
diff --git a/asm/FILE_2CFE00.s b/files/FILE_2CFE00.s
index 513e7dea..513e7dea 100644
--- a/asm/FILE_2CFE00.s
+++ b/files/FILE_2CFE00.s
diff --git a/asm/FILE_2D5C00.s b/files/FILE_2D5C00.s
index adc46cc2..adc46cc2 100644
--- a/asm/FILE_2D5C00.s
+++ b/files/FILE_2D5C00.s
diff --git a/asm/FILE_2D7C00.s b/files/FILE_2D7C00.s
index 4fc876ea..4fc876ea 100644
--- a/asm/FILE_2D7C00.s
+++ b/files/FILE_2D7C00.s
diff --git a/asm/FILE_2D9800.s b/files/FILE_2D9800.s
index 772b6549..772b6549 100644
--- a/asm/FILE_2D9800.s
+++ b/files/FILE_2D9800.s
diff --git a/asm/FILE_2D9E00.s b/files/FILE_2D9E00.s
index 934f9168..934f9168 100644
--- a/asm/FILE_2D9E00.s
+++ b/files/FILE_2D9E00.s
diff --git a/asm/FILE_2DF200.s b/files/FILE_2DF200.s
index b5761253..b5761253 100644
--- a/asm/FILE_2DF200.s
+++ b/files/FILE_2DF200.s
diff --git a/asm/FILE_2E9A00.s b/files/FILE_2E9A00.s
index 8b6338f7..8b6338f7 100644
--- a/asm/FILE_2E9A00.s
+++ b/files/FILE_2E9A00.s
diff --git a/asm/FILE_2EF000.s b/files/FILE_2EF000.s
index b8304264..b8304264 100644
--- a/asm/FILE_2EF000.s
+++ b/files/FILE_2EF000.s
diff --git a/asm/FILE_2F1600.s b/files/FILE_2F1600.s
index 643b88fc..643b88fc 100644
--- a/asm/FILE_2F1600.s
+++ b/files/FILE_2F1600.s
diff --git a/asm/FILE_2FFA00.s b/files/FILE_2FFA00.s
index 8fb7cb9c..8fb7cb9c 100644
--- a/asm/FILE_2FFA00.s
+++ b/files/FILE_2FFA00.s
diff --git a/asm/FILE_303400.s b/files/FILE_303400.s
index a180411b..a180411b 100644
--- a/asm/FILE_303400.s
+++ b/files/FILE_303400.s
diff --git a/asm/FILE_30C600.s b/files/FILE_30C600.s
index 72531ed0..72531ed0 100644
--- a/asm/FILE_30C600.s
+++ b/files/FILE_30C600.s
diff --git a/asm/FILE_339000_UTF16.dat.s b/files/FILE_339000_UTF16.dat.s
index 16d336a2..16d336a2 100644
--- a/asm/FILE_339000_UTF16.dat.s
+++ b/files/FILE_339000_UTF16.dat.s
diff --git a/asm/FILE_339200_area00light.txt b/files/FILE_339200_area00light.txt
index 438ee9c5..438ee9c5 100644
--- a/asm/FILE_339200_area00light.txt
+++ b/files/FILE_339200_area00light.txt
diff --git a/asm/FILE_339200_area00light.txt.s b/files/FILE_339200_area00light.txt.s
index 4d6aac59..be9e67e7 100644
--- a/asm/FILE_339200_area00light.txt.s
+++ b/files/FILE_339200_area00light.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_339200_area00light.txt"
+	.incbin "files/FILE_339200_area00light.txt"
 	.balign 512, 255
diff --git a/asm/FILE_339C00_area01light.txt b/files/FILE_339C00_area01light.txt
index 8261dc97..8261dc97 100644
--- a/asm/FILE_339C00_area01light.txt
+++ b/files/FILE_339C00_area01light.txt
diff --git a/asm/FILE_339C00_area01light.txt.s b/files/FILE_339C00_area01light.txt.s
index 79c3cc16..92e89159 100644
--- a/asm/FILE_339C00_area01light.txt.s
+++ b/files/FILE_339C00_area01light.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_339C00_area01light.txt"
+	.incbin "files/FILE_339C00_area01light.txt"
 	.balign 512, 255
diff --git a/asm/FILE_33A400_area02light.txt b/files/FILE_33A400_area02light.txt
index ecf534a2..ecf534a2 100644
--- a/asm/FILE_33A400_area02light.txt
+++ b/files/FILE_33A400_area02light.txt
diff --git a/asm/FILE_33A400_area02light.txt.s b/files/FILE_33A400_area02light.txt.s
index 626eebdb..9fdcb3ff 100644
--- a/asm/FILE_33A400_area02light.txt.s
+++ b/files/FILE_33A400_area02light.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_33A400_area02light.txt"
+	.incbin "files/FILE_33A400_area02light.txt"
 	.balign 512, 255
diff --git a/asm/FILE_33AE00_battle_win.NSCR.s b/files/FILE_33AE00_battle_win.NSCR.s
index 6be90be0..6be90be0 100644
--- a/asm/FILE_33AE00_battle_win.NSCR.s
+++ b/files/FILE_33AE00_battle_win.NSCR.s
diff --git a/asm/FILE_33B800_btower_canm.resdat.s b/files/FILE_33B800_btower_canm.resdat.s
index b17d2641..b17d2641 100644
--- a/asm/FILE_33B800_btower_canm.resdat.s
+++ b/files/FILE_33B800_btower_canm.resdat.s
diff --git a/asm/FILE_33BA00_btower_celact.cldat.s b/files/FILE_33BA00_btower_celact.cldat.s
index 93b435ba..93b435ba 100644
--- a/asm/FILE_33BA00_btower_celact.cldat.s
+++ b/files/FILE_33BA00_btower_celact.cldat.s
diff --git a/asm/FILE_33BC00_btower_cell.resdat.s b/files/FILE_33BC00_btower_cell.resdat.s
index cc8b7a55..cc8b7a55 100644
--- a/asm/FILE_33BC00_btower_cell.resdat.s
+++ b/files/FILE_33BC00_btower_cell.resdat.s
diff --git a/asm/FILE_33BE00_btower_chr.resdat.s b/files/FILE_33BE00_btower_chr.resdat.s
index 0b2584b0..0b2584b0 100644
--- a/asm/FILE_33BE00_btower_chr.resdat.s
+++ b/files/FILE_33BE00_btower_chr.resdat.s
diff --git a/asm/FILE_33C000_btower_pal.resdat.s b/files/FILE_33C000_btower_pal.resdat.s
index ae600822..ae600822 100644
--- a/asm/FILE_33C000_btower_pal.resdat.s
+++ b/files/FILE_33C000_btower_pal.resdat.s
diff --git a/asm/FILE_33C200_cell0.NCGR.s b/files/FILE_33C200_cell0.NCGR.s
index 95d21501..95d21501 100644
--- a/asm/FILE_33C200_cell0.NCGR.s
+++ b/files/FILE_33C200_cell0.NCGR.s
diff --git a/asm/FILE_33E400_cell0.NCLR.s b/files/FILE_33E400_cell0.NCLR.s
index d42a0ffa..d42a0ffa 100644
--- a/asm/FILE_33E400_cell0.NCLR.s
+++ b/files/FILE_33E400_cell0.NCLR.s
diff --git a/asm/FILE_33E800_clact_default.NANR.s b/files/FILE_33E800_clact_default.NANR.s
index d29d3e96..d29d3e96 100644
--- a/asm/FILE_33E800_clact_default.NANR.s
+++ b/files/FILE_33E800_clact_default.NANR.s
diff --git a/asm/FILE_33EA00_crystal.nsbmd.s b/files/FILE_33EA00_crystal.nsbmd.s
index e97ce96a..e97ce96a 100644
--- a/asm/FILE_33EA00_crystal.nsbmd.s
+++ b/files/FILE_33EA00_crystal.nsbmd.s
diff --git a/asm/FILE_33F800_demo_climax.narc.s b/files/FILE_33F800_demo_climax.narc.s
index ad6c700f..ad6c700f 100644
--- a/asm/FILE_33F800_demo_climax.narc.s
+++ b/files/FILE_33F800_demo_climax.narc.s
diff --git a/asm/FILE_3787200_contest_bg.narc.s b/files/FILE_3787200_contest_bg.narc.s
index 5f83f539..5f83f539 100644
--- a/asm/FILE_3787200_contest_bg.narc.s
+++ b/files/FILE_3787200_contest_bg.narc.s
diff --git a/asm/FILE_379AE00_contest_obj.narc.s b/files/FILE_379AE00_contest_obj.narc.s
index 95be3d85..95be3d85 100644
--- a/asm/FILE_379AE00_contest_obj.narc.s
+++ b/files/FILE_379AE00_contest_obj.narc.s
diff --git a/asm/FILE_37A0C00_contest_data.narc.s b/files/FILE_37A0C00_contest_data.narc.s
index 3af8bc97..3af8bc97 100644
--- a/asm/FILE_37A0C00_contest_data.narc.s
+++ b/files/FILE_37A0C00_contest_data.narc.s
diff --git a/asm/FILE_37A4400_particledata.narc.s b/files/FILE_37A4400_particledata.narc.s
index 8f50ab55..8f50ab55 100644
--- a/asm/FILE_37A4400_particledata.narc.s
+++ b/files/FILE_37A4400_particledata.narc.s
diff --git a/asm/FILE_37ACA00_zukan_data.narc.s b/files/FILE_37ACA00_zukan_data.narc.s
index a69055e7..a69055e7 100644
--- a/asm/FILE_37ACA00_zukan_data.narc.s
+++ b/files/FILE_37ACA00_zukan_data.narc.s
diff --git a/asm/FILE_37B2400_wifi_earth.narc.s b/files/FILE_37B2400_wifi_earth.narc.s
index ea556db4..ea556db4 100644
--- a/asm/FILE_37B2400_wifi_earth.narc.s
+++ b/files/FILE_37B2400_wifi_earth.narc.s
diff --git a/asm/FILE_37D7800_wifi_earth_place.narc.s b/files/FILE_37D7800_wifi_earth_place.narc.s
index ebd1877b..ebd1877b 100644
--- a/asm/FILE_37D7800_wifi_earth_place.narc.s
+++ b/files/FILE_37D7800_wifi_earth_place.narc.s
diff --git a/asm/FILE_37D8600_titledemo.narc.s b/files/FILE_37D8600_titledemo.narc.s
index 7a24933e..7a24933e 100644
--- a/asm/FILE_37D8600_titledemo.narc.s
+++ b/files/FILE_37D8600_titledemo.narc.s
diff --git a/asm/FILE_3810200_cb_data.narc.s b/files/FILE_3810200_cb_data.narc.s
index f4df5385..f4df5385 100644
--- a/asm/FILE_3810200_cb_data.narc.s
+++ b/files/FILE_3810200_cb_data.narc.s
diff --git a/asm/FILE_381F000_egg_data.narc.s b/files/FILE_381F000_egg_data.narc.s
index 2c0031bf..2c0031bf 100644
--- a/asm/FILE_381F000_egg_data.narc.s
+++ b/files/FILE_381F000_egg_data.narc.s
diff --git a/asm/FILE_3821C00_egg_demo_particle.narc.s b/files/FILE_3821C00_egg_demo_particle.narc.s
index ab364d0c..ab364d0c 100644
--- a/asm/FILE_3821C00_egg_demo_particle.narc.s
+++ b/files/FILE_3821C00_egg_demo_particle.narc.s
diff --git a/asm/FILE_3824200_move_model_list.narc.s b/files/FILE_3824200_move_model_list.narc.s
index 39d788e8..39d788e8 100644
--- a/asm/FILE_3824200_move_model_list.narc.s
+++ b/files/FILE_3824200_move_model_list.narc.s
diff --git a/asm/FILE_3824600_poke_anm.narc.s b/files/FILE_3824600_poke_anm.narc.s
index 5b0a77c2..5b0a77c2 100644
--- a/asm/FILE_3824600_poke_anm.narc.s
+++ b/files/FILE_3824600_poke_anm.narc.s
diff --git a/asm/FILE_382AA00_tr_ai_seq.narc.s b/files/FILE_382AA00_tr_ai_seq.narc.s
index 06c6d3c5..06c6d3c5 100644
--- a/asm/FILE_382AA00_tr_ai_seq.narc.s
+++ b/files/FILE_382AA00_tr_ai_seq.narc.s
diff --git a/asm/FILE_3835000_bm_anime.narc.s b/files/FILE_3835000_bm_anime.narc.s
index 2f1be08b..2f1be08b 100644
--- a/asm/FILE_3835000_bm_anime.narc.s
+++ b/files/FILE_3835000_bm_anime.narc.s
diff --git a/asm/FILE_383E200_bm_anime_list.narc.s b/files/FILE_383E200_bm_anime_list.narc.s
index 618aaddf..618aaddf 100644
--- a/asm/FILE_383E200_bm_anime_list.narc.s
+++ b/files/FILE_383E200_bm_anime_list.narc.s
diff --git a/asm/FILE_3841E00_encdata_ex.narc.s b/files/FILE_3841E00_encdata_ex.narc.s
index 680d2cf9..680d2cf9 100644
--- a/asm/FILE_3841E00_encdata_ex.narc.s
+++ b/files/FILE_3841E00_encdata_ex.narc.s
diff --git a/asm/FILE_3842600_ppark.narc.s b/files/FILE_3842600_ppark.narc.s
index 6a7be749..6a7be749 100644
--- a/asm/FILE_3842600_ppark.narc.s
+++ b/files/FILE_3842600_ppark.narc.s
diff --git a/asm/FILE_3843200_ship_demo.narc.s b/files/FILE_3843200_ship_demo.narc.s
index c52c4b57..c52c4b57 100644
--- a/asm/FILE_3843200_ship_demo.narc.s
+++ b/files/FILE_3843200_ship_demo.narc.s
diff --git a/asm/FILE_385A600_tv.narc.s b/files/FILE_385A600_tv.narc.s
index ff16da27..ff16da27 100644
--- a/asm/FILE_385A600_tv.narc.s
+++ b/files/FILE_385A600_tv.narc.s
diff --git a/asm/FILE_385AA00_mapname.bin.s b/files/FILE_385AA00_mapname.bin.s
index fb54114e..fb54114e 100644
--- a/asm/FILE_385AA00_mapname.bin.s
+++ b/files/FILE_385AA00_mapname.bin.s
diff --git a/asm/FILE_385CE00_pokezukan.narc.s b/files/FILE_385CE00_pokezukan.narc.s
index a53aa43d..a53aa43d 100644
--- a/asm/FILE_385CE00_pokezukan.narc.s
+++ b/files/FILE_385CE00_pokezukan.narc.s
diff --git a/asm/FILE_385D400_shinzukan.narc.s b/files/FILE_385D400_shinzukan.narc.s
index 3bd19b92..3bd19b92 100644
--- a/asm/FILE_385D400_shinzukan.narc.s
+++ b/files/FILE_385D400_shinzukan.narc.s
diff --git a/asm/FILE_385D600_pokeanm.narc.s b/files/FILE_385D600_pokeanm.narc.s
index db2c96a8..db2c96a8 100644
--- a/asm/FILE_385D600_pokeanm.narc.s
+++ b/files/FILE_385D600_pokeanm.narc.s
diff --git a/asm/FILE_3860E00_fld_trade.narc.s b/files/FILE_3860E00_fld_trade.narc.s
index 69b9ba19..69b9ba19 100644
--- a/asm/FILE_3860E00_fld_trade.narc.s
+++ b/files/FILE_3860E00_fld_trade.narc.s
diff --git a/asm/FILE_3861000_shinka_demo_particle.narc.s b/files/FILE_3861000_shinka_demo_particle.narc.s
index b456d699..b456d699 100644
--- a/asm/FILE_3861000_shinka_demo_particle.narc.s
+++ b/files/FILE_3861000_shinka_demo_particle.narc.s
diff --git a/asm/FILE_3863600_intro.narc.s b/files/FILE_3863600_intro.narc.s
index 861679fe..861679fe 100644
--- a/asm/FILE_3863600_intro.narc.s
+++ b/files/FILE_3863600_intro.narc.s
diff --git a/asm/FILE_387EA00_intro_tv.narc.s b/files/FILE_387EA00_intro_tv.narc.s
index 56dc016f..56dc016f 100644
--- a/asm/FILE_387EA00_intro_tv.narc.s
+++ b/files/FILE_387EA00_intro_tv.narc.s
diff --git a/asm/FILE_388CA00_op_demo.narc.s b/files/FILE_388CA00_op_demo.narc.s
index f3dc60f2..f3dc60f2 100644
--- a/asm/FILE_388CA00_op_demo.narc.s
+++ b/files/FILE_388CA00_op_demo.narc.s
diff --git a/asm/FILE_3923C00_syoujyou.narc.s b/files/FILE_3923C00_syoujyou.narc.s
index 6cdf411c..6cdf411c 100644
--- a/asm/FILE_3923C00_syoujyou.narc.s
+++ b/files/FILE_3923C00_syoujyou.narc.s
diff --git a/asm/FILE_392A200_btdpm.narc.s b/files/FILE_392A200_btdpm.narc.s
index 571e1039..571e1039 100644
--- a/asm/FILE_392A200_btdpm.narc.s
+++ b/files/FILE_392A200_btdpm.narc.s
diff --git a/asm/FILE_392FC00_btdtr.narc.s b/files/FILE_392FC00_btdtr.narc.s
index f28c2549..f28c2549 100644
--- a/asm/FILE_392FC00_btdtr.narc.s
+++ b/files/FILE_392FC00_btdtr.narc.s
diff --git a/asm/FILE_3938000_zukan_enc_diamond.narc.s b/files/FILE_3938000_zukan_enc_diamond.narc.s
index 3ec06846..3ec06846 100644
--- a/asm/FILE_3938000_zukan_enc_diamond.narc.s
+++ b/files/FILE_3938000_zukan_enc_diamond.narc.s
diff --git a/asm/FILE_3949800_zukan_enc_pearl.narc.s b/files/FILE_3949800_zukan_enc_pearl.narc.s
index 6514c80e..6514c80e 100644
--- a/asm/FILE_3949800_zukan_enc_pearl.narc.s
+++ b/files/FILE_3949800_zukan_enc_pearl.narc.s
diff --git a/asm/FILE_395B000_trial.narc.s b/files/FILE_395B000_trial.narc.s
index af01b222..af01b222 100644
--- a/asm/FILE_395B000_trial.narc.s
+++ b/files/FILE_395B000_trial.narc.s
diff --git a/asm/FILE_3968C00_zukan.narc.s b/files/FILE_3968C00_zukan.narc.s
index b3013a6b..b3013a6b 100644
--- a/asm/FILE_3968C00_zukan.narc.s
+++ b/files/FILE_3968C00_zukan.narc.s
diff --git a/asm/FILE_397AA00_utility.bin.s b/files/FILE_397AA00_utility.bin.s
index 4fb3fac0..4fb3fac0 100644
--- a/asm/FILE_397AA00_utility.bin.s
+++ b/files/FILE_397AA00_utility.bin.s
diff --git a/asm/FILE_3B3000_dp_areawindow.NCGR.s b/files/FILE_3B3000_dp_areawindow.NCGR.s
index 8dea4f2d..8dea4f2d 100644
--- a/asm/FILE_3B3000_dp_areawindow.NCGR.s
+++ b/files/FILE_3B3000_dp_areawindow.NCGR.s
diff --git a/asm/FILE_3B3200_dp_areawindow.NCLR.s b/files/FILE_3B3200_dp_areawindow.NCLR.s
index fd3ed204..fd3ed204 100644
--- a/asm/FILE_3B3200_dp_areawindow.NCLR.s
+++ b/files/FILE_3B3200_dp_areawindow.NCLR.s
diff --git a/asm/FILE_3B3600_dt_test_celact.txt b/files/FILE_3B3600_dt_test_celact.txt
index 6802e0ed..6802e0ed 100644
--- a/asm/FILE_3B3600_dt_test_celact.txt
+++ b/files/FILE_3B3600_dt_test_celact.txt
diff --git a/asm/FILE_3B3600_dt_test_celact.txt.s b/files/FILE_3B3600_dt_test_celact.txt.s
index f1794b27..2d964dd0 100644
--- a/asm/FILE_3B3600_dt_test_celact.txt.s
+++ b/files/FILE_3B3600_dt_test_celact.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_3B3600_dt_test_celact.txt"
+	.incbin "files/FILE_3B3600_dt_test_celact.txt"
 	.balign 512, 255
diff --git a/asm/FILE_3B3800_dt_test_res_cell.txt b/files/FILE_3B3800_dt_test_res_cell.txt
index b23c8226..b23c8226 100644
--- a/asm/FILE_3B3800_dt_test_res_cell.txt
+++ b/files/FILE_3B3800_dt_test_res_cell.txt
diff --git a/asm/FILE_3B3800_dt_test_res_cell.txt.s b/files/FILE_3B3800_dt_test_res_cell.txt.s
index b7b6aaae..4d137245 100644
--- a/asm/FILE_3B3800_dt_test_res_cell.txt.s
+++ b/files/FILE_3B3800_dt_test_res_cell.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_3B3800_dt_test_res_cell.txt"
+	.incbin "files/FILE_3B3800_dt_test_res_cell.txt"
 	.balign 512, 255
diff --git a/asm/FILE_3B3A00_dt_test_res_cellanm.txt b/files/FILE_3B3A00_dt_test_res_cellanm.txt
index c80a0e2c..c80a0e2c 100644
--- a/asm/FILE_3B3A00_dt_test_res_cellanm.txt
+++ b/files/FILE_3B3A00_dt_test_res_cellanm.txt
diff --git a/files/FILE_3B3A00_dt_test_res_cellanm.txt.s b/files/FILE_3B3A00_dt_test_res_cellanm.txt.s
new file mode 100644
index 00000000..aa7fb06b
--- /dev/null
+++ b/files/FILE_3B3A00_dt_test_res_cellanm.txt.s
@@ -0,0 +1,4 @@
+	.include "asm/macros.inc"
+	.text
+	.incbin "files/FILE_3B3A00_dt_test_res_cellanm.txt"
+	.balign 512, 255
diff --git a/asm/FILE_3B3C00_dt_test_res_char.txt b/files/FILE_3B3C00_dt_test_res_char.txt
index 5af4589b..5af4589b 100644
--- a/asm/FILE_3B3C00_dt_test_res_char.txt
+++ b/files/FILE_3B3C00_dt_test_res_char.txt
diff --git a/asm/FILE_3B3C00_dt_test_res_char.txt.s b/files/FILE_3B3C00_dt_test_res_char.txt.s
index 04147391..c6f5b327 100644
--- a/asm/FILE_3B3C00_dt_test_res_char.txt.s
+++ b/files/FILE_3B3C00_dt_test_res_char.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_3B3C00_dt_test_res_char.txt"
+	.incbin "files/FILE_3B3C00_dt_test_res_char.txt"
 	.balign 512, 255
diff --git a/asm/FILE_3B3E00_dt_test_res_multi.txt b/files/FILE_3B3E00_dt_test_res_multi.txt
index 94493646..94493646 100644
--- a/asm/FILE_3B3E00_dt_test_res_multi.txt
+++ b/files/FILE_3B3E00_dt_test_res_multi.txt
diff --git a/asm/FILE_3B3E00_dt_test_res_multi.txt.s b/files/FILE_3B3E00_dt_test_res_multi.txt.s
index 1863c3ee..7b2f4188 100644
--- a/asm/FILE_3B3E00_dt_test_res_multi.txt.s
+++ b/files/FILE_3B3E00_dt_test_res_multi.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_3B3E00_dt_test_res_multi.txt"
+	.incbin "files/FILE_3B3E00_dt_test_res_multi.txt"
 	.balign 512, 255
diff --git a/asm/FILE_3B4000_dt_test_res_multianm.txt b/files/FILE_3B4000_dt_test_res_multianm.txt
index da4150b4..da4150b4 100644
--- a/asm/FILE_3B4000_dt_test_res_multianm.txt
+++ b/files/FILE_3B4000_dt_test_res_multianm.txt
diff --git a/files/FILE_3B4000_dt_test_res_multianm.txt.s b/files/FILE_3B4000_dt_test_res_multianm.txt.s
new file mode 100644
index 00000000..457294da
--- /dev/null
+++ b/files/FILE_3B4000_dt_test_res_multianm.txt.s
@@ -0,0 +1,4 @@
+	.include "asm/macros.inc"
+	.text
+	.incbin "files/FILE_3B4000_dt_test_res_multianm.txt"
+	.balign 512, 255
diff --git a/asm/FILE_3B4200_dt_test_res_pltt.txt b/files/FILE_3B4200_dt_test_res_pltt.txt
index f7849d4a..f7849d4a 100644
--- a/asm/FILE_3B4200_dt_test_res_pltt.txt
+++ b/files/FILE_3B4200_dt_test_res_pltt.txt
diff --git a/asm/FILE_3B4200_dt_test_res_pltt.txt.s b/files/FILE_3B4200_dt_test_res_pltt.txt.s
index 66058db7..a5561d6b 100644
--- a/asm/FILE_3B4200_dt_test_res_pltt.txt.s
+++ b/files/FILE_3B4200_dt_test_res_pltt.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_3B4200_dt_test_res_pltt.txt"
+	.incbin "files/FILE_3B4200_dt_test_res_pltt.txt"
 	.balign 512, 255
diff --git a/asm/FILE_3B4400_dun_sea.nsbtx.s b/files/FILE_3B4400_dun_sea.nsbtx.s
index 09fae4e6..09fae4e6 100644
--- a/asm/FILE_3B4400_dun_sea.nsbtx.s
+++ b/files/FILE_3B4400_dun_sea.nsbtx.s
diff --git a/asm/FILE_3B4A00_eoo.dat.s b/files/FILE_3B4A00_eoo.dat.s
index e1acd422..e1acd422 100644
--- a/asm/FILE_3B4A00_eoo.dat.s
+++ b/files/FILE_3B4A00_eoo.dat.s
diff --git a/asm/FILE_3FAA00_exdata.dat.s b/files/FILE_3FAA00_exdata.dat.s
index 915ee755..915ee755 100644
--- a/asm/FILE_3FAA00_exdata.dat.s
+++ b/files/FILE_3FAA00_exdata.dat.s
diff --git a/asm/FILE_3FAC00_field_cutin.narc.s b/files/FILE_3FAC00_field_cutin.narc.s
index cf6425ca..cf6425ca 100644
--- a/asm/FILE_3FAC00_field_cutin.narc.s
+++ b/files/FILE_3FAC00_field_cutin.narc.s
diff --git a/asm/FILE_408000_fld_anime0.bin.s b/files/FILE_408000_fld_anime0.bin.s
index 8f9342ed..8f9342ed 100644
--- a/asm/FILE_408000_fld_anime0.bin.s
+++ b/files/FILE_408000_fld_anime0.bin.s
diff --git a/asm/FILE_408200_fld_anime1.bin.s b/files/FILE_408200_fld_anime1.bin.s
index e06ce16d..e06ce16d 100644
--- a/asm/FILE_408200_fld_anime1.bin.s
+++ b/files/FILE_408200_fld_anime1.bin.s
diff --git a/asm/FILE_408400_fld_anime10.bin.s b/files/FILE_408400_fld_anime10.bin.s
index 48856ecf..48856ecf 100644
--- a/asm/FILE_408400_fld_anime10.bin.s
+++ b/files/FILE_408400_fld_anime10.bin.s
diff --git a/asm/FILE_408600_fld_anime2.bin.s b/files/FILE_408600_fld_anime2.bin.s
index 9c96be9f..9c96be9f 100644
--- a/asm/FILE_408600_fld_anime2.bin.s
+++ b/files/FILE_408600_fld_anime2.bin.s
diff --git a/asm/FILE_408800_fld_anime3.bin.s b/files/FILE_408800_fld_anime3.bin.s
index ff05c45d..ff05c45d 100644
--- a/asm/FILE_408800_fld_anime3.bin.s
+++ b/files/FILE_408800_fld_anime3.bin.s
diff --git a/asm/FILE_408A00_fld_anime4.bin.s b/files/FILE_408A00_fld_anime4.bin.s
index 8de311cb..8de311cb 100644
--- a/asm/FILE_408A00_fld_anime4.bin.s
+++ b/files/FILE_408A00_fld_anime4.bin.s
diff --git a/asm/FILE_408C00_fld_anime5.bin.s b/files/FILE_408C00_fld_anime5.bin.s
index 2b79d005..2b79d005 100644
--- a/asm/FILE_408C00_fld_anime5.bin.s
+++ b/files/FILE_408C00_fld_anime5.bin.s
diff --git a/asm/FILE_408E00_fld_anime6.bin.s b/files/FILE_408E00_fld_anime6.bin.s
index d0e21416..d0e21416 100644
--- a/asm/FILE_408E00_fld_anime6.bin.s
+++ b/files/FILE_408E00_fld_anime6.bin.s
diff --git a/asm/FILE_409000_fld_anime7.bin.s b/files/FILE_409000_fld_anime7.bin.s
index 65de7b11..65de7b11 100644
--- a/asm/FILE_409000_fld_anime7.bin.s
+++ b/files/FILE_409000_fld_anime7.bin.s
diff --git a/asm/FILE_409200_fld_anime8.bin.s b/files/FILE_409200_fld_anime8.bin.s
index 16763fc0..16763fc0 100644
--- a/asm/FILE_409200_fld_anime8.bin.s
+++ b/files/FILE_409200_fld_anime8.bin.s
diff --git a/asm/FILE_409400_fld_anime9.bin.s b/files/FILE_409400_fld_anime9.bin.s
index a9f4a232..a9f4a232 100644
--- a/asm/FILE_409400_fld_anime9.bin.s
+++ b/files/FILE_409400_fld_anime9.bin.s
diff --git a/asm/FILE_409600_fs_kanban.nsbca.s b/files/FILE_409600_fs_kanban.nsbca.s
index 6bf0fb8e..6bf0fb8e 100644
--- a/asm/FILE_409600_fs_kanban.nsbca.s
+++ b/files/FILE_409600_fs_kanban.nsbca.s
diff --git a/asm/FILE_409E00_ground0.NCGR.s b/files/FILE_409E00_ground0.NCGR.s
index 5ea93acd..5ea93acd 100644
--- a/asm/FILE_409E00_ground0.NCGR.s
+++ b/files/FILE_409E00_ground0.NCGR.s
diff --git a/asm/FILE_412000_ground0.NCLR.s b/files/FILE_412000_ground0.NCLR.s
index 3005a462..3005a462 100644
--- a/asm/FILE_412000_ground0.NCLR.s
+++ b/files/FILE_412000_ground0.NCLR.s
diff --git a/asm/FILE_412400_ground0.NSCR.s b/files/FILE_412400_ground0.NSCR.s
index 9b2c5b20..9b2c5b20 100644
--- a/asm/FILE_412400_ground0.NSCR.s
+++ b/files/FILE_412400_ground0.NSCR.s
diff --git a/asm/FILE_412E00_kemu_itpconv.dat.s b/files/FILE_412E00_kemu_itpconv.dat.s
index 3828f9a5..3828f9a5 100644
--- a/asm/FILE_412E00_kemu_itpconv.dat.s
+++ b/files/FILE_412E00_kemu_itpconv.dat.s
diff --git a/asm/FILE_413000_lake_anim.nsbtx.s b/files/FILE_413000_lake_anim.nsbtx.s
index 7950a6ee..7950a6ee 100644
--- a/asm/FILE_413000_lake_anim.nsbtx.s
+++ b/files/FILE_413000_lake_anim.nsbtx.s
diff --git a/asm/FILE_414200_miniasahamabe.nsbtx.s b/files/FILE_414200_miniasahamabe.nsbtx.s
index a38928c4..a38928c4 100644
--- a/asm/FILE_414200_miniasahamabe.nsbtx.s
+++ b/files/FILE_414200_miniasahamabe.nsbtx.s
diff --git a/asm/FILE_415400_miniasasea.nsbtx.s b/files/FILE_415400_miniasasea.nsbtx.s
index 66f478a8..66f478a8 100644
--- a/asm/FILE_415400_miniasasea.nsbtx.s
+++ b/files/FILE_415400_miniasasea.nsbtx.s
diff --git a/asm/FILE_415A00_minihamabe.nsbtx.s b/files/FILE_415A00_minihamabe.nsbtx.s
index a3ed5509..a3ed5509 100644
--- a/asm/FILE_415A00_minihamabe.nsbtx.s
+++ b/files/FILE_415A00_minihamabe.nsbtx.s
diff --git a/asm/FILE_416C00_minimum.nsbtx.s b/files/FILE_416C00_minimum.nsbtx.s
index b8c74dbf..b8c74dbf 100644
--- a/asm/FILE_416C00_minimum.nsbtx.s
+++ b/files/FILE_416C00_minimum.nsbtx.s
diff --git a/asm/FILE_417200_minirhana.nsbtx.s b/files/FILE_417200_minirhana.nsbtx.s
index fec8e2bc..fec8e2bc 100644
--- a/asm/FILE_417200_minirhana.nsbtx.s
+++ b/files/FILE_417200_minirhana.nsbtx.s
diff --git a/asm/FILE_417600_namein.narc.s b/files/FILE_417600_namein.narc.s
index a36727c1..a36727c1 100644
--- a/asm/FILE_417600_namein.narc.s
+++ b/files/FILE_417600_namein.narc.s
diff --git a/asm/FILE_41B600_nfont.NCGR.s b/files/FILE_41B600_nfont.NCGR.s
index 87741cad..87741cad 100644
--- a/asm/FILE_41B600_nfont.NCGR.s
+++ b/files/FILE_41B600_nfont.NCGR.s
diff --git a/asm/FILE_423800_nfont.NCLR.s b/files/FILE_423800_nfont.NCLR.s
index 1f668e48..1f668e48 100644
--- a/asm/FILE_423800_nfont.NCLR.s
+++ b/files/FILE_423800_nfont.NCLR.s
diff --git a/asm/FILE_423C00_pc.nsbca.s b/files/FILE_423C00_pc.nsbca.s
index a3fadec8..a3fadec8 100644
--- a/asm/FILE_423C00_pc.nsbca.s
+++ b/files/FILE_423C00_pc.nsbca.s
diff --git a/asm/FILE_423E00_plist_canm.resdat.s b/files/FILE_423E00_plist_canm.resdat.s
index 3e4631fd..3e4631fd 100644
--- a/asm/FILE_423E00_plist_canm.resdat.s
+++ b/files/FILE_423E00_plist_canm.resdat.s
diff --git a/asm/FILE_424000_plist_cell.resdat.s b/files/FILE_424000_plist_cell.resdat.s
index 8d73ee6a..8d73ee6a 100644
--- a/asm/FILE_424000_plist_cell.resdat.s
+++ b/files/FILE_424000_plist_cell.resdat.s
diff --git a/asm/FILE_424200_plist_chr.resdat.s b/files/FILE_424200_plist_chr.resdat.s
index 67cb7045..67cb7045 100644
--- a/asm/FILE_424200_plist_chr.resdat.s
+++ b/files/FILE_424200_plist_chr.resdat.s
diff --git a/asm/FILE_424400_plist_h.cldat.s b/files/FILE_424400_plist_h.cldat.s
index 2e163ba7..2e163ba7 100644
--- a/asm/FILE_424400_plist_h.cldat.s
+++ b/files/FILE_424400_plist_h.cldat.s
diff --git a/asm/FILE_424600_plist_pal.resdat.s b/files/FILE_424600_plist_pal.resdat.s
index 794b107c..794b107c 100644
--- a/asm/FILE_424600_plist_pal.resdat.s
+++ b/files/FILE_424600_plist_pal.resdat.s
diff --git a/asm/FILE_424800_porucase_canm.resdat.s b/files/FILE_424800_porucase_canm.resdat.s
index 5fb8558e..5fb8558e 100644
--- a/asm/FILE_424800_porucase_canm.resdat.s
+++ b/files/FILE_424800_porucase_canm.resdat.s
diff --git a/asm/FILE_424A00_porucase_celact.cldat.s b/files/FILE_424A00_porucase_celact.cldat.s
index cc8b6f74..cc8b6f74 100644
--- a/asm/FILE_424A00_porucase_celact.cldat.s
+++ b/files/FILE_424A00_porucase_celact.cldat.s
diff --git a/asm/FILE_424C00_porucase_cell.resdat.s b/files/FILE_424C00_porucase_cell.resdat.s
index 32c01cc9..32c01cc9 100644
--- a/asm/FILE_424C00_porucase_cell.resdat.s
+++ b/files/FILE_424C00_porucase_cell.resdat.s
diff --git a/asm/FILE_424E00_porucase_chr.resdat.s b/files/FILE_424E00_porucase_chr.resdat.s
index aa4dd60e..aa4dd60e 100644
--- a/asm/FILE_424E00_porucase_chr.resdat.s
+++ b/files/FILE_424E00_porucase_chr.resdat.s
diff --git a/asm/FILE_425000_porucase_pal.resdat.s b/files/FILE_425000_porucase_pal.resdat.s
index f573d330..f573d330 100644
--- a/asm/FILE_425000_porucase_pal.resdat.s
+++ b/files/FILE_425000_porucase_pal.resdat.s
diff --git a/asm/FILE_425200_pst_canm.resdat.s b/files/FILE_425200_pst_canm.resdat.s
index eaff3772..eaff3772 100644
--- a/asm/FILE_425200_pst_canm.resdat.s
+++ b/files/FILE_425200_pst_canm.resdat.s
diff --git a/asm/FILE_425400_pst_cell.resdat.s b/files/FILE_425400_pst_cell.resdat.s
index f554a45a..f554a45a 100644
--- a/asm/FILE_425400_pst_cell.resdat.s
+++ b/files/FILE_425400_pst_cell.resdat.s
diff --git a/asm/FILE_425600_pst_chr.resdat.s b/files/FILE_425600_pst_chr.resdat.s
index a694a18e..a694a18e 100644
--- a/asm/FILE_425600_pst_chr.resdat.s
+++ b/files/FILE_425600_pst_chr.resdat.s
diff --git a/asm/FILE_425C00_pst_h.cldat.s b/files/FILE_425C00_pst_h.cldat.s
index 5df13ddc..5df13ddc 100644
--- a/asm/FILE_425C00_pst_h.cldat.s
+++ b/files/FILE_425C00_pst_h.cldat.s
diff --git a/asm/FILE_426200_pst_pal.resdat.s b/files/FILE_426200_pst_pal.resdat.s
index 6f4092ae..6f4092ae 100644
--- a/asm/FILE_426200_pst_pal.resdat.s
+++ b/files/FILE_426200_pst_pal.resdat.s
diff --git a/asm/FILE_426400_shop_canm.resdat.s b/files/FILE_426400_shop_canm.resdat.s
index 4c87b70e..4c87b70e 100644
--- a/asm/FILE_426400_shop_canm.resdat.s
+++ b/files/FILE_426400_shop_canm.resdat.s
diff --git a/asm/FILE_426600_shop_cell.resdat.s b/files/FILE_426600_shop_cell.resdat.s
index 9468b158..9468b158 100644
--- a/asm/FILE_426600_shop_cell.resdat.s
+++ b/files/FILE_426600_shop_cell.resdat.s
diff --git a/asm/FILE_426800_shop_chr.resdat.s b/files/FILE_426800_shop_chr.resdat.s
index 1ebae636..1ebae636 100644
--- a/asm/FILE_426800_shop_chr.resdat.s
+++ b/files/FILE_426800_shop_chr.resdat.s
diff --git a/asm/FILE_426A00_shop_h.cldat.s b/files/FILE_426A00_shop_h.cldat.s
index 3b0eebef..3b0eebef 100644
--- a/asm/FILE_426A00_shop_h.cldat.s
+++ b/files/FILE_426A00_shop_h.cldat.s
diff --git a/asm/FILE_426C00_shop_pal.resdat.s b/files/FILE_426C00_shop_pal.resdat.s
index 5758e1a6..5758e1a6 100644
--- a/asm/FILE_426C00_shop_pal.resdat.s
+++ b/files/FILE_426C00_shop_pal.resdat.s
diff --git a/asm/FILE_426E00_slot.narc.s b/files/FILE_426E00_slot.narc.s
index 69df3aa0..69df3aa0 100644
--- a/asm/FILE_426E00_slot.narc.s
+++ b/files/FILE_426E00_slot.narc.s
diff --git a/asm/FILE_43C800_smptm_koori.NANR.s b/files/FILE_43C800_smptm_koori.NANR.s
index 5c8c3d3a..5c8c3d3a 100644
--- a/asm/FILE_43C800_smptm_koori.NANR.s
+++ b/files/FILE_43C800_smptm_koori.NANR.s
diff --git a/asm/FILE_43CA00_smptm_koori.NCER.s b/files/FILE_43CA00_smptm_koori.NCER.s
index 0dd93c86..0dd93c86 100644
--- a/asm/FILE_43CA00_smptm_koori.NCER.s
+++ b/files/FILE_43CA00_smptm_koori.NCER.s
diff --git a/asm/FILE_43CC00_smptm_koori.NCGR.s b/files/FILE_43CC00_smptm_koori.NCGR.s
index 7c3c39c4..7c3c39c4 100644
--- a/asm/FILE_43CC00_smptm_koori.NCGR.s
+++ b/files/FILE_43CC00_smptm_koori.NCGR.s
diff --git a/asm/FILE_43DA00_smptm_koori.NCLR.s b/files/FILE_43DA00_smptm_koori.NCLR.s
index 60fb05d7..60fb05d7 100644
--- a/asm/FILE_43DA00_smptm_koori.NCLR.s
+++ b/files/FILE_43DA00_smptm_koori.NCLR.s
diff --git a/asm/FILE_43DE00_smptm_nemuri.NANR.s b/files/FILE_43DE00_smptm_nemuri.NANR.s
index 3fd59e27..3fd59e27 100644
--- a/asm/FILE_43DE00_smptm_nemuri.NANR.s
+++ b/files/FILE_43DE00_smptm_nemuri.NANR.s
diff --git a/asm/FILE_43E000_smptm_nemuri.NCER.s b/files/FILE_43E000_smptm_nemuri.NCER.s
index 6a733bb4..6a733bb4 100644
--- a/asm/FILE_43E000_smptm_nemuri.NCER.s
+++ b/files/FILE_43E000_smptm_nemuri.NCER.s
diff --git a/asm/FILE_43E200_smptm_nemuri.NCGR.s b/files/FILE_43E200_smptm_nemuri.NCGR.s
index 642fd427..642fd427 100644
--- a/asm/FILE_43E200_smptm_nemuri.NCGR.s
+++ b/files/FILE_43E200_smptm_nemuri.NCGR.s
diff --git a/asm/FILE_43E600_smptm_nemuri.NCLR.s b/files/FILE_43E600_smptm_nemuri.NCLR.s
index 178aa359..178aa359 100644
--- a/asm/FILE_43E600_smptm_nemuri.NCLR.s
+++ b/files/FILE_43E600_smptm_nemuri.NCLR.s
diff --git a/asm/FILE_43EA00_t3_fl_b.nsbtx.s b/files/FILE_43EA00_t3_fl_b.nsbtx.s
index febba0ca..febba0ca 100644
--- a/asm/FILE_43EA00_t3_fl_b.nsbtx.s
+++ b/files/FILE_43EA00_t3_fl_b.nsbtx.s
diff --git a/asm/FILE_43EE00_t3_fl_p.nsbtx.s b/files/FILE_43EE00_t3_fl_p.nsbtx.s
index f35a9627..f35a9627 100644
--- a/asm/FILE_43EE00_t3_fl_p.nsbtx.s
+++ b/files/FILE_43EE00_t3_fl_p.nsbtx.s
diff --git a/asm/FILE_43F200_t3_fl_r.nsbtx.s b/files/FILE_43F200_t3_fl_r.nsbtx.s
index d22e3ceb..d22e3ceb 100644
--- a/asm/FILE_43F200_t3_fl_r.nsbtx.s
+++ b/files/FILE_43F200_t3_fl_r.nsbtx.s
diff --git a/asm/FILE_43F600_t3_fl_y.nsbtx.s b/files/FILE_43F600_t3_fl_y.nsbtx.s
index 35f002d5..35f002d5 100644
--- a/asm/FILE_43F600_t3_fl_y.nsbtx.s
+++ b/files/FILE_43F600_t3_fl_y.nsbtx.s
diff --git a/asm/FILE_43FA00_test.atr.s b/files/FILE_43FA00_test.atr.s
index 3bac3b89..3bac3b89 100644
--- a/asm/FILE_43FA00_test.atr.s
+++ b/files/FILE_43FA00_test.atr.s
diff --git a/asm/FILE_440200_tmap_block.dat.s b/files/FILE_440200_tmap_block.dat.s
index 98536dbc..98536dbc 100644
--- a/asm/FILE_440200_tmap_block.dat.s
+++ b/files/FILE_440200_tmap_block.dat.s
diff --git a/asm/FILE_441400_tmap_flags.dat.s b/files/FILE_441400_tmap_flags.dat.s
index 601db5ff..601db5ff 100644
--- a/asm/FILE_441400_tmap_flags.dat.s
+++ b/files/FILE_441400_tmap_flags.dat.s
diff --git a/asm/FILE_441800_tmapn_canm.resdat.s b/files/FILE_441800_tmapn_canm.resdat.s
index f5a4904e..f5a4904e 100644
--- a/asm/FILE_441800_tmapn_canm.resdat.s
+++ b/files/FILE_441800_tmapn_canm.resdat.s
diff --git a/asm/FILE_441A00_tmapn_celact.cldat.s b/files/FILE_441A00_tmapn_celact.cldat.s
index e3b25824..e3b25824 100644
--- a/asm/FILE_441A00_tmapn_celact.cldat.s
+++ b/files/FILE_441A00_tmapn_celact.cldat.s
diff --git a/asm/FILE_441C00_tmapn_celact.txt b/files/FILE_441C00_tmapn_celact.txt
index a9c7d20a..a9c7d20a 100644
--- a/asm/FILE_441C00_tmapn_celact.txt
+++ b/files/FILE_441C00_tmapn_celact.txt
diff --git a/asm/FILE_441C00_tmapn_celact.txt.s b/files/FILE_441C00_tmapn_celact.txt.s
index 965646af..311447a4 100644
--- a/asm/FILE_441C00_tmapn_celact.txt.s
+++ b/files/FILE_441C00_tmapn_celact.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_441C00_tmapn_celact.txt"
+	.incbin "files/FILE_441C00_tmapn_celact.txt"
 	.balign 512, 255
diff --git a/asm/FILE_441E00_tmapn_cell.resdat.s b/files/FILE_441E00_tmapn_cell.resdat.s
index 53cd5d48..53cd5d48 100644
--- a/asm/FILE_441E00_tmapn_cell.resdat.s
+++ b/files/FILE_441E00_tmapn_cell.resdat.s
diff --git a/asm/FILE_442000_tmapn_chr.resdat.s b/files/FILE_442000_tmapn_chr.resdat.s
index 94f2cf40..94f2cf40 100644
--- a/asm/FILE_442000_tmapn_chr.resdat.s
+++ b/files/FILE_442000_tmapn_chr.resdat.s
diff --git a/asm/FILE_442200_tmapn_pal.resdat.s b/files/FILE_442200_tmapn_pal.resdat.s
index b5e5d54f..b5e5d54f 100644
--- a/asm/FILE_442200_tmapn_pal.resdat.s
+++ b/files/FILE_442200_tmapn_pal.resdat.s
diff --git a/asm/FILE_442400_tmapn_res_canm.txt b/files/FILE_442400_tmapn_res_canm.txt
index 0f33864a..0f33864a 100644
--- a/asm/FILE_442400_tmapn_res_canm.txt
+++ b/files/FILE_442400_tmapn_res_canm.txt
diff --git a/asm/FILE_442400_tmapn_res_canm.txt.s b/files/FILE_442400_tmapn_res_canm.txt.s
index 669a8846..0f06c8c3 100644
--- a/asm/FILE_442400_tmapn_res_canm.txt.s
+++ b/files/FILE_442400_tmapn_res_canm.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_442400_tmapn_res_canm.txt"
+	.incbin "files/FILE_442400_tmapn_res_canm.txt"
 	.balign 512, 255
diff --git a/asm/FILE_442600_tmapn_res_cell.txt b/files/FILE_442600_tmapn_res_cell.txt
index 93f58403..93f58403 100644
--- a/asm/FILE_442600_tmapn_res_cell.txt
+++ b/files/FILE_442600_tmapn_res_cell.txt
diff --git a/asm/FILE_442600_tmapn_res_cell.txt.s b/files/FILE_442600_tmapn_res_cell.txt.s
index 3ddcad4b..72d4c2da 100644
--- a/asm/FILE_442600_tmapn_res_cell.txt.s
+++ b/files/FILE_442600_tmapn_res_cell.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_442600_tmapn_res_cell.txt"
+	.incbin "files/FILE_442600_tmapn_res_cell.txt"
 	.balign 512, 255
diff --git a/asm/FILE_442800_tmapn_res_chr.txt b/files/FILE_442800_tmapn_res_chr.txt
index 8489deb3..8489deb3 100644
--- a/asm/FILE_442800_tmapn_res_chr.txt
+++ b/files/FILE_442800_tmapn_res_chr.txt
diff --git a/asm/FILE_442800_tmapn_res_chr.txt.s b/files/FILE_442800_tmapn_res_chr.txt.s
index 50e4963c..c0b6ce34 100644
--- a/asm/FILE_442800_tmapn_res_chr.txt.s
+++ b/files/FILE_442800_tmapn_res_chr.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_442800_tmapn_res_chr.txt"
+	.incbin "files/FILE_442800_tmapn_res_chr.txt"
 	.balign 512, 255
diff --git a/asm/FILE_442A00_tmapn_res_pal.txt b/files/FILE_442A00_tmapn_res_pal.txt
index 531916c2..531916c2 100644
--- a/asm/FILE_442A00_tmapn_res_pal.txt
+++ b/files/FILE_442A00_tmapn_res_pal.txt
diff --git a/asm/FILE_442A00_tmapn_res_pal.txt.s b/files/FILE_442A00_tmapn_res_pal.txt.s
index 274f7101..3ca5cd83 100644
--- a/asm/FILE_442A00_tmapn_res_pal.txt.s
+++ b/files/FILE_442A00_tmapn_res_pal.txt.s
@@ -1,4 +1,4 @@
 	.include "asm/macros.inc"
 	.text
-	.incbin "asm/FILE_442A00_tmapn_res_pal.txt"
+	.incbin "files/FILE_442A00_tmapn_res_pal.txt"
 	.balign 512, 255
diff --git a/asm/FILE_442C00_tradelist.narc.s b/files/FILE_442C00_tradelist.narc.s
index 5aea85a7..5aea85a7 100644
--- a/asm/FILE_442C00_tradelist.narc.s
+++ b/files/FILE_442C00_tradelist.narc.s
diff --git a/asm/FILE_445800_trapmark.narc.s b/files/FILE_445800_trapmark.narc.s
index 7a5a9a79..7a5a9a79 100644
--- a/asm/FILE_445800_trapmark.narc.s
+++ b/files/FILE_445800_trapmark.narc.s
diff --git a/asm/FILE_445C00_ug_anim.narc.s b/files/FILE_445C00_ug_anim.narc.s
index 33146404..33146404 100644
--- a/asm/FILE_445C00_ug_anim.narc.s
+++ b/files/FILE_445C00_ug_anim.narc.s
diff --git a/asm/FILE_44BA00_ug_base_cur.nsbmd.s b/files/FILE_44BA00_ug_base_cur.nsbmd.s
index b8a7a462..b8a7a462 100644
--- a/asm/FILE_44BA00_ug_base_cur.nsbmd.s
+++ b/files/FILE_44BA00_ug_base_cur.nsbmd.s
diff --git a/asm/FILE_44C200_ug_boygirl.NCGR.s b/files/FILE_44C200_ug_boygirl.NCGR.s
index 64b547fa..64b547fa 100644
--- a/asm/FILE_44C200_ug_boygirl.NCGR.s
+++ b/files/FILE_44C200_ug_boygirl.NCGR.s
diff --git a/asm/FILE_44D600_ug_boygirl.NCLR.s b/files/FILE_44D600_ug_boygirl.NCLR.s
index 42cb0b77..42cb0b77 100644
--- a/asm/FILE_44D600_ug_boygirl.NCLR.s
+++ b/files/FILE_44D600_ug_boygirl.NCLR.s
diff --git a/asm/FILE_44DA00_ug_fossil.narc.s b/files/FILE_44DA00_ug_fossil.narc.s
index e9d8458d..e9d8458d 100644
--- a/asm/FILE_44DA00_ug_fossil.narc.s
+++ b/files/FILE_44DA00_ug_fossil.narc.s
diff --git a/asm/FILE_451A00_ug_hero.NANR.s b/files/FILE_451A00_ug_hero.NANR.s
index 18d614c3..18d614c3 100644
--- a/asm/FILE_451A00_ug_hero.NANR.s
+++ b/files/FILE_451A00_ug_hero.NANR.s
diff --git a/asm/FILE_451C00_ug_hero.NCER.s b/files/FILE_451C00_ug_hero.NCER.s
index 2e3544bb..2e3544bb 100644
--- a/asm/FILE_451C00_ug_hero.NCER.s
+++ b/files/FILE_451C00_ug_hero.NCER.s
diff --git a/asm/FILE_451E00_ug_hole.NANR.s b/files/FILE_451E00_ug_hole.NANR.s
index 6d0ffb57..6d0ffb57 100644
--- a/asm/FILE_451E00_ug_hole.NANR.s
+++ b/files/FILE_451E00_ug_hole.NANR.s
diff --git a/asm/FILE_452000_ug_hole.NCER.s b/files/FILE_452000_ug_hole.NCER.s
index 9d97706d..9d97706d 100644
--- a/asm/FILE_452000_ug_hole.NCER.s
+++ b/files/FILE_452000_ug_hole.NCER.s
diff --git a/asm/FILE_452200_ug_hole.NCGR.s b/files/FILE_452200_ug_hole.NCGR.s
index efe2a8f7..efe2a8f7 100644
--- a/asm/FILE_452200_ug_hole.NCGR.s
+++ b/files/FILE_452200_ug_hole.NCGR.s
diff --git a/asm/FILE_452800_ug_parts.narc.s b/files/FILE_452800_ug_parts.narc.s
index 3d14c906..3d14c906 100644
--- a/asm/FILE_452800_ug_parts.narc.s
+++ b/files/FILE_452800_ug_parts.narc.s
diff --git a/asm/FILE_473000_ug_radar.narc.s b/files/FILE_473000_ug_radar.narc.s
index 3d969275..3d969275 100644
--- a/asm/FILE_473000_ug_radar.narc.s
+++ b/files/FILE_473000_ug_radar.narc.s
diff --git a/asm/FILE_476A00_ug_trap.narc.s b/files/FILE_476A00_ug_trap.narc.s
index 15e92dae..15e92dae 100644
--- a/asm/FILE_476A00_ug_trap.narc.s
+++ b/files/FILE_476A00_ug_trap.narc.s
diff --git a/asm/FILE_494600_ugeffect_obj_graphic.narc.s b/files/FILE_494600_ugeffect_obj_graphic.narc.s
index 3455e819..3455e819 100644
--- a/asm/FILE_494600_ugeffect_obj_graphic.narc.s
+++ b/files/FILE_494600_ugeffect_obj_graphic.narc.s
diff --git a/asm/FILE_499400_uground_cell.resdat.s b/files/FILE_499400_uground_cell.resdat.s
index 1bcd3095..1bcd3095 100644
--- a/asm/FILE_499400_uground_cell.resdat.s
+++ b/files/FILE_499400_uground_cell.resdat.s
diff --git a/asm/FILE_499600_uground_cellanm.resdat.s b/files/FILE_499600_uground_cellanm.resdat.s
index 21fbb431..21fbb431 100644
--- a/asm/FILE_499600_uground_cellanm.resdat.s
+++ b/files/FILE_499600_uground_cellanm.resdat.s
diff --git a/asm/FILE_499800_uground_char.resdat.s b/files/FILE_499800_uground_char.resdat.s
index 122f5a92..122f5a92 100644
--- a/asm/FILE_499800_uground_char.resdat.s
+++ b/files/FILE_499800_uground_char.resdat.s
diff --git a/asm/FILE_499A00_uground_char2.resdat.s b/files/FILE_499A00_uground_char2.resdat.s
index 6cd7298d..6cd7298d 100644
--- a/asm/FILE_499A00_uground_char2.resdat.s
+++ b/files/FILE_499A00_uground_char2.resdat.s
diff --git a/asm/FILE_499C00_uground_clact.cldat.s b/files/FILE_499C00_uground_clact.cldat.s
index 79d7f960..79d7f960 100644
--- a/asm/FILE_499C00_uground_clact.cldat.s
+++ b/files/FILE_499C00_uground_clact.cldat.s
diff --git a/asm/FILE_499E00_uground_pltt.resdat.s b/files/FILE_499E00_uground_pltt.resdat.s
index d81f847a..d81f847a 100644
--- a/asm/FILE_499E00_uground_pltt.resdat.s
+++ b/files/FILE_499E00_uground_pltt.resdat.s
diff --git a/asm/FILE_49A000_uground_pltt2.resdat.s b/files/FILE_49A000_uground_pltt2.resdat.s
index 81782bd8..81782bd8 100644
--- a/asm/FILE_49A000_uground_pltt2.resdat.s
+++ b/files/FILE_49A000_uground_pltt2.resdat.s
diff --git a/asm/FILE_49A200_underg_radar.narc.s b/files/FILE_49A200_underg_radar.narc.s
index dc01a7d2..dc01a7d2 100644
--- a/asm/FILE_49A200_underg_radar.narc.s
+++ b/files/FILE_49A200_underg_radar.narc.s
diff --git a/asm/FILE_4A4600_utility.bin.s b/files/FILE_4A4600_utility.bin.s
index acbbf403..acbbf403 100644
--- a/asm/FILE_4A4600_utility.bin.s
+++ b/files/FILE_4A4600_utility.bin.s
diff --git a/asm/FILE_57FC00_weather_sys.narc.s b/files/FILE_57FC00_weather_sys.narc.s
index 56997d89..56997d89 100644
--- a/asm/FILE_57FC00_weather_sys.narc.s
+++ b/files/FILE_57FC00_weather_sys.narc.s
diff --git a/asm/FILE_58F600_wifi.ncgr.s b/files/FILE_58F600_wifi.ncgr.s
index 6ce418e9..6ce418e9 100644
--- a/asm/FILE_58F600_wifi.ncgr.s
+++ b/files/FILE_58F600_wifi.ncgr.s
diff --git a/asm/FILE_58FA00_wifinote.narc.s b/files/FILE_58FA00_wifinote.narc.s
index 9a41e6a2..9a41e6a2 100644
--- a/asm/FILE_58FA00_wifinote.narc.s
+++ b/files/FILE_58FA00_wifinote.narc.s
diff --git a/asm/FILE_593400_wifip2pmatch.narc.s b/files/FILE_593400_wifip2pmatch.narc.s
index 7947eb3d..7947eb3d 100644
--- a/asm/FILE_593400_wifip2pmatch.narc.s
+++ b/files/FILE_593400_wifip2pmatch.narc.s
diff --git a/asm/FILE_597400_wm.ncgr.s b/files/FILE_597400_wm.ncgr.s
index 2bc9abdf..2bc9abdf 100644
--- a/asm/FILE_597400_wm.ncgr.s
+++ b/files/FILE_597400_wm.ncgr.s
diff --git a/asm/FILE_597800_wm.nclr.s b/files/FILE_597800_wm.nclr.s
index 75830ff4..75830ff4 100644
--- a/asm/FILE_597800_wm.nclr.s
+++ b/files/FILE_597800_wm.nclr.s
diff --git a/asm/FILE_597C00_sound_data.sdat.s b/files/FILE_597C00_sound_data.sdat.s
index c1134756..c1134756 100644
--- a/asm/FILE_597C00_sound_data.sdat.s
+++ b/files/FILE_597C00_sound_data.sdat.s
diff --git a/asm/FILE_CBB200_msg.narc.s b/files/FILE_CBB200_msg.narc.s
index 4d89d15f..4d89d15f 100644
--- a/asm/FILE_CBB200_msg.narc.s
+++ b/files/FILE_CBB200_msg.narc.s
diff --git a/asm/FILE_F4D400_scr_msg.narc.s b/files/FILE_F4D400_scr_msg.narc.s
index 62a75c80..62a75c80 100644
--- a/asm/FILE_F4D400_scr_msg.narc.s
+++ b/files/FILE_F4D400_scr_msg.narc.s
diff --git a/asm/FILE_F4F000_height.narc.s b/files/FILE_F4F000_height.narc.s
index 8b56a3f8..8b56a3f8 100644
--- a/asm/FILE_F4F000_height.narc.s
+++ b/files/FILE_F4F000_height.narc.s
diff --git a/asm/FILE_F54C00_height_o.narc.s b/files/FILE_F54C00_height_o.narc.s
index fdbb9c7f..fdbb9c7f 100644
--- a/asm/FILE_F54C00_height_o.narc.s
+++ b/files/FILE_F54C00_height_o.narc.s
diff --git a/asm/FILE_F55400_otherpoke.narc.s b/files/FILE_F55400_otherpoke.narc.s
index 102a42bb..102a42bb 100644
--- a/asm/FILE_F55400_otherpoke.narc.s
+++ b/files/FILE_F55400_otherpoke.narc.s