From 8451552bd75e0d3cff726835f1c36c3cf4c3c3a1 Mon Sep 17 00:00:00 2001
From: "Carl.Kenner" <Carl.Kenner@ab33defa-829a-11dd-99d6-6900107db72b>
Date: Sun, 26 Apr 2009 20:47:31 +0000
Subject: [PATCH] Misc minor changes.

---
 source/ngc/gameinput.cpp         |  3 +--
 source/ngc/inputmortalkombat.cpp | 10 +++++-----
 source/ngc/wiiusbsupport.h       |  1 -
 source/vba/gb/gbMono.cpp         |  4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/source/ngc/gameinput.cpp b/source/ngc/gameinput.cpp
index 411bcaa..6f216f1 100644
--- a/source/ngc/gameinput.cpp
+++ b/source/ngc/gameinput.cpp
@@ -64,7 +64,6 @@ u32 LegoStarWars1Input(unsigned short pad) {
 		J |= VBA_BUTTON_START;
 
 	if (wp->exp.type == WPAD_EXP_NONE) {
-		// CAKTODO
 		J |= DecodeWiimote(pad);
 	} else if (wp->exp.type == WPAD_EXP_NUNCHUK) {
 		// build, use force
@@ -250,7 +249,7 @@ u32 TMNTInput(unsigned short pad) {
 	if (Select) J |= VBA_BUTTON_SELECT;
 	if (Roll) {
 		if (!wait) {
-			J |= LastDir; // Double tap D-Pad to roll CAKTODO
+			J |= LastDir; // Double tap D-Pad to roll
 			wait = true;
 		} else wait = false;
 	}
diff --git a/source/ngc/inputmortalkombat.cpp b/source/ngc/inputmortalkombat.cpp
index 9264d8b..8a2ba2f 100644
--- a/source/ngc/inputmortalkombat.cpp
+++ b/source/ngc/inputmortalkombat.cpp
@@ -979,13 +979,13 @@ void MKAMakeSindel() {
 	}
 	gbaWriteHalfWord(0x200005c, 0x78D4);
 }
-void MKAMakeKabal() { // CAKTODO, currently a Ninja
+void MKAMakeKabal() { 
 	if (MKAIsStanding()) {
-	    MKASetYPos(0x36); // y offset
-	    gbaWriteHalfWord(0x2000040, 0x039b);
-	    gbaWriteHalfWord(0x2000048, 0x0409);
+	    MKASetYPos(0x31); // y offset
+	    gbaWriteHalfWord(0x2000040, 0x0591);
+	    gbaWriteHalfWord(0x2000048, 0x050A);
 	}
-	gbaWriteHalfWord(0x200005c, 0x3494);
+	gbaWriteHalfWord(0x200005c, 0x4E2C);
 }
 
 #define CYBORG_RED      0x94
diff --git a/source/ngc/wiiusbsupport.h b/source/ngc/wiiusbsupport.h
index 78e2c53..80f7931 100644
--- a/source/ngc/wiiusbsupport.h
+++ b/source/ngc/wiiusbsupport.h
@@ -69,7 +69,6 @@
 #define KB_RSHIFT 	229
 #define KB_RALT 	230
 #define KB_RWIN 	231
-// CAKTODO
 #define KB_MOUSEL 	232
 #define KB_MOUSER 	233
 #define KB_MOUSEM 	234
diff --git a/source/vba/gb/gbMono.cpp b/source/vba/gb/gbMono.cpp
index 3d05d0f..ee989aa 100644
--- a/source/vba/gb/gbMono.cpp
+++ b/source/vba/gb/gbMono.cpp
@@ -257,8 +257,8 @@ bool StartColorizing() {
 }
 
 void StopColorizing() {
-  for(int i = 0; i < 8; i++) // CAKTODO fix
-    gbPalette[i] = systemGbPalette[gbPaletteOption*8+i];
+  for(int i = 0; i < 12; i++)
+    gbPalette[i] = systemGbPalette[gbPaletteOption*12+i];
   ColorizeGameboy = false;
 }