Merge pull request #102 from ElectroDeoxys/master

Disassemble and document some bank $2

3 files changed, 76 insertions, 76 deletions

diff --git a/src/text/text2.asm b/src/text/text2.asm
index 55a08b4..0e0c083 100644
--- a/src/text/text2.asm
+++ b/src/text/text2.asm
@@ -1619,7 +1619,7 @@ Text0227: ; 3ba3c (e:7a3c)
 	text "Select deck"
 	done
 
-Text0228: ; 3ba49 (e:7a49)
+CancelText: ; 3ba49 (e:7a49)
 	text "Cancel"
 	done
 
@@ -1652,66 +1652,66 @@ ThereIsNoDeckHereText: ; 3ba84 (e:7a84)
 	text "There is no Deck here!"
 	done
 
-Text0230: ; 3ba9c (e:7a9c)
+ConfirmText: ; 3ba9c (e:7a9c)
 	text "Confirm"
 	done
 
-Text0231: ; 3baa5 (e:7aa5)
+DismantleText: ; 3baa5 (e:7aa5)
 	text "Dismantle"
 	done
 
-Text0232: ; 3bab0 (e:7ab0)
+ModifyText: ; 3bab0 (e:7ab0)
 	text "Modify"
 	done
 
-Text0233: ; 3bab8 (e:7ab8)
+SaveText: ; 3bab8 (e:7ab8)
 	text "Save"
 	done
 
-Text0234: ; 3babe (e:7abe)
+NameText: ; 3babe (e:7abe)
 	text "Name"
 	done
 
-Text0235: ; 3bac4 (e:7ac4)
+ThereIsOnly1DeckSoCannotBeDismantledText: ; 3bac4 (e:7ac4)
 	text "There is only 1 Deck, so this"
 	line "Deck cannot be dismantled."
 	done
 
-Text0236: ; 3bafe (e:7afe)
+ThereAreNoBasicPokemonInThisDeckText: ; 3bafe (e:7afe)
 	text "There are no Basic Pokémon"
 	line "in this Deck!"
 	done
 
-Text0237: ; 3bb28 (e:7b28)
+YouMustIncludeABasicPokemonInTheDeckText: ; 3bb28 (e:7b28)
 	text "You must include a Basic Pokémon"
 	line "in the Deck!"
 	done
 
-Text0238: ; 3bb57 (e:7b57)
+ThisIsntA60CardDeckText: ; 3bb57 (e:7b57)
 	text "This isn't a 60-card deck!"
 	done
 
-Text0239: ; 3bb73 (e:7b73)
+TheDeckMustInclude60CardsText: ; 3bb73 (e:7b73)
 	text "The Deck must include 60 cards!"
 	done
 
-Text023a: ; 3bb94 (e:7b94)
+ReturnToOriginalConfigurationText: ; 3bb94 (e:7b94)
 	text "Return to original configuration?"
 	done
 
-Text023b: ; 3bbb7 (e:7bb7)
+SaveThisDeckText: ; 3bbb7 (e:7bb7)
 	text "Save this Deck?"
 	done
 
-Text023c: ; 3bbc8 (e:7bc8)
+QuitModifyingTheDeckText: ; 3bbc8 (e:7bc8)
 	text "Quit modifying the Deck?"
 	done
 
-Text023d: ; 3bbe2 (e:7be2)
+DismantleThisDeckText: ; 3bbe2 (e:7be2)
 	text "Dismantle this Deck?"
 	done
 
-Text023e: ; 3bbf8 (e:7bf8)
+NoCardsChosenText: ; 3bbf8 (e:7bf8)
 	text "No cards chosen."
 	done
 
@@ -1832,7 +1832,7 @@ Text025b: ; 3bddb (e:7ddb)
 	textfw0 "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-"
 	done
 
-Text025c: ; 3bdea (e:7dea)
+DeckSaveMachineText: ; 3bdea (e:7dea)
 	text "  Deck Save Machine   "
 	done
 
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 4fccc9c..3d32c15 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -70,11 +70,11 @@ Text027b: ; 3c1f7 (f:41f7)
 	line "the Game Boy Printer OFF."
 	done
 
-Text027c: ; 3c22b (f:422b)
+ProceduresForSendingCardsText: ; 3c22b (f:422b)
 	text "Procedures for sending cards:"
 	done
 
-Text027d: ; 3c24a (f:424a)
+CardSendingProceduresText: ; 3c24a (f:424a)
 	text "1. Choose the card you wish to send."
 	line "   Press left/right to choose more."
 	line ""
@@ -85,38 +85,38 @@ Text027d: ; 3c24a (f:424a)
 	line "   the process."
 	done
 
-Text027e: ; 3c305 (f:4305)
+PleaseReadTheProceduresForSendingCardsText: ; 3c305 (f:4305)
 	text "Please read the procedures"
 	line "for sending cards."
 	done
 
-Text027f: ; 3c334 (f:4334)
+SendText: ; 3c334 (f:4334)
 	text "Send"
 	done
 
-Text0280: ; 3c33a (f:433a)
+CardReceivedText: ; 3c33a (f:433a)
 	text "Card received"
 	done
 
-Text0281: ; 3c349 (f:4349)
+CardToSendText: ; 3c349 (f:4349)
 	text "Card to send"
 	done
 
-Text0282: ; 3c357 (f:4357)
+SendTheseCardsText: ; 3c357 (f:4357)
 	text "Send these cards?"
 	done
 
-Text0283: ; 3c36a (f:436a)
+ReceivedTheseCardsFromText: ; 3c36a (f:436a)
 	text "Received these cards"
 	line "from  <RAMTEXT>!"
 	done
 
-Text0284: ; 3c389 (f:4389)
+PleaseChooseADeckConfigurationToSendText: ; 3c389 (f:4389)
 	text "Please choose a Deck "
 	line "configuration to send."
 	done
 
-Text0285: ; 3c3b7 (f:43b7)
+PleaseChooseASaveSlotText: ; 3c3b7 (f:43b7)
 	text "Please choose a Save Slot."
 	done
 
@@ -124,48 +124,48 @@ Text0286: ; 3c3d3 (f:43d3)
 	text "Receive configuration."
 	done
 
-Text0287: ; 3c3eb (f:43eb)
+ReceivedADeckConfigurationFromText: ; 3c3eb (f:43eb)
 	text "Received a deck configuration"
 	line "from  <RAMTEXT>!"
 	done
 
-Text0288: ; 3c413 (f:4413)
+FightingMachineText: ; 3c413 (f:4413)
 	text "  Fighting Machine  "
 	done
 
-Text0289: ; 3c429 (f:4429)
+RockMachineText: ; 3c429 (f:4429)
 	text "  Rock Machine  "
 	done
 
-Text028a: ; 3c43b (f:443b)
+WaterMachineText: ; 3c43b (f:443b)
 	text "  Water Machine   "
 	done
 
-Text028b: ; 3c44f (f:444f)
+LightningMachineText: ; 3c44f (f:444f)
 	text "  Lightning Machine   "
 	done
 
-Text028c: ; 3c467 (f:4467)
+GrassMachineText: ; 3c467 (f:4467)
 	text "  Grass Machine   "
 	done
 
-Text028d: ; 3c47b (f:447b)
+PsychicMachineText: ; 3c47b (f:447b)
 	text "  Psychic Machine   "
 	done
 
-Text028e: ; 3c491 (f:4491)
+ScienceMachineText: ; 3c491 (f:4491)
 	text "  Science Machine   "
 	done
 
-Text028f: ; 3c4a7 (f:44a7)
+FireMachineText: ; 3c4a7 (f:44a7)
 	text "  Fire Machine  "
 	done
 
-Text0290: ; 3c4b9 (f:44b9)
+AutoMachineText: ; 3c4b9 (f:44b9)
 	text "  Auto Machine  "
 	done
 
-Text0291: ; 3c4cb (f:44cb)
+LegendaryMachineText: ; 3c4cb (f:44cb)
 	text "  Legendary Machine   "
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index f37c395..b8a1dbf 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -553,7 +553,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0225                                           ; 0x0225
 	textpointer Text0226                                           ; 0x0226
 	textpointer Text0227                                           ; 0x0227
-	textpointer Text0228                                           ; 0x0228
+	textpointer CancelText                                         ; 0x0228
 	textpointer Text0229                                           ; 0x0229
 	textpointer ChosenAsDuelingDeckText                            ; 0x022a
 	textpointer Deck1Text                                          ; 0x022b
@@ -561,21 +561,21 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Deck3Text                                          ; 0x022d
 	textpointer Deck4Text                                          ; 0x022e
 	textpointer ThereIsNoDeckHereText                              ; 0x022f
-	textpointer Text0230                                           ; 0x0230
-	textpointer Text0231                                           ; 0x0231
-	textpointer Text0232                                           ; 0x0232
-	textpointer Text0233                                           ; 0x0233
-	textpointer Text0234                                           ; 0x0234
-	textpointer Text0235                                           ; 0x0235
-	textpointer Text0236                                           ; 0x0236
-	textpointer Text0237                                           ; 0x0237
-	textpointer Text0238                                           ; 0x0238
-	textpointer Text0239                                           ; 0x0239
-	textpointer Text023a                                           ; 0x023a
-	textpointer Text023b                                           ; 0x023b
-	textpointer Text023c                                           ; 0x023c
-	textpointer Text023d                                           ; 0x023d
-	textpointer Text023e                                           ; 0x023e
+	textpointer ConfirmText                                        ; 0x0230
+	textpointer DismantleText                                      ; 0x0231
+	textpointer ModifyText                                         ; 0x0232
+	textpointer SaveText                                           ; 0x0233
+	textpointer NameText                                           ; 0x0234
+	textpointer ThereIsOnly1DeckSoCannotBeDismantledText           ; 0x0235
+	textpointer ThereAreNoBasicPokemonInThisDeckText               ; 0x0236
+	textpointer YouMustIncludeABasicPokemonInTheDeckText           ; 0x0237
+	textpointer ThisIsntA60CardDeckText                            ; 0x0238
+	textpointer TheDeckMustInclude60CardsText                      ; 0x0239
+	textpointer ReturnToOriginalConfigurationText                  ; 0x023a
+	textpointer SaveThisDeckText                                   ; 0x023b
+	textpointer QuitModifyingTheDeckText                           ; 0x023c
+	textpointer DismantleThisDeckText                              ; 0x023d
+	textpointer NoCardsChosenText                                  ; 0x023e
 	textpointer YourPokemonText                                    ; 0x023f
 	textpointer YourDiscardPileText2                               ; 0x0240
 	textpointer YourHandText                                       ; 0x0241
@@ -605,7 +605,7 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0259                                           ; 0x0259
 	textpointer Text025a                                           ; 0x025a
 	textpointer Text025b                                           ; 0x025b
-	textpointer Text025c                                           ; 0x025c
+	textpointer DeckSaveMachineText                                ; 0x025c
 	textpointer Text025d                                           ; 0x025d
 	textpointer Text025e                                           ; 0x025e
 	textpointer Text025f                                           ; 0x025f
@@ -637,28 +637,28 @@ TextOffsets:: ; 34000 (d:4000)
 	textpointer Text0279                                           ; 0x0279
 	textpointer Text027a                                           ; 0x027a
 	textpointer Text027b                                           ; 0x027b
-	textpointer Text027c                                           ; 0x027c
-	textpointer Text027d                                           ; 0x027d
-	textpointer Text027e                                           ; 0x027e
-	textpointer Text027f                                           ; 0x027f
-	textpointer Text0280                                           ; 0x0280
-	textpointer Text0281                                           ; 0x0281
-	textpointer Text0282                                           ; 0x0282
-	textpointer Text0283                                           ; 0x0283
-	textpointer Text0284                                           ; 0x0284
-	textpointer Text0285                                           ; 0x0285
+	textpointer ProceduresForSendingCardsText                      ; 0x027c
+	textpointer CardSendingProceduresText                          ; 0x027d
+	textpointer PleaseReadTheProceduresForSendingCardsText         ; 0x027e
+	textpointer SendText                                           ; 0x027f
+	textpointer CardReceivedText                                   ; 0x0280
+	textpointer CardToSendText                                     ; 0x0281
+	textpointer SendTheseCardsText                                 ; 0x0282
+	textpointer ReceivedTheseCardsFromText                         ; 0x0283
+	textpointer PleaseChooseADeckConfigurationToSendText           ; 0x0284
+	textpointer PleaseChooseASaveSlotText                          ; 0x0285
 	textpointer Text0286                                           ; 0x0286
-	textpointer Text0287                                           ; 0x0287
-	textpointer Text0288                                           ; 0x0288
-	textpointer Text0289                                           ; 0x0289
-	textpointer Text028a                                           ; 0x028a
-	textpointer Text028b                                           ; 0x028b
-	textpointer Text028c                                           ; 0x028c
-	textpointer Text028d                                           ; 0x028d
-	textpointer Text028e                                           ; 0x028e
-	textpointer Text028f                                           ; 0x028f
-	textpointer Text0290                                           ; 0x0290
-	textpointer Text0291                                           ; 0x0291
+	textpointer ReceivedADeckConfigurationFromText                 ; 0x0287
+	textpointer FightingMachineText                                ; 0x0288
+	textpointer RockMachineText                                    ; 0x0289
+	textpointer WaterMachineText                                   ; 0x028a
+	textpointer LightningMachineText                               ; 0x028b
+	textpointer GrassMachineText                                   ; 0x028c
+	textpointer PsychicMachineText                                 ; 0x028d
+	textpointer ScienceMachineText                                 ; 0x028e
+	textpointer FireMachineText                                    ; 0x028f
+	textpointer AutoMachineText                                    ; 0x0290
+	textpointer LegendaryMachineText                               ; 0x0291
 	textpointer Text0292                                           ; 0x0292
 	textpointer Text0293                                           ; 0x0293
 	textpointer Text0294                                           ; 0x0294