Merged and fixed incbin conflicts with Danny.

2026-02-06 15:45:24 +13:00 · 2013-12-15 16:18:14 -06:00 · 2013-12-15 16:18:14 -06:00 · 549fe35420
commit 549fe35420
parent ac9e622144 323a1a638f
40 changed files with 14451 additions and 8362 deletions
--- a/gfx/ED_tile.1bpp
+++ b/gfx/ED_tile.1bpp
@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--- a/gfx/blue/slotmachine1.2bpp
+++ b/gfx/blue/slotmachine1.2bpp
--- a/gfx/emotion_bubbles.2bpp
+++ b/gfx/emotion_bubbles.2bpp
--- a/gfx/red/slotmachine1.2bpp
+++ b/gfx/red/slotmachine1.2bpp