Merge branch 'r44'

mtheall · Aug 19, 2015 · 8ccbc94 · 8ccbc94
2 parents f505422 + 0ba3844
commit 8ccbc94
Show file tree

Hide file tree

Showing 17 changed files with 241 additions and 1,092 deletions.
diff --git a/Makefile.3ds b/Makefile.3ds
@@ -44,7 +44,7 @@ ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard
 CFLAGS   := -g -Wall -O3 -mword-relocations \
             -fomit-frame-pointer -ffast-math \
             $(ARCH) \
-            -DSTATUS_STRING="\"ftbrony v1.0\""
+            -DSTATUS_STRING="\"ftbrony v1.1\""
 
 CFLAGS   +=  $(INCLUDE) -DARM11 -D_3DS
 

diff --git a/data/sans.10.kerning.bin b/data/sans.10.kerning.bin
diff --git a/data/sans.10.render.bin b/data/sans.10.render.bin
diff --git a/data/sans.12.kerning.bin b/data/sans.12.kerning.bin
diff --git a/data/sans.12.render.bin b/data/sans.12.render.bin
diff --git a/data/sans.14.kerning.bin b/data/sans.14.kerning.bin
diff --git a/data/sans.14.render.bin b/data/sans.14.render.bin
diff --git a/data/sans.16.kerning.bin b/data/sans.16.kerning.bin
diff --git a/data/sans.16.render.bin b/data/sans.16.render.bin
diff --git a/data/sans.8.kerning.bin b/data/sans.8.kerning.bin
diff --git a/data/sans.8.render.bin b/data/sans.8.render.bin
diff --git a/include/console.h b/include/console.h
@@ -1,7 +1,17 @@
 #pragma once
 
+#define ESC(x) "\x1b[" #x
+#define RESET   ESC(0m)
+#define BLACK   ESC(30m)
+#define RED     ESC(31;1m)
+#define GREEN   ESC(32;1m)
+#define YELLOW  ESC(33;1m)
+#define BLUE    ESC(34;1m)
+#define MAGENTA ESC(35;1m)
+#define CYAN    ESC(36;1m)
+#define WHITE   ESC(37;1m)
+
 void console_init(void);
-void console_exit(void);
 
 __attribute__((format(printf,1,2)))
 void console_set_status(const char *fmt, ...);

diff --git a/include/gfx.h b/include/gfx.h
@@ -1,3 +1,8 @@
 #pragma once
 
-void gfxDrawSprite(gfxScreen_t screen, gfx3dSide_t side, u8* spriteData, u16 width, u16 height, s16 x, s16 y);
+#ifdef _3DS
+#include <3ds.h>
+
+void gfxDrawSprite(gfxScreen_t screen, gfx3dSide_t side, u8* spriteData, u16 width, u16 height, s16 x, s16 y);
+
+#endif