Merge branch 'develop'

# Conflicts:
#	version

Makefile

@@ -71,4 +71,4 @@ version.h: version
 	tr -d '\r\n ' < $< | xxd -u -p -c 1 | sed 's/\s+/_/g' | sed 's/^/  0x/g; s/$$/,/g' | sed -z 's/^/unsigned char version[] = {\n/g; s/$$/};\n/g' > $@
 
 $(BIN):	obj version.h obj/main.o obj/bank_00.o obj/bank_01.o obj/bank_02.o obj/bank_03.o obj/bank_04.o obj/bank_05.o obj/bank_06.o obj/bank_07.o obj/bank_08.o obj/bank_09.o obj/bank_10.o obj/bank_11.o obj/bank_12.o obj/bank_13.o obj/bank_14.o obj/bank_15.o obj/bank_16.o obj/pxlr.sav
-	$(CC) -Wl-yt0xFC -Wl-yo4 -Wl-ya16 -o obj/$@ obj/main.o obj/bank_00.o obj/bank_01.o obj/bank_02.o obj/bank_03.o obj/bank_04.o obj/bank_05.o obj/bank_06.o obj/bank_07.o obj/bank_08.o obj/bank_09.o obj/bank_10.o obj/bank_11.o obj/bank_12.o obj/bank_13.o obj/bank_14.o obj/bank_15.o obj/bank_16.o
+	$(CC) -Wl-yt0xFC -Wl-yo4 -Wl-ya16 -Wm-yn"PXLR CAMERA" -o obj/$@ obj/main.o obj/bank_00.o obj/bank_01.o obj/bank_02.o obj/bank_03.o obj/bank_04.o obj/bank_05.o obj/bank_06.o obj/bank_07.o obj/bank_08.o obj/bank_09.o obj/bank_10.o obj/bank_11.o obj/bank_12.o obj/bank_13.o obj/bank_14.o obj/bank_15.o obj/bank_16.o

src/menu.h

@@ -111,6 +111,9 @@ inline void renderMenu() {
 
   set_bkg_based_tiles(0, 16, 9, 2, menuItems[menuPos]->description, OFFSET_FONT - 32);
 
+  set_bkg_based_tiles(12, 16, 6, 2, "   /30Images", OFFSET_FONT - 32);
+  writeNumber(12, 16, nextImageIndex);
+
   unsigned char spriteX = (menuItems[menuPos]->x * 8) + 38;
   move_sprite(SPRITE_MENU_INDICATOR, spriteX, 20);
 }

src/utils.h

@@ -90,30 +90,25 @@ inline void pause(unsigned char frames) {
 }
 
 unsigned char digits_map[10];
+void writeNumber(unsigned char x, unsigned char y, unsigned char number) {
+  BCD bcd = MAKE_BCD(0);
+  uint2bcd(number, &bcd);
+  bcd2text(&bcd, OFFSET_FONT + 16, digits_map);
 
-//void showDigit(unsigned char digit, unsigned char numChars, unsigned char xposition, unsigned char ypositoion) {
-//  BCD bcd = MAKE_BCD(0);
-//  uint2bcd(digit, &bcd);
-//  bcd2text(&bcd, OFFSET_FONT, digits_map);
-//
-//  if (numChars == 3) {
-//    unsigned char threeDigits[] = {
-//      digits_map[5],
-//      digits_map[6],
-//      digits_map[7],
-//    };
-//
-//    set_bkg_tiles(xposition, ypositoion, 3, 1, threeDigits);
-//  } else if (numChars == 2) {
-//    unsigned char twoDigits[] = {
-//      digits_map[6],
-//      digits_map[7],
-//    };
-//
-//    set_bkg_tiles(xposition, ypositoion, 2, 1, twoDigits);
-//  }
-//
-//}
+  unsigned char digits[3] = { ' ', ' ' , ' ', };
+
+  digits[2] = digits_map[7];
+
+  if (number > 9) {
+    digits[1] = digits_map[6];
+  }
+
+  if (number > 99) {
+    digits[0] = digits_map[5];
+  }
+
+  set_bkg_tiles(x, y, 3, 1, digits);
+}
 
 void waitPush(unsigned char what) {
   // Wait until A has been pressed

version

@@ -1 +1 @@
-v0.0.3
+v0.0.4