diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-17 19:19:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-17 19:19:47 -0500 |
| commit | 173c5923cbdfc23559103c43dc076322580fb435 (patch) | |
| tree | cd86975921f1e0e781abc26d9175cb70894a264a | |
| parent | 442398261ee13464f4bde73142a2fd551a78dc74 (diff) | |
clean up reel_time_gfx
| -rw-r--r-- | data/slot_machine.s | 2 | ||||
| -rwxr-xr-x | graphics/slot_machine/reel_pikachu_and_machine.png | bin | 3051 -> 0 bytes | |||
| -rwxr-xr-x | graphics/slot_machine/reel_time_machine.png | bin | 0 -> 954 bytes | |||
| -rwxr-xr-x | graphics/slot_machine/reel_time_pikachu.png | bin | 0 -> 2210 bytes | |||
| -rw-r--r-- | graphics_file_rules.mk | 5 |
5 files changed, 6 insertions, 1 deletions
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 Binary files differdeleted file mode 100755 index ddbd332ee..000000000 --- a/graphics/slot_machine/reel_pikachu_and_machine.png +++ /dev/null diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png Binary files differnew file mode 100755 index 000000000..59279ccef --- /dev/null +++ b/graphics/slot_machine/reel_time_machine.png diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png Binary files differnew file mode 100755 index 000000000..29b004c84 --- /dev/null +++ b/graphics/slot_machine/reel_time_pikachu.png 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 \ |
