From 8d22aaea908732c5d804936dfde767451aec46f9 Mon Sep 17 00:00:00 2001
From: VariantXYZ <VariantXYZ@users.noreply.github.com>
Date: Sun, 9 Jul 2023 22:42:32 -0700
Subject: [PATCH] Identify Paint Shop bubble text and shopkeeper avatar
 tilesets

---
 game/src/version/tileset_table.asm            |  20 +++++++++---------
 ...3A0D.malias => PaintShopBubbleText.malias} | Bin
 ...alias => PaintShopShopkeeperAvatar.malias} | Bin
 ...ias.png => PaintShopBubbleText.malias.png} | Bin
 ...g => PaintShopShopkeeperAvatar.malias.png} | Bin
 scripts/res/meta_tileset_index.tbl            |   4 ++--
 scripts/res/meta_tileset_names.tbl            |   4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename gfx/prebuilt/tilesets/{Tileset3A0D.malias => PaintShopBubbleText.malias} (100%)
 rename gfx/prebuilt/tilesets/{Tileset3A0B.malias => PaintShopShopkeeperAvatar.malias} (100%)
 rename gfx/tilesets/{Tileset3A0D.malias.png => PaintShopBubbleText.malias.png} (100%)
 rename gfx/tilesets/{Tileset3A0B.malias.png => PaintShopShopkeeperAvatar.malias.png} (100%)

diff --git a/game/src/version/tileset_table.asm b/game/src/version/tileset_table.asm
index c401f06e..9274a3fc 100644
--- a/game/src/version/tileset_table.asm
+++ b/game/src/version/tileset_table.asm
@@ -66,8 +66,8 @@ TilesetSourceAddressTable::
   TilesetTableEntry Tileset3A05 ; 38 (3A05)
   TilesetTableEntry Tileset3A07 ; 39 (3A07)
   TilesetTableEntry Tileset3A09 ; 3A (3A09)
-  TilesetTableEntry Tileset3A0B ; 3B (3A0B)
-  TilesetTableEntry Tileset3A0D ; 3C (3A0D)
+  TilesetTableEntry PaintShopShopkeeperAvatar ; 3B (3A0B)
+  TilesetTableEntry PaintShopBubbleText ; 3C (3A0D)
   TilesetTableEntry Tileset3A0F ; 3D (3A0F)
   TilesetTableEntry Tileset3A11 ; 3E (3A11)
   TilesetTableEntry Tileset3A13 ; 3F (3A13)
@@ -582,8 +582,8 @@ TilesetInfoTable::
   dbwb BANK(Tileset3A05), $8300, $0 ; 038
   dbwb BANK(Tileset3A07), $8000, $1 ; 039
   dbwb BANK(Tileset3A09), $9000, $0 ; 03A
-  dbwb BANK(Tileset3A0B), $9560, $0 ; 03B
-  dbwb BANK(Tileset3A0D), $8400, $0 ; 03C
+  dbwb BANK(PaintShopShopkeeperAvatar), $9560, $0 ; 03B
+  dbwb BANK(PaintShopBubbleText), $8400, $0 ; 03C
   dbwb BANK(Tileset3A0F), $8300, $0 ; 03D
   dbwb BANK(Tileset3A11), $8000, $0 ; 03E
   dbwb BANK(Tileset3A13), $8B60, $0 ; 03F
@@ -1230,13 +1230,13 @@ SECTION "Tileset Data Tileset3A09", ROMX[$4E96], BANK[$3B]
 Tileset3A09::
   INCBIN "./build/tilesets/Tileset3A09.malias"
 
-SECTION "Tileset Data Tileset3A0B", ROMX[$4F4D], BANK[$3B]
-Tileset3A0B::
-  INCBIN "./build/tilesets/Tileset3A0B.malias"
+SECTION "Tileset Data PaintShopShopkeeperAvatar", ROMX[$4F4D], BANK[$3B]
+PaintShopShopkeeperAvatar::
+  INCBIN "./build/tilesets/PaintShopShopkeeperAvatar.malias"
 
-SECTION "Tileset Data Tileset3A0D", ROMX[$51BB], BANK[$3B]
-Tileset3A0D::
-  INCBIN "./build/tilesets/Tileset3A0D.malias"
+SECTION "Tileset Data PaintShopBubbleText", ROMX[$51BB], BANK[$3B]
+PaintShopBubbleText::
+  INCBIN "./build/tilesets/PaintShopBubbleText.malias"
 
 SECTION "Tileset Data Tileset3A0F", ROMX[$52B5], BANK[$3B]
 Tileset3A0F::
diff --git a/gfx/prebuilt/tilesets/Tileset3A0D.malias b/gfx/prebuilt/tilesets/PaintShopBubbleText.malias
similarity index 100%
rename from gfx/prebuilt/tilesets/Tileset3A0D.malias
rename to gfx/prebuilt/tilesets/PaintShopBubbleText.malias
diff --git a/gfx/prebuilt/tilesets/Tileset3A0B.malias b/gfx/prebuilt/tilesets/PaintShopShopkeeperAvatar.malias
similarity index 100%
rename from gfx/prebuilt/tilesets/Tileset3A0B.malias
rename to gfx/prebuilt/tilesets/PaintShopShopkeeperAvatar.malias
diff --git a/gfx/tilesets/Tileset3A0D.malias.png b/gfx/tilesets/PaintShopBubbleText.malias.png
similarity index 100%
rename from gfx/tilesets/Tileset3A0D.malias.png
rename to gfx/tilesets/PaintShopBubbleText.malias.png
diff --git a/gfx/tilesets/Tileset3A0B.malias.png b/gfx/tilesets/PaintShopShopkeeperAvatar.malias.png
similarity index 100%
rename from gfx/tilesets/Tileset3A0B.malias.png
rename to gfx/tilesets/PaintShopShopkeeperAvatar.malias.png
diff --git a/scripts/res/meta_tileset_index.tbl b/scripts/res/meta_tileset_index.tbl
index 82242893..cd07829a 100644
--- a/scripts/res/meta_tileset_index.tbl
+++ b/scripts/res/meta_tileset_index.tbl
@@ -57,8 +57,8 @@
 038=Tileset3A05
 039=Tileset3A07
 03A=Tileset3A09
-03B=Tileset3A0B
-03C=Tileset3A0D
+03B=PaintShopShopkeeperAvatar
+03C=PaintShopBubbleText
 03D=Tileset3A0F
 03E=Tileset3A11
 03F=Tileset3A13
diff --git a/scripts/res/meta_tileset_names.tbl b/scripts/res/meta_tileset_names.tbl
index ba63ccc5..3c4531f9 100644
--- a/scripts/res/meta_tileset_names.tbl
+++ b/scripts/res/meta_tileset_names.tbl
@@ -46,8 +46,8 @@
 3A05=Tileset3A05
 3A07=Tileset3A07
 3A09=Tileset3A09
-3A0B=Tileset3A0B
-3A0D=Tileset3A0D
+3A0B=PaintShopShopkeeperAvatar
+3A0D=PaintShopBubbleText
 3A0F=Tileset3A0F
 3A11=Tileset3A11
 3A13=Tileset3A13