diff --git a/Makefile b/Makefile
index e08d983c8c..df9ceaa04f 100644
--- a/Makefile
+++ b/Makefile
@@ -173,14 +173,12 @@ SRC_DIRS := $(shell find src -type d)
 ASM_DIRS := $(shell find asm -type d -not -path "asm/non_matchings*") $(shell find data -type d)
 
 ## Assets binaries (PNGs, JPGs, etc)
-ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*")
+ASSET_BIN_DIRS := $(shell find assets/* -type d -not -path "assets/xml*" -not -path "assets/c/*" -not -name "c")
 # Prevents building C files that will be #include'd
 ASSET_BIN_DIRS_C_FILES := $(shell find assets/* -type d -not -path "assets/xml*" -not -path "assets/code*" -not -path "assets/overlays*")
 
-ASSET_FILES_XML := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.xml))
 ASSET_FILES_BIN := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.bin))
-ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_XML:.xml=.c),$f) \
-				   $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f)
+ASSET_FILES_OUT := $(foreach f,$(ASSET_FILES_BIN:.bin=.bin.inc.c),build/$f)
 
 TEXTURE_FILES_PNG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.png))
 TEXTURE_FILES_JPG := $(foreach dir,$(ASSET_BIN_DIRS),$(wildcard $(dir)/*.jpg))
@@ -204,7 +202,7 @@ OVL_RELOC_FILES := $(shell $(CPP) $(CPPFLAGS) $(SPEC) | grep -o '[^"]*_reloc.o'
 DEP_FILES := $(O_FILES:.o=.asmproc.d) $(OVL_RELOC_FILES:.o=.d)
 
 # create build directories
-$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(ASSET_BIN_DIRS),build/$(dir)))
+$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(ASSET_BIN_DIRS) $(ASSET_BIN_DIRS_C_FILES),build/$(dir)))
 
 # directory flags
 build/src/boot/O2/%.o: OPTFLAGS := -O2
@@ -353,7 +351,7 @@ build/assets/%.o: assets/%.c
 	$(OBJCOPY_BIN)
 	$(RM_MDEBUG)
 
-build/assets/archives/%.yar.o: build/assets/archives/%.o
+build/%.yar.o: build/%.o
 	$(MAKEYAR) $< $(@:.yar.o=.yar.bin) $(@:.yar.o=.symbols.o)
 	$(OBJCOPY) -I binary -O elf32-big $(@:.yar.o=.yar.bin) $@
 
diff --git a/assets/c/.gitignore b/assets/c/.gitignore
new file mode 100644
index 0000000000..66dbd2b82e
--- /dev/null
+++ b/assets/c/.gitignore
@@ -0,0 +1,2 @@
+!*.c
+!*.h
diff --git a/assets/c/archives/map_grand_static/map_grand_static.c b/assets/c/archives/map_grand_static/map_grand_static.c
new file mode 100644
index 0000000000..582d37e682
--- /dev/null
+++ b/assets/c/archives/map_grand_static/map_grand_static.c
@@ -0,0 +1,394 @@
+#include "map_grand_static.h"
+
+u64 gMapGrandStatic100Tex[] = {
+#include "assets/archives/map_grand_static/map_100.i4.inc.c"
+};
+
+u64 gMapGrandStatic101Tex[] = {
+#include "assets/archives/map_grand_static/map_101.i4.inc.c"
+};
+
+u64 gMapGrandStatic102Tex[] = {
+#include "assets/archives/map_grand_static/map_102.i4.inc.c"
+};
+
+u64 gMapGrandStatic103Tex[] = {
+#include "assets/archives/map_grand_static/map_103.i4.inc.c"
+};
+
+u64 gMapGrandStatic104Tex[] = {
+#include "assets/archives/map_grand_static/map_104.i4.inc.c"
+};
+
+u64 gMapGrandStatic105Tex[] = {
+#include "assets/archives/map_grand_static/map_105.i4.inc.c"
+};
+
+u64 gMapGrandStatic106Tex[] = {
+#include "assets/archives/map_grand_static/map_106.i4.inc.c"
+};
+
+u64 gMapGrandStatic107Tex[] = {
+#include "assets/archives/map_grand_static/map_107.i4.inc.c"
+};
+
+u64 gMapGrandStatic108Tex[] = {
+#include "assets/archives/map_grand_static/map_108.i4.inc.c"
+};
+
+u64 gMapGrandStatic109Tex[] = {
+#include "assets/archives/map_grand_static/map_109.i4.inc.c"
+};
+
+u64 gMapGrandStatic10ATex[] = {
+#include "assets/archives/map_grand_static/map_10A.i4.inc.c"
+};
+
+u64 gMapGrandStatic10BTex[] = {
+#include "assets/archives/map_grand_static/map_10B.i4.inc.c"
+};
+
+u64 gMapGrandStatic10CTex[] = {
+#include "assets/archives/map_grand_static/map_10C.i4.inc.c"
+};
+
+u64 gMapGrandStatic10DTex[] = {
+#include "assets/archives/map_grand_static/map_10D.i4.inc.c"
+};
+
+u64 gMapGrandStatic10ETex[] = {
+#include "assets/archives/map_grand_static/map_10E.i4.inc.c"
+};
+
+u64 gMapGrandStatic10FTex[] = {
+#include "assets/archives/map_grand_static/map_10F.i4.inc.c"
+};
+
+u64 gMapGrandStatic110Tex[] = {
+#include "assets/archives/map_grand_static/map_110.i4.inc.c"
+};
+
+u64 gMapGrandStatic111Tex[] = {
+#include "assets/archives/map_grand_static/map_111.i4.inc.c"
+};
+
+u64 gMapGrandStatic112Tex[] = {
+#include "assets/archives/map_grand_static/map_112.i4.inc.c"
+};
+
+u64 gMapGrandStatic113Tex[] = {
+#include "assets/archives/map_grand_static/map_113.i4.inc.c"
+};
+
+u64 gMapGrandStatic114Tex[] = {
+#include "assets/archives/map_grand_static/map_114.i4.inc.c"
+};
+
+u64 gMapGrandStatic115Tex[] = {
+#include "assets/archives/map_grand_static/map_115.i4.inc.c"
+};
+
+u64 gMapGrandStatic116Tex[] = {
+#include "assets/archives/map_grand_static/map_116.i4.inc.c"
+};
+
+u64 gMapGrandStatic117Tex[] = {
+#include "assets/archives/map_grand_static/map_117.i4.inc.c"
+};
+
+u64 gMapGrandStatic118Tex[] = {
+#include "assets/archives/map_grand_static/map_118.i4.inc.c"
+};
+
+u64 gMapGrandStatic119Tex[] = {
+#include "assets/archives/map_grand_static/map_119.i4.inc.c"
+};
+
+u64 gMapGrandStatic11ATex[] = {
+#include "assets/archives/map_grand_static/map_11A.i4.inc.c"
+};
+
+u64 gMapGrandStatic11BTex[] = {
+#include "assets/archives/map_grand_static/map_11B.i4.inc.c"
+};
+
+u64 gMapGrandStatic11CTex[] = {
+#include "assets/archives/map_grand_static/map_11C.i4.inc.c"
+};
+
+u64 gMapGrandStatic11DTex[] = {
+#include "assets/archives/map_grand_static/map_11D.i4.inc.c"
+};
+
+u64 gMapGrandStatic11ETex[] = {
+#include "assets/archives/map_grand_static/map_11E.i4.inc.c"
+};
+
+u64 gMapGrandStatic11FTex[] = {
+#include "assets/archives/map_grand_static/map_11F.i4.inc.c"
+};
+
+u64 gMapGrandStatic120Tex[] = {
+#include "assets/archives/map_grand_static/map_120.i4.inc.c"
+};
+
+u64 gMapGrandStatic121Tex[] = {
+#include "assets/archives/map_grand_static/map_121.i4.inc.c"
+};
+
+u64 gMapGrandStatic122Tex[] = {
+#include "assets/archives/map_grand_static/map_122.i4.inc.c"
+};
+
+u64 gMapGrandStatic123Tex[] = {
+#include "assets/archives/map_grand_static/map_123.i4.inc.c"
+};
+
+u64 gMapGrandStatic124Tex[] = {
+#include "assets/archives/map_grand_static/map_124.i4.inc.c"
+};
+
+u64 gMapGrandStatic125Tex[] = {
+#include "assets/archives/map_grand_static/map_125.i4.inc.c"
+};
+
+u64 gMapGrandStatic126Tex[] = {
+#include "assets/archives/map_grand_static/map_126.i4.inc.c"
+};
+
+u64 gMapGrandStatic127Tex[] = {
+#include "assets/archives/map_grand_static/map_127.i4.inc.c"
+};
+
+u64 gMapGrandStatic128Tex[] = {
+#include "assets/archives/map_grand_static/map_128.i4.inc.c"
+};
+
+u64 gMapGrandStatic129Tex[] = {
+#include "assets/archives/map_grand_static/map_129.i4.inc.c"
+};
+
+u64 gMapGrandStatic12ATex[] = {
+#include "assets/archives/map_grand_static/map_12A.i4.inc.c"
+};
+
+u64 gMapGrandStatic12BTex[] = {
+#include "assets/archives/map_grand_static/map_12B.i4.inc.c"
+};
+
+u64 gMapGrandStatic12CTex[] = {
+#include "assets/archives/map_grand_static/map_12C.i4.inc.c"
+};
+
+u64 gMapGrandStatic12DTex[] = {
+#include "assets/archives/map_grand_static/map_12D.i4.inc.c"
+};
+
+u64 gMapGrandStatic12ETex[] = {
+#include "assets/archives/map_grand_static/map_12E.i4.inc.c"
+};
+
+u64 gMapGrandStatic12FTex[] = {
+#include "assets/archives/map_grand_static/map_12F.i4.inc.c"
+};
+
+u64 gMapGrandStatic130Tex[] = {
+#include "assets/archives/map_grand_static/map_130.i4.inc.c"
+};
+
+u64 gMapGrandStatic131Tex[] = {
+#include "assets/archives/map_grand_static/map_131.i4.inc.c"
+};
+
+u64 gMapGrandStatic132Tex[] = {
+#include "assets/archives/map_grand_static/map_132.i4.inc.c"
+};
+
+u64 gMapGrandStatic133Tex[] = {
+#include "assets/archives/map_grand_static/map_133.i4.inc.c"
+};
+
+u64 gMapGrandStatic134Tex[] = {
+#include "assets/archives/map_grand_static/map_134.i4.inc.c"
+};
+
+u64 gMapGrandStatic135Tex[] = {
+#include "assets/archives/map_grand_static/map_135.i4.inc.c"
+};
+
+u64 gMapGrandStatic136Tex[] = {
+#include "assets/archives/map_grand_static/map_136.i4.inc.c"
+};
+
+u64 gMapGrandStatic137Tex[] = {
+#include "assets/archives/map_grand_static/map_137.i4.inc.c"
+};
+
+u64 gMapGrandStatic138Tex[] = {
+#include "assets/archives/map_grand_static/map_138.i4.inc.c"
+};
+
+u64 gMapGrandStatic139Tex[] = {
+#include "assets/archives/map_grand_static/map_139.i4.inc.c"
+};
+
+u64 gMapGrandStatic13ATex[] = {
+#include "assets/archives/map_grand_static/map_13A.i4.inc.c"
+};
+
+u64 gMapGrandStatic13BTex[] = {
+#include "assets/archives/map_grand_static/map_13B.i4.inc.c"
+};
+
+u64 gMapGrandStatic13CTex[] = {
+#include "assets/archives/map_grand_static/map_13C.i4.inc.c"
+};
+
+u64 gMapGrandStatic13DTex[] = {
+#include "assets/archives/map_grand_static/map_13D.i4.inc.c"
+};
+
+u64 gMapGrandStatic13ETex[] = {
+#include "assets/archives/map_grand_static/map_13E.i4.inc.c"
+};
+
+u64 gMapGrandStatic13FTex[] = {
+#include "assets/archives/map_grand_static/map_13F.i4.inc.c"
+};
+
+u64 gMapGrandStatic140Tex[] = {
+#include "assets/archives/map_grand_static/map_140.i4.inc.c"
+};
+
+u64 gMapGrandStatic141Tex[] = {
+#include "assets/archives/map_grand_static/map_141.i4.inc.c"
+};
+
+u64 gMapGrandStatic142Tex[] = {
+#include "assets/archives/map_grand_static/map_142.i4.inc.c"
+};
+
+u64 gMapGrandStatic143Tex[] = {
+#include "assets/archives/map_grand_static/map_143.i4.inc.c"
+};
+
+u64 gMapGrandStatic144Tex[] = {
+#include "assets/archives/map_grand_static/map_144.i4.inc.c"
+};
+
+u64 gMapGrandStatic145Tex[] = {
+#include "assets/archives/map_grand_static/map_145.i4.inc.c"
+};
+
+u64 gMapGrandStatic146Tex[] = {
+#include "assets/archives/map_grand_static/map_146.i4.inc.c"
+};
+
+u64 gMapGrandStatic147Tex[] = {
+#include "assets/archives/map_grand_static/map_147.i4.inc.c"
+};
+
+u64 gMapGrandStatic148Tex[] = {
+#include "assets/archives/map_grand_static/map_148.i4.inc.c"
+};
+
+u64 gMapGrandStatic149Tex[] = {
+#include "assets/archives/map_grand_static/map_149.i4.inc.c"
+};
+
+u64 gMapGrandStatic14ATex[] = {
+#include "assets/archives/map_grand_static/map_14A.i4.inc.c"
+};
+
+u64 gMapGrandStatic14BTex[] = {
+#include "assets/archives/map_grand_static/map_14B.i4.inc.c"
+};
+
+u64 gMapGrandStatic14CTex[] = {
+#include "assets/archives/map_grand_static/map_14C.i4.inc.c"
+};
+
+u64 gMapGrandStatic14DTex[] = {
+#include "assets/archives/map_grand_static/map_14D.i4.inc.c"
+};
+
+u64 gMapGrandStatic14ETex[] = {
+#include "assets/archives/map_grand_static/map_14E.i4.inc.c"
+};
+
+u64 gMapGrandStatic14FTex[] = {
+#include "assets/archives/map_grand_static/map_14F.i4.inc.c"
+};
+
+u64 gMapGrandStatic150Tex[] = {
+#include "assets/archives/map_grand_static/map_150.i4.inc.c"
+};
+
+u64 gMapGrandStatic151Tex[] = {
+#include "assets/archives/map_grand_static/map_151.i4.inc.c"
+};
+
+u64 gMapGrandStatic152Tex[] = {
+#include "assets/archives/map_grand_static/map_152.i4.inc.c"
+};
+
+u64 gMapGrandStatic153Tex[] = {
+#include "assets/archives/map_grand_static/map_153.i4.inc.c"
+};
+
+u64 gMapGrandStatic154Tex[] = {
+#include "assets/archives/map_grand_static/map_154.i4.inc.c"
+};
+
+u64 gMapGrandStatic155Tex[] = {
+#include "assets/archives/map_grand_static/map_155.i4.inc.c"
+};
+
+u64 gMapGrandStatic156Tex[] = {
+#include "assets/archives/map_grand_static/map_156.i4.inc.c"
+};
+
+u64 gMapGrandStatic157Tex[] = {
+#include "assets/archives/map_grand_static/map_157.i4.inc.c"
+};
+
+u64 gMapGrandStatic158Tex[] = {
+#include "assets/archives/map_grand_static/map_158.i4.inc.c"
+};
+
+u64 gMapGrandStatic159Tex[] = {
+#include "assets/archives/map_grand_static/map_159.i4.inc.c"
+};
+
+u64 gMapGrandStatic15ATex[] = {
+#include "assets/archives/map_grand_static/map_15A.i4.inc.c"
+};
+
+u64 gMapGrandStatic15BTex[] = {
+#include "assets/archives/map_grand_static/map_15B.i4.inc.c"
+};
+
+u64 gMapGrandStatic15CTex[] = {
+#include "assets/archives/map_grand_static/map_15C.i4.inc.c"
+};
+
+u64 gMapGrandStatic15DTex[] = {
+#include "assets/archives/map_grand_static/map_15D.i4.inc.c"
+};
+
+u64 gMapGrandStatic15ETex[] = {
+#include "assets/archives/map_grand_static/map_15E.i4.inc.c"
+};
+
+u64 gMapGrandStatic15FTex[] = {
+#include "assets/archives/map_grand_static/map_15F.i4.inc.c"
+};
+
+u64 gMapGrandStatic160Tex[] = {
+#include "assets/archives/map_grand_static/map_160.i4.inc.c"
+};
+
+u64 gMapGrandStatic161Tex[] = {
+#include "assets/archives/map_grand_static/map_161.i4.inc.c"
+};
+
diff --git a/assets/c/archives/map_grand_static/map_grand_static.h b/assets/c/archives/map_grand_static/map_grand_static.h
new file mode 100644
index 0000000000..a940d4d422
--- /dev/null
+++ b/assets/c/archives/map_grand_static/map_grand_static.h
@@ -0,0 +1,105 @@
+#ifndef MAP_GRAND_STATIC_H
+#define MAP_GRAND_STATIC_H 1
+
+#include "ultra64.h"
+
+extern u64 gMapGrandStatic100Tex[];
+extern u64 gMapGrandStatic101Tex[];
+extern u64 gMapGrandStatic102Tex[];
+extern u64 gMapGrandStatic103Tex[];
+extern u64 gMapGrandStatic104Tex[];
+extern u64 gMapGrandStatic105Tex[];
+extern u64 gMapGrandStatic106Tex[];
+extern u64 gMapGrandStatic107Tex[];
+extern u64 gMapGrandStatic108Tex[];
+extern u64 gMapGrandStatic109Tex[];
+extern u64 gMapGrandStatic10ATex[];
+extern u64 gMapGrandStatic10BTex[];
+extern u64 gMapGrandStatic10CTex[];
+extern u64 gMapGrandStatic10DTex[];
+extern u64 gMapGrandStatic10ETex[];
+extern u64 gMapGrandStatic10FTex[];
+extern u64 gMapGrandStatic110Tex[];
+extern u64 gMapGrandStatic111Tex[];
+extern u64 gMapGrandStatic112Tex[];
+extern u64 gMapGrandStatic113Tex[];
+extern u64 gMapGrandStatic114Tex[];
+extern u64 gMapGrandStatic115Tex[];
+extern u64 gMapGrandStatic116Tex[];
+extern u64 gMapGrandStatic117Tex[];
+extern u64 gMapGrandStatic118Tex[];
+extern u64 gMapGrandStatic119Tex[];
+extern u64 gMapGrandStatic11ATex[];
+extern u64 gMapGrandStatic11BTex[];
+extern u64 gMapGrandStatic11CTex[];
+extern u64 gMapGrandStatic11DTex[];
+extern u64 gMapGrandStatic11ETex[];
+extern u64 gMapGrandStatic11FTex[];
+extern u64 gMapGrandStatic120Tex[];
+extern u64 gMapGrandStatic121Tex[];
+extern u64 gMapGrandStatic122Tex[];
+extern u64 gMapGrandStatic123Tex[];
+extern u64 gMapGrandStatic124Tex[];
+extern u64 gMapGrandStatic125Tex[];
+extern u64 gMapGrandStatic126Tex[];
+extern u64 gMapGrandStatic127Tex[];
+extern u64 gMapGrandStatic128Tex[];
+extern u64 gMapGrandStatic129Tex[];
+extern u64 gMapGrandStatic12ATex[];
+extern u64 gMapGrandStatic12BTex[];
+extern u64 gMapGrandStatic12CTex[];
+extern u64 gMapGrandStatic12DTex[];
+extern u64 gMapGrandStatic12ETex[];
+extern u64 gMapGrandStatic12FTex[];
+extern u64 gMapGrandStatic130Tex[];
+extern u64 gMapGrandStatic131Tex[];
+extern u64 gMapGrandStatic132Tex[];
+extern u64 gMapGrandStatic133Tex[];
+extern u64 gMapGrandStatic134Tex[];
+extern u64 gMapGrandStatic135Tex[];
+extern u64 gMapGrandStatic136Tex[];
+extern u64 gMapGrandStatic137Tex[];
+extern u64 gMapGrandStatic138Tex[];
+extern u64 gMapGrandStatic139Tex[];
+extern u64 gMapGrandStatic13ATex[];
+extern u64 gMapGrandStatic13BTex[];
+extern u64 gMapGrandStatic13CTex[];
+extern u64 gMapGrandStatic13DTex[];
+extern u64 gMapGrandStatic13ETex[];
+extern u64 gMapGrandStatic13FTex[];
+extern u64 gMapGrandStatic140Tex[];
+extern u64 gMapGrandStatic141Tex[];
+extern u64 gMapGrandStatic142Tex[];
+extern u64 gMapGrandStatic143Tex[];
+extern u64 gMapGrandStatic144Tex[];
+extern u64 gMapGrandStatic145Tex[];
+extern u64 gMapGrandStatic146Tex[];
+extern u64 gMapGrandStatic147Tex[];
+extern u64 gMapGrandStatic148Tex[];
+extern u64 gMapGrandStatic149Tex[];
+extern u64 gMapGrandStatic14ATex[];
+extern u64 gMapGrandStatic14BTex[];
+extern u64 gMapGrandStatic14CTex[];
+extern u64 gMapGrandStatic14DTex[];
+extern u64 gMapGrandStatic14ETex[];
+extern u64 gMapGrandStatic14FTex[];
+extern u64 gMapGrandStatic150Tex[];
+extern u64 gMapGrandStatic151Tex[];
+extern u64 gMapGrandStatic152Tex[];
+extern u64 gMapGrandStatic153Tex[];
+extern u64 gMapGrandStatic154Tex[];
+extern u64 gMapGrandStatic155Tex[];
+extern u64 gMapGrandStatic156Tex[];
+extern u64 gMapGrandStatic157Tex[];
+extern u64 gMapGrandStatic158Tex[];
+extern u64 gMapGrandStatic159Tex[];
+extern u64 gMapGrandStatic15ATex[];
+extern u64 gMapGrandStatic15BTex[];
+extern u64 gMapGrandStatic15CTex[];
+extern u64 gMapGrandStatic15DTex[];
+extern u64 gMapGrandStatic15ETex[];
+extern u64 gMapGrandStatic15FTex[];
+extern u64 gMapGrandStatic160Tex[];
+extern u64 gMapGrandStatic161Tex[];
+
+#endif
diff --git a/assets/c/archives/map_i_static/map_i_static.c b/assets/c/archives/map_i_static/map_i_static.c
new file mode 100644
index 0000000000..7b94327861
--- /dev/null
+++ b/assets/c/archives/map_i_static/map_i_static.c
@@ -0,0 +1,233 @@
+#include "map_i_static.h"
+
+u64 gMapIStatic00Tex[] = {
+#include "assets/archives/map_i_static/map_00.i4.inc.c"
+};
+
+u64 gMapIStatic01Tex[] = {
+#include "assets/archives/map_i_static/map_01.i4.inc.c"
+};
+
+u64 gMapIStatic02Tex[] = {
+#include "assets/archives/map_i_static/map_02.i4.inc.c"
+};
+
+u64 gMapIStatic03Tex[] = {
+#include "assets/archives/map_i_static/map_03.i4.inc.c"
+};
+
+u64 gMapIStatic04Tex[] = {
+#include "assets/archives/map_i_static/map_04.i4.inc.c"
+};
+
+u64 gMapIStatic05Tex[] = {
+#include "assets/archives/map_i_static/map_05.i4.inc.c"
+};
+
+u64 gMapIStatic06Tex[] = {
+#include "assets/archives/map_i_static/map_06.i4.inc.c"
+};
+
+u64 gMapIStatic07Tex[] = {
+#include "assets/archives/map_i_static/map_07.i4.inc.c"
+};
+
+u64 gMapIStatic08Tex[] = {
+#include "assets/archives/map_i_static/map_08.i4.inc.c"
+};
+
+u64 gMapIStatic09Tex[] = {
+#include "assets/archives/map_i_static/map_09.i4.inc.c"
+};
+
+u64 gMapIStatic0ATex[] = {
+#include "assets/archives/map_i_static/map_0A.i4.inc.c"
+};
+
+u64 gMapIStatic0BTex[] = {
+#include "assets/archives/map_i_static/map_0B.i4.inc.c"
+};
+
+u64 gMapIStatic0CTex[] = {
+#include "assets/archives/map_i_static/map_0C.i4.inc.c"
+};
+
+u64 gMapIStatic0DTex[] = {
+#include "assets/archives/map_i_static/map_0D.i4.inc.c"
+};
+
+u64 gMapIStatic0ETex[] = {
+#include "assets/archives/map_i_static/map_0E.i4.inc.c"
+};
+
+u64 gMapIStatic0FTex[] = {
+#include "assets/archives/map_i_static/map_0F.i4.inc.c"
+};
+
+u64 gMapIStatic10Tex[] = {
+#include "assets/archives/map_i_static/map_10.i4.inc.c"
+};
+
+u64 gMapIStatic11Tex[] = {
+#include "assets/archives/map_i_static/map_11.i4.inc.c"
+};
+
+u64 gMapIStatic12Tex[] = {
+#include "assets/archives/map_i_static/map_12.i4.inc.c"
+};
+
+u64 gMapIStatic13Tex[] = {
+#include "assets/archives/map_i_static/map_13.i4.inc.c"
+};
+
+u64 gMapIStatic14Tex[] = {
+#include "assets/archives/map_i_static/map_14.i4.inc.c"
+};
+
+u64 gMapIStatic15Tex[] = {
+#include "assets/archives/map_i_static/map_15.i4.inc.c"
+};
+
+u64 gMapIStatic16Tex[] = {
+#include "assets/archives/map_i_static/map_16.i4.inc.c"
+};
+
+u64 gMapIStatic17Tex[] = {
+#include "assets/archives/map_i_static/map_17.i4.inc.c"
+};
+
+u64 gMapIStatic18Tex[] = {
+#include "assets/archives/map_i_static/map_18.i4.inc.c"
+};
+
+u64 gMapIStatic19Tex[] = {
+#include "assets/archives/map_i_static/map_19.i4.inc.c"
+};
+
+u64 gMapIStatic1ATex[] = {
+#include "assets/archives/map_i_static/map_1A.i4.inc.c"
+};
+
+u64 gMapIStatic1BTex[] = {
+#include "assets/archives/map_i_static/map_1B.i4.inc.c"
+};
+
+u64 gMapIStatic1CTex[] = {
+#include "assets/archives/map_i_static/map_1C.i4.inc.c"
+};
+
+u64 gMapIStatic1DTex[] = {
+#include "assets/archives/map_i_static/map_1D.i4.inc.c"
+};
+
+u64 gMapIStatic1ETex[] = {
+#include "assets/archives/map_i_static/map_1E.i4.inc.c"
+};
+
+u64 gMapIStatic1FTex[] = {
+#include "assets/archives/map_i_static/map_1F.i4.inc.c"
+};
+
+u64 gMapIStatic20Tex[] = {
+#include "assets/archives/map_i_static/map_20.i4.inc.c"
+};
+
+u64 gMapIStatic21Tex[] = {
+#include "assets/archives/map_i_static/map_21.i4.inc.c"
+};
+
+u64 gMapIStatic22Tex[] = {
+#include "assets/archives/map_i_static/map_22.i4.inc.c"
+};
+
+u64 gMapIStatic23Tex[] = {
+#include "assets/archives/map_i_static/map_23.i4.inc.c"
+};
+
+u64 gMapIStatic24Tex[] = {
+#include "assets/archives/map_i_static/map_24.i4.inc.c"
+};
+
+u64 gMapIStatic25Tex[] = {
+#include "assets/archives/map_i_static/map_25.i4.inc.c"
+};
+
+u64 gMapIStatic26Tex[] = {
+#include "assets/archives/map_i_static/map_26.i4.inc.c"
+};
+
+u64 gMapIStatic27Tex[] = {
+#include "assets/archives/map_i_static/map_27.i4.inc.c"
+};
+
+u64 gMapIStatic28Tex[] = {
+#include "assets/archives/map_i_static/map_28.i4.inc.c"
+};
+
+u64 gMapIStatic29Tex[] = {
+#include "assets/archives/map_i_static/map_29.i4.inc.c"
+};
+
+u64 gMapIStatic2ATex[] = {
+#include "assets/archives/map_i_static/map_2A.i4.inc.c"
+};
+
+u64 gMapIStatic2BTex[] = {
+#include "assets/archives/map_i_static/map_2B.i4.inc.c"
+};
+
+u64 gMapIStatic2CTex[] = {
+#include "assets/archives/map_i_static/map_2C.i4.inc.c"
+};
+
+u64 gMapIStatic2DTex[] = {
+#include "assets/archives/map_i_static/map_2D.i4.inc.c"
+};
+
+u64 gMapIStatic2ETex[] = {
+#include "assets/archives/map_i_static/map_2E.i4.inc.c"
+};
+
+u64 gMapIStatic2FTex[] = {
+#include "assets/archives/map_i_static/map_2F.i4.inc.c"
+};
+
+u64 gMapIStatic30Tex[] = {
+#include "assets/archives/map_i_static/map_30.i4.inc.c"
+};
+
+u64 gMapIStatic31Tex[] = {
+#include "assets/archives/map_i_static/map_31.i4.inc.c"
+};
+
+u64 gMapIStatic32Tex[] = {
+#include "assets/archives/map_i_static/map_32.i4.inc.c"
+};
+
+u64 gMapIStatic33Tex[] = {
+#include "assets/archives/map_i_static/map_33.i4.inc.c"
+};
+
+u64 gMapIStatic34Tex[] = {
+#include "assets/archives/map_i_static/map_34.i4.inc.c"
+};
+
+u64 gMapIStatic35Tex[] = {
+#include "assets/archives/map_i_static/map_35.i4.inc.c"
+};
+
+u64 gMapIStatic36Tex[] = {
+#include "assets/archives/map_i_static/map_36.i4.inc.c"
+};
+
+u64 gMapIStatic37Tex[] = {
+#include "assets/archives/map_i_static/map_37.i4.inc.c"
+};
+
+u64 gMapIStatic38Tex[] = {
+#include "assets/archives/map_i_static/map_38.i4.inc.c"
+};
+
+u64 gMapIStatic39Tex[] = {
+#include "assets/archives/map_i_static/map_39.i4.inc.c"
+};
diff --git a/assets/c/archives/map_i_static/map_i_static.h b/assets/c/archives/map_i_static/map_i_static.h
new file mode 100644
index 0000000000..c614bb6f84
--- /dev/null
+++ b/assets/c/archives/map_i_static/map_i_static.h
@@ -0,0 +1,65 @@
+#ifndef MAP_I_STATIC_H
+#define MAP_I_STATIC_H 1
+
+#include "ultra64.h"
+
+extern u64 gMapIStatic00Tex[];
+extern u64 gMapIStatic01Tex[];
+extern u64 gMapIStatic02Tex[];
+extern u64 gMapIStatic03Tex[];
+extern u64 gMapIStatic04Tex[];
+extern u64 gMapIStatic05Tex[];
+extern u64 gMapIStatic06Tex[];
+extern u64 gMapIStatic07Tex[];
+extern u64 gMapIStatic08Tex[];
+extern u64 gMapIStatic09Tex[];
+extern u64 gMapIStatic0ATex[];
+extern u64 gMapIStatic0BTex[];
+extern u64 gMapIStatic0CTex[];
+extern u64 gMapIStatic0DTex[];
+extern u64 gMapIStatic0ETex[];
+extern u64 gMapIStatic0FTex[];
+extern u64 gMapIStatic10Tex[];
+extern u64 gMapIStatic11Tex[];
+extern u64 gMapIStatic12Tex[];
+extern u64 gMapIStatic13Tex[];
+extern u64 gMapIStatic14Tex[];
+extern u64 gMapIStatic15Tex[];
+extern u64 gMapIStatic16Tex[];
+extern u64 gMapIStatic17Tex[];
+extern u64 gMapIStatic18Tex[];
+extern u64 gMapIStatic19Tex[];
+extern u64 gMapIStatic1ATex[];
+extern u64 gMapIStatic1BTex[];
+extern u64 gMapIStatic1CTex[];
+extern u64 gMapIStatic1DTex[];
+extern u64 gMapIStatic1ETex[];
+extern u64 gMapIStatic1FTex[];
+extern u64 gMapIStatic20Tex[];
+extern u64 gMapIStatic21Tex[];
+extern u64 gMapIStatic22Tex[];
+extern u64 gMapIStatic23Tex[];
+extern u64 gMapIStatic24Tex[];
+extern u64 gMapIStatic25Tex[];
+extern u64 gMapIStatic26Tex[];
+extern u64 gMapIStatic27Tex[];
+extern u64 gMapIStatic28Tex[];
+extern u64 gMapIStatic29Tex[];
+extern u64 gMapIStatic2ATex[];
+extern u64 gMapIStatic2BTex[];
+extern u64 gMapIStatic2CTex[];
+extern u64 gMapIStatic2DTex[];
+extern u64 gMapIStatic2ETex[];
+extern u64 gMapIStatic2FTex[];
+extern u64 gMapIStatic30Tex[];
+extern u64 gMapIStatic31Tex[];
+extern u64 gMapIStatic32Tex[];
+extern u64 gMapIStatic33Tex[];
+extern u64 gMapIStatic34Tex[];
+extern u64 gMapIStatic35Tex[];
+extern u64 gMapIStatic36Tex[];
+extern u64 gMapIStatic37Tex[];
+extern u64 gMapIStatic38Tex[];
+extern u64 gMapIStatic39Tex[];
+
+#endif
diff --git a/assets/xml/archives/map_grand_static.xml b/assets/xml/archives/map_grand_static.xml
index d5d80bdd6d..05e5893c1f 100644
--- a/assets/xml/archives/map_grand_static.xml
+++ b/assets/xml/archives/map_grand_static.xml
@@ -1,102 +1,102 @@
 <Root>
     <File Name="map_grand_static.unarchive">
-        <Blob Name="map_grand_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_grand_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_grand_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_grand_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_grand_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_grand_static_Blob_004FB0" Size="0x0B40" Offset="0x4FB0" />
-        <Blob Name="map_grand_static_Blob_005AF0" Size="0x0FF0" Offset="0x5AF0" />
-        <Blob Name="map_grand_static_Blob_006AE0" Size="0x0FF0" Offset="0x6AE0" />
-        <Blob Name="map_grand_static_Blob_007AD0" Size="0x0FF0" Offset="0x7AD0" />
-        <Blob Name="map_grand_static_Blob_008AC0" Size="0x0FF0" Offset="0x8AC0" />
-        <Blob Name="map_grand_static_Blob_009AB0" Size="0x0420" Offset="0x9AB0" />
-        <Blob Name="map_grand_static_Blob_009ED0" Size="0x0FF0" Offset="0x9ED0" />
-        <Blob Name="map_grand_static_Blob_00AEC0" Size="0x0450" Offset="0xAEC0" />
-        <Blob Name="map_grand_static_Blob_00B310" Size="0x07A0" Offset="0xB310" />
-        <Blob Name="map_grand_static_Blob_00BAB0" Size="0x0FF0" Offset="0xBAB0" />
-        <Blob Name="map_grand_static_Blob_00CAA0" Size="0x0FF0" Offset="0xCAA0" />
-        <Blob Name="map_grand_static_Blob_00DA90" Size="0x0FF0" Offset="0xDA90" />
-        <Blob Name="map_grand_static_Blob_00EA80" Size="0x0780" Offset="0xEA80" />
-        <Blob Name="map_grand_static_Blob_00F200" Size="0x0800" Offset="0xF200" />
-        <Blob Name="map_grand_static_Blob_00FA00" Size="0x0850" Offset="0xFA00" />
-        <Blob Name="map_grand_static_Blob_010250" Size="0x0510" Offset="0x10250" />
-        <Blob Name="map_grand_static_Blob_010760" Size="0x0710" Offset="0x10760" />
-        <Blob Name="map_grand_static_Blob_010E70" Size="0x0AE0" Offset="0x10E70" />
-        <Blob Name="map_grand_static_Blob_011950" Size="0x0660" Offset="0x11950" />
-        <Blob Name="map_grand_static_Blob_011FB0" Size="0x0C60" Offset="0x11FB0" />
-        <Blob Name="map_grand_static_Blob_012C10" Size="0x0E10" Offset="0x12C10" />
-        <Blob Name="map_grand_static_Blob_013A20" Size="0x03E0" Offset="0x13A20" />
-        <Blob Name="map_grand_static_Blob_013E00" Size="0x05A0" Offset="0x13E00" />
-        <Blob Name="map_grand_static_Blob_0143A0" Size="0x0820" Offset="0x143A0" />
-        <Blob Name="map_grand_static_Blob_014BC0" Size="0x0440" Offset="0x14BC0" />
-        <Blob Name="map_grand_static_Blob_015000" Size="0x0590" Offset="0x15000" />
-        <Blob Name="map_grand_static_Blob_015590" Size="0x05A0" Offset="0x15590" />
-        <Blob Name="map_grand_static_Blob_015B30" Size="0x07A0" Offset="0x15B30" />
-        <Blob Name="map_grand_static_Blob_0162D0" Size="0x07A0" Offset="0x162D0" />
-        <Blob Name="map_grand_static_Blob_016A70" Size="0x0DF0" Offset="0x16A70" />
-        <Blob Name="map_grand_static_Blob_017860" Size="0x0850" Offset="0x17860" />
-        <Blob Name="map_grand_static_Blob_0180B0" Size="0x09C0" Offset="0x180B0" />
-        <Blob Name="map_grand_static_Blob_018A70" Size="0x0880" Offset="0x18A70" />
-        <Blob Name="map_grand_static_Blob_0192F0" Size="0x0660" Offset="0x192F0" />
-        <Blob Name="map_grand_static_Blob_019950" Size="0x0360" Offset="0x19950" />
-        <Blob Name="map_grand_static_Blob_019CB0" Size="0x0260" Offset="0x19CB0" />
-        <Blob Name="map_grand_static_Blob_019F10" Size="0x0960" Offset="0x19F10" />
-        <Blob Name="map_grand_static_Blob_01A870" Size="0x0350" Offset="0x1A870" />
-        <Blob Name="map_grand_static_Blob_01ABC0" Size="0x09B0" Offset="0x1ABC0" />
-        <Blob Name="map_grand_static_Blob_01B570" Size="0x0980" Offset="0x1B570" />
-        <Blob Name="map_grand_static_Blob_01BEF0" Size="0x0FF0" Offset="0x1BEF0" />
-        <Blob Name="map_grand_static_Blob_01CEE0" Size="0x0B20" Offset="0x1CEE0" />
-        <Blob Name="map_grand_static_Blob_01DA00" Size="0x0DA0" Offset="0x1DA00" />
-        <Blob Name="map_grand_static_Blob_01E7A0" Size="0x0820" Offset="0x1E7A0" />
-        <Blob Name="map_grand_static_Blob_01EFC0" Size="0x03E0" Offset="0x1EFC0" />
-        <Blob Name="map_grand_static_Blob_01F3A0" Size="0x0980" Offset="0x1F3A0" />
-        <Blob Name="map_grand_static_Blob_01FD20" Size="0x0960" Offset="0x1FD20" />
-        <Blob Name="map_grand_static_Blob_020680" Size="0x0760" Offset="0x20680" />
-        <Blob Name="map_grand_static_Blob_020DE0" Size="0x0960" Offset="0x20DE0" />
-        <Blob Name="map_grand_static_Blob_021740" Size="0x01D0" Offset="0x21740" />
-        <Blob Name="map_grand_static_Blob_021910" Size="0x0630" Offset="0x21910" />
-        <Blob Name="map_grand_static_Blob_021F40" Size="0x0680" Offset="0x21F40" />
-        <Blob Name="map_grand_static_Blob_0225C0" Size="0x07D0" Offset="0x225C0" />
-        <Blob Name="map_grand_static_Blob_022D90" Size="0x0870" Offset="0x22D90" />
-        <Blob Name="map_grand_static_Blob_023600" Size="0x0E60" Offset="0x23600" />
-        <Blob Name="map_grand_static_Blob_024460" Size="0x0710" Offset="0x24460" />
-        <Blob Name="map_grand_static_Blob_024B70" Size="0x0620" Offset="0x24B70" />
-        <Blob Name="map_grand_static_Blob_025190" Size="0x0620" Offset="0x25190" />
-        <Blob Name="map_grand_static_Blob_0257B0" Size="0x0680" Offset="0x257B0" />
-        <Blob Name="map_grand_static_Blob_025E30" Size="0x0620" Offset="0x25E30" />
-        <Blob Name="map_grand_static_Blob_026450" Size="0x0210" Offset="0x26450" />
-        <Blob Name="map_grand_static_Blob_026660" Size="0x04B0" Offset="0x26660" />
-        <Blob Name="map_grand_static_Blob_026B10" Size="0x0680" Offset="0x26B10" />
-        <Blob Name="map_grand_static_Blob_027190" Size="0x0350" Offset="0x27190" />
-        <Blob Name="map_grand_static_Blob_0274E0" Size="0x0660" Offset="0x274E0" />
-        <Blob Name="map_grand_static_Blob_027B40" Size="0x0350" Offset="0x27B40" />
-        <Blob Name="map_grand_static_Blob_027E90" Size="0x0500" Offset="0x27E90" />
-        <Blob Name="map_grand_static_Blob_028390" Size="0x06A0" Offset="0x28390" />
-        <Blob Name="map_grand_static_Blob_028A30" Size="0x05E0" Offset="0x28A30" />
-        <Blob Name="map_grand_static_Blob_029010" Size="0x0680" Offset="0x29010" />
-        <Blob Name="map_grand_static_Blob_029690" Size="0x0480" Offset="0x29690" />
-        <Blob Name="map_grand_static_Blob_029B10" Size="0x0AE0" Offset="0x29B10" />
-        <Blob Name="map_grand_static_Blob_02A5F0" Size="0x02D0" Offset="0x2A5F0" />
-        <Blob Name="map_grand_static_Blob_02A8C0" Size="0x0B90" Offset="0x2A8C0" />
-        <Blob Name="map_grand_static_Blob_02B450" Size="0x0DA0" Offset="0x2B450" />
-        <Blob Name="map_grand_static_Blob_02C1F0" Size="0x08C0" Offset="0x2C1F0" />
-        <Blob Name="map_grand_static_Blob_02CAB0" Size="0x0A30" Offset="0x2CAB0" />
-        <Blob Name="map_grand_static_Blob_02D4E0" Size="0x0130" Offset="0x2D4E0" />
-        <Blob Name="map_grand_static_Blob_02D610" Size="0x0C30" Offset="0x2D610" />
-        <Blob Name="map_grand_static_Blob_02E240" Size="0x08A0" Offset="0x2E240" />
-        <Blob Name="map_grand_static_Blob_02EAE0" Size="0x0F50" Offset="0x2EAE0" />
-        <Blob Name="map_grand_static_Blob_02FA30" Size="0x09B0" Offset="0x2FA30" />
-        <Blob Name="map_grand_static_Blob_0303E0" Size="0x07B0" Offset="0x303E0" />
-        <Blob Name="map_grand_static_Blob_030B90" Size="0x0960" Offset="0x30B90" />
-        <Blob Name="map_grand_static_Blob_0314F0" Size="0x0740" Offset="0x314F0" />
-        <Blob Name="map_grand_static_Blob_031C30" Size="0x0A00" Offset="0x31C30" />
-        <Blob Name="map_grand_static_Blob_032630" Size="0x0640" Offset="0x32630" />
-        <Blob Name="map_grand_static_Blob_032C70" Size="0x0A30" Offset="0x32C70" />
-        <Blob Name="map_grand_static_Blob_0336A0" Size="0x03D0" Offset="0x336A0" />
-        <Blob Name="map_grand_static_Blob_033A70" Size="0x0D00" Offset="0x33A70" />
-        <Blob Name="map_grand_static_Blob_034770" Size="0x0440" Offset="0x34770" />
-        <Blob Name="map_grand_static_Blob_034BB0" Size="0x03A0" Offset="0x34BB0" />
-        <Blob Name="map_grand_static_Blob_034F50" Size="0x0960" Offset="0x34F50" />
+        <Texture Name="gMapGrandStatic100Tex" OutName="map_100" Format="i4" Width="96" Height="85" Offset="0x0" />
+        <Texture Name="gMapGrandStatic101Tex" OutName="map_101" Format="i4" Width="96" Height="85" Offset="0xFF0" />
+        <Texture Name="gMapGrandStatic102Tex" OutName="map_102" Format="i4" Width="96" Height="85" Offset="0x1FE0" />
+        <Texture Name="gMapGrandStatic103Tex" OutName="map_103" Format="i4" Width="96" Height="85" Offset="0x2FD0" />
+        <Texture Name="gMapGrandStatic104Tex" OutName="map_104" Format="i4" Width="96" Height="85" Offset="0x3FC0" />
+        <Texture Name="gMapGrandStatic105Tex" OutName="map_105" Format="i4" Width="80" Height="72" Offset="0x4FB0" />
+        <Texture Name="gMapGrandStatic106Tex" OutName="map_106" Format="i4" Width="96" Height="85" Offset="0x5AF0" />
+        <Texture Name="gMapGrandStatic107Tex" OutName="map_107" Format="i4" Width="96" Height="85" Offset="0x6AE0" />
+        <Texture Name="gMapGrandStatic108Tex" OutName="map_108" Format="i4" Width="96" Height="85" Offset="0x7AD0" />
+        <Texture Name="gMapGrandStatic109Tex" OutName="map_109" Format="i4" Width="96" Height="85" Offset="0x8AC0" />
+        <Texture Name="gMapGrandStatic10ATex" OutName="map_10A" Format="i4" Width="48" Height="44" Offset="0x9AB0" />
+        <Texture Name="gMapGrandStatic10BTex" OutName="map_10B" Format="i4" Width="96" Height="85" Offset="0x9ED0" />
+        <Texture Name="gMapGrandStatic10CTex" OutName="map_10C" Format="i4" Width="48" Height="46" Offset="0xAEC0" />
+        <Texture Name="gMapGrandStatic10DTex" OutName="map_10D" Format="i4" Width="64" Height="61" Offset="0xB310" />
+        <Texture Name="gMapGrandStatic10ETex" OutName="map_10E" Format="i4" Width="96" Height="85" Offset="0xBAB0" />
+        <Texture Name="gMapGrandStatic10FTex" OutName="map_10F" Format="i4" Width="96" Height="85" Offset="0xCAA0" />
+        <Texture Name="gMapGrandStatic110Tex" OutName="map_110" Format="i4" Width="96" Height="85" Offset="0xDA90" />
+        <Texture Name="gMapGrandStatic111Tex" OutName="map_111" Format="i4" Width="48" Height="80" Offset="0xEA80" />
+        <Texture Name="gMapGrandStatic112Tex" OutName="map_112" Format="i4" Width="32" Height="128" Offset="0xF200" />
+        <Texture Name="gMapGrandStatic113Tex" OutName="map_113" Format="i4" Width="80" Height="53" Offset="0xFA00" />
+        <Texture Name="gMapGrandStatic114Tex" OutName="map_114" Format="i4" Width="32" Height="81" Offset="0x10250" />
+        <Texture Name="gMapGrandStatic115Tex" OutName="map_115" Format="i4" Width="80" Height="45" Offset="0x10760" />
+        <Texture Name="gMapGrandStatic116Tex" OutName="map_116" Format="i4" Width="64" Height="87" Offset="0x10E70" />
+        <Texture Name="gMapGrandStatic117Tex" OutName="map_117" Format="i4" Width="64" Height="51" Offset="0x11950" />
+        <Texture Name="gMapGrandStatic118Tex" OutName="map_118" Format="i4" Width="80" Height="79" Offset="0x11FB0" />
+        <Texture Name="gMapGrandStatic119Tex" OutName="map_119" Format="i4" Width="96" Height="75" Offset="0x12C10" />
+        <Texture Name="gMapGrandStatic11ATex" OutName="map_11A" Format="i4" Width="48" Height="41" Offset="0x13A20" />
+        <Texture Name="gMapGrandStatic11BTex" OutName="map_11B" Format="i4" Width="64" Height="45" Offset="0x13E00" />
+        <Texture Name="gMapGrandStatic11CTex" OutName="map_11C" Format="i4" Width="80" Height="52" Offset="0x143A0" />
+        <Texture Name="gMapGrandStatic11DTex" OutName="map_11D" Format="i4" Width="48" Height="45" Offset="0x14BC0" />
+        <Texture Name="gMapGrandStatic11ETex" OutName="map_11E" Format="i4" Width="48" Height="59" Offset="0x15000" />
+        <Texture Name="gMapGrandStatic11FTex" OutName="map_11F" Format="i4" Width="48" Height="60" Offset="0x15590" />
+        <Texture Name="gMapGrandStatic120Tex" OutName="map_120" Format="i4" Width="48" Height="81" Offset="0x15B30" />
+        <Texture Name="gMapGrandStatic121Tex" OutName="map_121" Format="i4" Width="48" Height="81" Offset="0x162D0" />
+        <Texture Name="gMapGrandStatic122Tex" OutName="map_122" Format="i4" Width="80" Height="89" Offset="0x16A70" />
+        <Texture Name="gMapGrandStatic123Tex" OutName="map_123" Format="i4" Width="80" Height="53" Offset="0x17860" />
+        <Texture Name="gMapGrandStatic124Tex" OutName="map_124" Format="i4" Width="64" Height="78" Offset="0x180B0" />
+        <Texture Name="gMapGrandStatic125Tex" OutName="map_125" Format="i4" Width="64" Height="68" Offset="0x18A70" />
+        <Texture Name="gMapGrandStatic126Tex" OutName="map_126" Format="i4" Width="48" Height="68" Offset="0x192F0" />
+        <Texture Name="gMapGrandStatic127Tex" OutName="map_127" Format="i4" Width="48" Height="36" Offset="0x19950" />
+        <Texture Name="gMapGrandStatic128Tex" OutName="map_128" Format="i4" Width="48" Height="25" Offset="0x19CB0" />
+        <Texture Name="gMapGrandStatic129Tex" OutName="map_129" Format="i4" Width="64" Height="75" Offset="0x19F10" />
+        <Texture Name="gMapGrandStatic12ATex" OutName="map_12A" Format="i4" Width="32" Height="53" Offset="0x1A870" />
+        <Texture Name="gMapGrandStatic12BTex" OutName="map_12B" Format="i4" Width="80" Height="62" Offset="0x1ABC0" />
+        <Texture Name="gMapGrandStatic12CTex" OutName="map_12C" Format="i4" Width="64" Height="76" Offset="0x1B570" />
+        <Texture Name="gMapGrandStatic12DTex" OutName="map_12D" Format="i4" Width="96" Height="85" Offset="0x1BEF0" />
+        <Texture Name="gMapGrandStatic12ETex" OutName="map_12E" Format="i4" Width="80" Height="71" Offset="0x1CEE0" />
+        <Texture Name="gMapGrandStatic12FTex" OutName="map_12F" Format="i4" Width="80" Height="87" Offset="0x1DA00" />
+        <Texture Name="gMapGrandStatic130Tex" OutName="map_130" Format="i4" Width="64" Height="65" Offset="0x1E7A0" />
+        <Texture Name="gMapGrandStatic131Tex" OutName="map_131" Format="i4" Width="48" Height="41" Offset="0x1EFC0" />
+        <Texture Name="gMapGrandStatic132Tex" OutName="map_132" Format="i4" Width="64" Height="76" Offset="0x1F3A0" />
+        <Texture Name="gMapGrandStatic133Tex" OutName="map_133" Format="i4" Width="80" Height="60" Offset="0x1FD20" />
+        <Texture Name="gMapGrandStatic134Tex" OutName="map_134" Format="i4" Width="80" Height="47" Offset="0x20680" />
+        <Texture Name="gMapGrandStatic135Tex" OutName="map_135" Format="i4" Width="80" Height="60" Offset="0x20DE0" />
+        <Texture Name="gMapGrandStatic136Tex" OutName="map_136" Format="i4" Width="48" Height="19" Offset="0x21740" />
+        <Texture Name="gMapGrandStatic137Tex" OutName="map_137" Format="i4" Width="32" Height="99" Offset="0x21910" />
+        <Texture Name="gMapGrandStatic138Tex" OutName="map_138" Format="i4" Width="48" Height="69" Offset="0x21F40" />
+        <Texture Name="gMapGrandStatic139Tex" OutName="map_139" Format="i4" Width="48" Height="83" Offset="0x225C0" />
+        <Texture Name="gMapGrandStatic13ATex" OutName="map_13A" Format="i4" Width="80" Height="54" Offset="0x22D90" />
+        <Texture Name="gMapGrandStatic13BTex" OutName="map_13B" Format="i4" Width="80" Height="92" Offset="0x23600" />
+        <Texture Name="gMapGrandStatic13CTex" OutName="map_13C" Format="i4" Width="48" Height="75" Offset="0x24460" />
+        <Texture Name="gMapGrandStatic13DTex" OutName="map_13D" Format="i4" Width="64" Height="49" Offset="0x24B70" />
+        <Texture Name="gMapGrandStatic13ETex" OutName="map_13E" Format="i4" Width="64" Height="49" Offset="0x25190" />
+        <Texture Name="gMapGrandStatic13FTex" OutName="map_13F" Format="i4" Width="64" Height="52" Offset="0x257B0" />
+        <Texture Name="gMapGrandStatic140Tex" OutName="map_140" Format="i4" Width="64" Height="49" Offset="0x25E30" />
+        <Texture Name="gMapGrandStatic141Tex" OutName="map_141" Format="i4" Width="32" Height="33" Offset="0x26450" />
+        <Texture Name="gMapGrandStatic142Tex" OutName="map_142" Format="i4" Width="48" Height="50" Offset="0x26660" />
+        <Texture Name="gMapGrandStatic143Tex" OutName="map_143" Format="i4" Width="64" Height="52" Offset="0x26B10" />
+        <Texture Name="gMapGrandStatic144Tex" OutName="map_144" Format="i4" Width="48" Height="35" Offset="0x27190" />
+        <Texture Name="gMapGrandStatic145Tex" OutName="map_145" Format="i4" Width="64" Height="51" Offset="0x274E0" />
+        <Texture Name="gMapGrandStatic146Tex" OutName="map_146" Format="i4" Width="48" Height="35" Offset="0x27B40" />
+        <Texture Name="gMapGrandStatic147Tex" OutName="map_147" Format="i4" Width="48" Height="53" Offset="0x27E90" />
+        <Texture Name="gMapGrandStatic148Tex" OutName="map_148" Format="i4" Width="64" Height="53" Offset="0x28390" />
+        <Texture Name="gMapGrandStatic149Tex" OutName="map_149" Format="i4" Width="64" Height="47" Offset="0x28A30" />
+        <Texture Name="gMapGrandStatic14ATex" OutName="map_14A" Format="i4" Width="64" Height="52" Offset="0x29010" />
+        <Texture Name="gMapGrandStatic14BTex" OutName="map_14B" Format="i4" Width="48" Height="48" Offset="0x29690" />
+        <Texture Name="gMapGrandStatic14CTex" OutName="map_14C" Format="i4" Width="64" Height="87" Offset="0x29B10" />
+        <Texture Name="gMapGrandStatic14DTex" OutName="map_14D" Format="i4" Width="48" Height="30" Offset="0x2A5F0" />
+        <Texture Name="gMapGrandStatic14ETex" OutName="map_14E" Format="i4" Width="80" Height="74" Offset="0x2A8C0" />
+        <Texture Name="gMapGrandStatic14FTex" OutName="map_14F" Format="i4" Width="80" Height="87" Offset="0x2B450" />
+        <Texture Name="gMapGrandStatic150Tex" OutName="map_150" Format="i4" Width="80" Height="56" Offset="0x2C1F0" />
+        <Texture Name="gMapGrandStatic151Tex" OutName="map_151" Format="i4" Width="80" Height="65" Offset="0x2CAB0" />
+        <Texture Name="gMapGrandStatic152Tex" OutName="map_152" Format="i4" Width="16" Height="38" Offset="0x2D4E0" />
+        <Texture Name="gMapGrandStatic153Tex" OutName="map_153" Format="i4" Width="80" Height="78" Offset="0x2D610" />
+        <Texture Name="gMapGrandStatic154Tex" OutName="map_154" Format="i4" Width="80" Height="55" Offset="0x2E240" />
+        <Texture Name="gMapGrandStatic155Tex" OutName="map_155" Format="i4" Width="80" Height="98" Offset="0x2EAE0" />
+        <Texture Name="gMapGrandStatic156Tex" OutName="map_156" Format="i4" Width="80" Height="62" Offset="0x2FA30" />
+        <Texture Name="gMapGrandStatic157Tex" OutName="map_157" Format="i4" Width="32" Height="123" Offset="0x303E0" />
+        <Texture Name="gMapGrandStatic158Tex" OutName="map_158" Format="i4" Width="80" Height="60" Offset="0x30B90" />
+        <Texture Name="gMapGrandStatic159Tex" OutName="map_159" Format="i4" Width="48" Height="77" Offset="0x314F0" />
+        <Texture Name="gMapGrandStatic15ATex" OutName="map_15A" Format="i4" Width="80" Height="64" Offset="0x31C30" />
+        <Texture Name="gMapGrandStatic15BTex" OutName="map_15B" Format="i4" Width="64" Height="50" Offset="0x32630" />
+        <Texture Name="gMapGrandStatic15CTex" OutName="map_15C" Format="i4" Width="80" Height="65" Offset="0x32C70" />
+        <Texture Name="gMapGrandStatic15DTex" OutName="map_15D" Format="i4" Width="32" Height="61" Offset="0x336A0" />
+        <Texture Name="gMapGrandStatic15ETex" OutName="map_15E" Format="i4" Width="80" Height="83" Offset="0x33A70" />
+        <Texture Name="gMapGrandStatic15FTex" OutName="map_15F" Format="i4" Width="80" Height="27" Offset="0x34770" />
+        <Texture Name="gMapGrandStatic160Tex" OutName="map_160" Format="i4" Width="80" Height="23" Offset="0x34BB0" />
+        <Texture Name="gMapGrandStatic161Tex" OutName="map_161" Format="i4" Width="80" Height="60" Offset="0x34F50" />
     </File>
 </Root>
diff --git a/assets/xml/archives/map_i_static.xml b/assets/xml/archives/map_i_static.xml
index dbb64185d8..fce2cc4375 100644
--- a/assets/xml/archives/map_i_static.xml
+++ b/assets/xml/archives/map_i_static.xml
@@ -1,62 +1,62 @@
 <Root>
     <File Name="map_i_static.unarchive">
-        <Blob Name="map_i_static_Blob_000000" Size="0x0FF0" Offset="0x0" />
-        <Blob Name="map_i_static_Blob_000FF0" Size="0x0FF0" Offset="0xFF0" />
-        <Blob Name="map_i_static_Blob_001FE0" Size="0x0FF0" Offset="0x1FE0" />
-        <Blob Name="map_i_static_Blob_002FD0" Size="0x0FF0" Offset="0x2FD0" />
-        <Blob Name="map_i_static_Blob_003FC0" Size="0x0FF0" Offset="0x3FC0" />
-        <Blob Name="map_i_static_Blob_004FB0" Size="0x01D0" Offset="0x4FB0" />
-        <Blob Name="map_i_static_Blob_005180" Size="0x01B0" Offset="0x5180" />
-        <Blob Name="map_i_static_Blob_005330" Size="0x01E0" Offset="0x5330" />
-        <Blob Name="map_i_static_Blob_005510" Size="0x0100" Offset="0x5510" />
-        <Blob Name="map_i_static_Blob_005610" Size="0x0060" Offset="0x5610" />
-        <Blob Name="map_i_static_Blob_005670" Size="0x01B0" Offset="0x5670" />
-        <Blob Name="map_i_static_Blob_005820" Size="0x0070" Offset="0x5820" />
-        <Blob Name="map_i_static_Blob_005890" Size="0x0130" Offset="0x5890" />
-        <Blob Name="map_i_static_Blob_0059C0" Size="0x01A0" Offset="0x59C0" />
-        <Blob Name="map_i_static_Blob_005B60" Size="0x0100" Offset="0x5B60" />
-        <Blob Name="map_i_static_Blob_005C60" Size="0x01B0" Offset="0x5C60" />
-        <Blob Name="map_i_static_Blob_005E10" Size="0x0120" Offset="0x5E10" />
-        <Blob Name="map_i_static_Blob_005F30" Size="0x0120" Offset="0x5F30" />
-        <Blob Name="map_i_static_Blob_006050" Size="0x0260" Offset="0x6050" />
-        <Blob Name="map_i_static_Blob_0062B0" Size="0x0150" Offset="0x62B0" />
-        <Blob Name="map_i_static_Blob_006400" Size="0x0220" Offset="0x6400" />
-        <Blob Name="map_i_static_Blob_006620" Size="0x0300" Offset="0x6620" />
-        <Blob Name="map_i_static_Blob_006920" Size="0x0110" Offset="0x6920" />
-        <Blob Name="map_i_static_Blob_006A30" Size="0x0110" Offset="0x6A30" />
-        <Blob Name="map_i_static_Blob_006B40" Size="0x0150" Offset="0x6B40" />
-        <Blob Name="map_i_static_Blob_006C90" Size="0x0120" Offset="0x6C90" />
-        <Blob Name="map_i_static_Blob_006DB0" Size="0x00C0" Offset="0x6DB0" />
-        <Blob Name="map_i_static_Blob_006E70" Size="0x00D0" Offset="0x6E70" />
-        <Blob Name="map_i_static_Blob_006F40" Size="0x0230" Offset="0x6F40" />
-        <Blob Name="map_i_static_Blob_007170" Size="0x00A0" Offset="0x7170" />
-        <Blob Name="map_i_static_Blob_007210" Size="0x01C0" Offset="0x7210" />
-        <Blob Name="map_i_static_Blob_0073D0" Size="0x0100" Offset="0x73D0" />
-        <Blob Name="map_i_static_Blob_0074D0" Size="0x0180" Offset="0x74D0" />
-        <Blob Name="map_i_static_Blob_007650" Size="0x0150" Offset="0x7650" />
-        <Blob Name="map_i_static_Blob_0077A0" Size="0x00B0" Offset="0x77A0" />
-        <Blob Name="map_i_static_Blob_007850" Size="0x0050" Offset="0x7850" />
-        <Blob Name="map_i_static_Blob_0078A0" Size="0x0040" Offset="0x78A0" />
-        <Blob Name="map_i_static_Blob_0078E0" Size="0x0170" Offset="0x78E0" />
-        <Blob Name="map_i_static_Blob_007A50" Size="0x0080" Offset="0x7A50" />
-        <Blob Name="map_i_static_Blob_007AD0" Size="0x0090" Offset="0x7AD0" />
-        <Blob Name="map_i_static_Blob_007B60" Size="0x00C0" Offset="0x7B60" />
-        <Blob Name="map_i_static_Blob_007C20" Size="0x0080" Offset="0x7C20" />
-        <Blob Name="map_i_static_Blob_007CA0" Size="0x00F0" Offset="0x7CA0" />
-        <Blob Name="map_i_static_Blob_007D90" Size="0x0110" Offset="0x7D90" />
-        <Blob Name="map_i_static_Blob_007EA0" Size="0x0100" Offset="0x7EA0" />
-        <Blob Name="map_i_static_Blob_007FA0" Size="0x0050" Offset="0x7FA0" />
-        <Blob Name="map_i_static_Blob_007FF0" Size="0x0090" Offset="0x7FF0" />
-        <Blob Name="map_i_static_Blob_008080" Size="0x0110" Offset="0x8080" />
-        <Blob Name="map_i_static_Blob_008190" Size="0x0060" Offset="0x8190" />
-        <Blob Name="map_i_static_Blob_0081F0" Size="0x0110" Offset="0x81F0" />
-        <Blob Name="map_i_static_Blob_008300" Size="0x0060" Offset="0x8300" />
-        <Blob Name="map_i_static_Blob_008360" Size="0x0090" Offset="0x8360" />
-        <Blob Name="map_i_static_Blob_0083F0" Size="0x0110" Offset="0x83F0" />
-        <Blob Name="map_i_static_Blob_008500" Size="0x00F0" Offset="0x8500" />
-        <Blob Name="map_i_static_Blob_0085F0" Size="0x0090" Offset="0x85F0" />
-        <Blob Name="map_i_static_Blob_008680" Size="0x0080" Offset="0x8680" />
-        <Blob Name="map_i_static_Blob_008700" Size="0x00F0" Offset="0x8700" />
-        <Blob Name="map_i_static_Blob_0087F0" Size="0x0050" Offset="0x87F0" />
+        <Texture Name="gMapIStatic00Tex" OutName="map_00" Format="i4" Width="96" Height="85" Offset="0x0" />
+        <Texture Name="gMapIStatic01Tex" OutName="map_01" Format="i4" Width="96" Height="85" Offset="0xFF0" />
+        <Texture Name="gMapIStatic02Tex" OutName="map_02" Format="i4" Width="96" Height="85" Offset="0x1FE0" />
+        <Texture Name="gMapIStatic03Tex" OutName="map_03" Format="i4" Width="96" Height="85" Offset="0x2FD0" />
+        <Texture Name="gMapIStatic04Tex" OutName="map_04" Format="i4" Width="96" Height="85" Offset="0x3FC0" />
+        <Texture Name="gMapIStatic05Tex" OutName="map_05" Format="i4" Width="32" Height="29" Offset="0x4FB0" />
+        <Texture Name="gMapIStatic06Tex" OutName="map_06" Format="i4" Width="32" Height="27" Offset="0x5180" />
+        <Texture Name="gMapIStatic07Tex" OutName="map_07" Format="i4" Width="32" Height="30" Offset="0x5330" />
+        <Texture Name="gMapIStatic08Tex" OutName="map_08" Format="i4" Width="16" Height="32" Offset="0x5510" />
+        <Texture Name="gMapIStatic09Tex" OutName="map_09" Format="i4" Width="16" Height="12" Offset="0x5610" />
+        <Texture Name="gMapIStatic0ATex" OutName="map_0A" Format="i4" Width="32" Height="27" Offset="0x5670" />
+        <Texture Name="gMapIStatic0BTex" OutName="map_0B" Format="i4" Width="16" Height="14" Offset="0x5820" />
+        <Texture Name="gMapIStatic0CTex" OutName="map_0C" Format="i4" Width="32" Height="19" Offset="0x5890" />
+        <Texture Name="gMapIStatic0DTex" OutName="map_0D" Format="i4" Width="32" Height="26" Offset="0x59C0" />
+        <Texture Name="gMapIStatic0ETex" OutName="map_0E" Format="i4" Width="16" Height="32" Offset="0x5B60" />
+        <Texture Name="gMapIStatic0FTex" OutName="map_0F" Format="i4" Width="32" Height="27" Offset="0x5C60" />
+        <Texture Name="gMapIStatic10Tex" OutName="map_10" Format="i4" Width="16" Height="35" Offset="0x5E10" />
+        <Texture Name="gMapIStatic11Tex" OutName="map_11" Format="i4" Width="32" Height="18" Offset="0x5F30" />
+        <Texture Name="gMapIStatic12Tex" OutName="map_12" Format="i4" Width="32" Height="38" Offset="0x6050" />
+        <Texture Name="gMapIStatic13Tex" OutName="map_13" Format="i4" Width="32" Height="21" Offset="0x62B0" />
+        <Texture Name="gMapIStatic14Tex" OutName="map_14" Format="i4" Width="32" Height="34" Offset="0x6400" />
+        <Texture Name="gMapIStatic15Tex" OutName="map_15" Format="i4" Width="48" Height="32" Offset="0x6620" />
+        <Texture Name="gMapIStatic16Tex" OutName="map_16" Format="i4" Width="32" Height="17" Offset="0x6920" />
+        <Texture Name="gMapIStatic17Tex" OutName="map_17" Format="i4" Width="32" Height="17" Offset="0x6A30" />
+        <Texture Name="gMapIStatic18Tex" OutName="map_18" Format="i4" Width="32" Height="21" Offset="0x6B40" />
+        <Texture Name="gMapIStatic19Tex" OutName="map_19" Format="i4" Width="32" Height="18" Offset="0x6C90" />
+        <Texture Name="gMapIStatic1ATex" OutName="map_1A" Format="i4" Width="16" Height="24" Offset="0x6DB0" />
+        <Texture Name="gMapIStatic1BTex" OutName="map_1B" Format="i4" Width="16" Height="25" Offset="0x6E70" />
+        <Texture Name="gMapIStatic1CTex" OutName="map_1C" Format="i4" Width="32" Height="35" Offset="0x6F40" />
+        <Texture Name="gMapIStatic1DTex" OutName="map_1D" Format="i4" Width="16" Height="19" Offset="0x7170" />
+        <Texture Name="gMapIStatic1ETex" OutName="map_1E" Format="i4" Width="32" Height="28" Offset="0x7210" />
+        <Texture Name="gMapIStatic1FTex" OutName="map_1F" Format="i4" Width="32" Height="16" Offset="0x73D0" />
+        <Texture Name="gMapIStatic20Tex" OutName="map_20" Format="i4" Width="32" Height="24" Offset="0x74D0" />
+        <Texture Name="gMapIStatic21Tex" OutName="map_21" Format="i4" Width="32" Height="21" Offset="0x7650" />
+        <Texture Name="gMapIStatic22Tex" OutName="map_22" Format="i4" Width="16" Height="21" Offset="0x77A0" />
+        <Texture Name="gMapIStatic23Tex" OutName="map_23" Format="i4" Width="16" Height="10" Offset="0x7850" />
+        <Texture Name="gMapIStatic24Tex" OutName="map_24" Format="i4" Width="16" Height="7" Offset="0x78A0" />
+        <Texture Name="gMapIStatic25Tex" OutName="map_25" Format="i4" Width="32" Height="23" Offset="0x78E0" />
+        <Texture Name="gMapIStatic26Tex" OutName="map_26" Format="i4" Width="16" Height="16" Offset="0x7A50" />
+        <Texture Name="gMapIStatic27Tex" OutName="map_27" Format="i4" Width="16" Height="17" Offset="0x7AD0" />
+        <Texture Name="gMapIStatic28Tex" OutName="map_28" Format="i4" Width="16" Height="23" Offset="0x7B60" />
+        <Texture Name="gMapIStatic29Tex" OutName="map_29" Format="i4" Width="16" Height="15" Offset="0x7C20" />
+        <Texture Name="gMapIStatic2ATex" OutName="map_2A" Format="i4" Width="32" Height="15" Offset="0x7CA0" />
+        <Texture Name="gMapIStatic2BTex" OutName="map_2B" Format="i4" Width="32" Height="17" Offset="0x7D90" />
+        <Texture Name="gMapIStatic2CTex" OutName="map_2C" Format="i4" Width="32" Height="16" Offset="0x7EA0" />
+        <Texture Name="gMapIStatic2DTex" OutName="map_2D" Format="i4" Width="16" Height="10" Offset="0x7FA0" />
+        <Texture Name="gMapIStatic2ETex" OutName="map_2E" Format="i4" Width="16" Height="17" Offset="0x7FF0" />
+        <Texture Name="gMapIStatic2FTex" OutName="map_2F" Format="i4" Width="32" Height="17" Offset="0x8080" />
+        <Texture Name="gMapIStatic30Tex" OutName="map_30" Format="i4" Width="16" Height="11" Offset="0x8190" />
+        <Texture Name="gMapIStatic31Tex" OutName="map_31" Format="i4" Width="32" Height="17" Offset="0x81F0" />
+        <Texture Name="gMapIStatic32Tex" OutName="map_32" Format="i4" Width="16" Height="12" Offset="0x8300" />
+        <Texture Name="gMapIStatic33Tex" OutName="map_33" Format="i4" Width="16" Height="18" Offset="0x8360" />
+        <Texture Name="gMapIStatic34Tex" OutName="map_34" Format="i4" Width="32" Height="17" Offset="0x83F0" />
+        <Texture Name="gMapIStatic35Tex" OutName="map_35" Format="i4" Width="32" Height="15" Offset="0x8500" />
+        <Texture Name="gMapIStatic36Tex" OutName="map_36" Format="i4" Width="16" Height="18" Offset="0x85F0" />
+        <Texture Name="gMapIStatic37Tex" OutName="map_37" Format="i4" Width="16" Height="16" Offset="0x8680" />
+        <Texture Name="gMapIStatic38Tex" OutName="map_38" Format="i4" Width="16" Height="30" Offset="0x8700" />
+        <Texture Name="gMapIStatic39Tex" OutName="map_39" Format="i4" Width="16" Height="9" Offset="0x87F0" />
     </File>
 </Root>
diff --git a/extract_assets.py b/extract_assets.py
index dda5efaec7..4d64d7d135 100755
--- a/extract_assets.py
+++ b/extract_assets.py
@@ -6,6 +6,11 @@ colorama.init()
 
 EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json"
 
+dontGenerateCFilesList = [
+    "map_grand_static",
+    "map_i_static",
+]
+
 def SignalHandler(sig, frame):
     print(f'Signal {sig} received. Aborting...')
     mainAbort.set()
@@ -16,7 +21,13 @@ def ExtractFile(xmlPath, outputPath, outputSourcePath):
         # Don't extract if another file wasn't extracted properly.
         return
 
-    execStr = f"tools/ZAPD/ZAPD.out e -eh -i {xmlPath} -b baserom/ -o {outputPath} -osf {outputSourcePath} -gsf 1 -rconf tools/ZAPDConfigs/MM/Config.xml {ZAPDArgs}"
+    generateSourceFile = "1"
+    for name in dontGenerateCFilesList:
+        if name in xmlPath:
+            generateSourceFile = "0"
+            break
+
+    execStr = f"tools/ZAPD/ZAPD.out e -eh -i {xmlPath} -b baserom/ -o {outputPath} -osf {outputSourcePath} -gsf {generateSourceFile} -rconf tools/ZAPDConfigs/MM/Config.xml {ZAPDArgs}"
 
     if globalUnaccounted:
         execStr += " -Wunaccounted"
diff --git a/spec b/spec
index 622a496473..f0f1f865fa 100644
--- a/spec
+++ b/spec
@@ -329,12 +329,12 @@ endseg
 
 beginseg
     name "map_i_static"
-    include "build/assets/archives/map_i_static/map_i_static.yar.o"
+    include "build/assets/c/archives/map_i_static/map_i_static.yar.o"
 endseg
 
 beginseg
     name "map_grand_static"
-    include "build/assets/archives/map_grand_static/map_grand_static.yar.o"
+    include "build/assets/c/archives/map_grand_static/map_grand_static.yar.o"
 endseg
 
 beginseg
diff --git a/tools/buildtools/makeyar.c b/tools/buildtools/makeyar.c
index 6a241f6f5b..e94ce3f0c4 100644
--- a/tools/buildtools/makeyar.c
+++ b/tools/buildtools/makeyar.c
@@ -188,20 +188,27 @@ void createArchive(Bytearray *archive, const DataSection *dataSect) {
     offset = firstEntryOffset;
     for (i = 0; i < dataSect->symbols.len; i++) {
         const struct Elf32_Symbol *sym = &dataSect->symbols.symbols[i];
-        size_t uncompressedSize = sym->size;
-        uint8_t *output = malloc(uncompressedSize * sizeof(uint8_t)); // assume compressed shouldn't be bigger than uncompressed
+        size_t realUncompressedSize = sym->size;
+        size_t alignedUncompressedSize = ALIGN16(realUncompressedSize);
+        uint8_t *inputBuf = malloc(alignedUncompressedSize* sizeof(uint8_t));
+        uint8_t *output = malloc(alignedUncompressedSize * sizeof(uint8_t)); // assume compressed shouldn't be bigger than uncompressed
         size_t compressedSize;
 
+        // Make sure to pad each entry to a 0x10 boundary
+        memcpy(inputBuf, &dataSect->data.bytes[sym->value], realUncompressedSize);
+        if (realUncompressedSize < alignedUncompressedSize) {
+            memset(&inputBuf[realUncompressedSize], 0, alignedUncompressedSize - realUncompressedSize);
+        }
+
         output[0] = 'Y';
         output[1] = 'a';
         output[2] = 'z';
         output[3] = '0';
-        util_write_uint32_be(&output[4], uncompressedSize);
+        util_write_uint32_be(&output[4], alignedUncompressedSize);
         memset(&output[8], 0, 8);
         compressedSize = 0x10;
 
-        assert(sym->value + uncompressedSize <= dataSect->data.size);
-        compressedSize += yaz0_encode(&dataSect->data.bytes[sym->value], &output[0x10], uncompressedSize);
+        compressedSize += yaz0_encode(inputBuf, &output[0x10], alignedUncompressedSize);
 
         // Pad to 0x10
         while (compressedSize % 0x10 != 0) {