Merge branch 'master' into tr_EN

Medabots · Jul 12, 2023 · fda899e · fda899e
2 parents 57a6b24 + 2bcdc78
commit fda899e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/game/src/version/tilemap_table.asm b/game/src/version/tilemap_table.asm
@@ -875,13 +875,13 @@ TilemapTable01::
   dw TilemapTable01Terminator ; FE
   dw TilemapTable01Terminator ; FF
 Tilemap01_00::
-  INCBIN "./build/tilemaps/0100.map"
+  INCBIN "./build/tilemaps/MinigameAOverlay.map"
 Tilemap01_01::
-  INCBIN "./build/tilemaps/0101.map"
+  INCBIN "./build/tilemaps/MinigameAEnvironment.map"
 Tilemap01_02::
-  INCBIN "./build/tilemaps/0102.map"
+  INCBIN "./build/tilemaps/MinigameBOverlay.map"
 Tilemap01_04::
-  INCBIN "./build/tilemaps/0104.map"
+  INCBIN "./build/tilemaps/MinigameBEnvironment.map"
 Tilemap01_05::
   INCBIN "./build/tilemaps/0105.map"
 Tilemap01_06::

diff --git a/gfx/tilemaps/0101.txt → gfx/tilemaps/MinigameAEnvironment.txt b/gfx/tilemaps/0101.txt → gfx/tilemaps/MinigameAEnvironment.txt
diff --git a/gfx/tilemaps/0100.txt → gfx/tilemaps/MinigameAOverlay.txt b/gfx/tilemaps/0100.txt → gfx/tilemaps/MinigameAOverlay.txt
diff --git a/gfx/tilemaps/0104.txt → gfx/tilemaps/MinigameBEnvironment.txt b/gfx/tilemaps/0104.txt → gfx/tilemaps/MinigameBEnvironment.txt
diff --git a/gfx/tilemaps/0102.txt → gfx/tilemaps/MinigameBOverlay.txt b/gfx/tilemaps/0102.txt → gfx/tilemaps/MinigameBOverlay.txt
diff --git a/scripts/res/meta_tilemap_files.tbl b/scripts/res/meta_tilemap_files.tbl
@@ -166,10 +166,10 @@
 00_FC=RobattleTextDisabled
 00_FD=RobattleTextShiftChange
 00_FE=RobattleTextPowerChange
-01_00=0100
-01_01=0101
-01_02=0102
-01_04=0104
+01_00=MinigameAOverlay
+01_01=MinigameAEnvironment
+01_02=MinigameBOverlay
+01_04=MinigameBEnvironment
 01_05=0105
 01_06=0106
 01_07=0107