Misc minor changes.

This commit is contained in:
Carl.Kenner 2009-04-26 20:47:31 +00:00
parent ad6ce0bcb7
commit 8451552bd7
4 changed files with 8 additions and 10 deletions

View File

@ -64,7 +64,6 @@ u32 LegoStarWars1Input(unsigned short pad) {
J |= VBA_BUTTON_START; J |= VBA_BUTTON_START;
if (wp->exp.type == WPAD_EXP_NONE) { if (wp->exp.type == WPAD_EXP_NONE) {
// CAKTODO
J |= DecodeWiimote(pad); J |= DecodeWiimote(pad);
} else if (wp->exp.type == WPAD_EXP_NUNCHUK) { } else if (wp->exp.type == WPAD_EXP_NUNCHUK) {
// build, use force // build, use force
@ -250,7 +249,7 @@ u32 TMNTInput(unsigned short pad) {
if (Select) J |= VBA_BUTTON_SELECT; if (Select) J |= VBA_BUTTON_SELECT;
if (Roll) { if (Roll) {
if (!wait) { if (!wait) {
J |= LastDir; // Double tap D-Pad to roll CAKTODO J |= LastDir; // Double tap D-Pad to roll
wait = true; wait = true;
} else wait = false; } else wait = false;
} }

View File

@ -979,13 +979,13 @@ void MKAMakeSindel() {
} }
gbaWriteHalfWord(0x200005c, 0x78D4); gbaWriteHalfWord(0x200005c, 0x78D4);
} }
void MKAMakeKabal() { // CAKTODO, currently a Ninja void MKAMakeKabal() {
if (MKAIsStanding()) { if (MKAIsStanding()) {
MKASetYPos(0x36); // y offset MKASetYPos(0x31); // y offset
gbaWriteHalfWord(0x2000040, 0x039b); gbaWriteHalfWord(0x2000040, 0x0591);
gbaWriteHalfWord(0x2000048, 0x0409); gbaWriteHalfWord(0x2000048, 0x050A);
} }
gbaWriteHalfWord(0x200005c, 0x3494); gbaWriteHalfWord(0x200005c, 0x4E2C);
} }
#define CYBORG_RED 0x94 #define CYBORG_RED 0x94

View File

@ -69,7 +69,6 @@
#define KB_RSHIFT 229 #define KB_RSHIFT 229
#define KB_RALT 230 #define KB_RALT 230
#define KB_RWIN 231 #define KB_RWIN 231
// CAKTODO
#define KB_MOUSEL 232 #define KB_MOUSEL 232
#define KB_MOUSER 233 #define KB_MOUSER 233
#define KB_MOUSEM 234 #define KB_MOUSEM 234

View File

@ -257,8 +257,8 @@ bool StartColorizing() {
} }
void StopColorizing() { void StopColorizing() {
for(int i = 0; i < 8; i++) // CAKTODO fix for(int i = 0; i < 12; i++)
gbPalette[i] = systemGbPalette[gbPaletteOption*8+i]; gbPalette[i] = systemGbPalette[gbPaletteOption*12+i];
ColorizeGameboy = false; ColorizeGameboy = false;
} }