diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-04 23:56:40 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-04 23:56:40 -0400 |
| commit | 81306889e33c599f8015bc4e653929bb7de00967 (patch) | |
| tree | 7a812968ba565a13ef400cdcb5230e6e8185a1ec /Makefile | |
| parent | 145efc13535fbc9d8ab2786d29209d97aebf0481 (diff) | |
| parent | f750d4f4185529cfb440ac7825d202ebcf160766 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -21,8 +21,8 @@ data/maps/map_data.o \ data/pokemon/dex_entries.o \ data/pokemon/egg_moves.o \ data/pokemon/evos_attacks.o \ -engine/credits.o \ -engine/events.o \ +engine/movie/credits.o \ +engine/overworld/events.o \ gfx/pics.o \ gfx/sprites.o \ lib/mobile/main.o |