summaryrefslogtreecommitdiff
path: root/scripts/VermilionCity2.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /scripts/VermilionCity2.asm
parent53fcd05aa24693093d8af1dc8ec4fedd3957decc (diff)
Sync with pokered
Diffstat (limited to 'scripts/VermilionCity2.asm')
-rwxr-xr-xscripts/VermilionCity2.asm54
1 files changed, 27 insertions, 27 deletions
diff --git a/scripts/VermilionCity2.asm b/scripts/VermilionCity2.asm
index eb7ea37a..93aa8df5 100755
--- a/scripts/VermilionCity2.asm
+++ b/scripts/VermilionCity2.asm
@@ -1,4 +1,4 @@
-Func_f1a0f:
+Func_f1a0f::
CheckEvent EVENT_GOT_SQUIRTLE_FROM_OFFICER_JENNY
jr nz, .asm_f1a69
ld a, [wBeatGymFlags]
@@ -45,67 +45,67 @@ Func_f1a0f:
ret
OfficerJennyText1:
- TX_FAR _OfficerJennyText1
- db "@"
+ text_far _OfficerJennyText1
+ text_end
OfficerJennyText2:
- TX_FAR _OfficerJennyText2
- db "@"
+ text_far _OfficerJennyText2
+ text_end
OfficerJennyText3:
- TX_FAR _OfficerJennyText3
- db $d
- db "@"
+ text_far _OfficerJennyText3
+ text_waitbutton
+ text_end
OfficerJennyText4:
- TX_FAR _OfficerJennyText4
- db "@"
+ text_far _OfficerJennyText4
+ text_end
OfficerJennyText5:
- TX_FAR _OfficerJennyText5
- db "@"
+ text_far _OfficerJennyText5
+ text_end
-Func_f1a8a:
+Func_f1a8a::
ld hl, VermilionCityText_f1a91
call PrintText
ret
VermilionCityText_f1a91:
- TX_FAR _VermilionCityText8
- db "@"
+ text_far _VermilionCityText8
+ text_end
-Func_f1a96:
+Func_f1a96::
ld hl, VermilionCityText_f1a9d
call PrintText
ret
VermilionCityText_f1a9d:
- TX_FAR _VermilionCityText9
- db "@"
+ text_far _VermilionCityText9
+ text_end
-Func_f1aa2:
+Func_f1aa2::
ld hl, VermilionCityText_f1aa9
call PrintText
ret
VermilionCityText_f1aa9:
- TX_FAR _VermilionCityText12
- db "@"
+ text_far _VermilionCityText12
+ text_end
-Func_f1aae:
+Func_f1aae::
ld hl, VermilionCityText_f1ab5
call PrintText
ret
VermilionCityText_f1ab5:
- TX_FAR _VermilionCityText13
- db "@"
+ text_far _VermilionCityText13
+ text_end
-Func_f1aba:
+Func_f1aba::
ld hl, VermilionCityText_f1ac1
call PrintText
ret
VermilionCityText_f1ac1:
- TX_FAR _VermilionCityText14
- db "@"
+ text_far _VermilionCityText14
+ text_end