diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
| commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
| tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /data/data2b.s | |
| parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
| parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) | |
fix rom3 conflicts
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/data2b.s b/data/data2b.s index 2565f4c04..e723b4c97 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4497,6 +4497,7 @@ gUnknown_08305D0C:: @ 8305D0C .4byte gUnknown_08305CFC .4byte gUnknown_08305D04 + @ 8305D2C .include "data/graphics/trainers/back_pic_coords.inc" |
