diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
| commit | 549fe35420c2cd114cafa5997633297fa3ff9290 (patch) | |
| tree | 454f88103f1a3616612afd73bc532adbdf036459 /gfx | |
| parent | Nicknaming screen loads the 'ED' symbol separately. (diff) | |
| parent | incbin killing part 2 (diff) | |
| download | pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.gz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.xz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.zip | |
Merged and fixed incbin conflicts with Danny.
Diffstat (limited to 'gfx')
| -rwxr-xr-x | gfx/ED_tile.1bpp | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | gfx/blue/slotmachine1.2bpp | bin | 432 -> 592 bytes | |||
| -rwxr-xr-x | gfx/emotion_bubbles.2bpp | bin | 200 -> 192 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | gfx/red/slotmachine1.2bpp | bin | 432 -> 592 bytes |
4 files changed, 1 insertions, 0 deletions
diff --git a/gfx/ED_tile.1bpp b/gfx/ED_tile.1bpp new file mode 100755 index 00000000..7bbee183 --- /dev/null +++ b/gfx/ED_tile.1bpp @@ -0,0 +1 @@ +ðÀðÎý
\ No newline at end of file diff --git a/gfx/blue/slotmachine1.2bpp b/gfx/blue/slotmachine1.2bpp Binary files differindex c83ef184..0b79d447 100644..100755 --- a/gfx/blue/slotmachine1.2bpp +++ b/gfx/blue/slotmachine1.2bpp diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp Binary files differindex c8a13e2f..b1900c58 100755 --- a/gfx/emotion_bubbles.2bpp +++ b/gfx/emotion_bubbles.2bpp diff --git a/gfx/red/slotmachine1.2bpp b/gfx/red/slotmachine1.2bpp Binary files differindex 32d4daa5..be40a1df 100644..100755 --- a/gfx/red/slotmachine1.2bpp +++ b/gfx/red/slotmachine1.2bpp |