From 232f94d30e961b949a6f76adcae8cde8e534b765 Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich <lscharen@prowestgis.com>
Date: Sat, 14 Aug 2021 21:09:35 -0500
Subject: [PATCH] Fix layer comparison function

---
 assets/tiled/world_1-1.tmx |  2 +-
 src/App.TileMapBG0.s       | 10 +++++-----
 src/App.TileMapBG1.s       | 10 +++++-----
 tools/tiled2iigs.js        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/assets/tiled/world_1-1.tmx b/assets/tiled/world_1-1.tmx
index 4cdb568..9759b8b 100644
--- a/assets/tiled/world_1-1.tmx
+++ b/assets/tiled/world_1-1.tmx
@@ -4,7 +4,7 @@
   <export target="world_1-1.json" format="json"/>
  </editorsettings>
  <tileset firstgid="1" source="Overworld.tsx"/>
- <layer id="3" name="App.TileMapBG1" width="256" height="30" visible="0" locked="1" parallaxx="0.5" parallaxy="0.5">
+ <layer id="3" name="App.TileMapBG1" width="256" height="30" locked="1" parallaxx="0.5" parallaxy="0.5">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/src/App.TileMapBG0.s b/src/App.TileMapBG0.s
index d1da561..ab7c26d 100644
--- a/src/App.TileMapBG0.s
+++ b/src/App.TileMapBG0.s
@@ -4,15 +4,15 @@
 ; This is a generated file. Do not modify.
 
 
-BG1SetUp
+BG0SetUp
         lda #256
-        sta BG1TileMapWidth
+        sta TileMapWidth
         lda #30
-        sta BG1TileMapHeight
+        sta TileMapHeight
         lda #App_TileMapBG0
-        sta BG1TileMapPtr
+        sta TileMapPtr
         lda #^App_TileMapBG0
-        sta BG1TileMapPtr+2
+        sta TileMapPtr+2
         rts
     
 App_TileMapBG0
diff --git a/src/App.TileMapBG1.s b/src/App.TileMapBG1.s
index 87079de..50b10bb 100644
--- a/src/App.TileMapBG1.s
+++ b/src/App.TileMapBG1.s
@@ -4,15 +4,15 @@
 ; This is a generated file. Do not modify.
 
 
-BG0SetUp
+BG1SetUp
         lda #256
-        sta TileMapWidth
+        sta BG1TileMapWidth
         lda #30
-        sta TileMapHeight
+        sta BG1TileMapHeight
         lda #App_TileMapBG1
-        sta TileMapPtr
+        sta BG1TileMapPtr
         lda #^App_TileMapBG1
-        sta TileMapPtr+2
+        sta BG1TileMapPtr+2
         rts
     
 App_TileMapBG1
diff --git a/tools/tiled2iigs.js b/tools/tiled2iigs.js
index 05008d7..4a2b44f 100644
--- a/tools/tiled2iigs.js
+++ b/tools/tiled2iigs.js
@@ -132,7 +132,7 @@ async function main(argv) {
     }
 
     // Sort the tile layers by ID.  The lower ID is considered to be the "front" layer
-    tileLayers.sort((first, second) => first.id <= second.id);
+    tileLayers.sort((first, second) => first.id - second.id);
 
     // Load up any/all tilesets
     const tileSets = await Promise.all(doc.tilesets.map(tileset => loadTileset(workdir, tileset)));