diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-08 20:25:40 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-08 20:25:40 -0700 |
| commit | 06bed8be90c865057378482f2b179749b082619c (patch) | |
| tree | 6f9b516a00841e7225290a0d71e9e5d97dd58777 /data | |
| parent | 9ba7169baaee0645f406d95b426f1b2bf750c72e (diff) | |
starting decompliation of pokemon functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 3 | ||||
| -rw-r--r-- | data/text/battle_strings.s | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/data/data2.s b/data/data2.s index 3783dab93..0428e7ede 100644 --- a/data/data2.s +++ b/data/data2.s @@ -32324,8 +32324,7 @@ OtherText_Cancel:: OtherText_Lv:: .string "LV$" -gUnknown_0842CC34:: @ 842CC34 -OtherText_Egg:: +gEggNickname:: @ 842CC34 .string "EGG$" gUnknown_0842CC38:: @ 842CC38 diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index e9195e261..b4542b1b9 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1156,8 +1156,7 @@ gUnknown_08400E36:: @ 8400E36 BattleText_Format9: .string "are$" -gUnknown_08400E3A:: @ 8400E3A -BattleText_BadEGG: +gBadEggNickname:: @ 8400E3A .string "Bad EGG$" gUnknown_08400E42:: @ 8400E42 |