Skip to content
Permalink
Browse files

Fixed problem with keyboard and sidebar conflict

  • Loading branch information...
masterfeizz committed May 8, 2016
1 parent 48cdca2 commit 0534481eea626a7e8ddbf5a94878d55ad11e0d96
Showing with 5 additions and 5 deletions.
  1. +1 −1 Makefile
  2. BIN ctrQuake.cia
  3. BIN keyboardOverlay.bin
  4. +3 −3 source/touch_ctr.c
  5. +1 −1 touchOverlay.bin
@@ -45,7 +45,7 @@ CFLAGS := -g -Wall -O2 -mword-relocations \
-fomit-frame-pointer -ffunction-sections -ffast-math \
$(ARCH)

CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DGAME_HARD_LINKED -DREF_HARD_LINKED
CFLAGS += $(INCLUDE) -DARM11 -D_3DS -DGAME_HARD_LINKED -DREF_HARD_LINKED -D_3DS_CIA

CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11

BIN +0 Bytes (100%) ctrQuake.cia
Binary file not shown.
BIN +68.9 KB (180%) keyboardOverlay.bin
Binary file not shown.
@@ -135,15 +135,15 @@ void Touch_KeyboardToggle()

void Touch_ProcessTap()
{
if(touch.px > 268 && touch.py > 14 && touch.py < 226 )
Touch_TopBarTap();
if(touch.px > 268 && touch.py > 14 && touch.py < 226 && !keyboardToggled)
Touch_SideBarTap();
else if (touch.py > 62 && touch.py < 188 && touch.px > 12 && touch.px < 308 && keyboardToggled)
Touch_KeyboardTap();
else if (touch.py > 214 && touch.px > 142 && touch.px < 178)
Touch_KeyboardToggle();
}

void Touch_TopBarTap()
void Touch_SideBarTap()
{
uint16_t y = (touch.py - 14)/42;
lastKey = K_AUX9 + y;

Large diffs are not rendered by default.

0 comments on commit 0534481

Please sign in to comment.
You can’t perform that action at this time.