From b6aa26ffa4629e027ae0384c85ebeb9bc5635728 Mon Sep 17 00:00:00 2001
From: Matt <5638426+mattbruv@users.noreply.github.com>
Date: Sun, 3 May 2020 02:00:01 -0400
Subject: [PATCH 1/3] label hardcoded HRAM address, start documenting Vermilion

---
 scripts/VermilionCity.asm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index 1ac81521..780b9975 100755
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -8,14 +8,14 @@ VermilionCity_Script:
 	pop hl
 	bit 5, [hl]
 	res 5, [hl]
-	call nz, VermilionCityScript_197c0
+	call nz, .setFirstLockTrashCanIndex
 	ld hl, VermilionCity_ScriptPointers
 	ld a, [wVermilionCityCurScript]
 	jp CallFunctionInTable
 
-VermilionCityScript_197c0:
+.setFirstLockTrashCanIndex
 	call Random
-	ld a, [$ffd4]
+	ld a, [hRandomSub]
 	and $e
 	ld [wFirstLockTrashCanIndex], a
 	ret

From 6ec4b00b522e6f966475fc2d911712be1dcf5b6a Mon Sep 17 00:00:00 2001
From: Matt <5638426+mattbruv@users.noreply.github.com>
Date: Sun, 3 May 2020 14:25:01 -0400
Subject: [PATCH 2/3] clean up vermilion labels

---
 pokered.sn1               | Bin 0 -> 69955 bytes
 scripts/VermilionCity.asm |  56 +++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 pokered.sn1

diff --git a/pokered.sn1 b/pokered.sn1
new file mode 100644
index 0000000000000000000000000000000000000000..7ff6d5013091ea03bf77e7acab6d80cc70b8a182
GIT binary patch
literal 69955
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
XMnFd3wjnUTa7NnvlA>b%QL+C6nUv3x

literal 0
HcmV?d00001

diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm
index 780b9975..47be222d 100755
--- a/scripts/VermilionCity.asm
+++ b/scripts/VermilionCity.asm
@@ -4,7 +4,7 @@ VermilionCity_Script:
 	bit 6, [hl]
 	res 6, [hl]
 	push hl
-	call nz, VermilionCityScript_197cb
+	call nz, .initCityScript
 	pop hl
 	bit 5, [hl]
 	res 5, [hl]
@@ -20,7 +20,7 @@ VermilionCity_Script:
 	ld [wFirstLockTrashCanIndex], a
 	ret
 
-VermilionCityScript_197cb:
+.initCityScript
 	CheckEventHL EVENT_SS_ANNE_LEFT
 	ret z
 	CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
@@ -41,7 +41,7 @@ VermilionCityScript0:
 	ld a, [wSpriteStateData1 + 9]
 	and a ; cp SPRITE_FACING_DOWN
 	ret nz
-	ld hl, CoordsData_19823
+	ld hl, SSAnneTicketCheckCoords
 	call ArePlayerCoordsInArray
 	ret nc
 	xor a
@@ -51,13 +51,13 @@ VermilionCityScript0:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	CheckEvent EVENT_SS_ANNE_LEFT
-	jr nz, .asm_19810
+	jr nz, .shipHasDeparted
 	ld b, S_S_TICKET
 	predef GetQuantityOfItemInBag
 	ld a, b
 	and a
 	ret nz
-.asm_19810
+.shipHasDeparted
 	ld a, D_UP
 	ld [wSimulatedJoypadStatesEnd], a
 	ld a, $1
@@ -67,12 +67,12 @@ VermilionCityScript0:
 	ld [wVermilionCityCurScript], a
 	ret
 
-CoordsData_19823:
-	db $1e,$12
+SSAnneTicketCheckCoords:
+	db $1e,$12 ; y, x
 	db $ff
 
 VermilionCityScript4:
-	ld hl, CoordsData_19823
+	ld hl, SSAnneTicketCheckCoords
 	call ArePlayerCoordsInArray
 	ret c
 	ld a, $0
@@ -135,14 +135,14 @@ VermilionCityText1:
 VermilionCityText2:
 	TX_ASM
 	CheckEvent EVENT_SS_ANNE_LEFT
-	jr nz, .asm_1989e
+	jr nz, .shipHasDeparted
 	ld hl, VermilionCityText_198a7
 	call PrintText
-	jr .asm_198a4
-.asm_1989e
+	jr .end
+.shipHasDeparted
 	ld hl, VermilionCityText_198ac
 	call PrintText
-.asm_198a4
+.end
 	jp TextScriptEnd
 
 VermilionCityText_198a7:
@@ -156,43 +156,43 @@ VermilionCityText_198ac:
 VermilionCityText3:
 	TX_ASM
 	CheckEvent EVENT_SS_ANNE_LEFT
-	jr nz, .asm_198f6
+	jr nz, .shipHasDeparted
 	ld a, [wSpriteStateData1 + 9]
 	cp SPRITE_FACING_RIGHT
-	jr z, .asm_198c8
-	ld hl, VermilionCityCoords1
+	jr z, .greetPlayer
+	ld hl, .inFrontOfOrBehindGuardCoords
 	call ArePlayerCoordsInArray
-	jr nc, .asm_198d0
-.asm_198c8
+	jr nc, .greetPlayerAndCheckTicket
+.greetPlayer
 	ld hl, SSAnneWelcomeText4
 	call PrintText
-	jr .asm_198fc
-.asm_198d0
+	jr .end
+.greetPlayerAndCheckTicket
 	ld hl, SSAnneWelcomeText9
 	call PrintText
 	ld b, S_S_TICKET
 	predef GetQuantityOfItemInBag
 	ld a, b
 	and a
-	jr nz, .asm_198e9
+	jr nz, .playerHasTicket
 	ld hl, SSAnneNoTicketText
 	call PrintText
-	jr .asm_198fc
-.asm_198e9
+	jr .end
+.playerHasTicket
 	ld hl, SSAnneFlashedTicketText
 	call PrintText
 	ld a, $4
 	ld [wVermilionCityCurScript], a
-	jr .asm_198fc
-.asm_198f6
+	jr .end
+.shipHasDeparted
 	ld hl, SSAnneNotHereText
 	call PrintText
-.asm_198fc
+.end
 	jp TextScriptEnd
 
-VermilionCityCoords1:
-	db $1d,$13
-	db $1f,$13
+.inFrontOfOrBehindGuardCoords
+	db $1d,$13 ; y, x of tile in front of guard
+	db $1f,$13 ; y, x of tile behind guard
 	db $ff
 
 SSAnneWelcomeText4:

From 8210dca8e50ed565fa20d1d625041fb382102205 Mon Sep 17 00:00:00 2001
From: Matt <5638426+mattbruv@users.noreply.github.com>
Date: Sun, 3 May 2020 14:41:11 -0400
Subject: [PATCH 3/3] label npc conditional text

---
 scripts/VermilionCity.asm   | 12 ++++++------
 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!"