a couple of fixes, and digitbox wraparound

Author: prayerie

arm9/graphics/effectinput.grit

@@ -1 +1 @@
--gt -gB4 -m -pn16 -ftc
+-gt -gB4 -m -p! -ftc

arm9/source/tobkit/fxkeyboard.cpp

@@ -43,11 +43,9 @@ void FXKeyboard::pleaseDraw(void) {
 // Event calls
 void FXKeyboard::penDown(u8 px, u8 py)
 {
-	s16 tx, rx;
-	tx = ntxm_clamp((px - x)/24, 0, 8 - 1);
-	rx = (px - x) % 24;
-	bool r = rx > 11;
-	u8 bt_ind = (tx * 2) + (r ? 1 : 0);
+	if (px > FXBUTTON_WIDTH * NUM_FXKEYS) return;
+
+	u8 bt_ind = ntxm_clamp(px / FXBUTTON_WIDTH, 0, NUM_FXKEYS-1);
 
 	if (fxkb_state[bt_ind] != FXBUTTON_DISABLED)
 		fxkb_state[bt_ind] |= 0x1; // set pushed
@@ -120,6 +118,7 @@ void FXKeyboard::setCategory(u8 newcat) {
 
 	category = newcat;
 
+	useDarkTitle(false);
 	memset(fxkb_state, FXBUTTON_NORMAL, NUM_FXKEYS);
 	setCaption(category_captions[category]);
 
@@ -150,9 +149,9 @@ u8 FXKeyboard::getCategory(void)
 	return category;
 }
 
-void FXKeyboard::setLastCmd(u8 _last_e_cmd)
+void FXKeyboard::setLastCmd(u8 _last_cmd)
 {
-	last_cmd = _last_e_cmd;
+	last_cmd = _last_cmd;
 }
 
 u8 FXKeyboard::getLastCmd(void)
@@ -177,12 +176,12 @@ void FXKeyboard::drawCaption(void) {
 
 	drawFullBox(1, 3, width, 5, bgcolor);
 	u16 capcol = darken_title ? theme->col_fxkeyboard_cmd_desc_disabled : theme->col_fxkeyboard_cmd_desc;
-	drawSmallString(caption, ((NUM_FXKEYS * FXBUTTON_WIDTH) / 2) - (2 * strlen(caption)), 3, capcol);  // width=(3px char+1px space) / 2 
+	drawSmallString(caption, ((NUM_FXKEYS * FXBUTTON_WIDTH) / 2) - (2 * strlen(caption)) + 4, 3, capcol);  // width=(3px char+1px space) / 2 
 }
 
 void FXKeyboard::drawButtonLabel(u8 key, u8 cat, bool visible)
 {
-	u8 xpos = key * 12 + 3;
+	u8 xpos = key * FXBUTTON_WIDTH + 3;
 	u16 col = theme->col_fxkeyboard_btn_label;
 	u16 smallcol1 = theme->col_fxkeyboard_minilabel_x;
 	u16 smallcol2 = theme->col_fxkeyboard_minilabel_y;
@@ -200,7 +199,7 @@ void FXKeyboard::drawButtonLabel(u8 key, u8 cat, bool visible)
 	char small_caption[3] = {0}; // one wasted byte...noone will notice
 
 	if (cat == FX_CATEGORY_E)
-		snprintf(small_caption, 3, "E%1X", fxkb_vals[key]);
+		snprintf(small_caption, 3, "%1XX", fxkb_vals[key]);
 	else if (cat == FX_CATEGORY_NORMAL)
 		sprintf(small_caption, "X%s", ((labels_cat0 >> key) & 0x1) ? "Y" : "X");
 	else
@@ -226,7 +225,6 @@ void FXKeyboard::eraseButtonLabels(void)
 void FXKeyboard::draw(void) {
 	if (!isExposed()) return;
 
-	int row;
 	u16 lstate, rstate;
 
 	/* 
@@ -244,25 +242,28 @@ void FXKeyboard::draw(void) {
 	  basically this depends on the order of the tiles in
 	  effectinput.png, so dont rearrange them (˘︶˘)
 	*/
+
+	int row,col;
+
 	for (int pair=0;pair<NUM_FXKEYS/2;++pair)
 	{
 		lstate=fxkb_state[pair*2];
 		rstate=fxkb_state[pair*2+1];
 
-		u16 buttontiles[15]={
+		const u16 buttontiles[15]={
 			TILE_BLANK, TILE_LCORNER+lstate, 			 TILE_LEDGE+lstate, 			TILE_LEDGE+lstate, 			VFLIP(TILE_LCORNER+lstate),
 			TILE_BLANK, TILE_MID_EDGE+(3*rstate)+lstate, TILE_MID+(3*rstate)+lstate, 	TILE_MID+(3*rstate)+lstate, VFLIP(TILE_MID_EDGE+(3*rstate)+lstate),
 			TILE_BLANK, TILE_EVEN_END_EDGE+rstate, 		 TILE_EVEN_END_MID+rstate, 		TILE_EVEN_END_MID+rstate, 	VFLIP(TILE_EVEN_END_EDGE+rstate), 		//  btm edge=y flipped top edge
 		};
 
-		int abs_col=pair*3;
+		int tile_pos_x=pair*3;
 
-		for (int j=0;j<3;++j)
+		for (col=0;col<3;++col)
 		{
-			for (row=0;row<5;++row)
+			for (row=0;row<FXKEYBOARD_HEIGHT_TILES;++row)
 			{
-				u8 pos = (row * 28) + abs_col + j;
-				fxkb_map[pos]=buttontiles[row + (j*5)];
+				u8 pos = (row * FXKEYBOARD_WIDTH_TILES) + tile_pos_x + col;
+				fxkb_map[pos]=buttontiles[row + (col*FXKEYBOARD_HEIGHT_TILES)];
 			}
 		}
 	}
@@ -271,24 +272,24 @@ void FXKeyboard::draw(void) {
 	if (NUM_FXKEYS % 2 == 1)
 	{
 		rstate=fxkb_state[NUM_FXKEYS-1];
-
-		u16 oddend[10]={
+		
+		const u16 oddend[10]={
 			TILE_BLANK, TILE_LCORNER+rstate, TILE_LEDGE+rstate, TILE_LEDGE+rstate, VFLIP(TILE_LCORNER+rstate), 
 			TILE_BLANK, TILE_ODD_END_EDGE+rstate, TILE_ODD_END_MID+rstate, TILE_ODD_END_MID+rstate, VFLIP(TILE_ODD_END_EDGE+rstate)
 		};
 
-		for (int j=0;j<2;++j)
+		for (col=0;col<2;++col)
 		{
-			for (row=0;row<5;++row)
+			for (row=0;row<FXKEYBOARD_HEIGHT_TILES;++row)
 			{
-				u8 pos = (row * 28) + ((NUM_FXKEYS/2)*3) + j;
-				fxkb_map[pos]=oddend[row + (j*5)];
+				u8 pos = (row * FXKEYBOARD_WIDTH_TILES) + ((NUM_FXKEYS/2)*3) + col;
+				fxkb_map[pos]=oddend[row + (col*FXKEYBOARD_HEIGHT_TILES)];
 			}
 		}
 	}
 
-	for(int py=0; py<5; ++py)
-		memcpy(map_base + (32*(py+y/8)+(x/8)), fxkb_map + (28 * py), 28 * 2);
+	for(int py=0; py<FXKEYBOARD_HEIGHT_TILES; ++py)
+		memcpy(map_base + (32*(py+y/8)+(x/8)), fxkb_map + (FXKEYBOARD_WIDTH_TILES * py), FXKEYBOARD_WIDTH_TILES * 2);
 
 	drawButtonLabels();
 	drawCaption();

arm9/source/tobkit/fxkeyboard.h

@@ -19,12 +19,17 @@ limitations under the License.
 
 #include "tobkit/label.h"
 
-#define FXBUTTON_WIDTH		13
+#define FXBUTTON_WIDTH		12
 #define FXBUTTON_HEIGHT		27
 
 #define FXKEYBOARD_WIDTH		176
 #define FXKEYBOARD_HEIGHT		40
 
+// the fx keyboard isn't quite as wide as the piano, but we want to draw blank tiles
+// over where the piano was anyway
+#define FXKEYBOARD_WIDTH_TILES	28
+#define FXKEYBOARD_HEIGHT_TILES	5
+
 #define FXKEYBOARD_R_OVERDRAW	48
 #define FXKEYBOARD_LMARGIN		2
 #define FXKEYBOARD_YMARGIN		12
@@ -37,15 +42,18 @@ limitations under the License.
 #define FX_CATEGORY_FT 			2
 #define FX_CATEGORY_VOL 		3
 
+// button state, can be added to tilemap index to get tile in said state
+// eg TILE_LCORNER + FXBUTTON_DISABLED = TILE_LCORNER (disabled)
 #define FXBUTTON_NORMAL			0
 #define FXBUTTON_DOWN			1
 #define FXBUTTON_DISABLED		2
 
+// Tilemap indices
+#define TILE_BLANK				0x0000
 #define TILE_LCORNER			0x0001
 #define TILE_MID_EDGE			0x0004
 #define TILE_EVEN_END_EDGE		0x000d
 #define TILE_ODD_END_EDGE		0x0010
-#define TILE_BLANK				0x0000
 #define TILE_LEDGE				0x0013
 #define TILE_MID				0x0016
 #define TILE_EVEN_END_MID		0x001f
@@ -81,13 +89,14 @@ namespace tobkit {
 
 		void setLastCmd(u8 _last_cmd);
 		u8 getLastCmd(void);
+
 	private:
 		uint16* char_base, * map_base;
 
 		u8 category;
 		u8 last_cmd;
 
-		u16 fxkb_map[140] __attribute__((aligned(4))) = { 0 };
+		u16 fxkb_map[FXKEYBOARD_WIDTH_TILES*FXKEYBOARD_HEIGHT_TILES] __attribute__((aligned(4))) = { 0 };
 		u16 fxkb_pal[16];
 		u8 fxkb_state[NUM_FXKEYS] = { 0 };
 		u8 fxkb_vals[NUM_FXKEYS] = { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xf };

tobkit/source/digitbox.cpp

@@ -88,16 +88,19 @@ void DigitBox::penDown(u8 px, u8 py) {
 
 	if((px>x)&&(px<x+width/4)&&(py>y)&&(py<y+9)&&digits==2) { // top left arrow 
 		btnstate = 1;
-		if(value<max) value+=0x10;
+		if (value > max-0x10) value = value + 0x10 - max - 1; // wrap around if (value + 0x10) > 0xff. so 0xf0 wraps to 0x00
+		// if (0xf2 > 0xff-0x10) value = 0xff - 0xf2 - 0x10 + 1
+		else value+=0x10;
 	} else if((px>x)&&(px<x+width/4)&&(py>y+9)&&(py<y+18)&&digits==2) { // bottom left arrow
 		btnstate = 2;
-		if(value>min) value-=0x10;
+		if (value < 0x10) value = max - 0x10 + value + 1; // likewise wrap around downwards
+		else value-=0x10;
 	} else if((px>x)&&(px>x+(width/4)*3)&&(py>y)&&(py<y+9)) { // top right arrow
 		btnstate = 3;
-		if(value<max) value++;
+		if(value<max) value++; else value = min;
 	} else if((px>x)&&(px>x+(width/4)*3)&&(py>y+9)&&(py<y+18)) { // bottom right arrow
 		btnstate = 4;
-		if(value>min) value--;
+		if(value>min) value--; else value = max;
 	}
 
 	if(value!=oldvalue) {