diff --git a/data/slot_machine.s b/data/slot_machine.s index b09ee25c0..a3db540fa 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -1349,7 +1349,7 @@ gUnknown_085A8544:: @ 85A8544 null_obj_pal gUnknown_085A858C:: @ 85A858C - .incbin "graphics/slot_machine/reel_pikachu_and_machine.4bpp.lz" + .incbin "graphics/slot_machine/reel_time_gfx.4bpp.lz" gUnknown_085A96E0:: @ 85A96E0 @if anyone knows what this tilemap is please do share diff --git a/graphics/slot_machine/reel_pikachu_and_machine.png b/graphics/slot_machine/reel_pikachu_and_machine.png deleted file mode 100755 index ddbd332ee..000000000 Binary files a/graphics/slot_machine/reel_pikachu_and_machine.png and /dev/null differ diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png new file mode 100755 index 000000000..59279ccef Binary files /dev/null and b/graphics/slot_machine/reel_time_machine.png differ diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png new file mode 100755 index 000000000..29b004c84 Binary files /dev/null and b/graphics/slot_machine/reel_time_pikachu.png differ diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 250916022..f6724f685 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -16,6 +16,7 @@ rayquazadir := graphics/rayquaza_scene roulettegfxdir := graphics/roulette pknvdir := graphics/pokenav/ pknvoptionsdir := graphics/pokenav/options +slotmachinedir := graphics/slot_machine types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -464,6 +465,10 @@ $(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blank $(bttransgfxdir)/frontier_squares_4.4bpp @cat $^ >$@ +$(slotmachinedir)/reel_time_gfx.4bpp: $(slotmachinedir)/reel_time_pikachu.4bpp \ + $(slotmachinedir)/reel_time_machine.4bpp + @cat $^ >$@ + $(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ $(pknvoptionsdir)/condition.4bpp \ $(pknvoptionsdir)/match_call.4bpp \