diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-24 02:54:45 +0200 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-06-24 02:54:45 +0200 |
| commit | 946623e9b508156e37f4e3249152cf1093a9d8eb (patch) | |
| tree | 86d001aab19fb4275231b055687f8b04d2f6bfad | |
| parent | 838c6068daf5120a36ac18245b00172bf5fa2da8 (diff) | |
Make gfx match
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | data/graphics.s | 2 | ||||
| -rw-r--r-- | override-de.mk | 8 | ||||
| -rw-r--r-- | override.mk | 25 |
4 files changed, 34 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index dc68e835b..6a8602d30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,8 +49,8 @@ matrix: env: _="Build German" before_script: - cp override-de.mk override.mk - - rsync -avh data-de/ data/ - - rsync -avh graphics-de/ graphics/ + - rsync -avhI data-de/ data/ + - rsync -avhI graphics-de/ graphics/ script: - ./build_tools.sh - make -j2 compare_ruby_de diff --git a/data/graphics.s b/data/graphics.s index a8eeae6aa..d24039de6 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4696,7 +4696,7 @@ gTilesetPalettes_Shop:: .align 2 gTilesetTiles_Shop:: - .incbin "data-de/tilesets/secondary/shop/tiles.4bpp.lz" + .incbin "data/tilesets/secondary/shop/tiles.4bpp.lz" .align 2 gUnknown_083FAF1C:: diff --git a/override-de.mk b/override-de.mk index 50553f60a..02861fc6a 100644 --- a/override-de.mk +++ b/override-de.mk @@ -1,4 +1,6 @@ -// misc.mk +# +# misc.mk +# MENUGFXDIR := graphics/interface INTROGFXDIR := graphics/intro MISCGFXDIR := graphics/misc @@ -14,7 +16,9 @@ $(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png $(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png $(GFX) $< $@ -num_tiles 92 -// tilesets.mk +# +# tilesets.mk +# TILESETDIR := data/tilesets $(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png diff --git a/override.mk b/override.mk index e69de29bb..02861fc6a 100644 --- a/override.mk +++ b/override.mk @@ -0,0 +1,25 @@ +# +# misc.mk +# +MENUGFXDIR := graphics/interface +INTROGFXDIR := graphics/intro +MISCGFXDIR := graphics/misc + +$(MENUGFXDIR)/wordgroup_frame.4bpp: $(MENUGFXDIR)/wordgroup_frame.png + $(GFX) $< $@ -num_tiles 76 +$(MENUGFXDIR)/check_berry.4bpp: $(MENUGFXDIR)/check_berry.png + $(GFX) $< $@ -num_tiles 97 + +$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png + $(GFX) $< $@ -num_tiles 47 + +$(MISCGFXDIR)/end_copyright.4bpp: $(MISCGFXDIR)/end_copyright.png + $(GFX) $< $@ -num_tiles 92 + +# +# tilesets.mk +# +TILESETDIR := data/tilesets + +$(TILESETDIR)/secondary/shop/tiles.4bpp: $(TILESETDIR)/secondary/shop/tiles.png + $(GFX) $< $@ -num_tiles 503 |