Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 173 insertions, 172 deletions

diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index dfbf5951..237efd0b 100644
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -1,5 +1,5 @@
 SilphCo11F_Script:
-	call SilphCo11Script_62127
+	call SilphCo11FGateCallbackScript
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo11TrainerHeaders
 	ld de, SilphCo11F_ScriptPointers
@@ -8,14 +8,14 @@ SilphCo11F_Script:
 	ld [wSilphCo11FCurScript], a
 	ret
 
-SilphCo11Script_62127:
+SilphCo11FGateCallbackScript:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
 	ld hl, SilphCo11GateCoords
-	call SilphCo11Script_6214f
-	call SilphCo11Script_6217b
+	call SilphCo11F_SetCardKeyDoorYScript
+	call SilphCo11FSetUnlockedDoorEventScript
 	CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
 	ret nz
 	ld a, $20
@@ -28,7 +28,7 @@ SilphCo11GateCoords:
 	dbmapcoord  3,  6
 	db -1 ; end
 
-SilphCo11Script_6214f:
+SilphCo11F_SetCardKeyDoorYScript:
 	push hl
 	ld hl, wCardKeyDoorY
 	ld a, [hli]
@@ -38,111 +38,113 @@ SilphCo11Script_6214f:
 	xor a
 	ldh [hUnlockedSilphCoDoors], a
 	pop hl
-.asm_62143
+.loop_check_doors
 	ld a, [hli]
 	cp $ff
-	jr z, .asm_6215f
+	jr z, .exit_loop
 	push hl
 	ld hl, hUnlockedSilphCoDoors
 	inc [hl]
 	pop hl
 	cp b
-	jr z, .asm_62154
+	jr z, .check_y_coord
 	inc hl
-	jr .asm_62143
-.asm_62154
+	jr .loop_check_doors
+.check_y_coord
 	ld a, [hli]
 	cp c
-	jr nz, .asm_62143
+	jr nz, .loop_check_doors
 	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
 	ret
-.asm_6215f
+.exit_loop
 	xor a
 	ldh [hUnlockedSilphCoDoors], a
 	ret
 
-SilphCo11Script_6217b:
+SilphCo11FSetUnlockedDoorEventScript:
 	ldh a, [hUnlockedSilphCoDoors]
 	and a
 	ret z
 	SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR
 	ret
 
-SilphCo11Script_62185:
+SilphCo11FResetCurScript:
 	xor a
 	ld [wJoyIgnore], a
-SilphCo11Script_62189:
+; fallthrough
+SilphCo11FSetCurScript:
 	ld [wSilphCo11FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 SilphCo11F_ScriptPointers:
-	dw SilphCo11Script0
-	dw DisplayEnemyTrainerTextAndStartBattle
-	dw EndTrainerBattle
-	dw SilphCo11Script3
-	dw SilphCo11Script4
-	dw SilphCo11Script5
-	dw SilphCo11Script6
-	dw SilphCo11Script7
-	dw SilphCo11Script8
-	dw SilphCo11Script9
-	dw SilphCo11Script10
-	dw SilphCo11Script11
-	dw SilphCo11Script12
-	dw SilphCo11Script13
-	dw SilphCo11Script14
+	def_script_pointers
+	dw_const SilphCo11FDefaultScript,               SCRIPT_SILPHCO11F_DEFAULT
+	dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_SILPHCO11F_START_BATTLE
+	dw_const EndTrainerBattle,                      SCRIPT_SILPHCO11F_END_BATTLE
+	dw_const SilphCo11FGiovanniAfterBattleScript,   SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE
+	dw_const SilphCo11FGiovanniStartBattleScript,   SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE
+	dw_const SilphCo11FScript5,                     SCRIPT_SILPHCO11F_SCRIPT5
+	dw_const SilphCo11FScript6,                     SCRIPT_SILPHCO11F_SCRIPT6
+	dw_const SilphCo11FScript7,                     SCRIPT_SILPHCO11F_SCRIPT7
+	dw_const SilphCo11FScript8,                     SCRIPT_SILPHCO11F_SCRIPT8
+	dw_const SilphCo11FScript9,                     SCRIPT_SILPHCO11F_SCRIPT9
+	dw_const SilphCo11FScript10,                    SCRIPT_SILPHCO11F_SCRIPT10
+	dw_const SilphCo11FScript11,                    SCRIPT_SILPHCO11F_SCRIPT11
+	dw_const SilphCo11FScript12,                    SCRIPT_SILPHCO11F_SCRIPT12
+	dw_const SilphCo11FScript13,                    SCRIPT_SILPHCO11F_SCRIPT13
+	dw_const SilphCo11FScript14,                    SCRIPT_SILPHCO11F_SCRIPT14
 
-SilphCo11Script0:
+SilphCo11FDefaultScript:
 IF DEF(_DEBUG)
 	call DebugPressedOrHeldB
 	ret nz
 ENDC
 	CheckEvent EVENT_BEAT_SILPH_CO_11F_TRAINER_0
-	call z, SilphCo11Script_6229c
+	call z, SilphCo11FScript_6229c
 	CheckEvent EVENT_782
 	ret nz
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
-	call z, SilphCo11Script_621c5
+	call z, SilphCo11FScript_621c5
 	ret
 
-SilphCo11Script_621c5:
-	ld hl, CoordsData_62211
+SilphCo11FScript_621c5:
+	ld hl, .PlayerCoordsArray
 	call ArePlayerCoordsInArray
 	jp nc, CheckFightingMapTrainers
 	ld a, [wCoordIndex]
 	ld [wcf0d], a
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $f0
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $3
+	ld a, TEXT_SILPHCO11F_GIOVANNI
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, $3
+	ld a, SILPHCO11F_GIOVANNI
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
-	ld de, MovementData_62216
+	ld de, .GiovanniMovement
 	call MoveSprite
-	ld a, $4
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_GIOVANNI_START_BATTLE
+	call SilphCo11FSetCurScript
 	ret
 
-CoordsData_62211:
+.PlayerCoordsArray:
 	dbmapcoord  6, 13
 	dbmapcoord  7, 12
 	db -1 ; end
 
-MovementData_62216:
+.GiovanniMovement:
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db NPC_MOVEMENT_DOWN
 	db -1 ; end
 
-SilphCo11Script_621ff:
+SilphCo11FScript_621ff:
 	ld [wPlayerMovingDirection], a
 	ld a, b
 	ld [wSprite03StateData1FacingDirection], a
@@ -150,71 +152,71 @@ SilphCo11Script_621ff:
 	ld [wSprite03StateData1MovementStatus], a
 	ret
 
-SilphCo11Script3:
+SilphCo11FGiovanniAfterBattleScript:
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, SilphCo11Script_62185
+	jp z, SilphCo11FResetCurScript
 	ld a, [wcf0d]
 	cp $1
-	jr z, .asm_6223c
+	jr z, .face_player_up
 	ld a, PLAYER_DIR_LEFT
 	ld b, SPRITE_FACING_RIGHT
-	jr .asm_62240
-.asm_6223c
+	jr .continue
+.face_player_up
 	ld a, PLAYER_DIR_UP
 	ld b, SPRITE_FACING_DOWN
-.asm_62240
-	call SilphCo11Script_621ff
-	ld a, $f0
+.continue
+	call SilphCo11FScript_621ff
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $7
+	ld a, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
-	farcall SaffronCityHideRocketsShowCitizens
+	farcall SilphCo11FTeamRocketLeavesScript
 	call UpdateSprites
 	call Delay3
 	call GBFadeInFromBlack
 	SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	xor a
 	ld [wJoyIgnore], a
-	jp SilphCo11Script_62189
+	jp SilphCo11FSetCurScript
 
-SilphCo11Script4:
+SilphCo11FGiovanniStartBattleScript:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld a, $3
+	ld a, SILPHCO11F_GIOVANNI
 	ldh [hSpriteIndex], a
 	call SetSpriteMovementBytesToFF
 	ld a, [wcf0d]
 	cp $1
-	jr z, .asm_62284
+	jr z, .face_player_up
 	ld a, PLAYER_DIR_LEFT
 	ld b, SPRITE_FACING_RIGHT
-	jr .asm_62288
-.asm_62284
+	jr .continue
+.face_player_up
 	ld a, PLAYER_DIR_UP
 	ld b, SPRITE_FACING_DOWN
-.asm_62288
-	call SilphCo11Script_621ff
+.continue
+	call SilphCo11FScript_621ff
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, SilphCo10Text_62528
-	ld de, SilphCo10Text_62528
+	ld hl, SilphCo10FGiovanniILostAgainText
+	ld de, SilphCo10FGiovanniILostAgainText
 	call SaveEndBattleTextPointers
 	ldh a, [hSpriteIndex]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
-	ld a, $3
-	jp SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_GIOVANNI_AFTER_BATTLE
+	jp SilphCo11FSetCurScript
 
-SilphCo11Script_6229c:
+SilphCo11FScript_6229c:
 	ld a, [wYCoord]
 	cp $3
 	ret nz
@@ -238,23 +240,23 @@ SilphCo11Script_6229c:
 	call PlayMusic
 	xor a
 	ldh [hJoyHeld], a
-	ld a, $fc
+	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $8
+	ld a, TEXT_SILPHCO11F_TEXT8
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	SetEvent EVENT_782
-	ld a, $5
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT5
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11MovementData_622f5:
+SilphCo11FMovementData_622f5:
 	db $5
 	db $5
 	db $5
@@ -262,21 +264,21 @@ SilphCo11MovementData_622f5:
 	db $5
 	db $ff
 
-SilphCo11MovementData_622fb:
+SilphCo11FMovementData_622fb:
 	db $5
 	db $5
 	db $5
 	db $5
 	db $ff
 
-SilphCo11MovementData_62300:
+SilphCo11FMovementData_62300:
 	db $5
 	db $5
 	db $5
 	db $5
 	db $ff
 
-SilphCo11MovementData_62305:
+SilphCo11FMovementData_62305:
 	db $5
 	db $5
 	db $5
@@ -284,7 +286,7 @@ SilphCo11MovementData_62305:
 	db $5
 	db $ff
 
-SilphCo11MovementData_6230b:
+SilphCo11FMovementData_6230b:
 	db $5
 	db $5
 	db $6
@@ -292,7 +294,7 @@ SilphCo11MovementData_6230b:
 	db $5
 	db $ff
 
-SilphCo11MovementData_62311:
+SilphCo11FMovementData_62311:
 	db $5
 	db $5
 	db $5
@@ -301,32 +303,32 @@ SilphCo11MovementData_62311:
 	db $5
 	db $ff
 
-SilphCo11Script5:
-	ld de, SilphCo11MovementData_622f5
+SilphCo11FScript5:
+	ld de, SilphCo11FMovementData_622f5
 	CheckEitherEventSet EVENT_780, EVENT_781
 	and a
 	jr z, .asm_6232d
-	ld de, SilphCo11MovementData_62300
+	ld de, SilphCo11FMovementData_62300
 	cp $1
 	jr z, .asm_6232d
-	ld de, SilphCo11MovementData_6230b
+	ld de, SilphCo11FMovementData_6230b
 .asm_6232d
-	ld a, $4
+	ld a, SILPHCO11F_JAMES
 	ldh [hSpriteIndexOrTextID], a
 	call MoveSprite
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $6
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT6
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script6:
-	ld a, $ff
+SilphCo11FScript6:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-SilphCo11Script7:
+SilphCo11FScript7:
 	ld a, $2
 	ld [wSprite04StateData1MovementStatus], a
 	ld hl, wSprite04StateData1FacingDirection
@@ -337,36 +339,36 @@ SilphCo11Script7:
 	ld [hl], SPRITE_FACING_UP
 .asm_6235e
 	call Delay3
-	ld a, $fc
+	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-SilphCo11Script8:
-	ld de, SilphCo11MovementData_622fb
+SilphCo11FScript8:
+	ld de, SilphCo11FMovementData_622fb
 	CheckEitherEventSet EVENT_780, EVENT_781
 	and a
 	jr z, .asm_6237b
-	ld de, SilphCo11MovementData_62305
+	ld de, SilphCo11FMovementData_62305
 	cp $1
 	jr z, .asm_6237b
-	ld de, SilphCo11MovementData_62311
+	ld de, SilphCo11FMovementData_62311
 .asm_6237b
-	ld a, $6
+	ld a, SILPHCO11F_JESSIE
 	ldh [hSpriteIndexOrTextID], a
 	call MoveSprite
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $9
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT9
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script9:
-	ld a, $ff
+SilphCo11FScript9:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld a, $fc
+	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-SilphCo11Script10:
+SilphCo11FScript10:
 	ld a, $2
 	ld [wSprite06StateData1MovementStatus], a
 	ld hl, wSprite06StateData1FacingDirection
@@ -377,15 +379,15 @@ SilphCo11Script10:
 	ld [hl], SPRITE_FACING_LEFT
 .asm_623b1
 	call Delay3
-	ld a, $9
+	ld a, TEXT_SILPHCO11F_TEXT9
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-SilphCo11Script11:
+SilphCo11FScript11:
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
-	ld hl, SilphCo11Text_624c2
-	ld de, SilphCo11Text_624c2
+	ld hl, SilphCo11FText_624c2
+	ld de, SilphCo11FText_624c2
 	call SaveEndBattleTextPointers
 	ld a, OPP_ROCKET
 	ld [wCurOpponent], a
@@ -394,27 +396,27 @@ SilphCo11Script11:
 	xor a
 	ldh [hJoyHeld], a
 	ld [wJoyIgnore], a
-	ld a, $c
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT12
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script12:
-	ld a, $ff
+SilphCo11FScript12:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, [wIsInBattle]
 	cp $ff
-	jp z, SilphCo11Script_62185
+	jp z, SilphCo11FResetCurScript
 	ld a, $2
 	ld [wSprite04StateData1MovementStatus], a
 	ld [wSprite06StateData1MovementStatus], a
 	xor a
 	ld [wSprite04StateData1FacingDirection], a
 	ld [wSprite06StateData1FacingDirection], a
-	ld a, $fc
+	ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld a, $a
+	ld a, TEXT_SILPHCO11F_TEXT10
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
@@ -423,71 +425,70 @@ SilphCo11Script12:
 	ld c, BANK(Music_MeetJessieJames)
 	ld a, MUSIC_MEET_JESSIE_JAMES
 	call PlayMusic
-	ld a, $ff
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
-	ld a, $d
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT13
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script13:
-	ld a, $ff
+SilphCo11FScript13:
+	ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
 	ld a, HS_SILPH_CO_11F_JAMES
-	call SilphCo11Script_6246d
+	call SilphCo11FScript_HideObject
 	ld a, HS_SILPH_CO_11F_JESSIE
-	call SilphCo11Script_6246d
+	call SilphCo11FScript_HideObject
 	call UpdateSprites
 	call Delay3
 	call GBFadeInFromBlack
-	ld a, $e
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_SCRIPT14
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script14:
+SilphCo11FScript14:
 	call PlayDefaultMusic
 	xor a
 	ldh [hJoyHeld], a
 	ld [wJoyIgnore], a
 	ResetEvent EVENT_782
 	SetEventReuseHL EVENT_BEAT_SILPH_CO_11F_TRAINER_0
-	ld a, $0
-	call SilphCo11Script_62189
+	ld a, SCRIPT_SILPHCO11F_DEFAULT
+	call SilphCo11FSetCurScript
 	ret
 
-SilphCo11Script_6245e:
+SilphCo11FScript_ShowObject:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
 	call Delay3
 	ret
 
-SilphCo11Script_6246d:
+SilphCo11FScript_HideObject:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ret
 
 SilphCo11F_TextPointers:
-	dw SilphCo11Text1
-	dw SilphCo11Text2
-	dw SilphCo11Text3
-	dw SilphCo11Text4
-	dw SilphCo11Text5
-	dw SilphCo11Text6
-	dw SilphCo11Text7
-	dw SilphCo11Text8
-	dw SilphCo11Text9
-	dw SilphCo11Text10
+	def_text_pointers
+	dw_const SilphCo11FSilphPresidentText,            TEXT_SILPHCO11F_SILPH_PRESIDENT
+	dw_const SilphCo11FBeautyText,                    TEXT_SILPHCO11F_BEAUTY
+	dw_const SilphCo11FGiovanniText,                  TEXT_SILPHCO11F_GIOVANNI
+	dw_const SilphCo11FJessieJamesText,               TEXT_SILPHCO11F_JAMES
+	dw_const SilphCo11FRocketText,                    TEXT_SILPHCO11F_ROCKET
+	dw_const SilphCo11FJessieJamesText,               TEXT_SILPHCO11F_JESSIE
+	dw_const SilphCo11FGiovanniYouRuinedOurPlansText, TEXT_SILPHCO11F_GIOVANNI_YOU_RUINED_OUR_PLANS
+	dw_const SilphCo11FJessieJamesText,               TEXT_SILPHCO11F_TEXT8
+	dw_const SilphCo11FText9,                         TEXT_SILPHCO11F_TEXT9
+	dw_const SilphCo11FText10,                        TEXT_SILPHCO11F_TEXT10
 
 SilphCo11TrainerHeaders:
 	def_trainers 5
 SilphCo11TrainerHeader0:
-	trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText
+	trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11FRocketBattleText, SilphCo11FRocketEndBattleText, SilphCo11FRocketAfterBattleText
 	db -1 ; end
 
-SilphCo11Text4:
-SilphCo11Text6:
-SilphCo11Text8:
+SilphCo11FJessieJamesText:
 	text_far _SilphCoJessieJamesText1
 	text_asm
 	ld c, 10
@@ -503,91 +504,91 @@ SilphCo11Text8:
 	call DelayFrames
 	jp TextScriptEnd
 
-SilphCo11Text9:
+SilphCo11FText9:
 	text_far _SilphCoJessieJamesText2
 	text_end
 
-SilphCo11Text_624c2:
+SilphCo11FText_624c2:
 	text_far _SilphCoJessieJamesText3
 	text_end
 
-SilphCo11Text10:
+SilphCo11FText10:
 	text_far _SilphCoJessieJamesText4
 	text_asm
 	ld c, 64
 	call DelayFrames
 	jp TextScriptEnd
 
-SilphCo11Text1:
+SilphCo11FSilphPresidentText:
 	text_asm
 	CheckEvent EVENT_GOT_MASTER_BALL
 	jp nz, .got_item
-	ld hl, SilphCoPresidentText
+	ld hl, .Text
 	call PrintText
 	lb bc, MASTER_BALL, 1
 	call GiveItem
 	jr nc, .bag_full
-	ld hl, ReceivedSilphCoMasterBallText
+	ld hl, .ReceivedMasterBallText
 	call PrintText
 	SetEvent EVENT_GOT_MASTER_BALL
 	jr .done
 .bag_full
-	ld hl, SilphCoMasterBallNoRoomText
+	ld hl, .NoRoomText
 	call PrintText
 	jr .done
 .got_item
-	ld hl, SilphCo10Text_6231c
+	ld hl, .MasterBallDescriptionText
 	call PrintText
 .done
 	jp TextScriptEnd
 
-SilphCoPresidentText:
-	text_far _SilphCoPresidentText
+.Text:
+	text_far _SilphCo11FSilphPresidentText
 	text_end
 
-ReceivedSilphCoMasterBallText:
-	text_far _ReceivedSilphCoMasterBallText
+.ReceivedMasterBallText:
+	text_far _SilphCo11FSilphPresidentReceivedMasterBallText
 	sound_get_key_item
 	text_end
 
-SilphCo10Text_6231c:
-	text_far _SilphCo10Text_6231c
+.MasterBallDescriptionText:
+	text_far _SilphCo11FSilphPresidentMasterBallDescriptionText
 	text_end
 
-SilphCoMasterBallNoRoomText:
-	text_far _SilphCoMasterBallNoRoomText
+.NoRoomText:
+	text_far _SilphCo11FSilphPresidentNoRoomText
 	text_end
 
-SilphCo11Text2:
-	text_far _SilphCo11Text2
+SilphCo11FBeautyText:
+	text_far _SilphCo11FBeautyText
 	text_end
 
-SilphCo11Text3:
-	text_far _SilphCo11Text3
+SilphCo11FGiovanniText:
+	text_far _SilphCo11FGiovanniText
 	text_end
 
-SilphCo10Text_62528:
-	text_far _SilphCo10Text_62330
+SilphCo10FGiovanniILostAgainText:
+	text_far _SilphCo10FGiovanniILostAgainText
 	text_end
 
-SilphCo11Text7:
-	text_far _SilphCo10Text_62335
+SilphCo11FGiovanniYouRuinedOurPlansText:
+	text_far _SilphCo11FGiovanniYouRuinedOurPlansText
 	text_end
 
-SilphCo11Text5:
+SilphCo11FRocketText:
 	text_asm
 	ld hl, SilphCo11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-SilphCo11Trainer1BattleText:
-	text_far _SilphCo11BattleText2
+SilphCo11FRocketBattleText:
+	text_far _SilphCo11FRocket2BattleText
 	text_end
 
-SilphCo11Trainer1EndBattleText:
-	text_far _SilphCo11EndBattleText2
+SilphCo11FRocketEndBattleText:
+	text_far _SilphCo11FRocket2EndBattleText
 	text_end
 
-SilphCo11Trainer1AfterBattleText:
-	text_far _SilphCo11AfterBattleText2
+SilphCo11FRocketAfterBattleText:
+	text_far _SilphCo11FRocket2AfterBattleText
 	text_end