shithub: pokered

Download patch

ref: 292e5b8c807a9b06aaecbcc7d3c03173d6a60fe3
parent: 776e177e459711c26799b174f06dfc98baa95274
author: Bryan Bishop <kanzure@gmail.com>
date: Sat Jan 14 14:16:31 EST 2012

clean up CeladonPrizeRoomTexts

hg-commit-id: c877450ceacb


--- a/common.asm
+++ b/common.asm
@@ -23661,7 +23661,7 @@
 CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
     db $12 ; tileset
     db $04, $05 ; dimensions (y, x)
-    dw CeladonPrizeRoomBlocks, $50f3, $50f0 ; blocks, texts, scripts
+    dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTexts, CeladonPrizeRoomScript ; blocks, texts, scripts
     db $00 ; connections
 
     dw CeladonPrizeRoomObject ; objects
@@ -23670,7 +23670,8 @@
     jp $3c3c
 ; 0x490f3
 
-INCBIN "baserom.gbc",$490f3,$a
+CeladonPrizeRoomTexts:
+    dw CeladonPrizeRoomText1, CeladonPrizeRoomText2, CeladonPrizeRoomText3, CeladonPrizeRoomText3, CeladonPrizeRoomText3
 
 CeladonPrizeRoomText1: ; 0x490fd
     TX_FAR _CeladonPrizeRoomText1
@@ -23680,7 +23681,8 @@
     TX_FAR _CeladonPrizeRoomText2
     db $50
 
-INCBIN "baserom.gbc",$49107,$1
+CeladonPrizeRoomText3: ; 0x49107
+    db $f7
 
 CeladonPrizeRoomObject: ; 0x49108 (size=41)
     db $f ; border tile