Remove PaintShopBubbleText prebuilt

Medabots · Jul 11, 2023 · 8f7a965 · 8f7a965
1 parent dbd56b0
commit 8f7a965
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -215,7 +215,8 @@ patch_tilesets_ADDITIONAL := $(PATCH_TILESET_FILES) $(PATCH_TEXT_TILESET_FILES)\
  $(TILESET_OUT)/ChapterScreenChapterTitle6.$(COMPRESSED_TSET_TYPE)\
  $(TILESET_OUT)/GameOverScreenCharacters.$(COMPRESSED_TSET_TYPE)\
  $(TILESET_OUT)/GBCOnlyErrorScreenTextGraphics.$(COMPRESSED_TSET_TYPE)\
- $(TILESET_OUT)/SplashScreenConceptCredit.$(COMPRESSED_TSET_TYPE)
+ $(TILESET_OUT)/SplashScreenConceptCredit.$(COMPRESSED_TSET_TYPE)\
+ $(TILESET_OUT)/PaintShopBubbleText.$(COMPRESSED_TSET_TYPE)
 
 patch_vwf_ADDITIONAL := $(PATCH_TEXT_TILESET_FILES)
 

diff --git a/game/src/patch/tilesets.asm b/game/src/patch/tilesets.asm
@@ -94,6 +94,8 @@ ChapterScreenChapterNumber6::
   INCBIN "./build/tilesets/ChapterScreenChapterNumber6.malias"
 GBCOnlyErrorScreenTextGraphics::
   INCBIN "./build/tilesets/GBCOnlyErrorScreenTextGraphics.malias"
+PaintShopBubbleText::
+  INCBIN "./build/tilesets/PaintShopBubbleText.malias"
 
 SECTION "Patch 2bpp Tilesets 3", ROMX[$4000], BANK[$FD]
 ; Include certain 2bpp 'malias' uncompressed graphics here

diff --git a/game/src/version/tileset_table.asm b/game/src/version/tileset_table.asm
@@ -1194,10 +1194,6 @@ SECTION "Tileset Data PaintShopShopkeeperAvatar", ROMX[$4F4D], BANK[$3B]
 PaintShopShopkeeperAvatar::
   INCBIN "./build/tilesets/PaintShopShopkeeperAvatar.malias"
 
-SECTION "Tileset Data PaintShopBubbleText", ROMX[$51BB], BANK[$3B]
-PaintShopBubbleText::
-  INCBIN "./build/tilesets/PaintShopBubbleText.malias"
-
 SECTION "Tileset Data Tileset3A0F", ROMX[$52B5], BANK[$3B]
 Tileset3A0F::
   INCBIN "./build/tilesets/Tileset3A0F.malias"

diff --git a/gfx/prebuilt/tilesets/PaintShopBubbleText.malias b/gfx/prebuilt/tilesets/PaintShopBubbleText.malias
diff --git a/gfx/tilesets/PaintShopBubbleText.malias.png b/gfx/tilesets/PaintShopBubbleText.malias.png