summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/CeladonGym.asm18
-rwxr-xr-xscripts/CeruleanGym.asm18
-rwxr-xr-xscripts/CinnabarGym.asm12
-rwxr-xr-xscripts/FuchsiaGym.asm18
-rwxr-xr-xscripts/OaksLab.asm54
-rwxr-xr-xscripts/PewterCity.asm16
-rwxr-xr-xscripts/PewterGym.asm18
-rwxr-xr-xscripts/SaffronGym.asm18
-rwxr-xr-xscripts/VermilionGym.asm26
-rwxr-xr-xscripts/ViridianCity.asm44
-rwxr-xr-xscripts/ViridianGym.asm18
11 files changed, 130 insertions, 130 deletions
diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm
index 8ceb36ee..50c02196 100755
--- a/scripts/CeladonGym.asm
+++ b/scripts/CeladonGym.asm
@@ -54,12 +54,12 @@ CeladonGymText_48963:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM21
- jr .asm_4898c
+ jr .gymVictory
.BagFull
ld a, $b
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_4898c
+.gymVictory
ld hl, wObtainedBadges
set 3, [hl]
ld hl, wBeatGymFlags
@@ -151,17 +151,17 @@ CeladonGymTrainerHeader6:
CeladonGymText1:
TX_ASM
CheckEvent EVENT_BEAT_ERIKA
- jr z, .asm_48a2d
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM21
- jr nz, .asm_48a25
+ jr nz, .afterVictory
call z, CeladonGymText_48963
call DisableWaitingAfterTextDisplay
- jr .asm_48a5b
-.asm_48a25
+ jr .done
+.afterVictory
ld hl, CeladonGymText_48a68
call PrintText
- jr .asm_48a5b
-.asm_48a2d
+ jr .done
+.beginBattle
ld hl, CeladonGymText_48a5e
call PrintText
ld hl, wd72d
@@ -179,7 +179,7 @@ CeladonGymText1:
ld a, $3
ld [wCeladonGymCurScript], a
ld [wCurMapScript], a
-.asm_48a5b
+.done
jp TextScriptEnd
CeladonGymText_48a5e:
diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm
index 7d152b4f..c4aaf7de 100755
--- a/scripts/CeruleanGym.asm
+++ b/scripts/CeruleanGym.asm
@@ -54,12 +54,12 @@ CeruleanGymScript_5c70d:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM11
- jr .asm_5c736
+ jr .gymVictory
.BagFull
ld a, $7
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_5c736
+.gymVictory
ld hl, wObtainedBadges
set 1, [hl]
ld hl, wBeatGymFlags
@@ -102,17 +102,17 @@ CeruleanGymTrainerHeader1:
CeruleanGymText1:
TX_ASM
CheckEvent EVENT_BEAT_MISTY
- jr z, .asm_5c78d
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM11
- jr nz, .asm_5c785
+ jr nz, .afterVictory
call z, CeruleanGymScript_5c70d
call DisableWaitingAfterTextDisplay
- jr .asm_5c7bb
-.asm_5c785
+ jr .done
+.afterVictory
ld hl, CeruleanGymText_5c7c3
call PrintText
- jr .asm_5c7bb
-.asm_5c78d
+ jr .done
+.beginBattle
ld hl, CeruleanGymText_5c7be
call PrintText
ld hl, wd72d
@@ -131,7 +131,7 @@ CeruleanGymText1:
ld [hJoyHeld], a
ld a, $3
ld [wCeruleanGymCurScript], a
-.asm_5c7bb
+.done
jp TextScriptEnd
CeruleanGymText_5c7be:
diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm
index 295bd63d..f8be5823 100755
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -151,12 +151,12 @@ CinnabarGymScript3_75857:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM38
- jr .asm_75880
+ jr .gymVictory
.BagFull
ld a, $c
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_75880
+.gymVictory
ld hl, wObtainedBadges
set 6, [hl]
ld hl, wBeatGymFlags
@@ -207,17 +207,17 @@ CinnabarGymScript_758b7:
CinnabarGymText1:
TX_ASM
CheckEvent EVENT_BEAT_BLAINE
- jr z, .asm_d9332
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM38
- jr nz, .asm_3012f
+ jr nz, .afterVictory
call z, CinnabarGymScript3_75857
call DisableWaitingAfterTextDisplay
jp TextScriptEnd
-.asm_3012f
+.afterVictory
ld hl, BlaineFireBlastText
call PrintText
jp TextScriptEnd
-.asm_d9332
+.beginBattle
ld hl, BlaineBattleText
call PrintText
ld hl, BlaineEndBattleText
diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm
index c856c93b..15f016af 100755
--- a/scripts/FuchsiaGym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -54,12 +54,12 @@ FuchsiaGymScript3_75497:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM06
- jr .asm_754c0
+ jr .gymVictory
.BagFull
ld a, $b
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_754c0
+.gymVictory
ld hl, wObtainedBadges
set 4, [hl]
ld hl, wBeatGymFlags
@@ -142,17 +142,17 @@ FuchsiaGymTrainerHeader5:
FuchsiaGymText1:
TX_ASM
CheckEvent EVENT_BEAT_KOGA
- jr z, .asm_181b6
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM06
- jr nz, .asm_adc3b
+ jr nz, .afterVictory
call z, FuchsiaGymScript3_75497
call DisableWaitingAfterTextDisplay
- jr .asm_e84c6
-.asm_adc3b
+ jr .done
+.afterVictory
ld hl, KogaExplainToxicText
call PrintText
- jr .asm_e84c6
-.asm_181b6
+ jr .done
+.beginBattle
ld hl, KogaBeforeBattleText
call PrintText
ld hl, wd72d
@@ -171,7 +171,7 @@ FuchsiaGymText1:
ld [hJoyHeld], a
ld a, $3
ld [wFuchsiaGymCurScript], a
-.asm_e84c6
+.done
jp TextScriptEnd
KogaBeforeBattleText:
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index 364b157b..11abdf65 100755
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -201,9 +201,9 @@ OaksLabScript8:
ld de, .MiddleBallMovement1
ld a, [wYCoord]
cp $4 ; is the player standing below the table?
- jr z, .asm_1ccf3
+ jr z, .moveBlue
ld de, .MiddleBallMovement2
- jr .asm_1ccf3
+ jr .moveBlue
.MiddleBallMovement1
db NPC_MOVEMENT_DOWN
@@ -225,9 +225,9 @@ OaksLabScript8:
ld de, .RightBallMovement1
ld a, [wYCoord]
cp $4 ; is the player standing below the table?
- jr z, .asm_1ccf3
+ jr z, .moveBlue
ld de, .RightBallMovement2
- jr .asm_1ccf3
+ jr .moveBlue
.RightBallMovement1
db NPC_MOVEMENT_DOWN
@@ -251,7 +251,7 @@ OaksLabScript8:
ld de, .LeftBallMovement1
ld a, [wXCoord]
cp $9 ; is the player standing to the right of the table?
- jr nz, .asm_1ccf3
+ jr nz, .moveBlue
push hl
ld a, $1
ld [H_SPRITEINDEX], a
@@ -270,7 +270,7 @@ OaksLabScript8:
ld [hl], $9
ld de, .LeftBallMovement2 ; the rival is not currently onscreen, so account for that
pop hl
- jr .asm_1ccf3
+ jr .moveBlue
.LeftBallMovement1
db NPC_MOVEMENT_DOWN
@@ -279,7 +279,7 @@ OaksLabScript8:
db NPC_MOVEMENT_RIGHT
db $FF
-.asm_1ccf3
+.moveBlue
ld a, $1
ld [H_SPRITEINDEX], a
call MoveSprite
@@ -304,17 +304,17 @@ OaksLabScript9:
call DisplayTextID
ld a, [wRivalStarterBallSpriteIndex]
cp $2
- jr nz, .asm_1cd28
+ jr nz, .rivalDidNotChoseBall1
ld a, HS_STARTER_BALL_1
- jr .asm_1cd32
-.asm_1cd28
+ jr .hideBallAndContinue
+.rivalDidNotChoseBall1
cp $3
- jr nz, .asm_1cd30
+ jr nz, .rivalChoseBall3
ld a, HS_STARTER_BALL_2
- jr .asm_1cd32
-.asm_1cd30
+ jr .hideBallAndContinue
+.rivalChoseBall3
ld a, HS_STARTER_BALL_3
-.asm_1cd32
+.hideBallAndContinue
ld [wMissableObjectIndex], a
predef HideObject
call Delay3
@@ -473,7 +473,7 @@ OaksLabScript13:
OaksLabScript14:
ld a, [wd730]
bit 0, a
- jr nz, .asm_1ce8c
+ jr nz, .checkRivalPosition
ld a, HS_OAKS_LAB_RIVAL
ld [wMissableObjectIndex], a
predef HideObject
@@ -484,21 +484,21 @@ OaksLabScript14:
ld [wOaksLabCurScript], a
jr .done
; make the player keep facing the rival as he walks away
-.asm_1ce8c
+.checkRivalPosition
ld a, [wNPCNumScriptedSteps]
cp $5
- jr nz, .asm_1cea8
+ jr nz, .turnPlayerDown
ld a, [wXCoord]
cp $4
- jr nz, .asm_1cea1
+ jr nz, .turnPlayerLeft
ld a, SPRITE_FACING_RIGHT
ld [wSpriteStateData1 + 9], a
jr .done
-.asm_1cea1
+.turnPlayerLeft
ld a, SPRITE_FACING_LEFT
ld [wSpriteStateData1 + 9], a
jr .done
-.asm_1cea8
+.turnPlayerDown
cp $4
ret nz
xor a ; ld a, SPRITE_FACING_DOWN
@@ -764,20 +764,20 @@ OaksLab_TextPointers2:
OaksLabText1:
TX_ASM
CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
- jr nz, .asm_1d0de
+ jr nz, .beforeChooseMon
ld hl, OaksLabGaryText1
call PrintText
- jr .asm_1d0f0
-.asm_1d0de
+ jr .done
+.beforeChooseMon
bit 2, a
- jr nz, .asm_1d0ea
+ jr nz, .afterChooseMon
ld hl, OaksLabText40
call PrintText
- jr .asm_1d0f0
-.asm_1d0ea
+ jr .done
+.afterChooseMon
ld hl, OaksLabText41
call PrintText
-.asm_1d0f0
+.done
jp TextScriptEnd
OaksLabGaryText1:
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index dcc449c1..18296675 100755
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -207,11 +207,11 @@ PewterCityText3:
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- jr nz, .asm_193c9
+ jr nz, .playerDidNotGoIntoMuseum
ld hl, PewterCityText_193f6
call PrintText
- jr .asm_193ee
-.asm_193c9
+ jr .done
+.playerDidNotGoIntoMuseum
ld hl, PewterCityText_193fb
call PrintText
xor a
@@ -227,7 +227,7 @@ PewterCityText3:
call GetSpritePosition2
ld a, $1
ld [wPewterCityCurScript], a
-.asm_193ee
+.done
jp TextScriptEnd
PewterCityText_193f1:
@@ -253,14 +253,14 @@ PewterCityText4:
call YesNoChoice
ld a, [wCurrentMenuItem]
cp $0
- jr nz, .asm_1941e
+ jr nz, .playerDoesNotKnow
ld hl, PewterCityText_1942c
call PrintText
- jr .asm_19424
-.asm_1941e
+ jr .done
+.playerDoesNotKnow
ld hl, PewterCityText_19431
call PrintText
-.asm_19424
+.done
jp TextScriptEnd
PewterCityText_19427:
diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm
index 6dd24b08..cf02b141 100755
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -54,12 +54,12 @@ PewterGymScript_5c3df:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM34
- jr .asm_5c408
+ jr .gymVictory
.BagFull
ld a, $6
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_5c408
+.gymVictory
ld hl, wObtainedBadges
set 0, [hl]
ld hl, wBeatGymFlags
@@ -101,17 +101,17 @@ PewterGymTrainerHeader0:
PewterGymText1:
TX_ASM
CheckEvent EVENT_BEAT_BROCK
- jr z, .asm_5c46a
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM34
- jr nz, .asm_5c462
+ jr nz, .gymVictory
call z, PewterGymScript_5c3df
call DisableWaitingAfterTextDisplay
- jr .asm_5c49b
-.asm_5c462
+ jr .done
+.gymVictory
ld hl, PewterGymText_5c4a3
call PrintText
- jr .asm_5c49b
-.asm_5c46a
+ jr .done
+.beginBattle
ld hl, PewterGymText_5c49e
call PrintText
ld hl, wd72d
@@ -131,7 +131,7 @@ PewterGymText1:
ld a, $3
ld [wPewterGymCurScript], a
ld [wCurMapScript], a
-.asm_5c49b
+.done
jp TextScriptEnd
PewterGymText_5c49e:
diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm
index e51763e5..0539d613 100755
--- a/scripts/SaffronGym.asm
+++ b/scripts/SaffronGym.asm
@@ -54,12 +54,12 @@ SaffronGymText_5d068:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM46
- jr .asm_5d091
+ jr .gymVictory
.BagFull
ld a, $c
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_5d091
+.gymVictory
ld hl, wObtainedBadges
set 5, [hl]
ld hl, wBeatGymFlags
@@ -152,17 +152,17 @@ SaffronGymTrainerHeader6:
SaffronGymText1:
TX_ASM
CheckEvent EVENT_BEAT_SABRINA
- jr z, .asm_5d134
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM46
- jr nz, .asm_5d12c
+ jr nz, .afterVictory
call z, SaffronGymText_5d068
call DisableWaitingAfterTextDisplay
- jr .asm_5d15f
-.asm_5d12c
+ jr .done
+.afterVictory
ld hl, SaffronGymText_5d16e
call PrintText
- jr .asm_5d15f
-.asm_5d134
+ jr .done
+.beginBattle
ld hl, SaffronGymText_5d162
call PrintText
ld hl, wd72d
@@ -179,7 +179,7 @@ SaffronGymText1:
ld [wGymLeaderNo], a
ld a, $3
ld [wSaffronGymCurScript], a
-.asm_5d15f
+.done
jp TextScriptEnd
SaffronGymText_5d162:
diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm
index 5755628c..4c17a8ce 100755
--- a/scripts/VermilionGym.asm
+++ b/scripts/VermilionGym.asm
@@ -29,14 +29,14 @@ Gym3LeaderName:
VermilionGymScript_5ca6d:
CheckEvent EVENT_2ND_LOCK_OPENED
- jr nz, .asm_5ca78
+ jr nz, .doorsOpen
ld a, $24
- jr .asm_5ca7f
-.asm_5ca78
+ jr .replaceTile
+.doorsOpen
ld a, SFX_GO_INSIDE
call PlaySound
ld a, $5
-.asm_5ca7f
+.replaceTile
ld [wNewTileBlockID], a
lb bc, 2, 2
predef_jump ReplaceTileBlock
@@ -73,12 +73,12 @@ VermilionGymScript_5caaa:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM24
- jr .asm_5cad3
+ jr .gymVictory
.BagFull
ld a, $8
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_5cad3
+.gymVictory
ld hl, wObtainedBadges
set 2, [hl]
ld hl, wBeatGymFlags
@@ -131,17 +131,17 @@ VermilionGymTrainerHeader2:
VermilionGymText1:
TX_ASM
CheckEvent EVENT_BEAT_LT_SURGE
- jr z, .asm_5cb39
+ jr z, .beforeBeat
CheckEventReuseA EVENT_GOT_TM24
- jr nz, .asm_5cb31
+ jr nz, .afterBeat
call z, VermilionGymScript_5caaa
call DisableWaitingAfterTextDisplay
- jr .asm_5cb6a
-.asm_5cb31
+ jr .done
+.afterBeat
ld hl, VermilionGymText_5cb72
call PrintText
- jr .asm_5cb6a
-.asm_5cb39
+ jr .done
+.beforeBeat
ld hl, VermilionGymText_5cb6d
call PrintText
ld hl, wd72d
@@ -161,7 +161,7 @@ VermilionGymText1:
ld a, $3
ld [wVermilionGymCurScript], a
ld [wCurMapScript], a
-.asm_5cb6a
+.done
jp TextScriptEnd
VermilionGymText_5cb6d:
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm
index b70927b2..643431a4 100755
--- a/scripts/ViridianCity.asm
+++ b/scripts/ViridianCity.asm
@@ -19,10 +19,10 @@ ViridianCityScript_1900b:
ret nz
ld a, [wObtainedBadges]
cp %01111111
- jr nz, .asm_1901e
+ jr nz, .gymClosed
SetEvent EVENT_VIRIDIAN_GYM_OPEN
ret
-.asm_1901e
+.gymClosed
ld a, [wYCoord]
cp $8
ret nz
@@ -150,11 +150,11 @@ ViridianCityText2:
ld a, [wObtainedBadges]
cp %01111111
ld hl, ViridianCityText_19127
- jr z, .asm_ae9fe
+ jr z, .printAndDone
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
- jr nz, .asm_ae9fe
+ jr nz, .printAndDone
ld hl, ViridianCityText_19122
-.asm_ae9fe
+.printAndDone
call PrintText
jp TextScriptEnd
@@ -173,14 +173,14 @@ ViridianCityText3:
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- jr nz, .asm_6dfea
+ jr nz, .no
ld hl, ViridianCityText_19157
call PrintText
- jr .asm_d611f
-.asm_6dfea
+ jr .done
+.no
ld hl, ViridianCityText_19152
call PrintText
-.asm_d611f
+.done
jp TextScriptEnd
ViridianCityText_1914d:
@@ -198,14 +198,14 @@ ViridianCityText_19157:
ViridianCityText4:
TX_ASM
CheckEvent EVENT_GOT_POKEDEX
- jr nz, .asm_83894
+ jr nz, .gotPokedex
ld hl, ViridianCityText_19175
call PrintText
- jr .asm_700a6
-.asm_83894
+ jr .done
+.gotPokedex
ld hl, ViridianCityText_1917a
call PrintText
-.asm_700a6
+.done
jp TextScriptEnd
ViridianCityText_19175:
@@ -232,7 +232,7 @@ ViridianCityText_19191:
ViridianCityText6:
TX_ASM
CheckEvent EVENT_GOT_TM42
- jr nz, .asm_4e5a0
+ jr nz, .gotTm42
ld hl, ViridianCityText_191ca
call PrintText
lb bc, TM_42, 1
@@ -241,15 +241,15 @@ ViridianCityText6:
ld hl, ReceivedTM42Text
call PrintText
SetEvent EVENT_GOT_TM42
- jr .asm_3c73c
+ jr .done
.BagFull
ld hl, TM42NoRoomText
call PrintText
- jr .asm_3c73c
-.asm_4e5a0
+ jr .done
+.gotTm42
ld hl, TM42Explanation
call PrintText
-.asm_3c73c
+.done
jp TextScriptEnd
ViridianCityText_191ca:
@@ -278,16 +278,16 @@ ViridianCityText7:
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- jr z, .asm_42f68
+ jr z, .hurry
ld hl, ViridianCityText_1920f
call PrintText
ld a, $1
ld [wViridianCityCurScript], a
- jr .asm_2413a
-.asm_42f68
+ jr .done
+.hurry
ld hl, ViridianCityText_19214
call PrintText
-.asm_2413a
+.done
jp TextScriptEnd
ViridianCityText_1920a:
diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm
index 44966fef..b0f94b9d 100755
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -148,12 +148,12 @@ ViridianGymScript3_74995:
ld [hSpriteIndexOrTextID], a
call DisplayTextID
SetEvent EVENT_GOT_TM27
- jr .asm_749be
+ jr .gymVictory
.BagFull
ld a, $e
ld [hSpriteIndexOrTextID], a
call DisplayTextID
-.asm_749be
+.gymVictory
ld hl, wObtainedBadges
set 7, [hl]
ld hl, wBeatGymFlags
@@ -261,13 +261,13 @@ ViridianGymTrainerHeader7:
ViridianGymText1:
TX_ASM
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
- jr z, .asm_6de66
+ jr z, .beginBattle
CheckEventReuseA EVENT_GOT_TM27
- jr nz, .asm_9fc95
+ jr nz, .afterVictory
call z, ViridianGymScript3_74995
call DisableWaitingAfterTextDisplay
- jr .asm_6dff7
-.asm_9fc95
+ jr .done
+.afterVictory
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9
@@ -279,8 +279,8 @@ ViridianGymText1:
call UpdateSprites
call Delay3
call GBFadeInFromBlack
- jr .asm_6dff7
-.asm_6de66
+ jr .done
+.beginBattle
ld hl, ViridianGymText_74ace
call PrintText
ld hl, wd72d
@@ -297,7 +297,7 @@ ViridianGymText1:
ld [wGymLeaderNo], a
ld a, $3
ld [wViridianGymCurScript], a
-.asm_6dff7
+.done
jp TextScriptEnd
ViridianGymText_74ace:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 03:56:13 +0000