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.asm134
-rwxr-xr-xscripts/pewtercity.asm16
-rwxr-xr-xscripts/pewtergym.asm18
-rwxr-xr-xscripts/saffrongym.asm18
-rwxr-xr-xscripts/viridiangym.asm18
9 files changed, 135 insertions, 135 deletions
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index 903ef508..762806f2 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
@@ -152,17 +152,17 @@ CeladonGymTrainerHeader7:
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
@@ -180,7 +180,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 448ce744..78ed1fed 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -54,13 +54,13 @@ 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
@@ -104,17 +104,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
@@ -133,7 +133,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 1ebf943a..e2de3f6d 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -211,12 +211,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
@@ -267,17 +267,17 @@ CinnabarGymScript_750c3:
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 8268930d..364fca37 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
@@ -143,17 +143,17 @@ FuchsiaGymTrainerHeader6:
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
@@ -172,7 +172,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 4bc8198c..ad9572e7 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -434,7 +434,7 @@ OaksLabScript15:
OaksLabScript16:
ld a, [wd730]
bit 0, a
- jr nz, .asm_1c6ed
+ jr nz, .checkRivalPosition
ld a, $ff ^ (A_BUTTON | B_BUTTON)
ld [wJoyIgnore], a
ld a, HS_OAKS_LAB_RIVAL
@@ -445,25 +445,25 @@ OaksLabScript16:
ld [wOaksLabCurScript], a
ret
-.asm_1c6ed
+.checkRivalPosition
ld a, [wNPCNumScriptedSteps]
cp 5
- jr nz, .asm_1c703
+ jr nz, .turnPlayerDown
ld a, [wXCoord]
cp 4
- jr nz, .asm_1c6ff
+ jr nz, .turnPlayerLeft
ld a, SPRITE_FACING_RIGHT
- jr .asm_1c707
+ jr .done
-.asm_1c6ff
+.turnPlayerLeft
ld a, SPRITE_FACING_LEFT
- jr .asm_1c707
+ jr .done
-.asm_1c703
+.turnPlayerDown
cp 4
ret nz
xor a
-.asm_1c707
+.done
ld [wSpritePlayerStateData1FacingDirection], a
ret
@@ -631,20 +631,20 @@ OaksLabScript21:
OaksLabScript22:
ret
-OaksLabScript_1c897:
+OaksLabScript_RemoveParcel:
ld hl, wBagItems
ld bc, 0
-.asm_1c89d
+.loop
ld a, [hli]
cp $ff
ret z
cp OAKS_PARCEL
- jr z, .asm_1c8a9
+ jr z, .foundParcel
inc hl
inc c
- jr .asm_1c89d
+ jr .loop
-.asm_1c8a9
+.foundParcel
ld hl, wNumBagItems
ld a, c
ld [wWhichPokemon], a
@@ -748,33 +748,33 @@ OaksLabTextPointers2:
OaksLabText1:
TX_ASM
CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
- jr nz, .asm_1c968
- ld hl, OaksLabText_1c97d
+ jr nz, .beforeChooseMon
+ ld hl, OaksLabGaryText1
call PrintText
jr .asm_1c97a
-.asm_1c968
+.beforeChooseMon
CheckEventReuseA EVENT_GOT_STARTER
- jr nz, .asm_1c974
- ld hl, OaksLabText_1c982
+ jr nz, .afterChooseMon
+ ld hl, OaksLabText40
call PrintText
jr .asm_1c97a
-.asm_1c974
- ld hl, OaksLabText_1c987
+.afterChooseMon
+ ld hl, OaksLabText41
call PrintText
.asm_1c97a
jp TextScriptEnd
-OaksLabText_1c97d:
+OaksLabGaryText1:
TX_FAR _OaksLabGaryText1
db "@"
-OaksLabText_1c982:
+OaksLabText40:
TX_FAR _OaksLabText40
db "@"
-OaksLabText_1c987:
+OaksLabText41:
TX_FAR _OaksLabText41
db "@"
@@ -786,11 +786,11 @@ OaksLabText2:
jr nz, OaksLabScript_1c9ac
ld a, $0
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
- ld hl, OaksLabText_1c9a7
+ ld hl, OaksLabText39
call PrintText
jp TextScriptEnd
-OaksLabText_1c9a7:
+OaksLabText39:
TX_FAR _OaksLabText39
db "@"
@@ -859,15 +859,15 @@ OaksLabText3:
jr .asm_1ca6f
.asm_1ca3a
- ld hl, OaksLabText_1ca81
+ ld hl, OaksLabDeliverParcelText
call PrintText
- call OaksLabScript_1c897
+ call OaksLabScript_RemoveParcel
ld a, $13
ld [wOaksLabCurScript], a
jr .asm_1ca6f
.asm_1ca4a
- ld hl, OaksLabText_1ca8b
+ ld hl, OaksLabAroundWorldText
call PrintText
jr .asm_1ca6f
@@ -876,12 +876,12 @@ OaksLabText3:
jr nz, .asm_1ca69
lb bc, POKE_BALL, 5
call GiveItem
- ld hl, OaksLabText_1ca90
+ ld hl, OaksLabGivePokeballsText
call PrintText
jr .asm_1ca6f
.asm_1ca69
- ld hl, OaksLabText_1ca9a
+ ld hl, OaksLabPleaseVisitText
call PrintText
.asm_1ca6f
jp TextScriptEnd
@@ -898,23 +898,23 @@ OaksLabText_1ca7c:
TX_FAR _OaksLabText_1d2fa
db "@"
-OaksLabText_1ca81:
+OaksLabDeliverParcelText:
TX_FAR _OaksLabDeliverParcelText1
TX_SFX_KEY_ITEM
TX_FAR _OaksLabDeliverParcelText2
db "@"
-OaksLabText_1ca8b:
+OaksLabAroundWorldText:
TX_FAR _OaksLabAroundWorldText
db "@"
-OaksLabText_1ca90:
+OaksLabGivePokeballsText:
TX_FAR _OaksLabGivePokeballsText1
TX_SFX_KEY_ITEM
TX_FAR _OaksLabGivePokeballsText2
db "@"
-OaksLabText_1ca9a:
+OaksLabPleaseVisitText:
TX_FAR _OaksLabPleaseVisitText
db "@"
@@ -949,76 +949,76 @@ OaksLabText_1cac2:
OaksLabText13:
TX_ASM
- ld hl, OaksLabText_1cad1
+ ld hl, OaksLabRivalWaitingText
call PrintText
jp TextScriptEnd
-OaksLabText_1cad1:
+OaksLabRivalWaitingText:
TX_FAR _OaksLabRivalWaitingText
db "@"
OaksLabText14:
TX_ASM
- ld hl, OaksLabText_1cae0
+ ld hl, OaksLabChooseMonText
call PrintText
jp TextScriptEnd
-OaksLabText_1cae0:
+OaksLabChooseMonText:
TX_FAR _OaksLabChooseMonText
db "@"
OaksLabText15:
TX_ASM
- ld hl, OaksLabText_1caef
+ ld hl, OaksLabRivalInterjectionText
call PrintText
jp TextScriptEnd
-OaksLabText_1caef:
+OaksLabRivalInterjectionText:
TX_FAR _OaksLabRivalInterjectionText
db "@"
OaksLabText16:
TX_ASM
- ld hl, OaksLabText_1cafe
+ ld hl, OaksLabBePatientText
call PrintText
jp TextScriptEnd
-OaksLabText_1cafe:
+OaksLabBePatientText:
TX_FAR _OaksLabBePatientText
db "@"
OaksLabText17:
TX_ASM
- ld hl, OaksLabText_1cb25
+ ld hl, OaksLabRivalTakesText1
call PrintText
- ld hl, OaksLabText_1cb2a
+ ld hl, OaksLabRivalTakesText2
call PrintText
- ld hl, OaksLabText_1cb30
+ ld hl, OaksLabRivalTakesText3
call PrintText
- ld hl, OaksLabText_1cb35
+ ld hl, OaksLabRivalTakesText4
call PrintText
- ld hl, OaksLabText_1cb3a
+ ld hl, OaksLabRivalTakesText5
call PrintText
jp TextScriptEnd
-OaksLabText_1cb25:
+OaksLabRivalTakesText1:
TX_FAR _OaksLabRivalTakesText1
db "@"
-OaksLabText_1cb2a:
+OaksLabRivalTakesText2:
TX_FAR _OaksLabRivalTakesText2
TX_SFX_KEY_ITEM
db "@"
-OaksLabText_1cb30:
+OaksLabRivalTakesText3:
TX_FAR _OaksLabRivalTakesText3
db "@"
-OaksLabText_1cb35:
+OaksLabRivalTakesText4:
TX_FAR _OaksLabRivalTakesText4
db "@"
-OaksLabText_1cb3a:
+OaksLabRivalTakesText5:
TX_FAR _OaksLabRivalTakesText5
db "@"
@@ -1030,9 +1030,9 @@ OaksLabText18:
call GetMonName
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
- ld hl, OaksLabText_1cb85
+ ld hl, OaksLabOakGivesText
call PrintText
- ld hl, OaksLabText_1cb8a
+ ld hl, OaksLabRecievedText
call PrintText
xor a
ld [wMonDataLocation], a
@@ -1050,32 +1050,32 @@ OaksLabText18:
set 3, [hl]
jp TextScriptEnd
-OaksLabText_1cb85:
+OaksLabOakGivesText:
TX_FAR _OaksLabOakGivesText
db "@"
-OaksLabText_1cb8a:
+OaksLabRecievedText:
TX_FAR _OaksLabReceivedText
TX_SFX_KEY_ITEM
db "@"
OaksLabText10:
TX_ASM
- ld hl, OaksLabText_1cb9a
+ ld hl, OaksLabLeavingText
call PrintText
jp TextScriptEnd
-OaksLabText_1cb9a:
+OaksLabLeavingText:
TX_FAR _OaksLabLeavingText
db "@"
OaksLabText11:
TX_ASM
- ld hl, OaksLabText_1cba9
+ ld hl, OaksLabRivalChallengeText
call PrintText
jp TextScriptEnd
-OaksLabText_1cba9:
+OaksLabRivalChallengeText:
TX_FAR _OaksLabRivalChallengeText
db "@"
@@ -1089,11 +1089,11 @@ OaksLabRivalBeatYouText:
OaksLabText12:
TX_ASM
- ld hl, OaksLabText_1cbc2
+ ld hl, OaksLabRivalToughenUpText
call PrintText
jp TextScriptEnd
-OaksLabText_1cbc2:
+OaksLabRivalToughenUpText:
TX_FAR _OaksLabRivalToughenUpText
db "@"
@@ -1101,21 +1101,21 @@ OaksLabText26:
TX_ASM
ldpikacry e, PikachuCry2
callab PlayPikachuSoundClip
- ld hl, OaksLabText_1cbdb
+ ld hl, OaksLabPikachuDislikesPokeballsText1
call PrintText
jp TextScriptEnd
-OaksLabText_1cbdb:
+OaksLabPikachuDislikesPokeballsText1:
TX_FAR _OaksLabPikachuDislikesPokeballsText1
db "@"
OaksLabText27:
TX_ASM
- ld hl, OaksLabText_1cbea
+ ld hl, OaksLabPikachuDislikesPokeballsText2
call PrintText
jp TextScriptEnd
-OaksLabText_1cbea:
+OaksLabPikachuDislikesPokeballsText2:
TX_FAR _OaksLabPikachuDislikesPokeballsText2
db "@"
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm
index b7271b05..0456bb86 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 6014cf33..f9fc4ed2 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -54,13 +54,13 @@ 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
@@ -103,17 +103,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, .afterVictory
call z, PewterGymScript_5c3df
call DisableWaitingAfterTextDisplay
- jr .asm_5c49b
-.asm_5c462
+ jr .done
+.afterVictory
ld hl, PewterGymText_5c4a3
call PrintText
- jr .asm_5c49b
-.asm_5c46a
+ jr .done
+.beginBattle
ld hl, PewterGymText_5c49e
call PrintText
ld hl, wd72d
@@ -133,7 +133,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 146d31f9..f82b5ccd 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
@@ -153,17 +153,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
@@ -180,7 +180,7 @@ SaffronGymText1:
ld [wGymLeaderNo], a
ld a, $3
ld [wSaffronGymCurScript], a
-.asm_5d15f
+.done
jp TextScriptEnd
SaffronGymText_5d162:
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 1557f68a..75814e49 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
@@ -262,13 +262,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
@@ -280,8 +280,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
@@ -298,7 +298,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-06-02 07:54:36 +0000