aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/SaffronCity.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/SaffronCity.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/SaffronCity.asm (renamed from scripts/saffroncity.asm)7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/saffroncity.asm b/scripts/SaffronCity.asm
index 4653f150..02e6e2bb 100755
--- a/scripts/saffroncity.asm
+++ b/scripts/SaffronCity.asm
@@ -1,7 +1,7 @@
-SaffronCityScript:
+SaffronCity_Script:
jp EnableAutoTextBoxDrawing
-SaffronCityTextPointers:
+SaffronCity_TextPointers:
dw SaffronCityText1
dw SaffronCityText2
dw SaffronCityText3
@@ -74,7 +74,8 @@ SaffronCityText11:
SaffronCityText12:
TX_FAR _SaffronCityText12
- db $15, "@" ; play PIDGEOT cry from TextCommandSounds
+ TX_CRY_PIDGEOT
+ db "@"
SaffronCityText13:
TX_FAR _SaffronCityText13