summaryrefslogtreecommitdiff
path: root/src/text/text1.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-07-03 20:31:48 -0500
committerGitHub <noreply@github.com>2018-07-03 20:31:48 -0500
commit169dc3d8fdd5603efd1766acd9ad1b8c23093e7f (patch)
treef11717e83ab1105378698de708280988a6e8995c /src/text/text1.asm
parent779b0ff472edeff7b0bbb36970cb342c17613f12 (diff)
parentd27fb4554dda2b858b2fb3c0ea8585a2e782c0e6 (diff)
Merge pull request #43 from xCrystal/master
Disassembly and documentation of code related to text engine, menus and lists, and retreating Pokemon cards in a duel
Diffstat (limited to 'src/text/text1.asm')
-rw-r--r--src/text/text1.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text/text1.asm b/src/text/text1.asm
index 504dba0..4274caf 100644
--- a/src/text/text1.asm
+++ b/src/text/text1.asm
@@ -339,7 +339,7 @@ DamageToSelfDueToConfusionText: ; 3686c (d:686c)
text "20 damage to Self due to Confusion."
done
-Text0050: ; 36891 (d:6891)
+ChooseEnergyCardToDiscardText: ; 36891 (d:6891)
text "Choose the Energy card"
line "you wish to discard."
done
@@ -891,7 +891,7 @@ Text00be: ; 37715 (d:7715)
line "in your opponent's Play Area."
done
-Text00bf: ; 37758 (d:7758)
+EnergyCardsRequiredToRetreatText: ; 37758 (d:7758)
text TX_RAM3, " Energy cards"
line "are required to Retreat."
done