summaryrefslogtreecommitdiff
path: root/scripts/viridiancity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/viridiancity.asm')
-rwxr-xr-xscripts/viridiancity.asm204
1 files changed, 99 insertions, 105 deletions
diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm
index d0b2b4ae..3ccdc509 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -1,67 +1,64 @@
-ViridianCityScript: ; 18ff1 (6:4ff1)
+ViridianCityScript:
call EnableAutoTextBoxDrawing
ld hl, ViridianCityScriptPointers
- ld a, [W_VIRIDIANCITYCURSCRIPT]
+ ld a, [wViridianCityCurScript]
jp CallFunctionInTable
-ViridianCityScriptPointers: ; 18ffd (6:4ffd)
+ViridianCityScriptPointers:
dw ViridianCityScript0
dw ViridianCityScript1
dw ViridianCityScript2
dw ViridianCityScript3
-ViridianCityScript0: ; 19005 (6:5005)
+ViridianCityScript0:
call ViridianCityScript_1900b
jp ViridianCityScript_1903d
-ViridianCityScript_1900b: ; 1900b (6:500b)
- ld a, [wd74c]
- bit 0, a
+ViridianCityScript_1900b:
+ CheckEvent EVENT_VIRIDIAN_GYM_OPEN
ret nz
- ld a, [W_OBTAINEDBADGES]
+ ld a, [wObtainedBadges]
cp %01111111
- jr nz, .asm_1901e ; 0x19016 $6
- ld hl, wd74c
- set 0, [hl]
+ jr nz, .asm_1901e
+ SetEvent EVENT_VIRIDIAN_GYM_OPEN
ret
.asm_1901e
- ld a, [W_YCOORD]
+ ld a, [wYCoord]
cp $8
ret nz
- ld a, [W_XCOORD]
+ ld a, [wXCoord]
cp $20
ret nz
ld a, $e
- ld [$ff8c], a
+ ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
call ViridianCityScript_190cf
ld a, $3
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
ret
-ViridianCityScript_1903d: ; 1903d (6:503d)
- ld a, [wd74b]
- bit 5, a
+ViridianCityScript_1903d:
+ CheckEvent EVENT_GOT_POKEDEX
ret nz
- ld a, [W_YCOORD]
+ ld a, [wYCoord]
cp $9
ret nz
- ld a, [W_XCOORD]
+ ld a, [wXCoord]
cp $13
ret nz
ld a, $5
- ld [$ff8c], a
+ ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ld [hJoyHeld], a
call ViridianCityScript_190cf
ld a, $3
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
ret
-ViridianCityScript1: ; 19062 (6:5062)
+ViridianCityScript1:
ld a, [wSpriteStateData1 + $34]
ld [$ffeb], a
ld a, [wSpriteStateData1 + $36]
@@ -74,17 +71,17 @@ ViridianCityScript1: ; 19062 (6:5062)
ld [wListScrollOffset], a
; set up battle for Old Man
- ld a, $1
- ld [W_BATTLETYPE], a
+ ld a, BATTLE_TYPE_OLD_MAN
+ ld [wBattleType], a
ld a, 5
- ld [W_CURENEMYLVL], a
+ ld [wCurEnemyLVL], a
ld a, WEEDLE
- ld [W_CUROPPONENT], a
+ ld [wCurOpponent], a
ld a, $2
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
ret
-ViridianCityScript2: ; 1908f (6:508f)
+ViridianCityScript2:
ld a, [$ffeb]
ld [wSpriteStateData1 + $34], a
ld a, [$ffec]
@@ -98,36 +95,36 @@ ViridianCityScript2: ; 1908f (6:508f)
xor a
ld [wJoyIgnore], a
ld a, $f
- ld [$ff8c], a
+ ld [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
- ld [W_BATTLETYPE], a
+ ld [wBattleType], a
ld [wJoyIgnore], a
ld a, $0
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
ret
-ViridianCityScript3: ; 190c1 (6:50c1)
+ViridianCityScript3:
ld a, [wSimulatedJoypadStatesIndex]
and a
ret nz
call Delay3
ld a, 0
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
ret
-ViridianCityScript_190cf: ; 190cf (6:50cf)
+ViridianCityScript_190cf:
call StartSimulatingJoypadStates
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
- ld a, $80
+ ld a, D_DOWN
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
ret
-ViridianCityTextPointers: ; 190e4 (6:50e4)
+ViridianCityTextPointers:
dw ViridianCityText1
dw ViridianCityText2
dw ViridianCityText3
@@ -144,190 +141,187 @@ ViridianCityTextPointers: ; 190e4 (6:50e4)
dw ViridianCityText14
dw ViridianCityText15
-ViridianCityText1: ; 19102 (6:5102)
+ViridianCityText1:
TX_FAR _ViridianCityText1
db "@"
-ViridianCityText2: ; 19107 (6:5107)
- db $08 ; asm
- ld a, [W_OBTAINEDBADGES]
+ViridianCityText2:
+ TX_ASM
+ ld a, [wObtainedBadges]
cp %01111111
ld hl, ViridianCityText_19127
- jr z, .asm_ae9fe ; 0x19110
- ld a, [wd751]
- bit 1, a
- jr nz, .asm_ae9fe ; 0x19117
+ jr z, .asm_ae9fe
+ CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
+ jr nz, .asm_ae9fe
ld hl, ViridianCityText_19122
-.asm_ae9fe ; 0x1911c
+.asm_ae9fe
call PrintText
jp TextScriptEnd
-ViridianCityText_19122: ; 19122 (6:5122)
+ViridianCityText_19122:
TX_FAR _ViridianCityText_19122
db "@"
-ViridianCityText_19127: ; 19127 (6:5127)
+ViridianCityText_19127:
TX_FAR _ViridianCityText_19127
db "@"
-ViridianCityText3: ; 1912c (6:512c)
- db $08 ; asm
+ViridianCityText3:
+ TX_ASM
ld hl, ViridianCityText_1914d
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- jr nz, .asm_6dfea ; 0x1913a
+ jr nz, .asm_6dfea
ld hl, ViridianCityText_19157
call PrintText
- jr .asm_d611f ; 0x19142
-.asm_6dfea ; 0x19144
+ jr .asm_d611f
+.asm_6dfea
ld hl, ViridianCityText_19152
call PrintText
-.asm_d611f ; 0x1914a
+.asm_d611f
jp TextScriptEnd
-ViridianCityText_1914d: ; 1914d (6:514d)
+ViridianCityText_1914d:
TX_FAR _ViridianCityText_1914d
db "@"
-ViridianCityText_19152: ; 19152 (6:5152)
+ViridianCityText_19152:
TX_FAR _ViridianCityText_19152
db "@"
-ViridianCityText_19157: ; 19157 (6:5157)
+ViridianCityText_19157:
TX_FAR _ViridianCityText_19157
db "@"
-ViridianCityText4: ; 1915c (6:515c)
- db $08 ; asm
- ld a, [wd74b]
- bit 5, a
- jr nz, .asm_83894 ; 0x19162
+ViridianCityText4:
+ TX_ASM
+ CheckEvent EVENT_GOT_POKEDEX
+ jr nz, .asm_83894
ld hl, ViridianCityText_19175
call PrintText
- jr .asm_700a6 ; 0x1916a
-.asm_83894 ; 0x1916c
+ jr .asm_700a6
+.asm_83894
ld hl, ViridianCityText_1917a
call PrintText
-.asm_700a6 ; 0x19172
+.asm_700a6
jp TextScriptEnd
-ViridianCityText_19175: ; 19175 (6:5175)
+ViridianCityText_19175:
TX_FAR _ViridianCityText_19175
db "@"
-ViridianCityText_1917a: ; 1917a (6:517a)
+ViridianCityText_1917a:
TX_FAR _ViridianCityText_1917a
db "@"
-ViridianCityText5: ; 1917f (6:517f)
- db $08 ; asm
+ViridianCityText5:
+ TX_ASM
ld hl, ViridianCityText_19191
call PrintText
call ViridianCityScript_190cf
ld a, $3
- ld [W_VIRIDIANCITYCURSCRIPT], a
+ ld [wViridianCityCurScript], a
jp TextScriptEnd
-ViridianCityText_19191: ; 19191 (6:5191)
+ViridianCityText_19191:
TX_FAR _ViridianCityText_19191
db "@"
-ViridianCityText6: ; 19196 (6:5196)
- db $08 ; asm
- ld a, [wd74c]
- bit 1, a
- jr nz, .asm_4e5a0 ; 0x1919c
+ViridianCityText6:
+ TX_ASM
+ CheckEvent EVENT_GOT_TM42
+ jr nz, .asm_4e5a0
ld hl, ViridianCityText_191ca
call PrintText
- ld bc, (TM_42 << 8) | 1
+ lb bc, TM_42, 1
call GiveItem
jr nc, .BagFull
ld hl, ReceivedTM42Text
call PrintText
- ld hl, wd74c
- set 1, [hl]
- jr .asm_3c73c ; 0x191b7
+ SetEvent EVENT_GOT_TM42
+ jr .asm_3c73c
.BagFull
ld hl, TM42NoRoomText
call PrintText
- jr .asm_3c73c ; 0x191bf
-.asm_4e5a0 ; 0x191c1
+ jr .asm_3c73c
+.asm_4e5a0
ld hl, TM42Explanation
call PrintText
-.asm_3c73c ; 0x191c7
+.asm_3c73c
jp TextScriptEnd
-ViridianCityText_191ca: ; 191ca (6:51ca)
+ViridianCityText_191ca:
TX_FAR _ViridianCityText_191ca
db "@"
-ReceivedTM42Text: ; 191cf (6:51cf)
+ReceivedTM42Text:
TX_FAR _ReceivedTM42Text
- db $10, "@"
+ TX_SFX_ITEM_2
+ db "@"
-TM42Explanation: ; 191d5 (6:51d5)
+TM42Explanation:
TX_FAR _TM42Explanation
db "@"
-TM42NoRoomText: ; 191da (6:51da)
+TM42NoRoomText:
TX_FAR _TM42NoRoomText
db "@"
-ViridianCityText7: ; 191df (6:51df)
- db $08 ; asm
+ViridianCityText7:
+ TX_ASM
ld hl, ViridianCityText_1920a
call PrintText
- ld c, $2
+ ld c, 2
call DelayFrames
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- jr z, .asm_42f68 ; 0x191f2
+ jr z, .asm_42f68
ld hl, ViridianCityText_1920f
call PrintText
ld a, $1
- ld [W_VIRIDIANCITYCURSCRIPT], a
- jr .asm_2413a ; 0x191ff
-.asm_42f68 ; 0x19201
+ ld [wViridianCityCurScript], a
+ jr .asm_2413a
+.asm_42f68
ld hl, ViridianCityText_19214
call PrintText
-.asm_2413a ; 0x19207
+.asm_2413a
jp TextScriptEnd
-ViridianCityText_1920a: ; 1920a (6:520a)
+ViridianCityText_1920a:
TX_FAR _ViridianCityText_1920a
db "@"
-ViridianCityText_1920f: ; 1920f (6:520f)
+ViridianCityText_1920f:
TX_FAR _ViridianCityText_1920f
db "@"
-ViridianCityText_19214: ; 19214 (6:5214)
+ViridianCityText_19214:
TX_FAR _ViridianCityText_19214
db "@"
-ViridianCityText15: ; 19219 (6:5219)
+ViridianCityText15:
TX_FAR _ViridianCityText_19219
db "@"
-ViridianCityText8: ; 1921e (6:521e)
+ViridianCityText8:
TX_FAR _ViridianCityText8
db "@"
-ViridianCityText9: ; 19223 (6:5223)
+ViridianCityText9:
TX_FAR _ViridianCityText9
db "@"
-ViridianCityText10: ; 19228 (6:5228)
+ViridianCityText10:
TX_FAR _ViridianCityText10
db "@"
-ViridianCityText13: ; 1922d (6:522d)
+ViridianCityText13:
TX_FAR _ViridianCityText13
db "@"
-ViridianCityText14: ; 19232 (6:5232)
+ViridianCityText14:
TX_FAR _ViridianCityText14
db "@"