aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/celadonmartroof.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/celadonmartroof.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xscripts/CeladonMartRoof.asm (renamed from scripts/celadonmartroof.asm)26
1 files changed, 13 insertions, 13 deletions
diff --git a/scripts/celadonmartroof.asm b/scripts/CeladonMartRoof.asm
index 22a83780..64871bdd 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoofScript:
+CeladonMartRoof_Script:
call EnableAutoTextBoxDrawing
ret
@@ -143,48 +143,48 @@ CeladonMartRoofText_484ee:
CeladonMartRoofText_484f3:
TX_FAR _CeladonMartRoofText_484f3
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_484f9:
TX_FAR _CeladonMartRoofText_484f9
- db $0b
+ TX_SFX_ITEM_1
TX_FAR _CeladonMartRoofText_484fe
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_48504:
TX_FAR _CeladonMartRoofText_48504
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_4850a:
TX_FAR _CeladonMartRoofText_4850a
- db $0b
+ TX_SFX_ITEM_1
TX_FAR _CeladonMartRoofText_4850f
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_48515:
TX_FAR _CeladonMartRoofText_48515
- db $0d
+ TX_WAIT
db "@"
ReceivedTM49Text:
TX_FAR _ReceivedTM49Text
- db $0b
+ TX_SFX_ITEM_1
TX_FAR _CeladonMartRoofText_48520
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_48526:
TX_FAR _CeladonMartRoofText_48526
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofText_4852c:
TX_FAR _CeladonMartRoofText_4852c
- db $0d
+ TX_WAIT
db "@"
CeladonMartRoofScript_PrintDrinksInBag:
@@ -209,7 +209,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
pop hl
jr .loop
-CeladonMartRoofTextPointers:
+CeladonMartRoof_TextPointers:
dw CeladonMartRoofText1
dw CeladonMartRoofText2
dw CeladonMartRoofText5