summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-01-03 13:28:04 -0600
committerdannye <33dannye@gmail.com>2021-01-03 13:28:04 -0600
commit5f64d73c3fcd49f93bcbc3f8a5fc0dd0043faf4d (patch)
tree5738af1dcc6418723d6be1f8dc2cefa1a15bc5c5 /src
parentfec3f3580a54dbaa3dfb138398c92b37d6c58dee (diff)
Rename some referenced text labels
Diffstat (limited to 'src')
-rw-r--r--src/data/map_objects.asm170
-rwxr-xr-xsrc/engine/bank03.asm22
-rw-r--r--src/engine/bank06.asm58
-rw-r--r--src/text/text2.asm16
-rw-r--r--src/text/text3.asm74
-rw-r--r--src/text/text4.asm24
-rw-r--r--src/text/text5.asm2
-rw-r--r--src/text/text8.asm2
-rw-r--r--src/text/text_offsets.asm118
9 files changed, 243 insertions, 243 deletions
diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm
index 069b12d..eaa456f 100644
--- a/src/data/map_objects.asm
+++ b/src/data/map_objects.asm
@@ -8,7 +8,7 @@ MasonLabObjects: ; 13b04 (3:7b04)
db NORTH, 18, 2
dw PrintInteractableObjectText
tx Text04a0
- tx Text049f
+ tx WhatIsADeckText
db NORTH, 20, 2
dw PrintInteractableObjectText
@@ -42,8 +42,8 @@ MasonLabObjects: ; 13b04 (3:7b04)
db NORTH, 2, 2
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db $ff
@@ -51,103 +51,103 @@ MasonLabObjects: ; 13b04 (3:7b04)
DeckMachineRoomObjects: ; 13b4d (3:7b4d)
db NORTH, 2, 2
dw Script_d932
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 4, 2
dw Script_d932
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 2
dw $593f
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 8, 2
dw $593f
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 10, 2
dw $5995
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 12, 2
dw $5995
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 14, 2
dw $59c2
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 16, 2
dw $59c2
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 18, 2
dw $59ef
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 20, 2
dw $59ef
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 14, 10
dw $5a1c
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 16, 10
dw $5a1c
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 18, 10
dw $5a49
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 20, 10
dw $5a49
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 14, 18
dw $5a76
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 16, 18
dw $5a76
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 18, 18
dw $5aa3
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 20, 18
dw $5aa3
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 2, 18
dw $5ad0
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 4, 18
dw $5ad0
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db $ff
@@ -234,17 +234,17 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -268,17 +268,17 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -302,17 +302,17 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -336,17 +336,17 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -370,17 +370,17 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -404,17 +404,17 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -438,17 +438,17 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -472,17 +472,17 @@ FireClubLobbyObjects: ; 13df0 (3:7df0)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -506,17 +506,17 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
db NORTH, 2, 8
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 6, 6
dw Script_fc52
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db NORTH, 10, 6
dw Func_fc7a
- tx Text041b
+ tx PlaceholderMessageText
tx ClerkNPCName
db $ff
@@ -575,8 +575,8 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
db NORTH, 28, 2
dw PC_c7ea
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db $ff
@@ -596,12 +596,12 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2)
db NORTH, 10, 2
dw $7be1
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db NORTH, 12, 2
dw $7be1
- tx Text041b
- tx Text041a
+ tx PlaceholderMessageText
+ tx PokemonTradingCards101Text
db $ff
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 8f39e57..b162dc6 100755
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -2856,7 +2856,7 @@ ScriptCommand_ShowSamNormalMultichoice: ; d2f6 (3:52f6)
.multichoice_menu_args ; d30c
tx SamNPCName ; NPC title for textbox under menu
- tx Text03fe ; text for textbox under menu
+ tx HowCanIHelpText ; text for textbox under menu
dw SamNormalMultichoice_ConfigurationTable ; location of table configuration in bank 4
db $03 ; the value to return when b is pressed
dw wMultichoiceTextboxResult_Sam ; ram location to return result into
@@ -3954,35 +3954,35 @@ Script_Gal1: ; e0cf (3:60cf)
start_script
jump_if_flag_equal EVENT_FLAG_12, $02, .ows_e10e
jump_if_flag_equal EVENT_FLAG_12, $00, NULL
- print_variable_text Text041d, Text041e
+ print_variable_text Gal1WantToTrade1Text, Gal1WantToTrade2Text
script_set_flag_value EVENT_FLAG_12, $01
- ask_question_jump Text041f, .ows_e0eb
- print_text_string Text0420
+ ask_question_jump Gal1WouldYouLikeToTradeText, .ows_e0eb
+ print_text_string Gal1DeclinedTradeText
quit_script_fully
.ows_e0eb
jump_if_card_owned LAPRAS, .ows_e0f3
- print_text_string Text0421
+ print_text_string Gal1DontOwnCardText
quit_script_fully
.ows_e0f3
jump_if_card_in_collection LAPRAS, .ows_e0fb
- print_text_string Text0422
+ print_text_string Gal1CardInDeckText
quit_script_fully
.ows_e0fb
script_set_flag_value EVENT_FLAG_12, $02
- print_text_string Text0423
+ print_text_string Gal1LetsTradeText
run_command Func_ccdc
- tx Text0424
+ tx Gal1TradeCompleteText
take_card LAPRAS
give_card ARCANINE1
show_card_received_screen ARCANINE1
- print_text_string Text0425
+ print_text_string Gal1ThanksText
quit_script_fully
.ows_e10e
- print_text_quit_fully Text0426
+ print_text_quit_fully Gal1AfterTradeText
Script_Lass1: ; e111 (3:6111)
start_script
@@ -4971,7 +4971,7 @@ Script_ee76: ; ee76 (3:6e76)
.ows_ee7d
script_set_flag_value EVENT_FLAG_21, $02
run_command Func_ccdc
- tx Text06a2
+ tx FoundLv9SlowpokeText
give_card SLOWPOKE1
show_card_received_screen SLOWPOKE1
quit_script_fully
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 4dcad9d..8101215 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -923,26 +923,26 @@ glossary_entry: MACRO
ENDM
GlossaryData1:
- glossary_entry 7, Text02fa, Text030c
- glossary_entry 5, Text02fb, Text030d
- glossary_entry 7, Text02fc, Text030e
- glossary_entry 6, Text02fd, Text030f
- glossary_entry 6, Text02fe, Text0310
- glossary_entry 4, Text02ff, Text0311
- glossary_entry 5, Text0300, Text0312
- glossary_entry 7, Text0301, Text0313
- glossary_entry 5, Text0302, Text0314
+ glossary_entry 7, AboutTheDeckText, DeckDescriptionText
+ glossary_entry 5, AboutTheDiscardPileText, DiscardPileDescriptionText
+ glossary_entry 7, AboutTheHandText, HandDescriptionText
+ glossary_entry 6, AboutTheArenaText, ArenaDescriptionText
+ glossary_entry 6, AboutTheBenchText, BenchDescriptionText
+ glossary_entry 4, AboutTheActivePokemonText, ActivePokemonDescriptionText
+ glossary_entry 5, AboutBenchPokemonText, BenchPokemonDescriptionText
+ glossary_entry 7, AboutPrizesText, PrizesDescriptionText
+ glossary_entry 5, AboutDamageCountersText, DamageCountersDescriptionText
GlossaryData2:
- glossary_entry 5, Text0303, Text0315
- glossary_entry 5, Text0304, Text0316
- glossary_entry 5, Text0305, Text0317
- glossary_entry 5, Text0306, Text0318
- glossary_entry 6, Text0307, Text0319
- glossary_entry 5, Text0308, Text031a
- glossary_entry 6, Text0309, Text031b
- glossary_entry 6, Text030a, Text031c
- glossary_entry 6, Text030b, Text031d
+ glossary_entry 5, AboutEnergyCardsText, EnergyCardsDescriptionText
+ glossary_entry 5, AboutTrainerCardsText, TrainerCardsDescriptionText
+ glossary_entry 5, AboutBasicPokemonText, BasicPokemonDescriptionText
+ glossary_entry 5, AboutEvolutionCardsText, EvolutionCardsDescriptionText
+ glossary_entry 6, AboutAttackingText, AttackingDescriptionText
+ glossary_entry 5, AboutPokemonPowerText, PokemonPowerDescriptionText
+ glossary_entry 6, AboutWeaknessText, WeaknessDescriptionText
+ glossary_entry 6, AboutResistanceText, ResistanceDescriptionText
+ glossary_entry 6, AboutRetreatingText, RetreatingDescriptionText
Func_18661: ; 18661 (6:4661)
xor a
@@ -1619,7 +1619,7 @@ Func_1a68d: ; 1a68d (6:668d)
call SetupText
bank1call InitAndDrawCardListScreenLayout
ldtx hl, ChooseTheCardYouWishToExamineText
- ldtx de, Text0196
+ ldtx de, BoosterPackText
bank1call SetCardListHeaderText
ld a, A_BUTTON | START
ld [wNoItemSelectionMenuKeys], a
@@ -1723,20 +1723,20 @@ WhatIsYourNameData: ; 1a75e (6:675e)
; without any bank description.
; That is, the developers hard-coded it. -_-;;
Deck1Data: ; 1a763 (6:6763)
- textitem 2, 1, Text022b
- textitem 14, 1, Text0219
+ textitem 2, 1, Deck1Text
+ textitem 14, 1, DeckText
db $ff
Deck2Data: ; 1a76c (6:676c)
- textitem 2, 1, Text022c
- textitem 14, 1, Text0219
+ textitem 2, 1, Deck2Text
+ textitem 14, 1, DeckText
db $ff
Deck3Data: ; 1a775 (6:6775)
- textitem 2, 1, Text022d
- textitem 14, 1, Text0219
+ textitem 2, 1, Deck3Text
+ textitem 14, 1, DeckText
db $ff
Deck4Data: ; 1a77e (6:677e)
- textitem 2, 1, Text022e
- textitem 14, 1, Text0219
+ textitem 2, 1, Deck4Text
+ textitem 14, 1, DeckText
db $ff
; set each byte zero from hl for b bytes.
@@ -1933,7 +1933,7 @@ DrawNamingScreenBG: ; 1a892 (6:6892)
; print "End".
ld hl, .data
call PlaceTextItems
- ldtx hl, Text0221
+ ldtx hl, PlayerNameKeyboardText
lb de, 2, 4
call InitTextPrinting
call ProcessTextFromID
@@ -2810,7 +2810,7 @@ Func_1ae99: ; 1ae99 (6:6e99)
ld hl, DrawNamingScreenBG.data
call PlaceTextItems
; print the keyboard characters.
- ldtx hl, NamingScreenKeyboardText ; "A B C D..."
+ ldtx hl, DeckNameKeyboardText ; "A B C D..."
lb de, 2, 4
call InitTextPrinting
call ProcessTextFromID
diff --git a/src/text/text2.asm b/src/text/text2.asm
index fc603ee..d85eda7 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -844,7 +844,7 @@ Text0195: ; 39f03 (e:5f03)
line "Please wait..."
done
-Text0196: ; 39f21 (e:5f21)
+BoosterPackText: ; 39f21 (e:5f21)
text "Booster Pack"
done
@@ -1507,7 +1507,7 @@ OpponentsDiscardPileText: ; 3b7cf (e:77cf)
text "Opponent's Discard Pile"
done
-Text0219: ; 3b7e8 (e:77e8)
+DeckText: ; 3b7e8 (e:77e8)
text "Deck"
done
@@ -1563,7 +1563,7 @@ Text0220: ; 3b886 (e:7886)
textfw0 "-(2)"
done
-Text0221: ; 3b8f2 (e:78f2)
+PlayerNameKeyboardText: ; 3b8f2 (e:78f2)
textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
line ""
textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
@@ -1580,7 +1580,7 @@ Text0221: ; 3b8f2 (e:78f2)
textfw0 " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "
done
-NamingScreenKeyboardText: ; 3b97b (e:797b)
+DeckNameKeyboardText: ; 3b97b (e:797b)
textfw3 "A", " ", "B", " ", "C", " ", "D", " ", "E", " ", "F", " ", "G", " ", "H", " ", "I"
line ""
textfw3 "J", " ", "K", " ", "L", " ", "M", " ", "N", " ", "O", " ", "P", " ", "Q", " ", "R"
@@ -1632,19 +1632,19 @@ ChosenAsDuelingDeckText: ; 3ba55 (e:7a55)
line "chosen as the dueling deck!"
done
-Text022b: ; 3ba78 (e:7a78)
+Deck1Text: ; 3ba78 (e:7a78)
textfw0 "1", "·"
done
-Text022c: ; 3ba7b (e:7a7b)
+Deck2Text: ; 3ba7b (e:7a7b)
textfw0 "2", "·"
done
-Text022d: ; 3ba7e (e:7a7e)
+Deck3Text: ; 3ba7e (e:7a7e)
textfw0 "3", "·"
done
-Text022e: ; 3ba81 (e:7a81)
+Deck4Text: ; 3ba81 (e:7a81)
textfw0 "4", "·"
done
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 4d3fccf..18b329e 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -644,79 +644,79 @@ ChooseWordAndPressAButtonText: ; 3d48f (f:548f)
line "A button."
done
-Text02fa: ; 3d4b6 (f:54b6)
+AboutTheDeckText: ; 3d4b6 (f:54b6)
text "About the Deck"
done
-Text02fb: ; 3d4c6 (f:54c6)
+AboutTheDiscardPileText: ; 3d4c6 (f:54c6)
text "About the Discard Pile"
done
-Text02fc: ; 3d4de (f:54de)
+AboutTheHandText: ; 3d4de (f:54de)
text "About the Hand"
done
-Text02fd: ; 3d4ee (f:54ee)
+AboutTheArenaText: ; 3d4ee (f:54ee)
text "About the Arena"
done
-Text02fe: ; 3d4ff (f:54ff)
+AboutTheBenchText: ; 3d4ff (f:54ff)
text "About the Bench"
done
-Text02ff: ; 3d510 (f:5510)
+AboutTheActivePokemonText: ; 3d510 (f:5510)
text "About the Active Pokémon"
done
-Text0300: ; 3d52a (f:552a)
+AboutBenchPokemonText: ; 3d52a (f:552a)
text "About Bench Pokémon"
done
-Text0301: ; 3d53f (f:553f)
+AboutPrizesText: ; 3d53f (f:553f)
text "About Prizes"
done
-Text0302: ; 3d54d (f:554d)
+AboutDamageCountersText: ; 3d54d (f:554d)
text "About Damage Counters"
done
-Text0303: ; 3d564 (f:5564)
+AboutEnergyCardsText: ; 3d564 (f:5564)
text "About Energy Cards"
done
-Text0304: ; 3d578 (f:5578)
+AboutTrainerCardsText: ; 3d578 (f:5578)
text "About Trainer Cards"
done
-Text0305: ; 3d58d (f:558d)
+AboutBasicPokemonText: ; 3d58d (f:558d)
text "About Basic Pokémon"
done
-Text0306: ; 3d5a2 (f:55a2)
+AboutEvolutionCardsText: ; 3d5a2 (f:55a2)
text "About Evolution Cards"
done
-Text0307: ; 3d5b9 (f:55b9)
+AboutAttackingText: ; 3d5b9 (f:55b9)
text "About Attacking"
done
-Text0308: ; 3d5ca (f:55ca)
+AboutPokemonPowerText: ; 3d5ca (f:55ca)
text "About Pokémon Power"
done
-Text0309: ; 3d5df (f:55df)
+AboutWeaknessText: ; 3d5df (f:55df)
text "About Weakness"
done
-Text030a: ; 3d5ef (f:55ef)
+AboutResistanceText: ; 3d5ef (f:55ef)
text "About Resistance"
done
-Text030b: ; 3d601 (f:5601)
+AboutRetreatingText: ; 3d601 (f:5601)
text "About Retreating"
done
-Text030c: ; 3d613 (f:5613)
+DeckDescriptionText: ; 3d613 (f:5613)
text "The Deck is the pile of cards"
line "you will be drawing from."
line "At the beginning of your turn, you"
@@ -725,7 +725,7 @@ Text030c: ; 3d613 (f:5613)
line "from the Deck, you lose the game."
done
-Text030d: ; 3d6d0 (f:56d0)
+DiscardPileDescriptionText: ; 3d6d0 (f:56d0)
text "The pile in which you place used"
line "cards is called the Discard Pile."
line "You can look at both yours and your"
@@ -733,7 +733,7 @@ Text030d: ; 3d6d0 (f:56d0)
line "with the Check command."
done
-Text030e: ; 3d769 (f:5769)
+HandDescriptionText: ; 3d769 (f:5769)
text "The cards held by each player"
line "are called a Hand."
line "There is no restriction to the"
@@ -742,7 +742,7 @@ Text030e: ; 3d769 (f:5769)
line "cards in your Hand."
done
-Text030f: ; 3d807 (f:5807)
+ArenaDescriptionText: ; 3d807 (f:5807)
text "The place where the Pokémon"
line "that is actively fighting"
line "is placed is called the Arena."
@@ -750,7 +750,7 @@ Text030f: ; 3d807 (f:5807)
line "Active Pokémon in the Arena."
done
-Text0310: ; 3d899 (f:5899)
+BenchDescriptionText: ; 3d899 (f:5899)
text "The Bench is where your Pokémon"
line "that are in play but aren't actively"
line "fighting sit."
@@ -761,14 +761,14 @@ Text0310: ; 3d899 (f:5899)
line "the Bench."
done
-Text0311: ; 3d96e (f:596e)
+ActivePokemonDescriptionText: ; 3d96e (f:596e)
text "The Active Pokémon is the "
line "Pokémon that is in the Arena."
line "Only Active Pokémon can "
line "attack."
done
-Text0312: ; 3d9c9 (f:59c9)
+BenchPokemonDescriptionText: ; 3d9c9 (f:59c9)
text "The Pokémon that are in play"
line "but aren't actively fighting"
line "are called Bench Pokémon."
@@ -780,7 +780,7 @@ Text0312: ; 3d9c9 (f:59c9)
line "Pokémon, you lose the game."
done
-Text0313: ; 3dad1 (f:5ad1)
+PrizesDescriptionText: ; 3dad1 (f:5ad1)
text "Prizes are the cards placed to"
line "count the number of the opponent's"
line "Pokémon you Knocked Out."
@@ -791,7 +791,7 @@ Text0313: ; 3dad1 (f:5ad1)
line "you win the game."
done
-Text0314: ; 3dbc5 (f:5bc5)
+DamageCountersDescriptionText: ; 3dbc5 (f:5bc5)
text "A Damage Counter represents the"
line "amount of damage a certain Pokémon"
line "has taken."
@@ -803,7 +803,7 @@ Text0314: ; 3dbc5 (f:5bc5)
line "HP is 0."
done
-Text0315: ; 3dcb2 (f:5cb2)
+EnergyCardsDescriptionText: ; 3dcb2 (f:5cb2)
text "Energy Cards are cards that power"
line "your Pokémon, making them able"
line "to Attack."
@@ -816,7 +816,7 @@ Text0315: ; 3dcb2 (f:5cb2)
line "from your Hand per turn."
done
-Text0316: ; 3ddbe (f:5dbe)
+TrainerCardsDescriptionText: ; 3ddbe (f:5dbe)
text "Trainer Cards are support cards."
line "There are many Trainer Cards"
line "with different effects."
@@ -828,7 +828,7 @@ Text0316: ; 3ddbe (f:5dbe)
line "as you like."
done
-Text0317: ; 3deb0 (f:5eb0)
+BasicPokemonDescriptionText: ; 3deb0 (f:5eb0)
text "Basic Pokémon are cards that "
line "can be played directly from your "
line "hand into the play area. Basic "
@@ -838,7 +838,7 @@ Text0317: ; 3deb0 (f:5eb0)
line "examples of Basic Pokémon."
done
-Text0318: ; 3df82 (f:5f82)
+EvolutionCardsDescriptionText: ; 3df82 (f:5f82)
text "Evolution Cards are cards you"
line "play on top of a Basic Pokémon card"
line "(or sometimes on top of another"
@@ -853,7 +853,7 @@ Text0318: ; 3df82 (f:5f82)
line "place the Stage 2 Evolution Card."
done
-Text0319: ; 3e10a (f:610a)
+AttackingDescriptionText: ; 3e10a (f:610a)
text "By choosing Attack, your Pokémon"
line "will fight your opponent's Pokémon."
line "Your Pokémon require Energy"
@@ -864,7 +864,7 @@ Text0319: ; 3e10a (f:610a)
line "Pokémon that can Attack."
done
-Text031a: ; 3e1f7 (f:61f7)
+PokemonPowerDescriptionText: ; 3e1f7 (f:61f7)
text "Unlike Attacks, Pokémon Power"
line "can be used by Active or Benched"
line "Pokémon. Some Pokémon Power are"
@@ -874,14 +874,14 @@ Text031a: ; 3e1f7 (f:61f7)
line "command, PKMN Power."
done
-Text031b: ; 3e2c5 (f:62c5)
+WeaknessDescriptionText: ; 3e2c5 (f:62c5)
text "Some Pokémon have a Weakness."
line "If a Pokémon has a Weakness, it"
line "takes double damage when attacked by"
line "Pokémon of a certain type."
done
-Text031c: ; 3e344 (f:6344)
+ResistanceDescriptionText: ; 3e344 (f:6344)
text "Some Pokémon have Resistance."
line "If a Pokémon has Resistance, it"
line "takes 30 less damage whenever"
@@ -889,7 +889,7 @@ Text031c: ; 3e344 (f:6344)
line "a certain type."
done
-Text031d: ; 3e3c8 (f:63c8)
+RetreatingDescriptionText: ; 3e3c8 (f:63c8)
text "By choosing Retreat, you can"
line "switch the Active Pokémon with"
line "a Pokémon on your Bench."
@@ -1949,7 +1949,7 @@ Text03fd: ; 3f9d0 (f:79d0)
text "Please select the Deck you want."
done
-Text03fe: ; 3f9f2 (f:79f2)
+HowCanIHelpText: ; 3f9f2 (f:79f2)
text "Hi, <RAMNAME>."
line "How can I help you?"
done
diff --git a/src/text/text4.asm b/src/text/text4.asm
index 74bec46..b597fb6 100644
--- a/src/text/text4.asm
+++ b/src/text/text4.asm
@@ -320,11 +320,11 @@ Text0419: ; 41965 (10:5965)
line "attached Booster Pack."
done
-Text041a: ; 4199b (10:599b)
+PokemonTradingCards101Text: ; 4199b (10:599b)
text "”Pokémon Trading Cards 101”"
done
-Text041b: ; 419b8 (10:59b8)
+PlaceholderMessageText: ; 419b8 (10:59b8)
text "This message is not in yet!"
done
@@ -338,7 +338,7 @@ Text041c: ; 419d5 (10:59d5)
line "just to collect them."
done
-Text041d: ; 41a74 (10:5a74)
+Gal1WantToTrade1Text: ; 41a74 (10:5a74)
text "We don't use Fire Pokémon cards"
line "here at the Water Club."
line "I have this rare Arcanine, but"
@@ -347,17 +347,17 @@ Text041d: ; 41a74 (10:5a74)
line "mind trading it for my Arcanine?"
done
-Text041e: ; 41b1d (10:5b1d)
+Gal1WantToTrade2Text: ; 41b1d (10:5b1d)
text "Hi! We meet again!"
line "Have you decided to trade your"
line "Lapras for my rare Arcanine?"
done
-Text041f: ; 41b6d (10:5b6d)
+Gal1WouldYouLikeToTradeText: ; 41b6d (10:5b6d)
text "Would you like to trade?"
done
-Text0420: ; 41b87 (10:5b87)
+Gal1DeclinedTradeText: ; 41b87 (10:5b87)
text "Aw, you're not going to"
line "trade with me?"
line "Well, that's too bad..."
@@ -365,13 +365,13 @@ Text0420: ; 41b87 (10:5b87)
line "come look for me."
done
-Text0421: ; 41bf6 (10:5bf6)
+Gal1DontOwnCardText: ; 41bf6 (10:5bf6)
text "Hey! What are you trying to pull?"
line "You don't have a Lapras!?!"
line "Come see me when you get a Lapras."
done
-Text0422: ; 41c57 (10:5c57)
+Gal1CardInDeckText: ; 41c57 (10:5c57)
text "OK! Let's trade your Lapras"
line "for my Arcanine..."
line "Oh! I see your Lapras"
@@ -382,23 +382,23 @@ Text0422: ; 41c57 (10:5c57)
line ""
done
-Text0423: ; 41cf7 (10:5cf7)
+Gal1LetsTradeText: ; 41cf7 (10:5cf7)
text "OK then, let's trade your"
line "Lapras for my Arcanine."
done
-Text0424: ; 41d2a (10:5d2a)
+Gal1TradeCompleteText: ; 41d2a (10:5d2a)
text "<RAMNAME> traded a Lapras"
line "for an Arcanine!"
done
-Text0425: ; 41d4e (10:5d4e)
+Gal1ThanksText: ; 41d4e (10:5d4e)
text "Thanks, <RAMNAME>!"
line "I'll take good care"
line "of this Lapras."
done
-Text0426: ; 41d7e (10:5d7e)
+Gal1AfterTradeText: ; 41d7e (10:5d7e)
text "Hey! You're the one who"
line "gave me your Lapras!"
line "I'm taking good care of"
diff --git a/src/text/text5.asm b/src/text/text5.asm
index ba26ccb..809cb63 100644
--- a/src/text/text5.asm
+++ b/src/text/text5.asm
@@ -95,7 +95,7 @@ Text049e: ; 4437a (11:437a)
line "Well, I hope I see you around!"
done
-Text049f: ; 443d6 (11:43d6)
+WhatIsADeckText: ; 443d6 (11:43d6)
text "What is a deck?"
done
diff --git a/src/text/text8.asm b/src/text/text8.asm
index c76de49..6bd0fe6 100644
--- a/src/text/text8.asm
+++ b/src/text/text8.asm
@@ -205,7 +205,7 @@ Text06a1: ; 509f2 (14:49f2)
line "Bye!"
done
-Text06a2: ; 50a9e (14:4a9e)
+FoundLv9SlowpokeText: ; 50a9e (14:4a9e)
text "<RAMNAME>"
line "checked the wall!"
line ""
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index b793894..0d2ca4d 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -407,7 +407,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer ReceivedPromotionalSurfingPikachuText ; 0x0193
textpointer Text0194 ; 0x0194
textpointer Text0195 ; 0x0195
- textpointer Text0196 ; 0x0196
+ textpointer BoosterPackText ; 0x0196
textpointer Text0197 ; 0x0197
textpointer Text0198 ; 0x0198
textpointer Text0199 ; 0x0199
@@ -538,7 +538,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer InchesText ; 0x0216
textpointer YourDiscardPileText ; 0x0217
textpointer OpponentsDiscardPileText ; 0x0218
- textpointer Text0219 ; 0x0219
+ textpointer DeckText ; 0x0219
textpointer Text021a ; 0x021a
textpointer Text021b ; 0x021b
textpointer Text021c ; 0x021c
@@ -546,8 +546,8 @@ TextOffsets:: ; 34000 (d:4000)
textpointer WhatIsYourNameText ; 0x021e
textpointer Text021f ; 0x021f
textpointer Text0220 ; 0x0220
- textpointer Text0221 ; 0x0221
- textpointer NamingScreenKeyboardText ; 0x0222
+ textpointer PlayerNameKeyboardText ; 0x0221
+ textpointer DeckNameKeyboardText ; 0x0222
textpointer NewDeckText ; 0x0223
textpointer PleaseSelectDeckText ; 0x0224
textpointer Text0225 ; 0x0225
@@ -556,10 +556,10 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0228 ; 0x0228
textpointer Text0229 ; 0x0229
textpointer ChosenAsDuelingDeckText ; 0x022a
- textpointer Text022b ; 0x022b
- textpointer Text022c ; 0x022c
- textpointer Text022d ; 0x022d
- textpointer Text022e ; 0x022e
+ textpointer Deck1Text ; 0x022b
+ textpointer Deck2Text ; 0x022c
+ textpointer Deck3Text ; 0x022d
+ textpointer Deck4Text ; 0x022e
textpointer ThereIsNoDeckHereText ; 0x022f
textpointer Text0230 ; 0x0230
textpointer Text0231 ; 0x0231
@@ -763,42 +763,42 @@ TextOffsets:: ; 34000 (d:4000)
textpointer GlossaryMenuPage1Text ; 0x02f7
textpointer GlossaryMenuPage2Text ; 0x02f8
textpointer ChooseWordAndPressAButtonText ; 0x02f9
- textpointer Text02fa ; 0x02fa
- textpointer Text02fb ; 0x02fb
- textpointer Text02fc ; 0x02fc
- textpointer Text02fd ; 0x02fd
- textpointer Text02fe ; 0x02fe
- textpointer Text02ff ; 0x02ff
- textpointer Text0300 ; 0x0300
- textpointer Text0301 ; 0x0301
- textpointer Text0302 ; 0x0302
- textpointer Text0303 ; 0x0303
- textpointer Text0304 ; 0x0304
- textpointer Text0305 ; 0x0305
- textpointer Text0306 ; 0x0306
- textpointer Text0307 ; 0x0307
- textpointer Text0308 ; 0x0308
- textpointer Text0309 ; 0x0309
- textpointer Text030a ; 0x030a
- textpointer Text030b ; 0x030b
- textpointer Text030c ; 0x030c
- textpointer Text030d ; 0x030d
- textpointer Text030e ; 0x030e
- textpointer Text030f ; 0x030f
- textpointer Text0310 ; 0x0310
- textpointer Text0311 ; 0x0311
- textpointer Text0312 ; 0x0312
- textpointer Text0313 ; 0x0313
- textpointer Text0314 ; 0x0314
- textpointer Text0315 ; 0x0315
- textpointer Text0316 ; 0x0316
- textpointer Text0317 ; 0x0317
- textpointer Text0318 ; 0x0318
- textpointer Text0319 ; 0x0319
- textpointer Text031a ; 0x031a
- textpointer Text031b ; 0x031b
- textpointer Text031c ; 0x031c
- textpointer Text031d ; 0x031d
+ textpointer AboutTheDeckText ; 0x02fa
+ textpointer AboutTheDiscardPileText ; 0x02fb
+ textpointer AboutTheHandText ; 0x02fc
+ textpointer AboutTheArenaText ; 0x02fd
+ textpointer AboutTheBenchText ; 0x02fe
+ textpointer AboutTheActivePokemonText ; 0x02ff
+ textpointer AboutBenchPokemonText ; 0x0300
+ textpointer AboutPrizesText ; 0x0301
+ textpointer AboutDamageCountersText ; 0x0302
+ textpointer AboutEnergyCardsText ; 0x0303
+ textpointer AboutTrainerCardsText ; 0x0304
+ textpointer AboutBasicPokemonText ; 0x0305
+ textpointer AboutEvolutionCardsText ; 0x0306
+ textpointer AboutAttackingText ; 0x0307
+ textpointer AboutPokemonPowerText ; 0x0308
+ textpointer AboutWeaknessText ; 0x0309
+ textpointer AboutResistanceText ; 0x030a
+ textpointer AboutRetreatingText ; 0x030b
+ textpointer DeckDescriptionText ; 0x030c
+ textpointer DiscardPileDescriptionText ; 0x030d
+ textpointer HandDescriptionText ; 0x030e
+ textpointer ArenaDescriptionText ; 0x030f
+ textpointer BenchDescriptionText ; 0x0310
+ textpointer ActivePokemonDescriptionText ; 0x0311
+ textpointer BenchPokemonDescriptionText ; 0x0312
+ textpointer PrizesDescriptionText ; 0x0313
+ textpointer DamageCountersDescriptionText ; 0x0314
+ textpointer EnergyCardsDescriptionText ; 0x0315
+ textpointer TrainerCardsDescriptionText ; 0x0316
+ textpointer BasicPokemonDescriptionText ; 0x0317
+ textpointer EvolutionCardsDescriptionText ; 0x0318
+ textpointer AttackingDescriptionText ; 0x0319
+ textpointer PokemonPowerDescriptionText ; 0x031a
+ textpointer WeaknessDescriptionText ; 0x031b
+ textpointer ResistanceDescriptionText ; 0x031c
+ textpointer RetreatingDescriptionText ; 0x031d
textpointer Text031e ; 0x031e
textpointer Text031f ; 0x031f
textpointer Text0320 ; 0x0320
@@ -1023,7 +1023,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text03fb ; 0x03fb
textpointer Text03fc ; 0x03fc
textpointer Text03fd ; 0x03fd
- textpointer Text03fe ; 0x03fe
+ textpointer HowCanIHelpText ; 0x03fe
textpointer Text03ff ; 0x03ff
textpointer Text0400 ; 0x0400
textpointer Text0401 ; 0x0401
@@ -1051,19 +1051,19 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text0417 ; 0x0417
textpointer Text0418 ; 0x0418
textpointer Text0419 ; 0x0419
- textpointer Text041a ; 0x041a
- textpointer Text041b ; 0x041b
+ textpointer PokemonTradingCards101Text ; 0x041a
+ textpointer PlaceholderMessageText ; 0x041b
textpointer Text041c ; 0x041c
- textpointer Text041d ; 0x041d
- textpointer Text041e ; 0x041e
- textpointer Text041f ; 0x041f
- textpointer Text0420 ; 0x0420
- textpointer Text0421 ; 0x0421
- textpointer Text0422 ; 0x0422
- textpointer Text0423 ; 0x0423
- textpointer Text0424 ; 0x0424
- textpointer Text0425 ; 0x0425
- textpointer Text0426 ; 0x0426
+ textpointer Gal1WantToTrade1Text ; 0x041d
+ textpointer Gal1WantToTrade2Text ; 0x041e
+ textpointer Gal1WouldYouLikeToTradeText ; 0x041f
+ textpointer Gal1DeclinedTradeText ; 0x0420
+ textpointer Gal1DontOwnCardText ; 0x0421
+ textpointer Gal1CardInDeckText ; 0x0422
+ textpointer Gal1LetsTradeText ; 0x0423
+ textpointer Gal1TradeCompleteText ; 0x0424
+ textpointer Gal1ThanksText ; 0x0425
+ textpointer Gal1AfterTradeText ; 0x0426
textpointer Text0427 ; 0x0427
textpointer Text0428 ; 0x0428
textpointer Text0429 ; 0x0429
@@ -1184,7 +1184,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text049c ; 0x049c
textpointer Text049d ; 0x049d
textpointer Text049e ; 0x049e
- textpointer Text049f ; 0x049f
+ textpointer WhatIsADeckText ; 0x049f
textpointer Text04a0 ; 0x04a0
textpointer Text04a1 ; 0x04a1
textpointer Text04a2 ; 0x04a2
@@ -1699,7 +1699,7 @@ TextOffsets:: ; 34000 (d:4000)
textpointer Text069f ; 0x069f
textpointer Text06a0 ; 0x06a0
textpointer Text06a1 ; 0x06a1
- textpointer Text06a2 ; 0x06a2
+ textpointer FoundLv9SlowpokeText ; 0x06a2
textpointer Text06a3 ; 0x06a3
textpointer Text06a4 ; 0x06a4
textpointer Text06a5 ; 0x06a5