summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/pokemon.s7
-rw-r--r--data/text/battle_strings.inc2
2 files changed, 3 insertions, 6 deletions
diff --git a/data/pokemon.s b/data/pokemon.s
index cae39c0f2..2229512a4 100644
--- a/data/pokemon.s
+++ b/data/pokemon.s
@@ -126,9 +126,6 @@ gHMMoves:: @ 820831A
.2byte MOVE_DIVE
.2byte 0xFFFF
-@ "Nidoran♂" Japanese name
+gJapaneseNidoranNames:: @ 820832C
.string "ニドラン♂$", 11
-
-@ "Nidoran♀" Japanese name
-gUnknown_08208337:: @ 8208337
- .string "ニドラン♀$", 13
+ .string "ニドラン♀$", 11
diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc
index 35c3d7d6b..d1aca1dee 100644
--- a/data/text/battle_strings.inc
+++ b/data/text/battle_strings.inc
@@ -480,7 +480,7 @@ BattleText_TookAttack2:
.string "{DEFENDING_MON}’s {STRING 22}\ntook the attack!$"
gUnknown_083FFCCA:: @ 83FFCCA
-BattleText_PreventedSwitch:
+BattleText_PreventedSwitch::
.string "{STRING 0}’s {STRING 20}\nprevents switching!\p$"
BattleText_PreventedOther:
.string "{DEFENDING_MON}’s {STRING 22}\nprevented {STRING 16}’s\l{STRING 0} from working!$"