Merge remote-tracking branch 'Bird/dump_slot_machine.s'

This commit is contained in:
Diegoisawesome
2018-01-18 14:19:13 -06:00
12 changed files with 1254 additions and 94 deletions

View File

@@ -14,6 +14,7 @@ BATTRANSGFXDIR := graphics/battle_transitions
TYPESGFXDIR := graphics/types
RAYQUAZAGFXDIR := graphics/rayquaza_scene
ROULETTEGFXDIR := graphics/roulette
SLOTMACHINEGFXDIR := graphics/slot_machine
PKNAVGFXDIR := graphics/pokenav/
PKNAVOPTIONSGFXDIR := graphics/pokenav/options
PSSGFXDIR := graphics/pokemon_storage
@@ -465,6 +466,10 @@ $(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_bla
$(BATTRANSGFXDIR)/frontier_squares_4.4bpp
@cat $^ >$@
$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \
$(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
@cat $^ >$@
$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \