diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
| commit | 05aba58d5d5783cb3942349b0a1cc7a19a871d8d (patch) | |
| tree | 8d7e4308d231420bdceb40a565af2fe10b4f58f6 /data/data2b.s | |
| parent | bc1a957674e84daf181c508afd2b623304de121d (diff) | |
| parent | d1630d481a0ff611fda2d70a100eed5046982cec (diff) | |
fix battle transition conflicts
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/data/data2b.s b/data/data2b.s index 74e13cc7f..1400b31d3 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -1,5 +1,3 @@ -@ the second big chunk of data - #include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" |