Merge branch 'master' into tr_EN

Medabots · Aug 23, 2023 · 5035039 · 5035039
2 parents fbfb62f + baa74de
commit 5035039
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 32 deletions.
diff --git a/game/src/version/tilemap_table.asm b/game/src/version/tilemap_table.asm
@@ -1119,37 +1119,37 @@ Tilemap01_96::
 Tilemap01_97::
   INCBIN "./build/tilemaps/0197.map"
 Tilemap01_98::
-  INCBIN "./build/tilemaps/0198.map"
+  INCBIN "./build/tilemaps/HeavensGateElevatorMainTilemap.map"
 Tilemap01_99::
-  INCBIN "./build/tilemaps/0199.map"
+  INCBIN "./build/tilemaps/HeavensGateElevatorB1F.map"
 Tilemap01_9A::
-  INCBIN "./build/tilemaps/019A.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator01F.map"
 Tilemap01_9B::
-  INCBIN "./build/tilemaps/019B.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator02F.map"
 Tilemap01_9C::
-  INCBIN "./build/tilemaps/019C.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator03F.map"
 Tilemap01_9D::
-  INCBIN "./build/tilemaps/019D.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator04F.map"
 Tilemap01_9E::
-  INCBIN "./build/tilemaps/019E.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator05F.map"
 Tilemap01_9F::
-  INCBIN "./build/tilemaps/019F.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator06F.map"
 Tilemap01_A0::
-  INCBIN "./build/tilemaps/01A0.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator07F.map"
 Tilemap01_A1::
-  INCBIN "./build/tilemaps/01A1.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator08F.map"
 Tilemap01_A2::
-  INCBIN "./build/tilemaps/01A2.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator09F.map"
 Tilemap01_A3::
-  INCBIN "./build/tilemaps/01A3.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator10F.map"
 Tilemap01_A4::
-  INCBIN "./build/tilemaps/01A4.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator11F.map"
 Tilemap01_A5::
-  INCBIN "./build/tilemaps/01A5.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator12F.map"
 Tilemap01_A6::
-  INCBIN "./build/tilemaps/01A6.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator13F.map"
 Tilemap01_A7::
-  INCBIN "./build/tilemaps/01A7.map"
+  INCBIN "./build/tilemaps/HeavensGateElevator14F.map"
 Tilemap01_A8::
   INCBIN "./build/tilemaps/01A8.map"
 Tilemap01_AB::

diff --git a/gfx/tilemaps/019A.txt → gfx/tilemaps/HeavensGateElevator01F.txt b/gfx/tilemaps/019A.txt → gfx/tilemaps/HeavensGateElevator01F.txt
diff --git a/gfx/tilemaps/019B.txt → gfx/tilemaps/HeavensGateElevator02F.txt b/gfx/tilemaps/019B.txt → gfx/tilemaps/HeavensGateElevator02F.txt
diff --git a/gfx/tilemaps/019C.txt → gfx/tilemaps/HeavensGateElevator03F.txt b/gfx/tilemaps/019C.txt → gfx/tilemaps/HeavensGateElevator03F.txt
diff --git a/gfx/tilemaps/019D.txt → gfx/tilemaps/HeavensGateElevator04F.txt b/gfx/tilemaps/019D.txt → gfx/tilemaps/HeavensGateElevator04F.txt
diff --git a/gfx/tilemaps/019E.txt → gfx/tilemaps/HeavensGateElevator05F.txt b/gfx/tilemaps/019E.txt → gfx/tilemaps/HeavensGateElevator05F.txt
diff --git a/gfx/tilemaps/019F.txt → gfx/tilemaps/HeavensGateElevator06F.txt b/gfx/tilemaps/019F.txt → gfx/tilemaps/HeavensGateElevator06F.txt
diff --git a/gfx/tilemaps/01A0.txt → gfx/tilemaps/HeavensGateElevator07F.txt b/gfx/tilemaps/01A0.txt → gfx/tilemaps/HeavensGateElevator07F.txt
diff --git a/gfx/tilemaps/01A1.txt → gfx/tilemaps/HeavensGateElevator08F.txt b/gfx/tilemaps/01A1.txt → gfx/tilemaps/HeavensGateElevator08F.txt
diff --git a/gfx/tilemaps/01A2.txt → gfx/tilemaps/HeavensGateElevator09F.txt b/gfx/tilemaps/01A2.txt → gfx/tilemaps/HeavensGateElevator09F.txt
diff --git a/gfx/tilemaps/01A3.txt → gfx/tilemaps/HeavensGateElevator10F.txt b/gfx/tilemaps/01A3.txt → gfx/tilemaps/HeavensGateElevator10F.txt
diff --git a/gfx/tilemaps/01A4.txt → gfx/tilemaps/HeavensGateElevator11F.txt b/gfx/tilemaps/01A4.txt → gfx/tilemaps/HeavensGateElevator11F.txt
diff --git a/gfx/tilemaps/01A5.txt → gfx/tilemaps/HeavensGateElevator12F.txt b/gfx/tilemaps/01A5.txt → gfx/tilemaps/HeavensGateElevator12F.txt
diff --git a/gfx/tilemaps/01A6.txt → gfx/tilemaps/HeavensGateElevator13F.txt b/gfx/tilemaps/01A6.txt → gfx/tilemaps/HeavensGateElevator13F.txt
diff --git a/gfx/tilemaps/01A7.txt → gfx/tilemaps/HeavensGateElevator14F.txt b/gfx/tilemaps/01A7.txt → gfx/tilemaps/HeavensGateElevator14F.txt
diff --git a/gfx/tilemaps/0199.txt → gfx/tilemaps/HeavensGateElevatorB1F.txt b/gfx/tilemaps/0199.txt → gfx/tilemaps/HeavensGateElevatorB1F.txt
diff --git a/gfx/tilemaps/0198.txt → ...lemaps/HeavensGateElevatorMainTilemap.txt b/gfx/tilemaps/0198.txt → ...lemaps/HeavensGateElevatorMainTilemap.txt
diff --git a/scripts/res/meta_tilemap_files.tbl b/scripts/res/meta_tilemap_files.tbl
@@ -301,22 +301,22 @@
 01_95=0195
 01_96=0196
 01_97=0197
-01_98=0198
-01_99=0199
-01_9A=019A
-01_9B=019B
-01_9C=019C
-01_9D=019D
-01_9E=019E
-01_9F=019F
-01_A0=01A0
-01_A1=01A1
-01_A2=01A2
-01_A3=01A3
-01_A4=01A4
-01_A5=01A5
-01_A6=01A6
-01_A7=01A7
+01_98=HeavensGateElevatorMainTilemap
+01_99=HeavensGateElevatorB1F
+01_9A=HeavensGateElevator01F
+01_9B=HeavensGateElevator02F
+01_9C=HeavensGateElevator03F
+01_9D=HeavensGateElevator04F
+01_9E=HeavensGateElevator05F
+01_9F=HeavensGateElevator06F
+01_A0=HeavensGateElevator07F
+01_A1=HeavensGateElevator08F
+01_A2=HeavensGateElevator09F
+01_A3=HeavensGateElevator10F
+01_A4=HeavensGateElevator11F
+01_A5=HeavensGateElevator12F
+01_A6=HeavensGateElevator13F
+01_A7=HeavensGateElevator14F
 01_A8=01A8
 01_AB=01AB
 01_AC=ChapterTitleScreen