Merge pull request #138 from TrainerX493/master

Label some names entries from text_offsets.asm
2026-04-25 15:42:58 -05:00 · 2023-10-28 11:09:27 -05:00 · 2023-10-28 11:09:27 -05:00 · 7531184c87
commit 7531184c87
parent 705df5627d cdfcb77b42
30 changed files with 1267 additions and 1266 deletions
--- a/bugs_and_glitches.md
+++ b/bugs_and_glitches.md
@ -531,7 +531,7 @@ HandleAICowardice:

 When playing the challenge cup, player name is used instead of rival name before the first fight, as seen here: https://www.youtube.com/watch?v=1igDbNxRfUw&t=17310s

-**Fix:** Edit `Text0533` in `text6.asm`: 
+**Fix:** Edit `Clerk12ChallengeCupContenderText` in `text6.asm`: 
 ```diff
 -	text "Presently, <RAMNAME> is still"
 +	text "Presently, <RAMTEXT> is still"
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@ -8290,7 +8290,7 @@ PidgeotLv38Card:
 	db 38 ; level
 	db 4, 11 ; length
 	dw 87 * 10 ; weight
-	tx Pidgeot1Description ; description
+	tx PidgeotLv38Description ; description
 	db 0

 PidgeotLv40Card:
@ -8341,7 +8341,7 @@ PidgeotLv40Card:
 	db 40 ; level
 	db 4, 11 ; length
 	dw 87 * 10 ; weight
-	tx Pidgeot2Description ; description
+	tx PidgeotLv40Description ; description
 	db 0

 RattataCard:
--- a/src/data/map_objects.asm
+++ b/src/data/map_objects.asm
@ -7,38 +7,38 @@
 MasonLabObjects:
 	db NORTH, 18, 2
 	dw PrintInteractableObjectText
-	tx Text04a0
-	tx WhatIsADeckText
+	tx WhatIsADeckBookText
+	tx WhatIsADeckBookName

 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04a2
-	tx Text04a1
+	tx CardsVol1BookText
+	tx CardsVol1BookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04a4
-	tx Text04a3
+	tx CardsVol2BookText
+	tx CardsVol2BookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04a6
-	tx Text04a5
+	tx CardsVol3BookText
+	tx CardsVol3BookName

 	db NORTH, 20, 14
 	dw PrintInteractableObjectText
-	tx Text04a8
-	tx Text04a7
+	tx WinOrLossOfAMatchVol1BookText
+	tx WinOrLossOfAMatchVol1BookName

 	db NORTH, 22, 14
 	dw PrintInteractableObjectText
-	tx Text04aa
-	tx Text04a9
+	tx WinOrLossOfAMatchVol2BookText
+	tx WinOrLossOfAMatchVol2BookName

 	db NORTH, 24, 14
 	dw PrintInteractableObjectText
-	tx Text04ac
-	tx Text04ab
+	tx WinOrLossOfAMatchVol3BookText
+	tx WinOrLossOfAMatchVol3BookName

 	db NORTH, 2, 2
 	dw PCMenu
@ -155,63 +155,63 @@ DeckMachineRoomObjects:
 IshiharasHouseObjects:
 	db NORTH, 6, 2
 	dw PrintInteractableObjectText
-	tx Text04ae
-	tx Text04ad
+	tx CombosBookText
+	tx CombosBookName

 	db NORTH, 8, 2
 	dw PrintInteractableObjectText
-	tx Text04b0
-	tx Text04af
+	tx EnergyTransBookText
+	tx EnergyTransBookName

 	db NORTH, 10, 2
 	dw PrintInteractableObjectText
-	tx Text04b2
-	tx Text04b1
+	tx ToxicGasBookText
+	tx ToxicGasBookName

 	db NORTH, 12, 2
 	dw PrintInteractableObjectText
-	tx Text04b4
-	tx Text04b3
+	tx RainDanceBookText
+	tx RainDanceBookName

 	db NORTH, 14, 2
 	dw PrintInteractableObjectText
-	tx Text04b6
-	tx Text04b5
+	tx SelfdestructBookText
+	tx SelfdestructBookName

 	db NORTH, 16, 2
 	dw PrintInteractableObjectText
-	tx Text04b8
-	tx Text04b7
+	tx DamageSwapBookText
+	tx DamageSwapBookName

 	db NORTH, 2, 12
 	dw PrintInteractableObjectText
-	tx Text04ba
-	tx Text04b9
+	tx HyperBeamBookText
+	tx HyperBeamBookName

 	db NORTH, 4, 12
 	dw PrintInteractableObjectText
-	tx Text04bc
-	tx Text04bb
+	tx PrehistoricPowerBookText
+	tx PrehistoricPowerBookName

 	db NORTH, 6, 12
 	dw PrintInteractableObjectText
-	tx Text04be
-	tx Text04bd
+	tx PhantomCardsBookText
+	tx PhantomCardsBookName

 	db NORTH, 12, 12
 	dw PrintInteractableObjectText
-	tx Text04c0
-	tx Text04bf
+	tx WeaknessAndResistanceBookText
+	tx WeaknessAndResistanceBookName

 	db NORTH, 14, 12
 	dw PrintInteractableObjectText
-	tx Text04c2
-	tx Text04c1
+	tx DrawingDesiredCardsBookText
+	tx DrawingDesiredCardsBookName

 	db NORTH, 16, 12
 	dw PrintInteractableObjectText
-	tx Text04c4
-	tx Text04c3
+	tx RetreatingBookText
+	tx RetreatingBookName

 	db $ff

@ -219,18 +219,18 @@ IshiharasHouseObjects:
 FightingClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04c6
-	tx Text04c5
+	tx FightingPokemonBookText
+	tx FightingPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04c8
-	tx Text04c7
+	tx FightingPokemonAndCombosBookText
+	tx FightingPokemonAndCombosBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04ca
-	tx Text04c9
+	tx DoubleColorlessEnergyBookText
+	tx DoubleColorlessEnergyBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -253,18 +253,18 @@ FightingClubLobbyObjects:
 RockClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04cc
-	tx Text04cb
+	tx RockPokemonBookText
+	tx RockPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04ce
-	tx Text04cd
+	tx WinningWithFightingPokemonBookText
+	tx WinningWithFightingPokemonBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04d0
-	tx Text04cf
+	tx BasicPokemonBookText
+	tx BasicPokemonBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -287,18 +287,18 @@ RockClubLobbyObjects:
 WaterClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04d2
-	tx Text04d1
+	tx WaterPokemonBookText
+	tx WaterPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04d4
-	tx Text04d3
+	tx WaterPokemonAttacksBookText
+	tx WaterPokemonAttacksBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04d6
-	tx Text04d5
+	tx ParalyzeBookText
+	tx ParalyzeBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -321,18 +321,18 @@ WaterClubLobbyObjects:
 LightningClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04d8
-	tx Text04d7
+	tx LightningPokemonBookText
+	tx LightningPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04da
-	tx Text04d9
+	tx EnergyCardsBookText
+	tx EnergyCardsBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04dc
-	tx Text04db
+	tx CardPopBookText
+	tx CardPopBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -355,18 +355,18 @@ LightningClubLobbyObjects:
 GrassClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04de
-	tx Text04dd
+	tx GrassPokemonBookText
+	tx GrassPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04e0
-	tx Text04df
+	tx PoisonBookText
+	tx PoisonBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04e2
-	tx Text04e1
+	tx GrassPokemonPokemonBreederBookText
+	tx GrassPokemonPokemonBreederBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -389,18 +389,18 @@ GrassClubLobbyObjects:
 PsychicClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04e4
-	tx Text04e3
+	tx PsychicPokemonBookText
+	tx PsychicPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04e6
-	tx Text04e5
+	tx SleepBookText
+	tx SleepBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04e8
-	tx Text04e7
+	tx PokemonPowerBookText
+	tx PokemonPowerBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -423,18 +423,18 @@ PsychicClubLobbyObjects:
 ScienceClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04ea
-	tx Text04e9
+	tx ScienceClubPokemonBookText
+	tx ScienceClubPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04ec
-	tx Text04eb
+	tx ConfusionBookText
+	tx ConfusionBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04ee
-	tx Text04ed
+	tx UsefulButtonsBookText
+	tx UsefulButtonsBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -457,18 +457,18 @@ ScienceClubLobbyObjects:
 FireClubLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04f0
-	tx Text04ef
+	tx FirePokemonBookText
+	tx FirePokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04f2
-	tx Text04f1
+	tx FirePokemonAttacksBookText
+	tx FirePokemonAttacksBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04f4
-	tx Text04f3
+	tx OriginalGameBoyCardsBookText
+	tx OriginalGameBoyCardsBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -491,18 +491,18 @@ FireClubLobbyObjects:
 ChallengeHallLobbyObjects:
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
-	tx Text04f6
-	tx Text04f5
+	tx ColorlessPokemonBookText
+	tx ColorlessPokemonBookName

 	db NORTH, 22, 2
 	dw PrintInteractableObjectText
-	tx Text04f8
-	tx Text04f7
+	tx DragonPokemonBookText
+	tx DragonPokemonBookName

 	db NORTH, 24, 2
 	dw PrintInteractableObjectText
-	tx Text04fa
-	tx Text04f9
+	tx BirdPokemonBookText
+	tx BirdPokemonBookName

 	db NORTH, 2, 8
 	dw PCMenu
@ -525,53 +525,53 @@ ChallengeHallLobbyObjects:
 PokemonDomeEntranceObjects:
 	db NORTH, 2, 2
 	dw PrintInteractableObjectText
-	tx Text04fc
-	tx Text04fb
+	tx LegendaryPokemonCardsVol1BookText
+	tx LegendaryPokemonCardsVol1BookName

 	db NORTH, 4, 2
 	dw PrintInteractableObjectText
-	tx Text04fe
-	tx Text04fd
+	tx LegendaryPokemonCardsVol2BookText
+	tx LegendaryPokemonCardsVol2BookName

 	db NORTH, 6, 2
 	dw PrintInteractableObjectText
-	tx Text0500
-	tx Text04ff
+	tx LegendaryPokemonCardsVol3BookText
+	tx LegendaryPokemonCardsVol3BookName

 	db NORTH, 2, 8
 	dw PrintInteractableObjectText
-	tx Text0502
-	tx Text0501
+	tx LegendaryPokemonCardsVol4BookText
+	tx LegendaryPokemonCardsVol4BookName

 	db NORTH, 4, 8
 	dw PrintInteractableObjectText
-	tx Text0504
-	tx Text0503
+	tx TheGrandMastersBookText
+	tx TheGrandMastersBookName

 	db NORTH, 6, 8
 	dw PrintInteractableObjectText
-	tx Text0506
-	tx Text0505
+	tx MasterMedalsBookText
+	tx MasterMedalsBookName

 	db NORTH, 18, 0
 	dw Script_f631
-	tx Text0508
-	tx Text0507
+	tx PlateOfLegendsText
+	tx PlateOfLegendsName

 	db NORTH, 20, 0
 	dw Script_f631
-	tx Text0508
-	tx Text0507
+	tx PlateOfLegendsText
+	tx PlateOfLegendsName

 	db NORTH, 22, 0
 	dw Script_f6af
-	tx Text0558
-	tx Text0509
+	tx MysteriousVoiceDoorNotEnoughMedalsText
+	tx MysteriousVoiceDoorName

 	db NORTH, 24, 0
 	dw Script_f6af
-	tx Text0558
-	tx Text0509
+	tx MysteriousVoiceDoorNotEnoughMedalsText
+	tx MysteriousVoiceDoorName

 	db NORTH, 28, 2
 	dw PCMenu
--- a/src/data/multichoice.asm
+++ b/src/data/multichoice.asm
@ -36,7 +36,7 @@ SamNormalMultichoice_ConfigurationTable:
 	db $0a, $00     ; x, y to start drawing box
 	db $0a, $0a     ; width, height of box
 	db $0c, $02     ; x, y coordinate to start printing next text
-	tx Text03ff     ; text id to print next
+	tx SamNormalMenuText     ; text id to print next
 	db $ff          ; marker byte -- end text entries
 	db $0b, $02     ; cursor starting x, y
 	db $02          ; number of tiles the cursor moves per toggle
@ -49,7 +49,7 @@ SamRulesMultichoice_ConfigurationTable:
 	db $06, $00     ; x, y to start drawing box
 	db $0e, $12     ; width, height of box
 	db $08, $02     ; x coordinate to start printing text
-	tx Text0400     ; text id to print next
+	tx SamRulesMenuText     ; text id to print next
 	db $ff          ; marker byte -- end text entries
 	db $07, $02     ; cursor starting x, y
 	db $02          ; number of tiles the cursor moves per toggle
--- a/src/engine/menus/deck_machine.asm
+++ b/src/engine/menus/deck_machine.asm
@ -587,8 +587,9 @@ HandleDeckSaveMachineMenu:
 	jp c, .wait_input
 	jr .return_to_list

+; Empty Deck
 .is_empty
-	ldtx hl, Text0264
+	ldtx hl, NoDeckIsSavedText
 	call DrawWideTextBox_WaitForInput
 	ld a, [wTempDeckMachineCursorPos]
 	jp .wait_input
--- a/src/engine/menus/gift_center.asm
+++ b/src/engine/menus/gift_center.asm
@ -18,7 +18,7 @@ Unknown_10da9:
 	db 10, 12 ; start menu text box dimensions

 	db 12, 2 ; text alignment for InitTextPrinting
-	tx Text0351
+	tx PCMenuOptionsText
 	db $ff

 	db 11, 2 ; cursor x, cursor y
--- a/src/engine/menus/mail.asm
+++ b/src/engine/menus/mail.asm
@ -201,63 +201,63 @@ PCMailTextPages:
 	dw NULL

 	; mail 1
-	tx Text0401
-	tx Text0402
+	tx Mail1Part1Text
+	tx Mail1Part2Text

 	; mail 2
-	tx Text0403
-	tx Text0404
+	tx Mail2Part1Text
+	tx Mail2Part2Text

 	; mail 3
-	tx Text0405
-	tx Text0406
+	tx Mail3Part1Text
+	tx Mail3Part2Text

 	; mail 4
-	tx Text0407
-	tx Text0408
+	tx Mail4Part1Text
+	tx Mail4Part2Text

 	; mail 5
-	tx Text0409
-	tx Text040a
+	tx Mail5Part1Text
+	tx Mail5Part2Text

 	; mail 6
-	tx Text040b
-	tx Text040c
+	tx Mail6Part1Text
+	tx Mail6Part2Text

 	; mail 7
-	tx Text040d
-	tx Text040e
+	tx Mail7Part1Text
+	tx Mail7Part2Text

 	; mail 8
-	tx Text040f
-	tx Text0410
+	tx Mail8Part1Text
+	tx Mail8Part2Text

 	; mail 9
-	tx Text0411
-	tx Text0412
+	tx Mail9Part1Text
+	tx Mail9Part2Text

 	; mail 10
-	tx Text0413
+	tx Mail10Part1Text
 	dw NULL

 	; mail 11
-	tx Text0414
+	tx Mail11Part1Text
 	dw NULL

 	; mail 12
-	tx Text0415
+	tx Mail12Part1Text
 	dw NULL

 	; mail 13
-	tx Text0416
+	tx Mail13Part1Text
 	dw NULL

 	; mail 14
-	tx Text0417
+	tx Mail14Part1Text
 	dw NULL

 	; mail 15
-	tx Text0418
+	tx Mail15Part1Text
 	dw NULL

 TryOpenPCMailBoosterPack:
@ -290,7 +290,7 @@ TryOpenPCMailBoosterPack:
 	call InitMenuScreen
 	lb de, $30, $ff
 	call SetupText
-	ldtx hl, Text0419
+	ldtx hl, MailBoosterPackAlreadyOpenedText
 	call PrintScrollableText_NoTextBoxLabel
 	jr .done

--- a/src/engine/menus/medal.asm
+++ b/src/engine/menus/medal.asm
@ -51,12 +51,12 @@ ShowMedalReceivedScreen:

 MasterMedalNames:
 	table_width 2, MasterMedalNames
-	tx GrassClubMapNameText
-	tx ScienceClubMapNameText
-	tx FireClubMapNameText
-	tx WaterClubMapNameText
-	tx LightningClubMapNameText
-	tx PsychicClubMapNameText
-	tx RockClubMapNameText
-	tx FightingClubMapNameText
+	tx GrassClubMapName
+	tx ScienceClubMapName
+	tx FireClubMapName
+	tx WaterClubMapName
+	tx LightningClubMapName
+	tx PsychicClubMapName
+	tx RockClubMapName
+	tx FightingClubMapName
 	assert_table_length NUM_MEDALS
--- a/src/engine/menus/naming.asm
+++ b/src/engine/menus/naming.asm
@ -59,7 +59,7 @@ Unknown_12908:
 	db 10, 6 ; start menu text box dimensions

 	db 12, 2 ; text alignment for InitTextPrinting
-	tx Text037b
+	tx DebugDuelModeMenuText
 	db $ff

 	db 11, 2 ; cursor x, cursor y
--- a/src/engine/menus/printer.asm
+++ b/src/engine/menus/printer.asm
@ -212,7 +212,7 @@ PrinterMenu_CardList:
 	call EnableLCD
 	lb de, 1, 1
 	call InitTextPrinting
-	ldtx hl, Text0277
+	ldtx hl, PrintTheCardListText
 	call ProcessTextFromID
 	ld a, $01
 	ld hl, Data_ad05
--- a/src/engine/overworld/scripting.asm
+++ b/src/engine/overworld/scripting.asm
@ -1389,18 +1389,18 @@ ScriptCommand_LoadCurrentMapNameIntoTxRamSlot:
 	jp IncreaseScriptPointerBy2

 MapNames:
-	tx MasonLaboratoryMapNameText
-	tx MrIshiharasHouseMapNameText
-	tx FightingClubMapNameText
-	tx RockClubMapNameText
-	tx WaterClubMapNameText
-	tx LightningClubMapNameText
-	tx GrassClubMapNameText
-	tx PsychicClubMapNameText
-	tx ScienceClubMapNameText
-	tx FireClubMapNameText
-	tx ChallengeHallMapNameText
-	tx PokemonDomeMapNameText
+	tx MasonLaboratoryMapName
+	tx MrIshiharasHouseMapName
+	tx FightingClubMapName
+	tx RockClubMapName
+	tx WaterClubMapName
+	tx LightningClubMapName
+	tx GrassClubMapName
+	tx PsychicClubMapName
+	tx ScienceClubMapName
+	tx FireClubMapName
+	tx ChallengeHallMapName
+	tx PokemonDomeMapName

 ScriptCommand_LoadChallengeHallNPCIntoTxRamSlot:
 	ld hl, wCurrentNPCNameTx
--- a/src/scripts/challenge_hall.asm
+++ b/src/scripts/challenge_hall.asm
@ -31,7 +31,7 @@ ChallengeHallLoadMap:

 Script_Clerk13:
 	start_script
-	print_text_quit_fully Text0525
+	print_text_quit_fully Clerk13Text

 Preload_Guide:
 	get_event_value EVENT_CHALLENGE_CUP_STARTING
@ -48,14 +48,14 @@ Preload_Guide:
 Script_Guide:
 	start_script
 	jump_if_event_false EVENT_CHALLENGE_CUP_STARTING, .ows_f28b
-	print_text_quit_fully Text0526
+	print_text_quit_fully GuideChallengeCupActiveText

 .ows_f28b
 	jump_if_event_zero EVENT_CHALLENGE_CUP_1_STATE, .ows_f292
-	print_text_quit_fully Text0527
+	print_text_quit_fully GuideChallengeCupOverText

 .ows_f292
-	print_text_quit_fully Text0528
+	print_text_quit_fully GuideChallengeCupPreparingText

 Script_Clerk12:
 	start_script
@ -70,29 +70,29 @@ Script_Clerk12:
 	script_jump .ows_f2c7

 .ows_f2c1
-	print_text_quit_fully Text0529
+	print_text_quit_fully Clerk12ChallengeCupWonText

 .ows_f2c4
-	print_text_quit_fully Text052a
+	print_text_quit_fully Clerk12ChallengeCupLostText

 .ows_f2c7
-	print_npc_text Text052b
+	print_npc_text Clerk12ChallengeCup1ActiveText
 	script_jump .ows_f2d6

 .ows_f2cd
-	print_npc_text Text052c
+	print_npc_text Clerk12ChallengeCup2ActiveText
 	script_jump .ows_f2d6

 .ows_f2d3
-	print_npc_text Text052d
+	print_npc_text Clerk12ChallengeCup3ActiveText
 .ows_f2d6
-	print_npc_text Text052e
-	ask_question_jump Text052f, .ows_f2e1
-	print_text_quit_fully Text0530
+	print_npc_text Clerk12ChallengeCupInviteText
+	ask_question_jump Clerk12WillYouEnterText, .ows_f2e1
+	print_text_quit_fully Clerk12DeclinedText

 .ows_f2e1
 	max_out_event_value EVENT_PLAYER_ENTERED_CHALLENGE_CUP
-	print_npc_text Text0531
+	print_npc_text Clerk12AcceptedText
 	close_text_box
 	move_active_npc NPCMovement_f349
 	jump_if_player_coords_match 8, 18, .ows_f2fa
@ -162,16 +162,16 @@ Script_f353:
 	do_frames 20
 	move_active_npc NPCMovement_f390
 	load_challenge_hall_npc_into_txram_slot 0
-	print_npc_text Text0532
+	print_npc_text Clerk12ChallengeCupIntroText
 	close_text_box
 	move_active_npc NPCMovement_f37f
-	print_npc_text Text0533
+	print_npc_text Clerk12ChallengeCupContenderText
 	close_text_box
 	move_active_npc NPCMovement_f388
-	print_npc_text Text0534
+	print_npc_text Clerk12ChallengeCupRound1ChallengerText
 	close_text_box
 	move_active_npc NPCMovement_f38e
-	print_npc_text Text0535
+	print_npc_text Clerk12ChallengeCupRound1DuelStartText
 	start_challenge_hall_duel PRIZES_4, SAMS_PRACTICE_DECK_ID, MUSIC_STOP
 	quit_script_fully

@ -218,11 +218,11 @@ Script_LostAtChallengeHall:
 	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 3, Script_f410.ows_f41a
 	load_challenge_hall_npc_into_txram_slot 0
 	load_challenge_hall_npc_into_txram_slot 1
-	print_npc_text Text0536
+	print_npc_text Clerk12ChallengeCupRound2PlayerLostText
 .ows_f3ae
 	close_text_box
 	move_active_npc NPCMovement_f38b
-	print_npc_text Text0537
+	print_npc_text Clerk12ChallengeCupLostContinuedText
 	close_text_box
 	move_active_npc NPCMovement_f38e
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f3ce
@ -277,15 +277,15 @@ NPCMovement_f40d:
 Script_f410:
 	load_challenge_hall_npc_into_txram_slot 0
 	load_challenge_hall_npc_into_txram_slot 1
-	print_npc_text Text0538
+	print_npc_text Clerk12ChallengeCupRound1PlayerLostText
 	script_jump Script_LostAtChallengeHall.ows_f3ae

 .ows_f41a
-	print_npc_text Text0539
+	print_npc_text Clerk12ChallengeCupPlayerLostToRonaldText
 	set_dialog_npc NPC_RONALD1
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f42e
 	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
-	print_variable_npc_text Text053a, Text053b
+	print_variable_npc_text RonaldChallengeCup2Or3PlayerLostText, RonaldChallengeCup1PlayerLostText
 .ows_f42e
 	set_dialog_npc NPC_HOST
 	script_jump Script_LostAtChallengeHall.ows_f3ae
@ -308,43 +308,43 @@ Script_WonAtChallengeHall:
 	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f456
 .ows_f456
 	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 1
-	print_variable_npc_text Text053c, Text053d
+	print_variable_npc_text Clerk12ChallengeCupRound1PlayerWonText, Clerk12ChallengeCupRound2PlayerWonText
 	move_active_npc NPCMovement_f37f
 	load_challenge_hall_npc_into_txram_slot 0
-	print_npc_text Text053e
+	print_npc_text Clerk12ChallengeCupPlayerWonContinuedText
 	close_text_box
 	move_challenge_hall_npc NPCMovement_f4c8
 	unload_challenge_hall_npc
-	print_npc_text Text053f
+	print_npc_text Clerk12ChallengeCupNextChallengerText
 	close_text_box
 	pick_challenge_hall_opponent
 	set_challenge_hall_npc_coords 20, 20
 	move_challenge_hall_npc NPCMovement_f4d0
 	load_challenge_hall_npc_into_txram_slot 0
 	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2
-	print_variable_npc_text Text0540, Text0541
+	print_variable_npc_text Clerk12ChallengeCupRound2ChallengerText, Clerk12ChallengeCupRound3ChallengerText
 	move_active_npc NPCMovement_f383
 	jump_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2, .ows_f4a4
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f4a1
 	close_text_box
 	set_dialog_npc NPC_RONALD1
 	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
-	print_variable_npc_text Text0542, Text0543
+	print_variable_npc_text RonaldChallengeCup2BeforeDuelText, RonaldChallengeCup1BeforeDuelText
 	set_dialog_npc NPC_HOST
 	close_text_box
 .ows_f4a1
-	print_npc_text Text0544
+	print_npc_text Clerk12ChallengeCupRound3DuelReadyText
 .ows_f4a4
 	zero_out_event_value EVENT_CHALLENGE_CUP_IN_MENU
-	print_npc_text Text0545
-	ask_question_jump_default_yes Text0546, .ows_f4bd
+	print_npc_text Clerk12AreYourDecksReadyText
+	ask_question_jump_default_yes Clerk12PrepareYourDeckText, .ows_f4bd
 	test_if_event_equal EVENT_CHALLENGE_CUP_OPPONENT_NUMBER, 2
-	print_variable_npc_text Text0547, Text0548
+	print_variable_npc_text Clerk12ChallengeCupRound2DuelStartText, Clerk12ChallengeCupRound3DuelStartText
 	start_challenge_hall_duel PRIZES_4, SAMS_PRACTICE_DECK_ID, MUSIC_STOP
 	quit_script_fully

 .ows_f4bd
-	print_npc_text Text0549
+	print_npc_text Clerk12MakeYourPreparationsText
 	close_text_box
 	max_out_event_value EVENT_CHALLENGE_CUP_IN_MENU
 	open_menu
@ -378,20 +378,20 @@ NPCMovement_f4d8:
 	db $ff

 Script_f4db:
-	print_npc_text Text054a
+	print_npc_text Clerk12ChallengeCupRound3PlayerWon1Text
 	move_active_npc NPCMovement_f37f
 	load_challenge_hall_npc_into_txram_slot 0
-	print_npc_text Text054b
+	print_npc_text Clerk12ChallengeCupRound3PlayerWon2Text
 	close_text_box
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f513
 	set_dialog_npc NPC_RONALD1
 	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
-	print_variable_npc_text Text054c, Text054d
+	print_variable_npc_text RonaldChallengeCup1PlayerWon1Text, RonaldChallengeCup2Or3PlayerWon1Text
 	move_challenge_hall_npc NPCMovement_f4d8
 	do_frames 40
 	move_challenge_hall_npc NPCMovement_f34c
 	test_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 1
-	print_variable_npc_text Text054e, Text054f
+	print_variable_npc_text RonaldChallengeCup1PlayerWon2Text, RonaldChallengeCup2Or3PlayerWon2Text
 	set_dialog_npc NPC_HOST
 	close_text_box
 	move_challenge_hall_npc NPCMovement_f4c9
@ -402,14 +402,14 @@ Script_f4db:
 .ows_f516
 	unload_challenge_hall_npc
 	move_active_npc NPCMovement_f383
-	print_npc_text Text0550
+	print_npc_text Clerk12ChallengeCupRound3PlayerWon3Text
 	close_text_box
 	move_active_npc NPCMovement_f38b
 	pick_challenge_cup_prize_card
-	print_npc_text Text0551
+	print_npc_text Clerk12ChallengeCupRound3PlayerWon4Text
 	give_card VARIABLE_CARD
 	show_card_received_screen VARIABLE_CARD
-	print_npc_text Text0552
+	print_npc_text Clerk12ChallengeCupRound3PlayerWon5Text
 	close_text_box
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 2, .ows_f540
 	jump_if_event_equal EVENT_CHALLENGE_CUP_NUMBER, 3, .ows_f549
--- a/src/scripts/challenge_hall_entrance.asm
+++ b/src/scripts/challenge_hall_entrance.asm
@ -91,16 +91,16 @@ Script_Clerk9:
 	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_WON, .ows_f072
 	jump_if_event_equal EVENT_CHALLENGE_CUP_1_STATE, CHALLENGE_CUP_READY_TO_START, .ows_f06c
 .ows_f066
-	print_text_quit_fully Text050a
+	print_text_quit_fully Clerk9DefualtText

 .ows_f069
-	print_text_quit_fully Text050b
+	print_text_quit_fully Clerk9ChallengeCupOverText

 .ows_f06c
-	print_text_quit_fully Text050c
+	print_text_quit_fully Clerk9ChallengeCupReadyText

 .ows_f06f
-	print_text_quit_fully Text050d
+	print_text_quit_fully Clerk9ChallengeCupLostText

 .ows_f072
-	print_text_quit_fully Text050e
+	print_text_quit_fully Clerk9ChallengeCupWonText
--- a/src/scripts/challenge_hall_lobby.asm
+++ b/src/scripts/challenge_hall_lobby.asm
@ -1,9 +1,9 @@
-Preload_ChallengeHallNPCs2:
+Preload_ChallengeHallNPCs2: ; Challenge Cup Iniactive
 	call Preload_ChallengeHallNPCs1
 	ccf
 	ret

-Preload_ChallengeHallNPCs1:
+Preload_ChallengeHallNPCs1: ; Challenge Cup Active
 	get_event_value EVENT_CHALLENGE_CUP_STARTING
 	or a
 	jr z, .quit
@ -23,29 +23,29 @@ ChallengeHallLobbyLoadMap:
 	ld bc, Script_f166
 	jp SetNextNPCAndScript

-Script_Pappy3:
+Script_Pappy3: ; Preload_ChallengeHallNPCs1
 	start_script
-	print_text_quit_fully Text050f
+	print_text_quit_fully Pappy3Text

-Script_Gal4:
+Script_Gal4: ; Preload_ChallengeHallNPCs1
 	start_script
-	print_text_quit_fully Text0510
+	print_text_quit_fully Gal4Text

-Script_Champ:
+Script_Champ: ; Preload_ChallengeHallNPCs1
 	start_script
-	print_text_quit_fully Text0511
+	print_text_quit_fully ChampText

-Script_Hood2:
+Script_Hood2: ; Preload_ChallengeHallNPCs1
 	start_script
-	print_text_quit_fully Text0512
+	print_text_quit_fully Hood2Text

-Script_Lass5:
+Script_Lass5: ; Preload_ChallengeHallNPCs2
 	start_script
-	print_text_quit_fully Text0513
+	print_text_quit_fully Lass5Text

-Script_Chap5:
+Script_Chap5: ; Preload_ChallengeHallNPCs2
 	start_script
-	print_text_quit_fully Text0514
+	print_text_quit_fully Chap5Text

 Preload_ChallengeHallLobbyRonald1:
 	set_event_zero EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE
@ -155,75 +155,75 @@ Script_f166:
 	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 7, .ows_f204
 	jump_if_event_equal EVENT_RONALD_CHALLENGE_HALL_LOBBY_STATE, 8, .ows_f217
 .ows_f192
-	print_npc_text Text0515
+	print_npc_text RonaldChallengeCup1NotStarted1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text0516
+	print_npc_text RonaldChallengeCup1NotStarted2Text
 	script_jump .ows_f227

 .ows_f1a5
-	print_npc_text Text0517
+	print_npc_text RonaldChallengeCup1LostActive1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text0518
+	print_npc_text RonaldChallengeCup1LostActive2Text
 	script_jump .ows_f227

 .ows_f1b8
-	print_npc_text Text0519
+	print_npc_text RonaldChallengeCup1LostInactive1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text051a
+	print_npc_text RonaldChallengeCup1LostInactive2Text
 	script_jump .ows_f227

 .ows_f1cb
-	print_npc_text Text051b
+	print_npc_text RonaldChallengeCup1Missed1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text051c
+	print_npc_text RonaldChallengeCup1Missed2Text
 	script_jump .ows_f227

 .ows_f1de
-	print_npc_text Text051d
+	print_npc_text RonaldChallengeCup2NotStarted1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text051e
+	print_npc_text RonaldChallengeCup2NotStarted2Text
 	script_jump .ows_f227

 .ows_f1f1
-	print_npc_text Text051f
+	print_npc_text RonaldChallengeCup2LostActive1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text0520
+	print_npc_text RonaldChallengeCup2LostActive2Text
 	script_jump .ows_f227

 .ows_f204
-	print_npc_text Text0521
+	print_npc_text RonaldChallengeCup2LostInactive1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text0522
+	print_npc_text RonaldChallengeCup2LostInactive2Text
 	script_jump .ows_f227

 .ows_f217
-	print_npc_text Text0523
+	print_npc_text RonaldChallengeCup2Missed1Text
 	close_text_box
 	move_player WEST, 1
 	move_player WEST, 1
 	move_player WEST, 1
-	print_npc_text Text0524
+	print_npc_text RonaldChallengeCup2Missed2Text
 .ows_f227
 	close_text_box
 	set_player_direction SOUTH
--- a/src/scripts/deck_machine_room.asm
+++ b/src/scripts/deck_machine_room.asm
@ -138,14 +138,14 @@ Func_d96c:
 	ret

 ClubMapNames:
-	tx FightingClubMapNameText
-	tx RockClubMapNameText
-	tx WaterClubMapNameText
-	tx LightningClubMapNameText
-	tx GrassClubMapNameText
-	tx PsychicClubMapNameText
-	tx ScienceClubMapNameText
-	tx FireClubMapNameText
+	tx FightingClubMapName
+	tx RockClubMapName
+	tx WaterClubMapName
+	tx LightningClubMapName
+	tx GrassClubMapName
+	tx PsychicClubMapName
+	tx ScienceClubMapName
+	tx FireClubMapName

 Script_d995:
 	ld a, $03
--- a/src/scripts/fighting_club.asm
+++ b/src/scripts/fighting_club.asm
@ -32,69 +32,69 @@ Script_Mitch:
 	fight_club_pupil_jump .first_interaction, .three_pupils_remaining, \
 		.two_pupils_remaining, .one_pupil_remaining, .all_pupils_defeated
 .first_interaction
-	print_npc_text Text0477
+	print_npc_text MitchFirstInteractionText
 	set_event EVENT_PUPIL_MICHAEL_STATE, PUPIL_ACTIVE
 	set_event EVENT_PUPIL_CHRIS_STATE, PUPIL_ACTIVE
 	set_event EVENT_PUPIL_JESSICA_STATE, PUPIL_ACTIVE
 	quit_script_fully

 .three_pupils_remaining
-	print_text_quit_fully Text0478
+	print_text_quit_fully Mitch3PupilsRemainingText

 .two_pupils_remaining
-	print_text_quit_fully Text0479
+	print_text_quit_fully Mitch2PupilsRemainingText

 .one_pupil_remaining
-	print_text_quit_fully Text047a
+	print_text_quit_fully Mitch1PupilRemainingText

 .all_pupils_defeated
-	print_npc_text Text047b
-	ask_question_jump Text047c, .start_duel
-	print_npc_text Text047d
+	print_npc_text MitchWouldLikeToDuelInitialText
+	ask_question_jump MitchWouldYouLikeToDuelText, .start_duel
+	print_npc_text MitchDeclinedInitialText
 	quit_script_fully

 .start_duel
-	print_npc_text Text047e
+	print_npc_text MitchDuelStartInitialText
 	start_duel PRIZES_6, FIRST_STRIKE_DECK_ID, MUSIC_DUEL_THEME_2
 	quit_script_fully

 Script_BeatMitch:
 	start_script
 	jump_if_event_true EVENT_BEAT_MITCH, Script_Mitch_GiveBoosters
-	print_npc_text Text047f
+	print_npc_text MitchPlayerWonInitial1Text
 	max_out_event_value EVENT_BEAT_MITCH
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_MITCH
 	record_master_win $01
-	print_npc_text Text0480
+	print_npc_text MitchPlayerWonInitial2Text
 	give_booster_packs BOOSTER_LABORATORY_NEUTRAL, BOOSTER_LABORATORY_NEUTRAL, NO_BOOSTER
-	print_npc_text Text0481
+	print_npc_text MitchPlayerWonInitial3Text
 	quit_script_fully

 Script_LostToMitch:
 	start_script
 	jump_if_event_true EVENT_BEAT_MITCH, Script_Mitch_PrintTrainHarderText
-	print_text_quit_fully Text0482
+	print_text_quit_fully MitchPlayerLostInitialText

 Script_Mitch_AlreadyHaveMedal:
-	print_npc_text Text0483
-	ask_question_jump Text047c, .start_duel
-	print_npc_text Text0484
+	print_npc_text MitchWouldLikeToDuelRepeatText
+	ask_question_jump MitchWouldYouLikeToDuelText, .start_duel
+	print_npc_text MitchDeclinedDuelRepeatText
 	quit_script_fully

 .start_duel
-	print_npc_text Text0485
+	print_npc_text MitchDuelStartRepeatText
 	start_duel PRIZES_6, FIRST_STRIKE_DECK_ID, MUSIC_DUEL_THEME_2
 	quit_script_fully

 Script_Mitch_GiveBoosters:
-	print_npc_text Text0486
+	print_npc_text MitchPlayerWonRepeat1Text
 	give_booster_packs BOOSTER_LABORATORY_NEUTRAL, BOOSTER_LABORATORY_NEUTRAL, NO_BOOSTER
-	print_npc_text Text0487
+	print_npc_text MitchPlayerWonRepeat2Text
 	quit_script_fully

 Script_Mitch_PrintTrainHarderText:
-	print_text_quit_fully Text0488
+	print_text_quit_fully MitchPlayerLostRepeatText

 Preload_ChrisInFightingClub:
 	get_event_value EVENT_PUPIL_CHRIS_STATE
@ -104,27 +104,27 @@ Preload_ChrisInFightingClub:

 Script_de4b:
 	test_if_event_equal EVENT_PUPIL_CHRIS_STATE, PUPIL_DEFEATED
-	print_variable_npc_text Text0489, Text048a
+	print_variable_npc_text ChrisFightingClubWantsToDuelInitialText, ChrisFightingClubWantsToDuelRepeatText
 	set_event EVENT_PUPIL_CHRIS_STATE, PUPIL_REVISITED
-	ask_question_jump Text048b, .ows_de61
-	print_npc_text Text048c
+	ask_question_jump ChrisFightingClubWouldYouLikeToDuelText, .ows_de61
+	print_npc_text ChrisFightingClubDeclinedDuelText
 	quit_script_fully

 .ows_de61
-	print_npc_text Text048d
+	print_npc_text ChrisFightingClubDuelStartText
 	start_duel PRIZES_4, MUSCLES_FOR_BRAINS_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully

 Script_BeatChrisInFightingClub:
 	start_script
-	print_npc_text Text048e
+	print_npc_text ChrisFightingClubPlayerWon1Text
 	give_booster_packs BOOSTER_EVOLUTION_FIGHTING, BOOSTER_EVOLUTION_FIGHTING, NO_BOOSTER
-	print_npc_text Text048f
+	print_npc_text ChrisFightingClubPlayerWon2Text
 	quit_script_fully

 Script_LostToChrisInFightingClub:
 	start_script
-	print_text_quit_fully Text0490
+	print_text_quit_fully ChrisFightingClubPlayerLostText

 Preload_MichaelInFightingClub:
 	get_event_value EVENT_PUPIL_MICHAEL_STATE
@ -133,26 +133,26 @@ Preload_MichaelInFightingClub:
 	ret

 Script_MichaelRematch:
-	print_npc_text Text0491
-	ask_question_jump Text0492, .ows_de8d
-	print_npc_text Text0493
+	print_npc_text MichaelFightingClubWantsToDuelText
+	ask_question_jump MichaelFightingClubWouldYouLikeToDuelText, .ows_de8d
+	print_npc_text MichaelFightingClubDeclinedDuelText
 	quit_script_fully

 .ows_de8d
-	print_npc_text Text0494
+	print_npc_text MichaelFightingClubDuelStartText
 	start_duel PRIZES_4, HEATED_BATTLE_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully

 Script_BeatMichaelInFightingClub:
 	start_script
-	print_npc_text Text0495
+	print_npc_text MichaelFightingClubPlayerWon1Text
 	give_booster_packs BOOSTER_COLOSSEUM_FIGHTING, BOOSTER_COLOSSEUM_FIGHTING, NO_BOOSTER
-	print_npc_text Text0496
+	print_npc_text MichaelFightingClubPlayerWon2Text
 	quit_script_fully

 Script_LostToMichaelInFightingClub:
 	start_script
-	print_text_quit_fully Text0497
+	print_text_quit_fully MichaelFightingClubPlayerLostText

 Preload_JessicaInFightingClub:
 	get_event_value EVENT_PUPIL_JESSICA_STATE
@ -161,23 +161,23 @@ Preload_JessicaInFightingClub:
 	ret

 Script_dead:
-	print_npc_text Text0498
-	ask_question_jump Text0499, .ows_deb9
-	print_npc_text Text049a
+	print_npc_text JessicaFightingClubWantsToDuelText
+	ask_question_jump JessicaFightingClubWouldYouLikeToDuelText, .ows_deb9
+	print_npc_text JessicaFightingClubDeclinedDuelText
 	quit_script_fully

 .ows_deb9
-	print_npc_text Text049b
+	print_npc_text JessicaFightingClubDuelStartText
 	start_duel PRIZES_4, LOVE_TO_BATTLE_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully

 Script_BeatJessicaInFightingClub:
 	start_script
-	print_npc_text Text049c
+	print_npc_text JessicaFightingClubPlayerWon1Text
 	give_booster_packs BOOSTER_COLOSSEUM_FIGHTING, BOOSTER_COLOSSEUM_FIGHTING, NO_BOOSTER
-	print_npc_text Text049d
+	print_npc_text JessicaFightingClubPlayerWon2Text
 	quit_script_fully

 Script_LostToJessicaInFightingClub:
 	start_script
-	print_text_quit_fully Text049e
+	print_text_quit_fully JessicaFightingClubPlayerLostText
--- a/src/scripts/fighting_club_entrance.asm
+++ b/src/scripts/fighting_club_entrance.asm
@ -1,3 +1,3 @@
 Script_Clerk1:
 	start_script
-	print_text_quit_fully Text045a
+	print_text_quit_fully Clerk1Text
--- a/src/scripts/fighting_club_lobby.asm
+++ b/src/scripts/fighting_club_lobby.asm
@ -18,42 +18,42 @@ Script_Man1:
 	max_out_event_value EVENT_MAN1_TALKED
 	pick_next_man1_requested_card
 	load_man1_requested_card_into_txram_slot 0
-	print_npc_text Text045b
+	print_npc_text Man1FirstRequestCardText
 	max_out_event_value EVENT_MAN1_WAITING_FOR_CARD
 	script_jump .ows_dca5

 .ows_dc91
 	jump_if_event_false EVENT_MAN1_WAITING_FOR_CARD, .ows_dc9d
 	load_man1_requested_card_into_txram_slot 0
-	print_npc_text Text045c
+	print_npc_text Man1WaitingForCardText
 	script_jump .ows_dca5

 .ows_dc9d
 	pick_next_man1_requested_card
 	load_man1_requested_card_into_txram_slot 0
-	print_npc_text Text045d
+	print_npc_text Man1NewRequestCardText
 	max_out_event_value EVENT_MAN1_WAITING_FOR_CARD
 .ows_dca5
 	load_man1_requested_card_into_txram_slot 0
-	ask_question_jump Text045e, .ows_dcaf
-	print_text_quit_fully Text045f
+	ask_question_jump Man1GiveAwayCardText, .ows_dcaf
+	print_text_quit_fully Man1DeclineText

 .ows_dcaf
 	jump_if_man1_requested_card_owned .ows_dcb9
 	load_man1_requested_card_into_txram_slot 0
 	load_man1_requested_card_into_txram_slot 1
-	print_text_quit_fully Text0460
+	print_text_quit_fully Man1DontHaveText

 .ows_dcb9
 	jump_if_man1_requested_card_in_collection .ows_dcc3
 	load_man1_requested_card_into_txram_slot 0
 	load_man1_requested_card_into_txram_slot 1
-	print_text_quit_fully Text0461
+	print_text_quit_fully Man1CardInDeckText

 .ows_dcc3
 	load_man1_requested_card_into_txram_slot 0
 	load_man1_requested_card_into_txram_slot 1
-	print_npc_text Text0462
+	print_npc_text Man1GiveCardText
 	remove_man1_requested_card_from_collection
 	max_out_event_value EVENT_TEMP_GIFTED_TO_MAN1
 	zero_out_event_value EVENT_MAN1_WAITING_FOR_CARD
@ -62,18 +62,18 @@ Script_Man1:
 	quit_script_fully

 .ows_dcd7
-	print_npc_text Text0463
+	print_npc_text Man1PlayerReceivePikachuAltLv16Text
 	give_card PIKACHU_ALT_LV16
 	show_card_received_screen PIKACHU_ALT_LV16
-	print_npc_text Text0464
+	print_npc_text Man1ThankYouText
 	set_event EVENT_MAN1_GIFT_SEQUENCE_STATE, MAN1_GIFT_SEQUENCE_COMPLETE
 	quit_script_fully

 .ows_dce5
-	print_text_quit_fully Text0465
+	print_text_quit_fully Man1GaveCardText

 .ows_dce8
-	print_text_quit_fully Text0466
+	print_text_quit_fully Man1GaveAllCardsText

 Preload_ImakuniInFightingClubLobby:
 	get_event_value EVENT_IMAKUNI_STATE
@ -100,14 +100,14 @@ Script_Imakuni:
 	start_script
 	set_event EVENT_IMAKUNI_STATE, IMAKUNI_TALKED
 	test_if_event_false EVENT_TEMP_TALKED_TO_IMAKUNI
-	print_variable_npc_text Text0467, Text0468
+	print_variable_npc_text ImakuniWouldLikeToDuelInitialText, ImakuniWouldLikeToDuelRepeatText
 	max_out_event_value EVENT_TEMP_TALKED_TO_IMAKUNI
-	ask_question_jump Text0469, .start_duel
-	print_npc_text Text046a
+	ask_question_jump ImakuniWouldYouLikeToDuelText, .start_duel
+	print_npc_text ImakuniDeclinedDuelText
 	quit_script_fully

 .start_duel
-	print_npc_text Text046b
+	print_npc_text ImakuniDuelStartText
 	start_duel PRIZES_6, IMAKUNI_DECK_ID, MUSIC_IMAKUNI
 	quit_script_fully

@ -118,27 +118,27 @@ Script_BeatImakuni:
 	jump_if_event_equal EVENT_IMAKUNI_WIN_COUNT, 3, .three_wins
 	jump_if_event_equal EVENT_IMAKUNI_WIN_COUNT, 6, .six_wins
 .give_boosters
-	print_npc_text Text046c
+	print_npc_text ImakuniPlayerWonNormalText
 	give_one_of_each_trainer_booster
 	script_jump .done

 .three_wins
-	print_npc_text Text046d
+	print_npc_text ImakuniPlayerWonThreeWinsText
 	script_jump .give_imakuni_card

 .six_wins
-	print_npc_text Text046e
+	print_npc_text ImakuniPlayerWonSixWinsText
 .give_imakuni_card
-	print_npc_text Text046f
+	print_npc_text ImakuniGivesImakuniText
 	give_card IMAKUNI_CARD
 	show_card_received_screen IMAKUNI_CARD
 .done
-	print_npc_text Text0470
+	print_npc_text ImakuniPlayerWonEndText
 	script_jump Script_LostToImakuni.imakuni_common

 Script_LostToImakuni:
 	start_script
-	print_npc_text Text0471
+	print_npc_text ImakuniPlayerLostText
 .imakuni_common
 	close_text_box
 	jump_if_player_coords_match 18, 4, .ows_dd69
@ -170,13 +170,13 @@ NPCMovement_dd78:
 Script_Specs1:
 	start_script
 	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
-	print_variable_npc_text Text0472, Text0473
+	print_variable_npc_text Specs1NormalText, Specs1PlayerIsChampionText
 	quit_script_fully

 Script_Butch:
 	start_script
 	test_if_event_false EVENT_RECEIVED_LEGENDARY_CARDS
-	print_variable_npc_text Text0474, Text0475
+	print_variable_npc_text ButchNormalText, ButchPlayerIsChampionText
 	quit_script_fully

 Preload_Granny1:
@ -186,4 +186,4 @@ Preload_Granny1:

 Script_Granny1:
 	start_script
-	print_text_quit_fully Text0476
+	print_text_quit_fully Granny1Text
--- a/src/scripts/pokemon_dome_entrance.asm
+++ b/src/scripts/pokemon_dome_entrance.asm
@ -18,7 +18,7 @@ PokemonDomeEntranceCloseTextBox:

 Script_f631:
 	start_script
-	print_npc_text Text0508
+	print_npc_text PlateOfLegendsText
 	close_advanced_text_box
 	set_next_npc_and_script NPC_RONALD1, .ows_f63c
 	end_script
@ -99,7 +99,7 @@ Script_f6af:
 	start_script
 	try_give_medal_pc_packs
 	jump_if_event_equal EVENT_MEDAL_COUNT, 8, .ows_f6b9
-	print_text_quit_fully Text0558
+	print_text_quit_fully MysteriousVoiceDoorNotEnoughMedalsText

 .ows_f6b9
 	print_npc_text Text0559
--- a/src/scripts/water_club.asm
+++ b/src/scripts/water_club.asm
@ -39,51 +39,51 @@ WaterClubAfterDuel:

 Script_Sara:
 	start_script
-	print_npc_text Text042c
-	ask_question_jump Text042d, .start_duel
-	print_npc_text Text042e
+	print_npc_text SaraWantsToDuelText
+	ask_question_jump SaraWouldYouLikeToDuelText, .start_duel
+	print_npc_text SaraDeclinedDuelText
 	quit_script_fully

 .start_duel
-	print_npc_text Text042f
+	print_npc_text SaraStartDuelText
 	start_duel PRIZES_2, WATERFRONT_POKEMON_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully

 Script_BeatSara:
 	start_script
 	max_out_event_value EVENT_BEAT_SARA
-	print_npc_text Text0430
+	print_npc_text SaraPlayerWon1Text
 	give_booster_packs BOOSTER_COLOSSEUM_WATER, BOOSTER_COLOSSEUM_WATER, NO_BOOSTER
-	print_npc_text Text0431
+	print_npc_text SaraPlayerWon2Text
 	quit_script_fully

 Script_LostToSara:
 	start_script
-	print_text_quit_fully Text0432
+	print_text_quit_fully SaraPlayerLostText

 Script_Amanda:
 	start_script
-	print_npc_text Text0433
-	ask_question_jump Text0434, .start_duel
-	print_npc_text Text0435
+	print_npc_text AmandaWantsToDuelText
+	ask_question_jump AmandaWouldYouLikeToDuelText, .start_duel
+	print_npc_text AmandaDeclinedDuelText
 	quit_script_fully

 .start_duel
-	print_npc_text Text0436
+	print_npc_text AmandaDuelStartText
 	start_duel PRIZES_3, LONELY_FRIENDS_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully

 Script_BeatAmanda:
 	start_script
 	max_out_event_value EVENT_BEAT_AMANDA
-	print_npc_text Text0437
+	print_npc_text AmandaPlayerWon1Text
 	give_booster_packs BOOSTER_MYSTERY_LIGHTNING_COLORLESS, BOOSTER_MYSTERY_LIGHTNING_COLORLESS, NO_BOOSTER
-	print_npc_text Text0438
+	print_npc_text AmandaPlayerWon2Text
 	quit_script_fully

 Script_LostToAmanda:
 	start_script
-	print_text_quit_fully Text0439
+	print_text_quit_fully AmandaPlayerLostText

 Script_NotReadyToSeeAmy:
 	start_script
@ -93,7 +93,7 @@ Script_NotReadyToSeeAmy:
 .ows_e1d5
 	move_player SOUTH, 4
 	move_active_npc NPCMovement_e213
-	print_npc_text Text043a
+	print_npc_text JoshuaAmyIsRestingText
 	jump_if_player_coords_match 18, 10, .ows_e1fe
 	jump_if_player_coords_match 20, 10, .ows_e202
 	move_active_npc NPCMovement_e215
@ -162,24 +162,24 @@ Script_Joshua:

 .sara_and_amanda_not_beaten
 	set_event EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_npc_text Text043b
+	print_npc_text JoshuaGoDefeatSaraAndAmandaText
 	quit_script_fully

 .beat_sara_and_amanda
 	jump_if_event_nonzero EVENT_JOSHUA_STATE, .already_talked
 	set_event EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_npc_text Text043b
-	print_npc_text Text043c
+	print_npc_text JoshuaGoDefeatSaraAndAmandaText
+	print_npc_text JoshuaSaraAndAmandaDefeatedText
 .already_talked
 	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_variable_npc_text Text043d, Text043e
-	ask_question_jump Text043f, .start_duel
+	print_variable_npc_text JoshuaWantsToDuelInitialText, JoshuaWantsToDuelRepeatText
+	ask_question_jump JoshuaWouldYouLikeToDuelText, .start_duel
 	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_variable_npc_text Text0440, Text0441
+	print_variable_npc_text JoshuaDeclinedDuelInitialText, JoshuaDeclinedDuelRepeatText
 	quit_script_fully

 .start_duel
-	print_npc_text Text0442
+	print_npc_text JoshuaDuelStartText
 	try_give_pc_pack $04
 	start_duel PRIZES_4, SOUND_OF_THE_WAVES_DECK_ID, MUSIC_DUEL_THEME_1
 	quit_script_fully
@ -187,25 +187,25 @@ Script_Joshua:
 Script_LostToJoshua:
 	start_script
 	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_variable_npc_text Text0443, Text0444
+	print_variable_npc_text JoshuaPlayerLostInitialText, JoshuaPlayerLostRepeatText
 	quit_script_fully

 Script_BeatJoshua:
 	start_script
 	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_variable_npc_text Text0445, Text0446
+	print_variable_npc_text JoshuaPlayerWonInitial1Text, JoshuaPlayerWonRepeat1Text
 	give_booster_packs BOOSTER_MYSTERY_WATER_COLORLESS, BOOSTER_MYSTERY_WATER_COLORLESS, NO_BOOSTER
 	test_if_event_equal EVENT_JOSHUA_STATE, JOSHUA_TALKED
-	print_variable_npc_text Text0447, Text0448
+	print_variable_npc_text JoshuaPlayerWonInitial2Text, JoshuaPlayerWonRepeat2Text
 	jump_if_event_not_equal EVENT_JOSHUA_STATE, JOSHUA_DEFEATED, .first_joshua_win
 	quit_script_fully

 .first_joshua_win
 	set_event EVENT_JOSHUA_STATE, JOSHUA_DEFEATED
-	print_npc_text Text0449
+	print_npc_text JoshuaWakesAmy1Text
 	close_text_box
 	move_active_npc_by_direction NPCMovementTable_e2a1
-	print_npc_text Text044a
+	print_npc_text JoshuaWakesAmy2Text
 	set_active_npc_direction NORTH
 	close_advanced_text_box
 	set_next_npc_and_script NPC_AMY, Script_MeetAmy
@ -248,11 +248,11 @@ Preload_Amy:

 Script_MeetAmy:
 	start_script
-	print_npc_text Text044b
+	print_npc_text AmyMeetsPlayer1Text
 	set_dialog_npc NPC_JOSHUA
-	print_npc_text Text044c
+	print_npc_text JoshuaWakesAmy3Text
 	set_dialog_npc NPC_AMY
-	print_npc_text Text044d
+	print_npc_text AmyMeetsPlayer2Text
 	close_text_box
 	set_sprite_attributes $09, $2f, $10
 	do_frames 32
@ -264,44 +264,44 @@ Script_MeetAmy:
 	move_player NORTH, 1
 	move_player NORTH, 1
 	move_npc NPC_JOSHUA, NPCMovement_e2ab
-	print_npc_text Text044e
+	print_npc_text AmyMeetsPlayer3Text
 	script_jump Script_Amy.ask_for_duel

 Script_Amy:
 	start_script
 	jump_if_event_true EVENT_BEAT_AMY, Script_Amy_AlreadyHaveMedal
-	print_npc_text Text044f
+	print_npc_text AmyWantsToDuelInitialText
 .ask_for_duel
-	ask_question_jump Text0450, .start_duel
+	ask_question_jump AmyWouldYouLikeToDuelText, .start_duel
 .deny_duel
-	print_npc_text Text0451
+	print_npc_text AmyDeclinedDuelInitialText
 	jump_if_active_npc_coords_match 20, 4, Script_LostToAmy.ows_e34e
 	quit_script_fully

 .start_duel
-	print_npc_text Text0452
+	print_npc_text AmyDuelStartInitialText
 	start_duel PRIZES_6, GO_GO_RAIN_DANCE_DECK_ID, MUSIC_DUEL_THEME_2
 	quit_script_fully

 Script_BeatAmy:
 	start_script
-	print_npc_text Text0453
+	print_npc_text AmyPlayerWon1Text
 	jump_if_event_true EVENT_BEAT_AMY, .give_booster_packs
-	print_npc_text Text0454
+	print_npc_text AmyGivesMedal1Text
 	max_out_event_value EVENT_BEAT_AMY
 	try_give_medal_pc_packs
 	show_medal_received_screen EVENT_BEAT_AMY
 	record_master_win $03
-	print_npc_text Text0455
+	print_npc_text AmyGivesMedal2Text
 .give_booster_packs
 	give_booster_packs BOOSTER_LABORATORY_WATER, BOOSTER_LABORATORY_WATER, NO_BOOSTER
-	print_npc_text Text0456
+	print_npc_text AmyPlayerWon2Text
 	jump_if_active_npc_coords_match 20, 4, Script_LostToAmy.ows_e34e
 	quit_script_fully

 Script_LostToAmy:
 	start_script
-	print_npc_text Text0457
+	print_npc_text AmyPlayerLostText
 	jump_if_active_npc_coords_match 20, 4, .ows_e34e
 	quit_script_fully

@ -311,11 +311,11 @@ Script_LostToAmy:
 	quit_script_fully

 Script_Amy_AlreadyHaveMedal:
-	print_npc_text Text0458
-	ask_question_jump Text0450, .start_duel
+	print_npc_text AmyWantsToDuelRepeatText
+	ask_question_jump AmyWouldYouLikeToDuelText, .start_duel
 	script_jump Script_Amy.deny_duel

 .start_duel
-	print_npc_text Text0459
+	print_npc_text AmyDuelStartRepeatText
 	start_duel PRIZES_6, GO_GO_RAIN_DANCE_DECK_ID, MUSIC_DUEL_THEME_2
 	quit_script_fully
--- a/src/scripts/water_club_entrance.asm
+++ b/src/scripts/water_club_entrance.asm
@ -1,3 +1,3 @@
 Script_Clerk3:
 	start_script
-	print_text_quit_fully Text041c
+	print_text_quit_fully Clerk3Text
--- a/src/scripts/water_club_lobby.asm
+++ b/src/scripts/water_club_lobby.asm
@ -65,7 +65,7 @@ Script_Gal1:
 Script_Lass1:
 	start_script
 	jump_if_event_equal EVENT_LASS1_MENTIONED_IMAKUNI, TRUE, .ows_e121
-	print_npc_text Text0427
+	print_npc_text Lass1NormalText
 	set_event EVENT_LASS1_MENTIONED_IMAKUNI, TRUE
 	set_event EVENT_IMAKUNI_STATE, IMAKUNI_MENTIONED
 	quit_script_fully
@ -73,10 +73,10 @@ Script_Lass1:
 .ows_e121
 	jump_if_event_not_equal EVENT_IMAKUNI_ROOM, IMAKUNI_WATER_CLUB, .ows_e12d
 	jump_if_event_true EVENT_TEMP_DUELED_IMAKUNI, .ows_e12d
-	print_text_quit_fully Text0428
+	print_text_quit_fully Lass1ImakuniHereText

 .ows_e12d
-	print_text_quit_fully Text0429
+	print_text_quit_fully Lass1ImakuniLeftText

 Preload_Man2:
 	get_event_value EVENT_JOSHUA_STATE
@ -85,8 +85,8 @@ Preload_Man2:

 Script_Man2:
 	start_script
-	print_text_quit_fully Text042a
+	print_text_quit_fully Man2Text

 Script_Pappy2:
 	start_script
-	print_text_quit_fully Text042b
+	print_text_quit_fully Pappy2Text
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@ -38,7 +38,7 @@ PKMNPWRText:
 	text "PKMN PWR"
 	done

-Text000b:
+UnusedText000b: ; Unused (Pokemon Card)
 	textfw0 "ポケモンカ—ド"
 	done

@ -130,7 +130,7 @@ DeckPrinterText:
 	text "Deck"
 	done

-Text0022:
+UnusedText0022: ; Unused
 	text "Attack"
 	done

@ -199,7 +199,7 @@ IncompleteText:
 	text "Incomplete"
 	done

-Text0032:
+UnusedText0032: ; Unused
 	text "Damage"
 	done

@ -207,7 +207,7 @@ UsedText:
 	text "Used <RAMTEXT>."
 	done

-Text0034:
+UnusedText0034: ; Unused
 	text "Received damage"
 	done

@ -601,7 +601,7 @@ SelectCheckText:
 	line "  Check"
 	done

-Text0087:
+UnusedText0087: ; Unused
 	textfw3 "B"
 	textfw0 "<RAMNUM>"
 	textfw3 "S"
@ -624,27 +624,27 @@ NumberOfPrizesText:
 	text "Number of Prizes"
 	done

-Text008c:
+UnusedText008c: ; Unused
 	text "Random 1"
 	done

-Text008d:
+UnusedText008d: ; Unused
 	text "Random 2"
 	done

-Text008e:
+UnusedText008e: ; Unused
 	text "Random 3"
 	done

-Text008f:
+UnusedText008f: ; Unused
 	text "Random 4"
 	done

-Text0090:
+UnusedText0090: ; Unused
 	text "Training COM"
 	done

-Text0091:
+UnusedText0091: ; Unused
 	text "Player 1"
 	done

@ -652,21 +652,21 @@ Player2Text:
 	text "Player 2"
 	done

-Text0093:
+UnusedText0093: ; Unused
 	text "Left to Right"
 	done

-Text0094:
+UnusedText0094: ; Unused
 	text "Right to Left"
 	done

-Text0095:
+UnusedText0095: ; Unused
 	text "START: Change"
 	line "    A: Execute"
 	line "    B: End"
 	done

-Text0096:
+UnusedText0096: ; Unused
 	text "Other"
 	line "Poison"
 	line "Sleep"
@ -687,7 +687,7 @@ Text0096:
 	line "Change Card"
 	done

-Text0097:
+UnusedText0097: ; Unused
 	text "WIN GAME"
 	line "LOSE GAME"
 	line "DRAW GAME"
@ -700,11 +700,11 @@ Text0097:
 	line "LOAD FILE"
 	done

-Text0098:
+UnusedText0098: ; Unused
 	text "Save File"
 	done

-Text0099:
+UnusedText0099: ; Unused
 	text "Load File"
 	line "  "
 	half2full
@ -712,24 +712,24 @@ Text0099:
 	text "  Last Saved File"
 	done

-Text009a:
+UnusedText009a: ; Unused
 	text "Pause Mode is ON"
 	line "Press SELECT to Pause"
 	done

-Text009b:
+UnusedText009b: ; Unused
 	text "Pause Mode is OFF"
 	done

-Text009c:
+UnusedText009c: ; Unused
 	text "Computer Mode is OFF"
 	done

-Text009d:
+UnusedText009d: ; Unused
 	text "Computer Mode is ON"
 	done

-Text009e:
+UnusedText009e: ; Unused
 	text "<GRASS> Pokémon"
 	line ""
 	text "<FIRE> Pokémon"
@ -747,15 +747,15 @@ Text009e:
 	line "Energy Card"
 	done

-Text009f:
+UnusedText009f: ; Unused
 	text "Card List"
 	done

-Text00a0:
+UnusedText00a0: ; Unused
 	text "Test Coin Flip"
 	done

-Text00a1:
+UnusedText00a1: ; Unused
 	text "End without Prizes?"
 	done

@ -994,7 +994,7 @@ UnableDueToToxicGasText:
 	line "effects of Toxic Gas."
 	done

-Text00d5:
+UnusedText00d5: ; Unused
 	text "A Transmission Error occured."
 	done

@ -1138,7 +1138,7 @@ IfHeadsNoDamageNextTurnText:
 	line "damage during opponent's next turn!"
 	done

-Text00f2:
+UnusedText00f2: ; Unused
 	text "Damage check"
 	done

--- a/src/text/text12.asm
+++ b/src/text/text12.asm
@ -509,7 +509,7 @@ GaleDescription:
 	line "switching the Pokémon.)"
 	done

-Pidgeot1Description:
+PidgeotLv38Description:
 	text "This Pokémon flies at Mach 2 speed,"
 	line "seeking prey. Its large talons are"
 	line "feared as wicked weapons."
@ -527,7 +527,7 @@ HurricaneDescription:
 	line "hand."
 	done

-Pidgeot2Description:
+PidgeotLv40Description:
 	text "When hunting, it skims the surface"
 	line "of water at high speed to pick off"
 	line "unwary prey such as Magikarp."
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@ -202,7 +202,7 @@ ChoosePokemonToAttachEnergyCardText:
 	line "the Energy card to."
 	done

-Text011e:
+UnusedText011e: ; Unused
 	text "Choose and Discard"
 	line "1 Fire Energy card."
 	done
@ -498,7 +498,7 @@ ThePkmnCardsInHandAndDeckWereShuffledText:
 	line "Hand and Deck were shuffled"
 	done

-Text014f:
+UnusedText014f: ; Unused
 	text "Remove Damage counter each time the"
 	line "A Button is pressed. B Button quits."
 	done
@ -523,7 +523,7 @@ Choose2BasicEnergyCardsFromDiscardPileText:
 	line "from the Discard Pile."
 	done

-Text0154:
+UnusedText0154: ; Unused
 	text "Choose a Pokémon and press the A"
 	line "Button to remove Damage counters."
 	done
@ -548,7 +548,7 @@ ChoosePokemonToAttachDefenderToText:
 	line "attach Defender to."
 	done

-Text0159:
+UnusedText0159: ; Unused
 	text "You can draw up to <RAMNUM> cards."
 	line "A to Draw, B to End."
 	done
@ -684,7 +684,7 @@ DiscardedCardsFromDeckText:
 	line "from <RAMNAME>'s Deck."
 	done

-Text0175:
+UnusedText0175: ; Unused
 	text "Discarded <RAMTEXT>"
 	line "from the Hand."
 	done
@ -760,7 +760,7 @@ ExchangedCardsInDuelistsHandText:
 	line "in <RAMNAME>'s Hand."
 	done

-Text0185:
+UnusedText0185: ; Unused
 	text "Battle Center"
 	done

@ -834,7 +834,7 @@ ReceivedPromotionalSurfingPikachuText:
 	line "card Surfin' Pikachu!"
 	done

-Text0194:
+UnusedText0194: ; Unused
 	text "Received a Flareon!!!"
 	line "Looked at the card list!"
 	done
@ -852,11 +852,11 @@ WouldYouLikeToTryAgainText:
 	text "Would you like to try again?"
 	done

-Text0198:
+UnusedText0198: ; Unused
 	text "Sent to <RAMNAME>."
 	done

-Text0199:
+UnusedText0199: ; Unused
 	text "Received from <RAMNAME>."
 	done

@ -1267,7 +1267,7 @@ ReplaceDueToKnockoutPracticeDuelText:
 	text " Replace due to Knockout "
 	done

-Text01dd:
+UnusedText01dd: ; Unused
 	text "Dummy"
 	done

@ -1483,11 +1483,11 @@ RetreatCostText:
 	text "Retreat Cost"
 	done

-Text0213:
+UnusedText0213: ; Unused
 	textfw3 "SWITCH TO UPPER"
 	done

-Text0214:
+UnusedText0214: ; Unused
 	textfw3 "SWITCH TO LOWER"
 	done

@ -1511,15 +1511,15 @@ DeckText:
 	text "Deck"
 	done

-Text021a:
+UnusedText021a: ; Unused (Hiragana)
 	hiragana "ひらがナ"
 	done

-Text021b:
+UnusedText021b: ; Unused (Katakana)
 	textfw0 "カタカナ"
 	done

-Text021c:
+UnusedText021c: ; Unused
 	textfw3 "ABC"
 	done

@ -1531,7 +1531,7 @@ WhatIsYourNameText:
 	text "What is your name?"
 	done

-Text021f:
+UnusedText021f: ; Unused
 	hiragana "あ か さ た な は ま や ら"
 	line ""
 	textfw0 "い き し ち に ひ み ゆ り"
@ -1547,7 +1547,7 @@ Text021f:
 	textfw0 "—"
 	done

-Text0220:
+UnusedText0220: ; Unused
 	textfw0 "ア カ サ タ ナ ハ マ ヤ ラ"
 	line ""
 	textfw0 "イ キ シ チ ニ ヒ ミ ユ リ"
@ -1623,7 +1623,7 @@ CancelText:
 	text "Cancel"
 	done

-Text0229:
+UnusedText0229: ; Unused
 	text "as"
 	done

@ -1727,7 +1727,7 @@ YourHandText:
 	text "Your Hand"
 	done

-Text0242:
+UnusedText0242: ; Unused
 	text "To Your Play Area"
 	done

@ -1743,7 +1743,7 @@ OpponentsHandText:
 	text "Opponent Hand"
 	done

-Text0246:
+UnusedText0246: ; Unused
 	text "To Opponent's Play Area"
 	done

@ -1852,12 +1852,12 @@ ChooseADeckToSaveText:
 	text "Choose a Deck to Save."
 	done

-Text0261:
+UnusedText0261: ; Unused
 	text "You may only Save 60 Decks."
 	line "Please Delete a Deck first."
 	done

-Text0262:
+UnusedText0262: ; Unused
 	text "for"
 	done

@ -1867,11 +1867,11 @@ SavedTheConfigurationForText:
 	text "<RAMTEXT>! "
 	done

-Text0264:
+NoDeckIsSavedText:
 	text "No Deck is saved."
 	done

-Text0265:
+UnusedText0265: ; Unused
 	text "Please choose a Deck "
 	line "configuration to delete."
 	done
@ -1900,7 +1900,7 @@ DismantledDeckText:
 	text "<RAMTEXT>."
 	done

-Text026b:
+UnusedText026b: ; Unused
 	text "Please choose the Deck"
 	line "you wish to Build."
 	done
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@ -43,7 +43,7 @@ PrintThisDeckText:
 	text "Print this Deck?"
 	done

-Text0277:
+PrintTheCardListText:
 	text "Print the card list?"
 	line "      Yes     No"
 	done
@ -120,7 +120,7 @@ PleaseChooseASaveSlotText:
 	text "Please choose a Save Slot."
 	done

-Text0286:
+UnusedText0286: ; Unused
 	text "Receive configuration."
 	done

@ -902,7 +902,7 @@ RetreatingDescriptionText:
 	line "of the retreating Pokémon."
 	done

-Text031e:
+UnusedText031e: ; Unused
 	text "Modify Deck"
 	line "Card List"
 	line "Album List"
@ -913,7 +913,7 @@ Text031e:
 	line "Name Input"
 	done

-Text031f:
+UnusedText031f: ; Unused
 	text "Fighting Machine"
 	line "Rock Machine"
 	line "Water Machine"
@ -926,18 +926,18 @@ Text031f:
 	line "Legendary Machine"
 	done

-Text0320:
+UnusedText0320: ; Unused
 	text "Send a Card"
 	line "Receive a Card"
 	line "Give Deck Instructions"
 	line "Receive Deck Instructions"
 	done

-Text0321:
+UnusedText0321: ; Unused
 	text "Lecture Duel"
 	done

-Text0322:
+UnusedText0322: ; Unused
 	text "First Strike Deck"
 	line ""
 	done
@ -994,55 +994,55 @@ OverworldMapMysteryHouseText:
 	text "     ??'s House     "
 	done

-MasonLaboratoryMapNameText:
+MasonLaboratoryMapName:
 	text "Mason Laboratory"
 	done

-MrIshiharasHouseMapNameText:
+MrIshiharasHouseMapName:
 	text "Mr Ishihara's House"
 	done

-FightingClubMapNameText:
+FightingClubMapName:
 	text "Fighting"
 	done

-RockClubMapNameText:
+RockClubMapName:
 	text "Rock"
 	done

-WaterClubMapNameText:
+WaterClubMapName:
 	text "Water"
 	done

-LightningClubMapNameText:
+LightningClubMapName:
 	text "Lightning"
 	done

-GrassClubMapNameText:
+GrassClubMapName:
 	text "Grass"
 	done

-PsychicClubMapNameText:
+PsychicClubMapName:
 	text "Psychic"
 	done

-ScienceClubMapNameText:
+ScienceClubMapName:
 	text "Science"
 	done

-FireClubMapNameText:
+FireClubMapName:
 	text "Fire"
 	done

-ChallengeHallMapNameText:
+ChallengeHallMapName:
 	text "Challenge Hall"
 	done

-PokemonDomeMapNameText:
+PokemonDomeMapName:
 	text "Pokémon Dome"
 	done

-Text033c:
+UnusedText033c: ; Unused
 	text "??'s House"
 	done

@ -1127,7 +1127,7 @@ ConfigMenuExitText:
 	text "   Exit Settings"
 	done

-Text034c:
+UnusedText034c: ; Unused
 	text "Duel           [<RAMTEXT>]"
 	line "SELECT         [<RAMTEXT>]"
 	line "Receive many cards"
@ -1135,23 +1135,23 @@ Text034c:
 	line "To Pokémon Dome 2"
 	done

-Text034d:
+UnusedText034d: ; Unused
 	text "Normal Duel"
 	done

-Text034e:
+UnusedText034e: ; Unused
 	text "Skip"
 	done

-Text034f:
+UnusedText034f: ; Unused
 	text "Normal"
 	done

-Text0350:
+UnusedText0350: ; Unused
 	text "Freeze Screen"
 	done

-Text0351:
+PCMenuOptionsText:
 	text "Card Album"
 	line "Read Mail"
 	line "Glossary"
@ -1388,7 +1388,7 @@ DebugMenuText:
 	line "QUIT"
 	done

-Text037b:
+DebugDuelModeMenuText:
 	text "NORMAL DUEL"
 	line "SKIP"
 	done
@ -1435,18 +1435,18 @@ DebugBoosterPackEnergyMenuText:
 	line "4"
 	done

-Text0381:
+UnusedText0381: ; Unused
 	text "A                   TIME"
 	line "     TO      (Change with Start)"
 	line "            A+B: Stop Animation"
 	line "            Select: Exit"
 	done

-Text0382:
+UnusedText0382: ; Unused
 	text "Left"
 	done

-Text0383:
+UnusedText0383: ; Unused
 	text "Right"
 	done

@ -1478,7 +1478,7 @@ CheckedCardsInBoosterPackText:
 	line "in the Booster Pack!!"
 	done

-Text038a:
+UnusedText038a: ; Unused
 	text "Substitute screen for"
 	line "receiving cards."
 	done
@ -1488,44 +1488,44 @@ WonTheMedalText:
 	line "Won the <RAMTEXT> Medal!"
 	done

-Text038c:
+UnusedText038c: ; Unused
 	text "Substitute screen for sending"
 	line "cards by Link cable."
 	done

-Text038d:
+UnusedText038d: ; Unused
 	text "Substitute screen for receiving"
 	line "cards by Link cable."
 	done

-Text038e:
+UnusedText038e: ; Unused
 	text "Substitute screen for sending"
 	line "a Deck design."
 	done

-Text038f:
+UnusedText038f: ; Unused
 	text "Substitute screen for receiving"
 	line "a Deck design."
 	done

-Text0390:
+UnusedText0390: ; Unused
 	text "????"
 	done

-Text0391:
+UnusedText0391: ; Unused
 	text "Ending Screen"
 	line "THE END"
 	done

-Text0392:
+UnusedText0392: ; Unused
 	text "Was the data transfer successful?"
 	done

-Text0393:
+UnusedText0393: ; Unused
 	text "(Person transferring data to)"
 	done

-Text0394:
+UnusedText0394: ; Unused
 	text "(Name of Deck transferring)"
 	done

@ -1954,14 +1954,14 @@ HowCanIHelpText:
 	line "How can I help you?"
 	done

-Text03ff:
+SamNormalMenuText:
 	text "Normal Duel"
 	line "Practice"
 	line "Rules"
 	line "Nothing"
 	done

-Text0400:
+SamRulesMenuText:
 	text "Energy"
 	line "Attacking"
 	line "Retreating"
@ -1972,7 +1972,7 @@ Text0400:
 	line "Nothing to Ask"
 	done

-Text0401:
+Mail1Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "Are you getting the hang of"
@ -1999,7 +1999,7 @@ Text0401:
 	line "Oh, here's something for you..."
 	done

-Text0402:
+Mail1Part2Text:
 	text "I'll be sending you useful"
 	line "information by e-mail."
 	line "I'll also attach a Booster Pack"
@ -2009,7 +2009,7 @@ Text0402:
 	line "      Doctor Mason  ;)"
 	done

-Text0403:
+Mail2Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
@ -2024,7 +2024,7 @@ Text0403:
 	line "Here's a Booster Pack for you..."
 	done

-Text0404:
+Mail2Part2Text:
 	text "<RAMNAME>, I know you can do it!"
 	line "Go win the Fighting Medal!"
 	line "Mason Laboratory"
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@ -1,4 +1,4 @@
-Text0405:
+Mail3Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information about"
@ -13,14 +13,14 @@ Text0405:
 	line "Here's a Booster Pack for you!"
 	done

-Text0406:
+Mail3Part2Text:
 	text "<RAMNAME>! Go defeat Gene,"
 	line "the Master of the Rock Club!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done

-Text0407:
+Mail4Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
@ -40,14 +40,14 @@ Text0407:
 	line "Here's a Booster Pack for you."
 	done

-Text0408:
+Mail4Part2Text:
 	text "<RAMNAME>!"
 	line "Keep at it, and don't give up!"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done

-Text0409:
+Mail5Part1Text:
 	text "How's it going, <RAMNAME>?"
 	line "It's me, Doctor Mason."
 	line "I have some information for you"
@ -69,14 +69,14 @@ Text0409:
 	line "Pokémon in this Booster Pack!"
 	done

-Text040a:
+Mail5Part2Text:
 	text "Did you find the Pokémon you were"
 	line "looking for in the Booster Pack?"
 	line "Mason Laboratory"
 	line "      Doctor Mason  ;)"
 	done

-Text040b:
+Mail6Part1Text:
 	text "It's me, Doctor Mason."
 	line "Have you won many Master Medals?"
 	line "I have some information for you "
@ -94,14 +94,14 @@ Text040b:
 	line "Fire Pokémon."
 	done

-Text040c:
+Mail6Part2Text:
 	text "Did it have a lot of Fire Pokémon"
 	line "(the weakness of Grass Pokémon)?"
 	line "Mason Laboratory"
 	line "      Dr. Mason  ;)"
 	done

-Text040d:
+Mail7Part1Text:
 	text "Are you getting any closer to"
 	line "inheriting the Legendary Pokémon "
 	line "Cards? Murray of the Psychic Club -"
@ -119,7 +119,7 @@ Text040d:
 	line "Here, take this!"
 	done

-Text040e:
+Mail7Part2Text:
 	text "Fight to the end, "
 	text "<RAMNAME>,"
 	line "and don't give up!"
@ -127,7 +127,7 @@ Text040e:
 	line "      Dr. Mason  ;)"
 	done

-Text040f:
+Mail8Part1Text:
 	text "It's me, Dr. Mason."
 	line "How are you doing, <RAMNAME>?"
 	line "I have some information for you"
@ -146,7 +146,7 @@ Text040f:
 	line "assistance..."
 	done

-Text0410:
+Mail8Part2Text:
 	text "Win all 8 Master Medals, "
 	line ""
 	text "<RAMNAME>!"
@ -154,7 +154,7 @@ Text0410:
 	line "      Dr. Mason  ;)"
 	done

-Text0411:
+Mail9Part1Text:
 	text "It's me, Dr. Mason."
 	line "Have you collected many cards?"
 	line "I have some information about"
@ -173,7 +173,7 @@ Text0411:
 	line "Booster Pack!"
 	done

-Text0412:
+Mail9Part2Text:
 	text "Look closely at the cards "
 	line "you just received."
 	line "You should be able to come up"
@ -182,7 +182,7 @@ Text0412:
 	line "      Dr. Mason  ;)"
 	done

-Text0413:
+Mail10Part1Text:
 	text "It's me, Dr. Mason."
 	line "It looks like you've won"
 	line "quite a few medals."
@ -201,7 +201,7 @@ Text0413:
 	line "you get 2 Booster Packs!"
 	done

-Text0414:
+Mail11Part1Text:
 	text "Did you try building your own deck?"
 	line "This time, I'll give you tips on"
 	line "the types and number of cards you"
@ -226,7 +226,7 @@ Text0414:
 	line "Packs again!"
 	done

-Text0415:
+Mail12Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Dr. Mason."
 	line "You're finally going to be dueling"
@ -247,7 +247,7 @@ Text0415:
 	line "Keep up the good work!"
 	done

-Text0416:
+Mail13Part1Text:
 	text "<RAMNAME>,"
 	line "It's me, Dr. Mason!"
 	line "Grand Master Steve uses"
@ -272,7 +272,7 @@ Text0416:
 	line "3 more to go!"
 	done

-Text0417:
+Mail14Part1Text:
 	text "It's me, Dr. Mason!"
 	line "2 more Grand Masters to go!"
 	line "Grand Master Jack uses"
@ -291,7 +291,7 @@ Text0417:
 	line "      Dr. Mason  ;)"
 	done

-Text0418:
+Mail15Part1Text:
 	text "It's me, Dr. Mason!"
 	line "The final duel is here!"
 	line "I have some information on Rod,"
@ -315,7 +315,7 @@ Text0418:
 	line "for you."
 	done

-Text0419:
+MailBoosterPackAlreadyOpenedText:
 	text "You have already received the"
 	line "attached Booster Pack."
 	done
@ -328,7 +328,7 @@ PlaceholderMessageText:
 	text "This message is not in yet!"
 	done

-Text041c:
+Clerk3Text:
 	text "Hello!"
 	line "Welcome to the Water Club!"
 	line "This is a Club devoted to"
@ -405,7 +405,7 @@ Gal1AfterTradeText:
 	line "your Lapras."
 	done

-Text0427:
+Lass1NormalText:
 	text "Do you know Imakuni??"
 	line "He's a suspicious-looking guy"
 	line "dressed all in black!"
@ -416,14 +416,14 @@ Text0427:
 	line "maybe you shouldn't go near him!"
 	done

-Text0428:
+Lass1ImakuniHereText:
 	text "Look! That's Imakuni? over there!"
 	line "Doesn't he look strange?"
 	line "You'll find him even stranger"
 	line "when you talk to him."
 	done

-Text0429:
+Lass1ImakuniLeftText:
 	text "What a strange guy Imakuni? is!"
 	line "Have you found him yet?"
 	line "It's rumored that he has really"
@ -432,104 +432,104 @@ Text0429:
 	line "might want to duel him."
 	done

-Text042a:
+Man2Text:
 	text "All Amy, the Master of this Club,"
 	line "does lately is sleep."
 	line "She's bored because she doesn't"
 	line "have anybody to duel."
 	done

-Text042b:
+Pappy2Text:
 	text "Sara and Amanda of the"
 	line "Water Club are twins."
 	line "No wonder they look"
 	line "so much alike!"
 	done

-Text042c:
+SaraWantsToDuelText:
 	text "It feels so good to swim"
 	line "in the pool!"
 	line "Do you want to take a swim?"
 	line "Or would you rather duel?"
 	done

-Text042d:
+SaraWouldYouLikeToDuelText:
 	text "Would you like to duel Sara?"
 	done

-Text042e:
+SaraDeclinedDuelText:
 	text "No?"
 	line "Then maybe I'll go for a dip."
 	done

-Text042f:
+SaraStartDuelText:
 	text "There will be 2 Prizes."
 	line "The duel will be 1 match."
 	line "OK, let's start!"
 	done

-Text0430:
+SaraPlayerWon1Text:
 	text "Uh-oh! I guess I lost..."
 	line "Maybe I shouldn't have been"
 	line "swimming so much."
 	done

-Text0431:
+SaraPlayerWon2Text:
 	text "I guess I have to practice more"
 	line "to improve my Pokémon card game."
 	done

-Text0432:
+SaraPlayerLostText:
 	text "It might look like all I can"
 	line "do is swim, but I play a pretty"
 	line "mean game of Pokémon Trading Cards!"
 	line "Do you want to join the Water Club?"
 	done

-Text0433:
+AmandaWantsToDuelText:
 	text "Doesn't it feel good to relax"
 	line "by the pool?"
 	line "Isn't it wonderful to duel"
 	line "in a place like this?"
 	done

-Text0434:
+AmandaWouldYouLikeToDuelText:
 	text "Would you like to duel Amanda?"
 	done

-Text0435:
+AmandaDeclinedDuelText:
 	text "Why..."
 	line "How boring!"
 	done

-Text0436:
+AmandaDuelStartText:
 	text "OK, we'll play with 3 Prizes."
 	line "It'll be a 1-match duel!"
 	done

-Text0437:
+AmandaPlayerWon1Text:
 	text "Oops, I lost!"
 	line "Now I'm in trouble!"
 	done

-Text0438:
+AmandaPlayerWon2Text:
 	text "Losing kind of destroys the"
 	line "atmosphere of the place."
 	done

-Text0439:
+AmandaPlayerLostText:
 	text "Winning in such nice surroundings"
 	line "makes it all the more pleasurable!"
 	done

-Text043a:
+JoshuaAmyIsRestingText:
 	text "Hey! Stop!"
 	line "This is a restricted area!"
 	line "Amy, the Club Master,"
 	line "is resting!"
 	done

-Text043b:
+JoshuaGoDefeatSaraAndAmandaText:
 	text "The person resting over there"
 	line "is Amy, the Club Master."
 	line "If you wish to duel Amy,"
@ -540,12 +540,12 @@ Text043b:
 	line "the Club Master!"
 	done

-Text043c:
+JoshuaSaraAndAmandaDefeatedText:
 	text "What?"
 	line "You defeated Sara and Amanda?"
 	done

-Text043d:
+JoshuaWantsToDuelInitialText:
 	text "You must be pretty good if you"
 	line "defeated Sara and Amanda..."
 	line "As promised, I'll test your skills."
@ -553,15 +553,15 @@ Text043d:
 	line "to Amy..."
 	done

-Text043e:
+JoshuaWantsToDuelRepeatText:
 	text "You wish to duel against me?"
 	done

-Text043f:
+JoshuaWouldYouLikeToDuelText:
 	text "Would you like to duel Joshua?"
 	done

-Text0440:
+JoshuaDeclinedDuelInitialText:
 	text "You don't want to duel?"
 	line "Are you afraid you won't be able"
 	line "to defeat me?"
@ -569,7 +569,7 @@ Text0440:
 	line "meet Amy is by going through me!"
 	done

-Text0441:
+JoshuaDeclinedDuelRepeatText:
 	text "You don't want to duel?"
 	line "Are you afraid you won't be able"
 	line "to defeat me?"
@ -577,141 +577,141 @@ Text0441:
 	line "very good!"
 	done

-Text0442:
+JoshuaDuelStartText:
 	text "OK, this will be a 1-match duel"
 	line "with 4 Prizes!"
 	done

-Text0443:
+JoshuaPlayerLostInitialText:
 	text "How's that! I win!"
 	line "I'm sorry, but unless you defeat "
 	line "me, I can't let you meet Amy."
 	done

-Text0444:
+JoshuaPlayerLostRepeatText:
 	text "How's that! I win!"
 	line "Too bad for you, but I'm"
 	line "the second best player"
 	line "after Amy!"
 	done

-Text0445:
+JoshuaPlayerWonInitial1Text:
 	text "What!?!"
 	line "How could I lose?"
 	done

-Text0446:
+JoshuaPlayerWonRepeat1Text:
 	text "What!?!"
 	line "How could I lose again?"
 	done

-Text0447:
+JoshuaPlayerWonInitial2Text:
 	text "Well, since I promised..."
 	line "I'll introduce you to Amy."
 	done

-Text0448:
+JoshuaPlayerWonRepeat2Text:
 	text "How could this be?"
 	line "It must be luck!"
 	line "Yeah, that's what it was!"
 	done

-Text0449:
+JoshuaWakesAmy1Text:
 	text "Don't think you're that good"
 	line "just because you defeated me."
 	line "We still have Amy here"
 	line "at the Water Club."
 	done

-Text044a:
+JoshuaWakesAmy2Text:
 	text "Amy!"
 	line "Please wake up!!"
 	done

-Text044b:
+AmyMeetsPlayer1Text:
 	text "Huh? What's going on?"
 	line "I was enjoying my little nap..."
 	done

-Text044c:
+JoshuaWakesAmy3Text:
 	text "Well, um..."
 	line "(psst, psst, psst)"
 	done

-Text044d:
+AmyMeetsPlayer2Text:
 	text "What? You lost?"
 	line "How could you!?!"
 	done

-Text044e:
+AmyMeetsPlayer3Text:
 	text "Was it <RAMNAME>?"
 	line "I will be your next opponent."
 	line "I, Amy, the Master of the "
 	line "Water Club!"
 	done

-Text044f:
+AmyWantsToDuelInitialText:
 	text "Aren't you <RAMNAME>?"
 	line "So you decided you want to"
 	line "duel me?"
 	done

-Text0450:
+AmyWouldYouLikeToDuelText:
 	text "Would you like to duel Amy?"
 	done

-Text0451:
+AmyDeclinedDuelInitialText:
 	text "No? How boring!"
 	line "I was looking forward to"
 	line "a game of Pokémon Trading Cards."
 	line "Well, come see me again!"
 	done

-Text0452:
+AmyDuelStartInitialText:
 	text "OK! A 1-Match Duel with 6 Prizes!"
 	line "Let's do it!"
 	done

-Text0453:
+AmyPlayerWon1Text:
 	text "Oh, no! I lost!?!"
 	done

-Text0454:
+AmyGivesMedal1Text:
 	text "Well, since I lost, you can have"
 	line "this Water Medal."
 	line "This should get you a step closer"
 	line "to inheriting the Legendary Cards!"
 	done

-Text0455:
+AmyGivesMedal2Text:
 	text "Here, you can also have these!"
 	line "They should come in handy!"
 	done

-Text0456:
+AmyPlayerWon2Text:
 	text "Come see me again! I'd like"
 	line "to duel you again sometime!"
 	done

-Text0457:
+AmyPlayerLostText:
 	text "Hah! I'm the best!"
 	line "Come see me again sometime! "
 	line "I'd like another duel!"
 	done

-Text0458:
+AmyWantsToDuelRepeatText:
 	text "Hi, <RAMNAME>."
 	line "Nice to see you again!!!"
 	line "Did you come to play the"
 	line "Pokémon Trading Card Game?"
 	done

-Text0459:
+AmyDuelStartRepeatText:
 	text "OK, same rules as before!"
 	line "A 1-match duel with 6 Prizes!"
 	done

-Text045a:
+Clerk1Text:
 	text "Hello."
 	line "Welcome to the Fighting Club!"
 	line "Here at this Club, we duel using"
@ -721,7 +721,7 @@ Text045a:
 	line "in this Club."
 	done

-Text045b:
+Man1FirstRequestCardText:
 	text "I see you play the Pokémon Trading"
 	line "Card Game. I'm not into dueling."
 	line "I prefer collecting the cards."
@ -732,14 +732,14 @@ Text045b:
 	line "How about it?"
 	done

-Text045c:
+Man1WaitingForCardText:
 	text "Hi! It's you!"
 	line "What's up?"
 	line "Did you decide to give me"
 	line "your <RAMTEXT>?"
 	done

-Text045d:
+Man1NewRequestCardText:
 	text "Hi! I see you're playing with"
 	line "the cards again."
 	line "By the way, I'm looking for"
@ -748,17 +748,17 @@ Text045d:
 	line "would you mind giving it to me?"
 	done

-Text045e:
+Man1GiveAwayCardText:
 	text "Give away your <RAMTEXT>?"
 	done

-Text045f:
+Man1DeclineText:
 	text "OK. I understand."
 	line "But if you should change your "
 	line "mind, please come see me."
 	done

-Text0460:
+Man1DontHaveText:
 	text "But you don't have <RAMTEXT>!"
 	line "I appreciate your generosity, but "
 	line "you can't give me what you don't "
@ -766,7 +766,7 @@ Text0460:
 	line "you get <RAMTEXT>."
 	done

-Text0461:
+Man1CardInDeckText:
 	text "You're going to give it to me?"
 	line "Thank you!"
 	line "But your <RAMTEXT>"
@ -775,7 +775,7 @@ Text0461:
 	line "playing with!"
 	done

-Text0462:
+Man1GiveCardText:
 	text "You're going to give it to me?"
 	line "I'll put it in my collection"
 	line "right away."
@ -783,7 +783,7 @@ Text0462:
 	line "Thank you! Thank you!!!"
 	done

-Text0463:
+Man1PlayerReceivePikachuAltLv16Text:
 	text "Since you've been so kind and given"
 	line "me so many cards,"
 	line "please accept this card as a gift"
@ -792,26 +792,26 @@ Text0463:
 	line "Please take good care of it!"
 	done

-Text0464:
+Man1ThankYouText:
 	text "Thank you for being so kind and"
 	line "giving me all these cards!"
 	done

-Text0465:
+Man1GaveCardText:
 	text "Hi!"
 	line "Thanks for being so kind!"
 	line "I'm taking good care"
 	line "of all the cards you gave me!"
 	done

-Text0466:
+Man1GaveAllCardsText:
 	text "Hi!"
 	line "Is the card I gave you"
 	line "coming in handy?"
 	line "Thanks again for being so kind!"
 	done

-Text0467:
+ImakuniWouldLikeToDuelInitialText:
 	text "Huh? W..Who are you?"
 	line "Who? Me? You don't know who I am?"
 	line "I am the super musical star,"
@ -829,56 +829,56 @@ Text0467:
 	line "OK, but if I win, you dance!"
 	done

-Text0468:
+ImakuniWouldLikeToDuelRepeatText:
 	text "What? You're still here?"
 	line "OK, sit over there."
 	line "What? You're already sitting?"
 	line "OK, OK! Then let's get started!"
 	done

-Text0469:
+ImakuniWouldYouLikeToDuelText:
 	text "Would you like to duel Imakuni??"
 	done

-Text046a:
+ImakuniDeclinedDuelText:
 	text "Come on, don't be cruel!"
 	line "You're going to make me cry!"
 	done

-Text046b:
+ImakuniDuelStartText:
 	text "OK, a 1-match duel with 6 Prizes!"
 	line "...Whatever that means..."
 	done

-Text046c:
+ImakuniPlayerWonNormalText:
 	text "Hey! You're pretty good!"
 	line "I'll give you this Booster Pack,"
 	line "so don't tell anyone I lost, OK?"
 	done

-Text046d:
+ImakuniPlayerWonThreeWinsText:
 	text "You won 3 times against me!"
 	line "Does that make you happy? Does it?"
 	done

-Text046e:
+ImakuniPlayerWonSixWinsText:
 	text "I can't believe I lost 6 times!"
 	line "...Seriously!"
 	done

-Text046f:
+ImakuniGivesImakuniText:
 	text "I don't really want to give you "
 	line "this, but here. Take care of it."
 	done

-Text0470:
+ImakuniPlayerWonEndText:
 	text "In both Cards and Dance,"
 	line "soul and rhythm are the secret."
 	line "Hey, that sounds pretty cool!"
 	line "Maybe I'll become a poet!"
 	done

-Text0471:
+ImakuniPlayerLostText:
 	text "Hmm...I win."
 	line "You weren't too bad, but since "
 	line "I won...Let's see you shake it!"
@ -891,37 +891,37 @@ Text0471:
 	line "... You dance weird!"
 	done

-Text0472:
+Specs1NormalText:
 	text "I was just saying which "
 	line "Grand Master is the best."
 	line "I think Steve is the best player."
 	done

-Text0473:
+Specs1PlayerIsChampionText:
 	text "I can't believe Steve the Grand"
 	line "Master could lose!"
 	line "Who could have defeated Steve?"
 	done

-Text0474:
+ButchNormalText:
 	text "The best player among the Grand"
 	line "Masters is Rod, since he's the"
 	line "leader of the Grand Masters."
 	done

-Text0475:
+ButchPlayerIsChampionText:
 	text "I can't believe Rod, the leader of"
 	line "the Grand Masters, was defeated!?!"
 	line "Could this mean the Legendary"
 	line "Pokémon Cards have been passed on?"
 	done

-Text0476:
+Granny1Text:
 	text "If I were just a few years younger,"
 	line "I'd be dueling with you kids, too."
 	done

-Text0477:
+MitchFirstInteractionText:
 	text "I am Mitch, Master of the"
 	line "Fighting Club!"
 	line "I have to warn you that you will"
@ -934,7 +934,7 @@ Text0477:
 	line "3 of my pupils!"
 	done

-Text0478:
+Mitch3PupilsRemainingText:
 	text "If you wish to duel me, you "
 	line "must defeat my pupils first!"
 	line "My pupils are training at the"
@ -943,7 +943,7 @@ Text0478:
 	line "3 of my pupils!"
 	done

-Text0479:
+Mitch2PupilsRemainingText:
 	text "So, you've defeated 1 of my pupils."
 	line "You must be a pretty good player."
 	line "But you're not good enough!"
@ -951,14 +951,14 @@ Text0479:
 	line "must defeat my 2 remaining pupils!"
 	done

-Text047a:
+Mitch1PupilRemainingText:
 	text "So, you've defeated 2 of my pupils!"
 	line "You are pretty good."
 	line "But there's still the last one..."
 	line "Can you defeat my last pupil?"
 	done

-Text047b:
+MitchWouldLikeToDuelInitialText:
 	text "So, you have defeated"
 	line "all of my pupils!"
 	line "Let's see if you have "
@ -967,23 +967,23 @@ Text047b:
 	line "OK! Are you ready?"
 	done

-Text047c:
+MitchWouldYouLikeToDuelText:
 	text "Would you like to Duel Mitch?"
 	done

-Text047d:
+MitchDeclinedInitialText:
 	text "What?"
 	line "Are you getting cold feet?"
 	line "Come see me again when you"
 	line "finally work up enough nerves!"
 	done

-Text047e:
+MitchDuelStartInitialText:
 	text "Come on! Show me what you've got!"
 	line "We'll play with 6 Prizes!"
 	done

-Text047f:
+MitchPlayerWonInitial1Text:
 	text "Wonderful! Great Match!"
 	line "You're very good."
 	line "Here, take this."
@ -992,54 +992,54 @@ Text047f:
 	line "of this Club encrypted in it."
 	done

-Text0480:
+MitchPlayerWonInitial2Text:
 	text "Here, take this, too. It's a"
 	line "LABORATORY Booster Pack."
 	done

-Text0481:
+MitchPlayerWonInitial3Text:
 	text "I hope to duel someone "
 	line "like you again someday!"
 	done

-Text0482:
+MitchPlayerLostInitialText:
 	text "You may have been able to defeat"
 	line "my pupils, but you still are not"
 	line "experienced enough to defeat me!"
 	line "Come back after you've trained more!"
 	done

-Text0483:
+MitchWouldLikeToDuelRepeatText:
 	text "You wish to duel the"
 	line "Fighting Club Master again?"
 	done

-Text0484:
+MitchDeclinedDuelRepeatText:
 	text "Oh, OK."
 	line "I'd like to duel again, though."
 	done

-Text0485:
+MitchDuelStartRepeatText:
 	text "As before, we'll play with 6 Prizes."
 	line "Come show me what you've got!"
 	done

-Text0486:
+MitchPlayerWonRepeat1Text:
 	text "Another utter defeat!"
 	line "Here, take this!"
 	done

-Text0487:
+MitchPlayerWonRepeat2Text:
 	text "I'd like to duel someone "
 	line "like you again!"
 	done

-Text0488:
+MitchPlayerLostRepeatText:
 	text "You must train harder!"
 	line "I'll be waiting!"
 	done

-Text0489:
+ChrisFightingClubWantsToDuelInitialText:
 	text "I lost to you before at the Rock"
 	line "Club, but not this time!"
 	line "I'm going to train to become"
@ -1048,14 +1048,14 @@ Text0489:
 	line "again, I must defeat you first!"
 	done

-Text048a:
+ChrisFightingClubWantsToDuelRepeatText:
 	text "I'm going to train to become"
 	line "an even better player!"
 	line "But before I can start my training"
 	line "again, I must defeat you first!"
 	done

-Text048b:
+ChrisFightingClubWouldYouLikeToDuelText:
 	text "Would you like to duel Chris?"
 	done

--- a/src/text/text5.asm
+++ b/src/text/text5.asm
--- a/src/text/text6.asm
+++ b/src/text/text6.asm
@ -1,4 +1,4 @@
-Text0524:
+RonaldChallengeCup2Missed2Text:
 	text "The Challenge Cup is over already! "
 	line "Too bad you couldn't enter!"
 	line "The prize belongs to me! <Lv>8 Mew!"
@ -9,19 +9,19 @@ Text0524:
 	line "Ha ha ha ha ha ha!"
 	done

-Text0525:
+Clerk13Text:
 	text "We do not accept entrants at"
 	line "this reception area."
 	line "Please go to the reception area"
 	line "to the left."
 	done

-Text0526:
+GuideChallengeCupActiveText:
 	text "You can't go past this point!"
 	line "It's restricted!"
 	done

-Text0527:
+GuideChallengeCupOverText:
 	text "The last Challenge Cup was "
 	line "a blast! The prize was really"
 	line "cool too! Challenge Cups are "
@ -29,7 +29,7 @@ Text0527:
 	line "next one will be?"
 	done

-Text0528:
+GuideChallengeCupPreparingText:
 	text "The Challenge Cup is held here,"
 	line "at the Challenge Hall."
 	line "We're still preparing for the "
@ -37,82 +37,82 @@ Text0528:
 	line "Please visit us another time."
 	done

-Text0529:
+Clerk12ChallengeCupWonText:
 	text "Someone who entered a Challenge"
 	line "Cup once cannot re-enter the "
 	line "same Challenge Cup again. Please"
 	line "wait for the next Challenge Cup."
 	done

-Text052a:
+Clerk12ChallengeCupLostText:
 	text "Someone who entered a Challenge"
 	line "Cup once cannot re-enter for"
 	line "a while. Please visit us another"
 	line "time."
 	done

-Text052b:
+Clerk12ChallengeCup1ActiveText:
 	text "The first Challenge Cup is"
 	line "now underway!"
 	line "Defeat 3 opponents to win the"
 	line "wonderful prize of <Lv>60 Mewtwo!"
 	done

-Text052c:
+Clerk12ChallengeCup2ActiveText:
 	text "The second Challenge Cup is"
 	line "now under way!"
 	line "Defeat 3 opponents to win the"
 	line "wonderful prize of <Lv>8 Mew!"
 	done

-Text052d:
+Clerk12ChallengeCup3ActiveText:
 	text "The Challenge Cup is now "
 	line "underway!"
 	line "Defeat 3 opponents to win a"
 	line "fabulous prize!"
 	done

-Text052e:
+Clerk12ChallengeCupInviteText:
 	text "The game will be a 1-match "
 	line "duel with 4 prizes! We are "
 	line "now accepting entrants here."
 	line "Wouldn't you like to enter?"
 	done

-Text052f:
+Clerk12WillYouEnterText:
 	text "Will you enter?"
 	done

-Text0530:
+Clerk12DeclinedText:
 	text "Oh, that's too bad."
 	line "Please do visit us again."
 	done

-Text0531:
+Clerk12AcceptedText:
 	text "Then please proceed to the stage!"
 	done

-Text0532:
+Clerk12ChallengeCupIntroText:
 	text "Well, things are heating up"
 	line "here at the Challenge Cup!"
 	done

-Text0533:
+Clerk12ChallengeCupContenderText:
 	text "Presently, <RAMNAME> is still"
 	line "a contender!"
 	done

-Text0534:
+Clerk12ChallengeCupRound1ChallengerText:
 	text "<RAMNAME> is the new challenger!"
 	done

-Text0535:
+Clerk12ChallengeCupRound1DuelStartText:
 	text "There will be 4 Prizes!"
 	line "OK!!"
 	line "Let the duel begin!"
 	done

-Text0536:
+Clerk12ChallengeCupRound2PlayerLostText:
 	text "The winner is <RAMTEXT>!!"
 	line ""
 	text "<RAMTEXT> has defeated 2 opponents!"
@ -120,12 +120,12 @@ Text0536:
 	line "before winning the prize!"
 	done

-Text0537:
+Clerk12ChallengeCupLostContinuedText:
 	text "Too bad, <RAMNAME>."
 	line "Have a safe trip home!"
 	done

-Text0538:
+Clerk12ChallengeCupRound1PlayerLostText:
 	text "The Winner is <RAMTEXT>!!!"
 	line ""
 	text "<RAMTEXT> has defeated 1 opponent!"
@ -133,27 +133,27 @@ Text0538:
 	line "before winning the prize!"
 	done

-Text0539:
+Clerk12ChallengeCupPlayerLostToRonaldText:
 	text "How unfortunate!"
 	line "Unable to defeat the last opponent!"
 	line "It was close, but <RAMNAME> was "
 	line "defeated by the third opponent!"
 	done

-Text053a:
+RonaldChallengeCup2Or3PlayerLostText:
 	text "You see! I'm the better player?"
 	line "Two more opponents to go"
 	line "to win the Challenge Cup!!"
 	done

-Text053b:
+RonaldChallengeCup1PlayerLostText:
 	text "Ha ha ha! How about that!?!"
 	line "I win!!"
 	line "2 more opponents to go and"
 	line "the <Lv>8 Mew belongs to me!"
 	done

-Text053c:
+Clerk12ChallengeCupRound1PlayerWonText:
 	text "Congratulations!"
 	line "The Winner is <RAMNAME>!"
 	line ""
@ -161,118 +161,118 @@ Text053c:
 	line "1 opponent!!!"
 	done

-Text053d:
+Clerk12ChallengeCupRound2PlayerWonText:
 	text "Way to go, <RAMNAME>!"
 	line "That's 2 wins!!!"
 	line "One more opponent to go before"
 	line "winning the Challenge Cup!"
 	done

-Text053e:
+Clerk12ChallengeCupPlayerWonContinuedText:
 	text "Most unfortunate, <RAMTEXT>."
 	line "Have a safe trip home!"
 	done

-Text053f:
+Clerk12ChallengeCupNextChallengerText:
 	text "Let's meet our next challenger!"
 	done

-Text0540:
+Clerk12ChallengeCupRound2ChallengerText:
 	text "Our new challenger is..."
 	line ""
 	text "<RAMTEXT>!"
 	done

-Text0541:
+Clerk12ChallengeCupRound3ChallengerText:
 	text "The third opponent is"
 	line ""
 	text "<RAMTEXT>!"
 	done

-Text0542:
+RonaldChallengeCup2BeforeDuelText:
 	text "Hey, <RAMNAME>!"
 	line "I'm not gonna lose to you!"
 	line ""
 	text "<Lv>60 Mewtwo belongs to me!!!"
 	done

-Text0543:
+RonaldChallengeCup1BeforeDuelText:
 	text "<RAMNAME>!"
 	line "I'm going to defeat you!"
 	line ""
 	text "<Lv>8 Mew belongs to me!!!"
 	done

-Text0544:
+Clerk12ChallengeCupRound3DuelReadyText:
 	text "With that, let the third match "
 	line "begin!"
 	done

-Text0545:
+Clerk12AreYourDecksReadyText:
 	text "Are your decks ready?"
 	done

-Text0546:
+Clerk12PrepareYourDeckText:
 	text "Prepare your deck?"
 	done

-Text0547:
+Clerk12ChallengeCupRound2DuelStartText:
 	text "Well then, <RAMNAME>!"
 	line "Let the second match begin!"
 	done

-Text0548:
+Clerk12ChallengeCupRound3DuelStartText:
 	text "Well, <RAMNAME>, let the third,"
 	line "and final, match begin!"
 	done

-Text0549:
+Clerk12MakeYourPreparationsText:
 	text "Now then, please make "
 	line "your preparations!"
 	done

-Text054a:
+Clerk12ChallengeCupRound3PlayerWon1Text:
 	text "Congratulations!"
 	line "You've defeated 3 opponents!"
 	done

-Text054b:
+Clerk12ChallengeCupRound3PlayerWon2Text:
 	text "Most unfortunate, <RAMTEXT>."
 	line "Do try again in the next"
 	line "Challenge Cup."
 	done

-Text054c:
+RonaldChallengeCup1PlayerWon1Text:
 	text "That was luck!"
 	line "But a loss is a loss..."
 	done

-Text054d:
+RonaldChallengeCup2Or3PlayerWon1Text:
 	text "Shoot! I got a bad deal!"
 	done

-Text054e:
+RonaldChallengeCup1PlayerWon2Text:
 	text "<RAMNAME>!"
 	line "I won't lose next time!"
 	done

-Text054f:
+RonaldChallengeCup2Or3PlayerWon2Text:
 	text "<RAMNAME>!"
 	line "I'll win next time!"
 	done

-Text0550:
+Clerk12ChallengeCupRound3PlayerWon3Text:
 	text "The Winner of this Challenge Cup "
 	line "is "
 	text "<RAMNAME>!!!"
 	done

-Text0551:
+Clerk12ChallengeCupRound3PlayerWon4Text:
 	text "<RAMNAME>, your prize"
 	line "is <RAMTEXT>!"
 	done

-Text0552:
+Clerk12ChallengeCupRound3PlayerWon5Text:
 	text "Congratulations, "
 	text "<RAMNAME>!!!"
 	done
@ -310,7 +310,7 @@ Text0557:
 	line "Give it up, already! See ya!"
 	done

-Text0558:
+MysteriousVoiceDoorNotEnoughMedalsText:
 	text "Only those who have won all 8 "
 	line "Master Medals may enter the Grand "
 	line "Hall. You have not won all the "
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm