Merge remote-tracking branch 'iimarckus/master' into crystal-makefile

Conflicts: Makefile main.asm
2025-09-17 02:40:50 +12:00 · 2013-12-07 23:20:43 -05:00 · 2013-12-07 23:20:43 -05:00 · 168d03b957
parent 766429f7d6 2ed422c696
commit 168d03b957
3 changed files with 4841 additions and 2265 deletions
--- a/gfx/ED_tile.1bpp
+++ b/gfx/ED_tile.1bpp
@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/gfx/emotion_bubbles.2bpp
+++ b/gfx/emotion_bubbles.2bpp
--- a/main.asm
+++ b/main.asm