diff options
| author | Matt <5638426+mattbruv@users.noreply.github.com> | 2020-05-03 14:41:11 -0400 |
|---|---|---|
| committer | Matt <5638426+mattbruv@users.noreply.github.com> | 2020-05-03 14:41:11 -0400 |
| commit | 8210dca8e50ed565fa20d1d625041fb382102205 (patch) | |
| tree | 64bb0e9796949a8f78162cae5b5f8830cd0f0a98 | |
| parent | 6ec4b00b522e6f966475fc2d911712be1dcf5b6a (diff) | |
label npc conditional text
| -rwxr-xr-x | scripts/VermilionCity.asm | 12 | ||||
| -rw-r--r-- | text/maps/VermilionCity.asm | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 47be222d..b253fea6 100755 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -136,21 +136,21 @@ VermilionCityText2: TX_ASM CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted - ld hl, VermilionCityText_198a7 + ld hl, VermilionCityTextDidYouSee call PrintText jr .end .shipHasDeparted - ld hl, VermilionCityText_198ac + ld hl, VermilionCityTextSSAnneDeparted call PrintText .end jp TextScriptEnd -VermilionCityText_198a7: - TX_FAR _VermilionCityText_198a7 +VermilionCityTextDidYouSee: + TX_FAR _VermilionCityTextDidYouSee db "@" -VermilionCityText_198ac: - TX_FAR _VermilionCityText_198ac +VermilionCityTextSSAnneDeparted: + TX_FAR _VermilionCityTextSSAnneDeparted db "@" VermilionCityText3: diff --git a/text/maps/VermilionCity.asm b/text/maps/VermilionCity.asm index b060a123..1cbc535c 100644 --- a/text/maps/VermilionCity.asm +++ b/text/maps/VermilionCity.asm @@ -7,13 +7,13 @@ _VermilionCityText1:: cont "toxic sludge!" done -_VermilionCityText_198a7:: +_VermilionCityTextDidYouSee:: text "Did you see S.S." line "ANNE moored in" cont "the harbor?" done -_VermilionCityText_198ac:: +_VermilionCityTextSSAnneDeparted:: text "So, S.S.ANNE has" line "departed!" |