diff options
| author | YamaArashi <shadow962@live.com> | 2017-05-07 22:57:17 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-05-07 22:57:17 -0700 |
| commit | 71f9479b00adf175cc43e704c27a9d50749f5d67 (patch) | |
| tree | bf8b0ad318182ac48f04e9ed77d22802cf00bd69 /data | |
| parent | 9c75355d718ab63bbe53fbdf3ab0eb414982a77e (diff) | |
finish decompiling pokemon_3
Diffstat (limited to 'data')
| -rw-r--r-- | data/pokemon.s | 7 | ||||
| -rw-r--r-- | data/text/battle_strings.inc | 2 |
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!$" |