diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /data/text | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix conflicts
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/move_descriptions.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc index 454e49ae1..0f6b1adbf 100644 --- a/data/text/move_descriptions.inc +++ b/data/text/move_descriptions.inc @@ -1,3 +1,6 @@ +gNullMoveDescription:: @ 86181C0 + .string "$" + gPoundMoveDescription:: @ 86181C1 .string "Pounds the foe with\nforelegs or tail.$" |