diff options
| author | yenatch <yenatch@gmail.com> | 2013-12-07 23:20:43 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-12-07 23:31:49 -0500 |
| commit | 168d03b957c75df88ee4c5b26e25b60249c82dcc (patch) | |
| tree | 6bf401a930e5df89b47796af8f1c98f97262ecd1 /gfx | |
| parent | bump pokemontools for global label handling (diff) | |
| parent | IshiharaTeam (diff) | |
| download | pokeyellow-168d03b957c75df88ee4c5b26e25b60249c82dcc.tar.gz pokeyellow-168d03b957c75df88ee4c5b26e25b60249c82dcc.tar.xz pokeyellow-168d03b957c75df88ee4c5b26e25b60249c82dcc.zip | |
Merge remote-tracking branch 'iimarckus/master' into crystal-makefile
Conflicts:
Makefile
main.asm
Diffstat (limited to 'gfx')
| -rwxr-xr-x | gfx/ED_tile.1bpp | 1 | ||||
| -rwxr-xr-x | gfx/emotion_bubbles.2bpp | bin | 200 -> 192 bytes |
2 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/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp Binary files differindex c8a13e2f..b1900c58 100755 --- a/gfx/emotion_bubbles.2bpp +++ b/gfx/emotion_bubbles.2bpp |