diff options
| author | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
| commit | e7be25948dfeef257697a7aa30706339f6ba014b (patch) | |
| tree | 973d0ad95361a1dfd1c371be59a300be19532e47 /Makefile | |
| parent | 99d16d616d5f70754dd6aa567e478e587a733d8c (diff) | |
| parent | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -14,6 +14,7 @@ engine/movie/credits.o \ engine/overworld/events.o \ gfx/pics.o \ gfx/sprites.o \ +gfx/tilesets.o \ lib/mobile/main.o crystal11_obj := $(crystal_obj:.o=11.o) @@ -166,6 +167,7 @@ gfx/mail/flower_mail_border.1bpp: tools/gfx += --remove-whitespace gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace +gfx/pokedex/question_mark.2bpp: rgbgfx += -h gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace |