Add some new tiles to main safe zones + fix

3 files changed, 116 insertions, 54 deletions

diff --git a/map/loading/romtiles.gbasm b/map/loading/romtiles.gbasm
index e35a1e5..51ebacf 100644
--- a/map/loading/romtiles.gbasm
+++ b/map/loading/romtiles.gbasm
@@ -64,11 +64,10 @@ Load_ROM_Block: ; X in A, Y in B
 
 	LD A, (HL+)
 	LD ($mem_prepared_block_tile), A
-	LD A, (HL)
+	LD A, (HL-)
 	LD ($mem_prepared_block_tile+1), A
 
 	LD A, L
-	DEC A
 	ADD $40
 	LD L, A
 	LD A, H
diff --git a/map/maps/test.ldtk b/map/maps/test.ldtk
index 994246d..65c4999 100644
--- a/map/maps/test.ldtk
+++ b/map/maps/test.ldtk
@@ -11,7 +11,7 @@
 	"iid": "a44281a0-3740-11f0-9e9d-278017e89d25",
 	"jsonVersion": "1.5.3",
 	"appBuildId": 485696,
-	"nextUid": 125,
+	"nextUid": 177,
 	"identifierStyle": "Capitalize",
 	"toc": [],
 	"worldLayout": "Free",
@@ -1002,7 +1002,7 @@
 			"savedSelections": [],
 			"cachedPixelData": {
 				"opaqueTiles": "1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
-				"averageColors": "fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfcdbfbdafbdafbdafbdafcdbfcdbfcdbfcdbfbcafac9fbcafac9fdfcfdfcfdfcf897f797f797f575f897f8a8f786f575f897f797f797f576f897f787f787f575fbcafab9f9b8f9b9fbcaf9b9f9b9f9b9fab9f9b9fab9fac9f9b9f9b9f9b9f9a9fbcafbcaf565f575fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcf455f897f685f575fdecfac9fbdbfcebfbcaf9b9f9b9fcdbfbcafab9f897f897fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfbcafbdbfbcafbcafbcafbcafbcafbdbfbcafbcafbcafacafbcafbcafbcafbcafbcafbcafbdbfbdbfacafbdbfbcafbcafbcafbcafbcafbcafbcafbdbfbcafbdbfbcafbdbfbdbfbcafdecfcdbfcdbfdecfdecfcebfcecfcdbfcdbfcdbfcdbfdecfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfbcaf8a7facafcebfac9facafab9fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfc"
+				"averageColors": "fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfcdbfbdafbdafbdafbdafcdbfcdbfcdbfcdbfbcafac9fbcafac9fdfcfdfcfdfcf897f797f797f575f897f8a8f786f575f897f797f797f576f897f787f787f575fbcafab9f9b8f9b9fbcaf9b9f9b9f9b9fab9f9b9fab9fac9f9b9f9b9f9b9f9a9fbcafbcaf565f575f9b9f9a8fab9f9a9fbdafcebfac9f9c9f9b8f9c9fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcf455f897f685f575fdecfac9fbdbfcebfbcaf9b9f9b9fcdbfbcafab9f897f897fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfbcafbdbfbcafbcafbcafbcafbcafbdbfbcafbcafbcafacafbcafbcafbcafbcafbcafbcafbdbfbdbfacafbdbfbcafbcafbcafbcafbcafbcafbcafbdbfbcafbdbfbcafbdbfbdbfbcafdecfcdbfcdbfdecfdecfcebfcecfcdbfcdbfcdbfcdbfdecfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfcdbfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfbcaf8a7facafcebfac9facafab9fdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfcfdfc"
 			}
 		}
 	], "enums": [], "externalEnums": [], "levelFields": [] },
@@ -1059,10 +1059,47 @@
 						{ "px": [256,80], "src": [120,16], "f": 0, "t": 47, "d": [672], "a": 1 },
 						{ "px": [240,96], "src": [0,32], "f": 0, "t": 64, "d": [798], "a": 1 },
 						{ "px": [248,96], "src": [8,32], "f": 0, "t": 65, "d": [799], "a": 1 },
+						{ "px": [224,104], "src": [56,32], "f": 0, "t": 71, "d": [860], "a": 1 },
+						{ "px": [256,112], "src": [72,32], "f": 0, "t": 73, "d": [928], "a": 1 },
+						{ "px": [264,112], "src": [72,32], "f": 0, "t": 73, "d": [929], "a": 1 },
+						{ "px": [216,128], "src": [112,16], "f": 0, "t": 46, "d": [1051], "a": 1 },
+						{ "px": [224,128], "src": [0,16], "f": 0, "t": 32, "d": [1052], "a": 1 },
+						{ "px": [216,136], "src": [112,16], "f": 0, "t": 46, "d": [1115], "a": 1 },
+						{ "px": [224,136], "src": [64,16], "f": 0, "t": 40, "d": [1116], "a": 1 },
+						{ "px": [264,136], "src": [56,32], "f": 0, "t": 71, "d": [1121], "a": 1 },
+						{ "px": [232,144], "src": [64,32], "f": 0, "t": 72, "d": [1181], "a": 1 },
+						{ "px": [200,184], "src": [32,32], "f": 0, "t": 68, "d": [1497], "a": 1 },
+						{ "px": [208,184], "src": [40,32], "f": 0, "t": 69, "d": [1498], "a": 1 },
+						{ "px": [304,184], "src": [32,32], "f": 0, "t": 68, "d": [1510], "a": 1 },
+						{ "px": [312,184], "src": [40,32], "f": 0, "t": 69, "d": [1511], "a": 1 },
+						{ "px": [200,192], "src": [48,32], "f": 0, "t": 70, "d": [1561], "a": 1 },
+						{ "px": [224,192], "src": [72,32], "f": 0, "t": 73, "d": [1564], "a": 1 },
+						{ "px": [232,192], "src": [72,32], "f": 0, "t": 73, "d": [1565], "a": 1 },
+						{ "px": [240,192], "src": [64,32], "f": 0, "t": 72, "d": [1566], "a": 1 },
+						{ "px": [248,192], "src": [72,32], "f": 0, "t": 73, "d": [1567], "a": 1 },
+						{ "px": [176,200], "src": [32,32], "f": 0, "t": 68, "d": [1622], "a": 1 },
+						{ "px": [184,200], "src": [40,32], "f": 0, "t": 69, "d": [1623], "a": 1 },
+						{ "px": [272,200], "src": [64,32], "f": 0, "t": 72, "d": [1634], "a": 1 },
+						{ "px": [280,200], "src": [72,32], "f": 0, "t": 73, "d": [1635], "a": 1 },
+						{ "px": [296,200], "src": [32,32], "f": 0, "t": 68, "d": [1637], "a": 1 },
+						{ "px": [304,200], "src": [40,32], "f": 0, "t": 69, "d": [1638], "a": 1 },
+						{ "px": [320,200], "src": [56,32], "f": 0, "t": 71, "d": [1640], "a": 1 },
+						{ "px": [176,216], "src": [72,32], "f": 0, "t": 73, "d": [1750], "a": 1 },
+						{ "px": [184,216], "src": [72,32], "f": 0, "t": 73, "d": [1751], "a": 1 },
+						{ "px": [288,216], "src": [48,32], "f": 0, "t": 70, "d": [1764], "a": 1 },
+						{ "px": [208,224], "src": [56,32], "f": 0, "t": 71, "d": [1818], "a": 1 },
 						{ "px": [240,224], "src": [96,24], "f": 0, "t": 60, "d": [1822], "a": 1 },
 						{ "px": [248,224], "src": [104,24], "f": 0, "t": 61, "d": [1823], "a": 1 },
+						{ "px": [304,224], "src": [72,32], "f": 0, "t": 73, "d": [1830], "a": 1 },
+						{ "px": [312,224], "src": [72,32], "f": 0, "t": 73, "d": [1831], "a": 1 },
+						{ "px": [152,232], "src": [32,32], "f": 0, "t": 68, "d": [1875], "a": 1 },
+						{ "px": [160,232], "src": [40,32], "f": 0, "t": 69, "d": [1876], "a": 1 },
 						{ "px": [240,232], "src": [112,24], "f": 0, "t": 62, "d": [1886], "a": 1 },
 						{ "px": [248,232], "src": [120,24], "f": 0, "t": 63, "d": [1887], "a": 1 },
+						{ "px": [192,240], "src": [64,32], "f": 0, "t": 72, "d": [1944], "a": 1 },
+						{ "px": [328,248], "src": [64,32], "f": 0, "t": 72, "d": [2025], "a": 1 },
+						{ "px": [336,248], "src": [72,32], "f": 0, "t": 73, "d": [2026], "a": 1 },
+						{ "px": [144,256], "src": [56,32], "f": 0, "t": 71, "d": [2066], "a": 1 },
 						{ "px": [208,256], "src": [64,24], "f": 0, "t": 56, "d": [2074], "a": 1 },
 						{ "px": [216,256], "src": [72,24], "f": 0, "t": 57, "d": [2075], "a": 1 },
 						{ "px": [240,256], "src": [32,24], "f": 0, "t": 52, "d": [2078], "a": 1 },
@@ -1075,10 +1112,31 @@
 						{ "px": [248,264], "src": [56,24], "f": 0, "t": 55, "d": [2143], "a": 1 },
 						{ "px": [272,264], "src": [80,24], "f": 0, "t": 58, "d": [2146], "a": 1 },
 						{ "px": [280,264], "src": [88,24], "f": 0, "t": 59, "d": [2147], "a": 1 },
+						{ "px": [288,264], "src": [80,32], "f": 0, "t": 74, "d": [2148], "a": 1 },
+						{ "px": [296,264], "src": [88,32], "f": 0, "t": 75, "d": [2149], "a": 1 },
+						{ "px": [328,264], "src": [48,32], "f": 0, "t": 70, "d": [2153], "a": 1 },
+						{ "px": [176,272], "src": [48,32], "f": 0, "t": 70, "d": [2198], "a": 1 },
+						{ "px": [288,272], "src": [96,32], "f": 0, "t": 76, "d": [2212], "a": 1 },
+						{ "px": [296,272], "src": [104,32], "f": 0, "t": 77, "d": [2213], "a": 1 },
 						{ "px": [240,288], "src": [96,24], "f": 0, "t": 60, "d": [2334], "a": 1 },
 						{ "px": [248,288], "src": [104,24], "f": 0, "t": 61, "d": [2335], "a": 1 },
 						{ "px": [240,296], "src": [112,24], "f": 0, "t": 62, "d": [2398], "a": 1 },
-						{ "px": [248,296], "src": [120,24], "f": 0, "t": 63, "d": [2399], "a": 1 }
+						{ "px": [248,296], "src": [120,24], "f": 0, "t": 63, "d": [2399], "a": 1 },
+						{ "px": [328,296], "src": [56,32], "f": 0, "t": 71, "d": [2409], "a": 1 },
+						{ "px": [176,304], "src": [72,32], "f": 0, "t": 73, "d": [2454], "a": 1 },
+						{ "px": [184,304], "src": [72,32], "f": 0, "t": 73, "d": [2455], "a": 1 },
+						{ "px": [216,312], "src": [64,32], "f": 0, "t": 72, "d": [2523], "a": 1 },
+						{ "px": [304,312], "src": [64,32], "f": 0, "t": 72, "d": [2534], "a": 1 },
+						{ "px": [176,320], "src": [56,32], "f": 0, "t": 71, "d": [2582], "a": 1 },
+						{ "px": [248,320], "src": [48,32], "f": 0, "t": 70, "d": [2591], "a": 1 },
+						{ "px": [296,320], "src": [56,32], "f": 0, "t": 71, "d": [2597], "a": 1 },
+						{ "px": [192,328], "src": [32,32], "f": 0, "t": 68, "d": [2648], "a": 1 },
+						{ "px": [200,328], "src": [40,32], "f": 0, "t": 69, "d": [2649], "a": 1 },
+						{ "px": [304,336], "src": [32,32], "f": 0, "t": 68, "d": [2726], "a": 1 },
+						{ "px": [312,336], "src": [40,32], "f": 0, "t": 69, "d": [2727], "a": 1 },
+						{ "px": [216,352], "src": [32,32], "f": 0, "t": 68, "d": [2843], "a": 1 },
+						{ "px": [224,352], "src": [40,32], "f": 0, "t": 69, "d": [2844], "a": 1 },
+						{ "px": [264,352], "src": [56,32], "f": 0, "t": 71, "d": [2849], "a": 1 }
 					],
 					"entityInstances": []
 				},
@@ -1098,7 +1156,7 @@
 					"layerDefUid": 3,
 					"pxOffsetX": 0,
 					"pxOffsetY": 0,
-					"visible": false,
+					"visible": true,
 					"optionalRules": [],
 					"intGridCsv": [],
 					"autoLayerTiles": [
@@ -1922,6 +1980,7 @@
 						{ "px": [160,160], "src": [48,48], "f": 0, "t": 15, "d": [122,330], "a": 1 },
 						{ "px": [144,176], "src": [48,48], "f": 0, "t": 15, "d": [122,361], "a": 1 },
 						{ "px": [128,208], "src": [48,48], "f": 0, "t": 15, "d": [122,424], "a": 1 },
+						{ "px": [208,128], "src": [48,48], "f": 0, "t": 15, "d": [121,269], "a": 1 },
 						{ "px": [128,304], "src": [48,48], "f": 0, "t": 15, "d": [121,616], "a": 1 },
 						{ "px": [144,336], "src": [48,48], "f": 0, "t": 15, "d": [121,681], "a": 1 },
 						{ "px": [160,352], "src": [48,48], "f": 0, "t": 15, "d": [121,714], "a": 1 },
@@ -1945,7 +2004,6 @@
 						{ "px": [304,160], "src": [48,16], "f": 0, "t": 7, "d": [118,339], "a": 1 },
 						{ "px": [208,96], "src": [16,48], "f": 0, "t": 13, "d": [117,205], "a": 1 },
 						{ "px": [208,112], "src": [16,48], "f": 0, "t": 13, "d": [117,237], "a": 1 },
-						{ "px": [208,128], "src": [16,48], "f": 0, "t": 13, "d": [117,269], "a": 1 },
 						{ "px": [144,192], "src": [16,48], "f": 0, "t": 13, "d": [117,393], "a": 1 },
 						{ "px": [128,224], "src": [16,48], "f": 0, "t": 13, "d": [117,456], "a": 1 },
 						{ "px": [128,240], "src": [16,48], "f": 0, "t": 13, "d": [117,488], "a": 1 },
@@ -1976,7 +2034,12 @@
 						{ "px": [336,304], "src": [32,32], "f": 0, "t": 10, "d": [112,629], "a": 1 },
 						{ "px": [320,336], "src": [32,32], "f": 0, "t": 10, "d": [112,692], "a": 1 },
 						{ "px": [288,352], "src": [32,32], "f": 0, "t": 10, "d": [112,722], "a": 1 },
-						{ "px": [240,256], "src": [0,0], "f": 0, "t": 0, "d": [100,527], "a": 1 }
+						{ "px": [224,128], "src": [16,0], "f": 0, "t": 1, "d": [107,270], "a": 1 },
+						{ "px": [272,176], "src": [0,0], "f": 0, "t": 0, "d": [100,369], "a": 1 },
+						{ "px": [160,240], "src": [0,0], "f": 0, "t": 0, "d": [100,490], "a": 1 },
+						{ "px": [240,256], "src": [0,0], "f": 0, "t": 0, "d": [100,527], "a": 1 },
+						{ "px": [192,288], "src": [0,0], "f": 0, "t": 0, "d": [100,588], "a": 1 },
+						{ "px": [288,304], "src": [0,0], "f": 0, "t": 0, "d": [100,626], "a": 1 }
 					],
 					"seed": 3670360,
 					"overrideTilesetUid": null,
@@ -1999,7 +2062,7 @@
 					"layerDefUid": 2,
 					"pxOffsetX": 0,
 					"pxOffsetY": 0,
-					"visible": false,
+					"visible": true,
 					"optionalRules": [],
 					"intGridCsv": [
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -2009,17 +2072,17 @@
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 						1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,2,2,2,2,
-						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,2,2,2,2,2,2,2,
+						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,2,2,2,2,2,2,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,2,2,2,2,2,2,2,2,2,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,
-						2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,
+						2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,2,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,
 						2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 						2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 						2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,
-						1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,
+						2,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,
 						1,1,2,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,
-						1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,
-						1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,2,
+						1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,2,1,1,1,1,1,1,
+						1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,2,1,1,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,
 						2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,
diff --git a/map/maps/test.map.gbasm b/map/maps/test.map.gbasm
index 49f7f29..8bc7f17 100644
--- a/map/maps/test.map.gbasm
+++ b/map/maps/test.map.gbasm
@@ -3,9 +3,9 @@ _map_Test:
 	.collisons:
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $80, $00, $00, $01, $c0, $00, $00, $01, $c0, $00
-		.DB $00, $01, $c0, $00, $00, $01, $c0, $00, $00, $03, $e0, $00, $00, $0f, $f8, $00
-		.DB $00, $1f, $fc, $00, $00, $1f, $fc, $00, $00, $3f, $fe, $00, $00, $3f, $fe, $00
-		.DB $00, $3f, $7e, $00, $00, $3f, $fe, $00, $00, $3f, $fe, $00, $00, $1f, $fc, $00
+		.DB $00, $01, $80, $00, $00, $01, $c0, $00, $00, $03, $e0, $00, $00, $0d, $f8, $00
+		.DB $00, $1f, $fc, $00, $00, $1f, $fc, $00, $00, $3f, $fe, $00, $00, $3f, $fa, $00
+		.DB $00, $3f, $7e, $00, $00, $3f, $fe, $00, $00, $3f, $ee, $00, $00, $1b, $fc, $00
 		.DB $00, $1f, $fc, $00, $00, $0f, $f8, $00, $00, $03, $e0, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
@@ -63,27 +63,27 @@ _map_Test:
 		.DB $00, $00, $22, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $00, $00, $00, $00
+		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $47, $00, $00, $00
 		.DB $00, $00, $2a, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $26, $00, $00, $00, $00
-		.DB $00, $00, $22, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
+		.DB $49, $49, $22, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $00, $00, $00, $00
 		.DB $00, $00, $2a, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $26, $00, $00, $00, $00
+		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $2e, $20, $24, $00, $00
 		.DB $00, $00, $22, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $00, $00, $00, $00
-		.DB $00, $00, $2a, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
+		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $28, $2c, $00, $00
+		.DB $00, $47, $2a, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $26, $00, $00, $00, $00
+		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $26, $00, $48, $00, $00
 		.DB $00, $00, $22, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
@@ -100,95 +100,95 @@ _map_Test:
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27, $23, $27
+		.DB $00, $00, $20, $24, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2f, $29, $2c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $28, $2d, $2b, $2f, $2b, $2f, $2b, $2f
+		.DB $2b, $2f, $2b, $2f, $29, $2c, $00, $00, $00, $44, $45, $00, $00, $00, $00, $00
+		.DB $00, $00, $28, $2c, $00, $00, $44, $45, $28, $2d, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $23, $27, $23, $26, $00, $00, $00, $00, $00, $46, $00, $00, $49, $49, $48, $49
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f, $2b, $2f
+		.DB $2b, $2f, $2b, $2e, $00, $00, $44, $45, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $00, $00, $48, $49, $00, $44, $45, $00, $47, $00, $2a, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $29, $2c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $28, $2d, $2b, $2f, $2b, $2f
+		.DB $2b, $2f, $29, $2c, $00, $00, $49, $49, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $00, $00, $00, $00, $46, $00, $00, $00, $00, $00, $28, $2d, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3c, $3d
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
+		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $47, $00, $00, $00, $3c, $3d
+		.DB $00, $00, $00, $00, $00, $00, $49, $49, $00, $00, $00, $00, $22, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3e, $3f
+		.DB $2b, $2e, $00, $44, $45, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3e, $3f
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $23, $26, $00, $00, $20, $24, $00, $00, $48, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f
+		.DB $2b, $2e, $00, $00, $28, $2c, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $48, $49, $00, $2a, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $38, $39, $00, $00, $34, $35
+		.DB $23, $26, $47, $00, $00, $00, $00, $00, $00, $00, $38, $39, $00, $00, $34, $35
 		.DB $00, $00, $38, $39, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $3a, $3b, $00, $00, $36, $37
-		.DB $00, $00, $3a, $3b, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f
+		.DB $00, $00, $3a, $3b, $4a, $4b, $00, $00, $00, $46, $00, $00, $2a, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
+		.DB $23, $26, $00, $00, $00, $00, $46, $00, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $00, $00, $00, $00, $4c, $4d, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3c, $3d
+		.DB $23, $26, $00, $00, $00, $00, $00, $00, $20, $24, $00, $00, $00, $00, $3c, $3d
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $3e, $3f
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f
+		.DB $2b, $2e, $00, $00, $00, $00, $00, $00, $28, $2c, $00, $00, $00, $00, $3e, $3f
+		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $47, $00, $00, $2a, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $21, $24, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $20, $25, $23, $27, $23, $27
+		.DB $23, $27, $21, $24, $00, $00, $49, $49, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $00, $00, $00, $00, $20, $24, $00, $00, $00, $00, $20, $25, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f, $2b, $2f
+		.DB $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $48, $00, $00, $00, $00
+		.DB $00, $00, $00, $00, $28, $2c, $48, $00, $00, $00, $2a, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $23, $26, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27
+		.DB $23, $27, $23, $26, $00, $00, $47, $00, $00, $00, $00, $00, $00, $00, $00, $46
+		.DB $00, $00, $00, $00, $00, $47, $00, $00, $00, $00, $22, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
-		.DB $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
+		.DB $2b, $2f, $2b, $2e, $00, $00, $00, $00, $44, $45, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $21, $24, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $00, $00, $00, $00, $20, $25, $23, $27, $23, $27, $23, $27
+		.DB $00, $00, $00, $00, $00, $00, $44, $45, $20, $25, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
 		.DB $00, $00, $00, $00, $00, $00, $00, $00, $2a, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
-		.DB $23, $27, $23, $27, $23, $27, $21, $25, $21, $24, $00, $00, $00, $00, $00, $00
-		.DB $00, $00, $00, $00, $20, $25, $21, $25, $23, $27, $23, $27, $23, $27, $23, $27
+		.DB $23, $27, $23, $27, $23, $27, $21, $25, $21, $24, $00, $44, $45, $00, $00, $00
+		.DB $00, $47, $00, $00, $20, $25, $21, $25, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27, $23, $27
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f
 		.DB $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2f, $2b, $2e, $00, $00, $00, $00, $00, $00