summaryrefslogtreecommitdiff
path: root/data/text
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-19 15:25:51 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-19 15:25:51 -0400
commit7b63a9c032a130a08fc554b9b6790fe47d170530 (patch)
treec5a5169c8c3946154cf846f0c61d87516bb0c87d /data/text
parente953302d3f81f080fd5d8423000496ce2fad36d3 (diff)
Finish disassembling effect commands.
Diffstat (limited to 'data/text')
-rwxr-xr-xdata/text/battle.asm6
-rw-r--r--data/text/common_2.asm26
2 files changed, 16 insertions, 16 deletions
diff --git a/data/text/battle.asm b/data/text/battle.asm
index a222cac5..cccc9421 100755
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -442,7 +442,7 @@ UsedBindText:
cont "<TARGET>!"
prompt
-WhirlpoolTrapText:
+WasTrappedText:
text "<TARGET>"
line "was trapped!"
prompt
@@ -806,7 +806,7 @@ SubFadedText:
line "SUBSTITUTE faded!"
prompt
-LearnedMoveText:
+MimicLearnedMoveText:
text "<USER>"
line "learned"
cont "@"
@@ -1072,7 +1072,7 @@ BeatUpAttackText:
line "attack!"
done
-CanReceiveGiftText:
+CantReceiveGiftText:
text "<TARGET> can't"
line "receive the gift!"
prompt
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 355c88bb..d82fdccd 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -372,65 +372,65 @@ _EndUsedMove5Text::
text "!"
done
-UnknownText_0x1c0cc6::
+Text_BattleEffectActivate::
text "<USER>'s"
line "@"
text_ram wStringBuffer2
db "@@"
-UnknownText_0x1c0cd0::
+_BattleStatWentWayUpText::
text_pause
text "<SCROLL>went way up!"
prompt
-UnknownText_0x1c0ce0::
+_BattleStatWentUpText::
text " went up!"
prompt
-UnknownText_0x1c0ceb::
+Text_BattleFoeEffectActivate::
text "<TARGET>'s"
line "@"
text_ram wStringBuffer2
db "@@"
-UnknownText_0x1c0cf5::
+_BattleStatSharplyFellText::
text_pause
text "<SCROLL>sharply fell!"
prompt
-UnknownText_0x1c0d06::
+_BattleStatFellText::
text " fell!"
prompt
-UnknownText_0x1c0d0e::
+Text_BattleUser::
text "<USER>@@"
-UnknownText_0x1c0d12::
+_BattleMadeWhirlwindText::
text_start
line "made a whirlwind!"
prompt
-UnknownText_0x1c0d26::
+_BattleTookSunlightText::
text_start
line "took in sunlight!"
prompt
-UnknownText_0x1c0d3a::
+_BattleLoweredHeadText::
text_start
line "lowered its head!"
prompt
-UnknownText_0x1c0d4e::
+_BattleGlowingText::
text_start
line "is glowing!"
prompt
-UnknownText_0x1c0d5c::
+_BattleFlewText::
text_start
line "flew up high!"
prompt
-UnknownText_0x1c0d6c::
+_BattleDugText::
text_start
line "dug a hole!"
prompt