summaryrefslogtreecommitdiff
path: root/scripts/vermilioncity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/vermilioncity.asm')
-rwxr-xr-xscripts/vermilioncity.asm164
1 files changed, 80 insertions, 84 deletions
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm
index 1214b27c..0a734e25 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -1,6 +1,6 @@
-VermilionCityScript: ; 197a1 (6:57a1)
+VermilionCityScript:
call EnableAutoTextBoxDrawing
- ld hl, wd126
+ ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
push hl
@@ -10,37 +10,36 @@ VermilionCityScript: ; 197a1 (6:57a1)
res 5, [hl]
call nz, VermilionCityScript_197c0
ld hl, VermilionCityScriptPointers
- ld a, [W_VERMILIONCITYCURSCRIPT]
+ ld a, [wVermilionCityCurScript]
jp CallFunctionInTable
-VermilionCityScript_197c0: ; 197c0 (6:57c0)
+VermilionCityScript_197c0:
call Random
ld a, [$ffd4]
and $e
- ld [wd743], a
+ ld [wFirstLockTrashCanIndex], a
ret
-VermilionCityScript_197cb: ; 197cb (6:57cb)
- ld hl, wd803
- bit 2, [hl]
+VermilionCityScript_197cb:
+ CheckEventHL EVENT_SS_ANNE_LEFT
ret z
- bit 3, [hl]
- set 3, [hl]
+ CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
+ SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
ret nz
ld a, $2
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-VermilionCityScriptPointers: ; 197dc (6:57dc)
+VermilionCityScriptPointers:
dw VermilionCityScript0
dw VermilionCityScript1
dw VermilionCityScript2
dw VermilionCityScript3
dw VermilionCityScript4
-VermilionCityScript0: ; 197e6 (6:57e6)
+VermilionCityScript0:
ld a, [wSpriteStateData1 + 9]
- and a
+ and a ; cp SPRITE_FACING_DOWN
ret nz
ld hl, CoordsData_19823
call ArePlayerCoordsInArray
@@ -49,52 +48,51 @@ VermilionCityScript0: ; 197e6 (6:57e6)
ld [hJoyHeld], a
ld [wcf0d], a
ld a, $3
- ld [$ff8c], a
+ ld [hSpriteIndexOrTextID], a
call DisplayTextID
- ld a, [wd803]
- bit 2, a
- jr nz, .asm_19810 ; 0x19804 $a
- ld b, $3f
- predef IsItemInBag_
+ CheckEvent EVENT_SS_ANNE_LEFT
+ jr nz, .asm_19810
+ ld b, S_S_TICKET
+ predef GetQuantityOfItemInBag
ld a, b
and a
ret nz
.asm_19810
- ld a, $40
+ ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $1
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-CoordsData_19823: ; 19823 (6:5823)
+CoordsData_19823:
db $1e,$12
db $ff
-VermilionCityScript4: ; 19826 (6:5826)
+VermilionCityScript4:
ld hl, CoordsData_19823
call ArePlayerCoordsInArray
ret c
ld a, $0
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-VermilionCityScript2: ; 19833 (6:5833)
+VermilionCityScript2:
ld a, $ff
ld [wJoyIgnore], a
- ld a, $40
+ ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
- ld [wccd4], a
- ld a, $2
+ ld [wSimulatedJoypadStatesEnd + 1], a
+ ld a, 2
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $3
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-VermilionCityScript3: ; 1984e (6:584e)
+VermilionCityScript3:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
@@ -102,20 +100,20 @@ VermilionCityScript3: ; 1984e (6:584e)
ld [wJoyIgnore], a
ld [hJoyHeld], a
ld a, $0
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-VermilionCityScript1: ; 1985f (6:585f)
+VermilionCityScript1:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
- ld c, $a
+ ld c, 10
call DelayFrames
ld a, $0
- ld [W_VERMILIONCITYCURSCRIPT], a
+ ld [wVermilionCityCurScript], a
ret
-VermilionCityTextPointers: ; 1986f (6:586f)
+VermilionCityTextPointers:
dw VermilionCityText1
dw VermilionCityText2
dw VermilionCityText3
@@ -130,132 +128,130 @@ VermilionCityTextPointers: ; 1986f (6:586f)
dw VermilionCityText12
dw VermilionCityText13
-VermilionCityText1: ; 19889 (6:5889)
+VermilionCityText1:
TX_FAR _VermilionCityText1
db "@"
-VermilionCityText2: ; 1988e (6:588e)
- db $08 ; asm
- ld a, [wd803]
- bit 2, a
- jr nz, .asm_359bd ; 0x19894
+VermilionCityText2:
+ TX_ASM
+ CheckEvent EVENT_SS_ANNE_LEFT
+ jr nz, .asm_1989e
ld hl, VermilionCityText_198a7
call PrintText
- jr .asm_735d9 ; 0x1989c
-.asm_359bd ; 0x1989e
+ jr .asm_198a4
+.asm_1989e
ld hl, VermilionCityText_198ac
call PrintText
-.asm_735d9 ; 0x198a4
+.asm_198a4
jp TextScriptEnd
-VermilionCityText_198a7: ; 198a7 (6:58a7)
+VermilionCityText_198a7:
TX_FAR _VermilionCityText_198a7
db "@"
-VermilionCityText_198ac: ; 198ac (6:58ac)
+VermilionCityText_198ac:
TX_FAR _VermilionCityText_198ac
db "@"
-VermilionCityText3: ; 198b1 (6:58b1)
- db $08 ; asm
- ld a, [wd803]
- bit 2, a
- jr nz, .asm_3e0e9 ; 0x198b7
+VermilionCityText3:
+ TX_ASM
+ CheckEvent EVENT_SS_ANNE_LEFT
+ jr nz, .asm_198f6
ld a, [wSpriteStateData1 + 9]
- cp $c
- jr z, .asm_07af3 ; 0x198be
+ cp SPRITE_FACING_RIGHT
+ jr z, .asm_198c8
ld hl, VermilionCityCoords1
call ArePlayerCoordsInArray
- jr nc, .asm_57b73 ; 0x198c6
-.asm_07af3 ; 0x198c8
+ jr nc, .asm_198d0
+.asm_198c8
ld hl, SSAnneWelcomeText4
call PrintText
- jr .asm_79bd1 ; 0x198ce
-.asm_57b73 ; 0x198d0
+ jr .asm_198fc
+.asm_198d0
ld hl, SSAnneWelcomeText9
call PrintText
- ld b, S_S__TICKET
- predef IsItemInBag_
+ ld b, S_S_TICKET
+ predef GetQuantityOfItemInBag
ld a, b
and a
- jr nz, .asm_0419b ; 0x198df
+ jr nz, .asm_198e9
ld hl, SSAnneNoTicketText
call PrintText
- jr .asm_79bd1 ; 0x198e7
-.asm_0419b ; 0x198e9
+ jr .asm_198fc
+.asm_198e9
ld hl, SSAnneFlashedTicketText
call PrintText
ld a, $4
- ld [W_VERMILIONCITYCURSCRIPT], a
- jr .asm_79bd1 ; 0x198f4
-.asm_3e0e9 ; 0x198f6
+ ld [wVermilionCityCurScript], a
+ jr .asm_198fc
+.asm_198f6
ld hl, SSAnneNotHereText
call PrintText
-.asm_79bd1 ; 0x198fc
+.asm_198fc
jp TextScriptEnd
-VermilionCityCoords1: ; 198ff (6:58ff)
+VermilionCityCoords1:
db $1d,$13
db $1f,$13
db $ff
-SSAnneWelcomeText4: ; 19904 (6:5904)
+SSAnneWelcomeText4:
TX_FAR _SSAnneWelcomeText4
db "@"
-SSAnneWelcomeText9: ; 19909 (6:5909)
+SSAnneWelcomeText9:
TX_FAR _SSAnneWelcomeText9
db "@"
-SSAnneFlashedTicketText: ; 1990e (6:590e)
+SSAnneFlashedTicketText:
TX_FAR _SSAnneFlashedTicketText
db "@"
-SSAnneNoTicketText: ; 19913 (6:5913)
+SSAnneNoTicketText:
TX_FAR _SSAnneNoTicketText
db "@"
-SSAnneNotHereText: ; 19918 (6:5918)
+SSAnneNotHereText:
TX_FAR _SSAnneNotHereText
db "@"
-VermilionCityText4: ; 1991d (6:591d)
+VermilionCityText4:
TX_FAR _VermilionCityText4
db "@"
-VermilionCityText5: ; 19922 (6:5922)
+VermilionCityText5:
TX_FAR _VermilionCityText5
- db $08 ; asm
+ TX_ASM
ld a, MACHOP
call PlayCry
call WaitForSoundToFinish
- ld hl, VermilionCityText14 ; $5933
+ ld hl, VermilionCityText14
ret
-VermilionCityText14: ; 19933 (6:5933)
+VermilionCityText14:
TX_FAR _VermilionCityText14
db "@"
-VermilionCityText6: ; 19938 (6:5938)
+VermilionCityText6:
TX_FAR _VermilionCityText6
db "@"
-VermilionCityText7: ; 1993d (6:593d)
+VermilionCityText7:
TX_FAR _VermilionCityText7
db "@"
-VermilionCityText8: ; 19942 (6:5942)
+VermilionCityText8:
TX_FAR _VermilionCityText8
db "@"
-VermilionCityText11: ; 19947 (6:5947)
+VermilionCityText11:
TX_FAR _VermilionCityText11
db "@"
-VermilionCityText12: ; 1994c (6:594c)
+VermilionCityText12:
TX_FAR _VermilionCityText12
db "@"
-VermilionCityText13: ; 19951 (6:5951)
+VermilionCityText13:
TX_FAR _VermilionCityText13
db "@"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 01:47:52 +0000