diff --git a/source/ngc/gameinput.cpp b/source/ngc/gameinput.cpp
index a67f766..5ec12df 100644
--- a/source/ngc/gameinput.cpp
+++ b/source/ngc/gameinput.cpp
@@ -30,9 +30,9 @@
 #include "gba/bios.h"
 #include "gba/GBAinline.h"
 
-char DebugStr[50] = "";
+/*char DebugStr[50] = "";
 
-/*void DebugPrintf(const char *format, ...) {
+void DebugPrintf(const char *format, ...) {
 	va_list args;
     va_start( args, format );
     vsprintf( DebugStr, format, args );
diff --git a/source/vba/gb/gbMemory.cpp b/source/vba/gb/gbMemory.cpp
index 3c508e6..aed86d5 100644
--- a/source/vba/gb/gbMemory.cpp
+++ b/source/vba/gb/gbMemory.cpp
@@ -582,7 +582,11 @@ void mapperMBC5ROM(u16 address, u8 value)
     }
     break;
   case 0x4000: // RAM bank select, plus rumble
-    if(gbDataMBC5.isRumbleCartridge) {
+    // Some games support rumble, such as Disney Tarzan, but aren't on a
+	// rumble cartridge. As long as the RAM is less than or equal to 256Kbit
+	// we know that the last address line is not used for real RAM addresses,
+	// so it must be a rumble signal instead.
+    if(gbDataMBC5.isRumbleCartridge || gbRamSizeMask <= 0x7FFF) {
 	  systemCartridgeRumble(value & 0x08);
       value &= 0x07;
     } else
diff --git a/vba-wii.pnproj b/vba-wii.pnproj
index 3eea206..cae6ec0 100644
--- a/vba-wii.pnproj
+++ b/vba-wii.pnproj
@@ -1 +1 @@
-<Project name="vba-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ngc" path="ngc\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="gui.h"></File><File path="gui_element.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_trigger.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="bg.h"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="saveicon.h"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="button_mapping.c"></File><File path="button_mapping.h"></File><File path="dvd.cpp"></File><File path="dvd.h"></File><File path="filelist.h"></File><File path="fileop.cpp"></File><File path="fileop.h"></File><File path="filesel.cpp"></File><File path="filesel.h"></File><File path="gameinput.cpp"></File><File path="gameinput.h"></File><File path="gamesettings.cpp"></File><File path="gamesettings.h"></File><File path="gcunzip.cpp"></File><File path="gcunzip.h"></File><File path="http.cpp"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="memcardop.cpp"></File><File path="memcardop.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="menudraw.cpp"></File><File path="menudraw.h"></File><File path="networkop.cpp"></File><File path="networkop.h"></File><File path="preferences.cpp"></File><File path="preferences.h"></File><File path="tbtime.c"></File><File path="tbtime.h"></File><File path="vba.cpp"></File><File path="vba.h"></File><File path="vbaconfig.cpp"></File><File path="vbaconfig.h"></File><File path="vbasupport.cpp"></File><File path="vbasupport.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="vmmem.cpp"></File><File path="vmmem.h"></File><File path="wiiusbsupport.cpp"></File><File path="wiiusbsupport.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sz" path="sz\"><File path="7zAlloc.c"></File><File path="7zAlloc.h"></File><File path="7zBuffer.c"></File><File path="7zBuffer.h"></File><File path="7zCrc.c"></File><File path="7zCrc.h"></File><File path="7zDecode.c"></File><File path="7zDecode.h"></File><File path="7zExtract.c"></File><File path="7zExtract.h"></File><File path="7zHeader.c"></File><File path="7zHeader.h"></File><File path="7zIn.c"></File><File path="7zIn.h"></File><File path="7zItem.c"></File><File path="7zItem.h"></File><File path="7zMethodID.c"></File><File path="7zMethodID.h"></File><File path="7zTypes.h"></File><File path="LzmaDecode.c"></File><File path="LzmaDecode.h"></File><File path="LzmaTypes.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="unzip" path="unzip\"><File path="crypt.h"></File><File path="ioapi.c"></File><File path="ioapi.h"></File><File path="miniunz.cpp"></File><File path="miniunz.h"></File><File path="unzip.c"></File><File path="unzip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="vba" path="vba\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="apu" path="apu\"><File path="blargg_common.h"></File><File path="blargg_config.h"></File><File path="blargg_source.h"></File><File path="Blip_Buffer.cpp"></File><File path="Blip_Buffer.h"></File><File path="Effects_Buffer.cpp"></File><File path="Effects_Buffer.h"></File><File path="Gb_Apu.cpp"></File><File path="Gb_Apu.h"></File><File path="Gb_Apu_State.cpp"></File><File path="Gb_Oscs.cpp"></File><File path="Gb_Oscs.h"></File><File path="Multi_Buffer.cpp"></File><File path="Multi_Buffer.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="common" path="common\"><File path="memfile.cpp"></File><File path="memfile.h"></File><File path="memgzio.c"></File><File path="memgzio.h"></File><File path="Patch.cpp"></File><File path="Patch.h"></File><File path="Port.h"></File><File path="SoundDriver.h"></File><File path="Types.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gb" path="gb\"><File path="GB.cpp"></File><File path="gb.h"></File><File path="gbCheats.cpp"></File><File path="gbCheats.h"></File><File path="gbCodes.h"></File><File path="gbCodesCB.h"></File><File path="gbDis.cpp"></File><File path="gbGfx.cpp"></File><File path="gbGlobals.cpp"></File><File path="gbGlobals.h"></File><File path="gbMemory.cpp"></File><File path="gbMemory.h"></File><File path="gbPrinter.cpp"></File><File path="gbPrinter.h"></File><File path="gbSGB.cpp"></File><File path="gbSGB.h"></File><File path="gbSound.cpp"></File><File path="gbSound.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gba" path="gba\"><File path="agbprint.cpp"></File><File path="agbprint.h"></File><File path="armdis.cpp"></File><File path="armdis.h"></File><File path="bios.cpp"></File><File path="bios.h"></File><File path="Cheats.cpp"></File><File path="Cheats.h"></File><File path="CheatSearch.cpp"></File><File path="CheatSearch.h"></File><File path="EEprom.cpp"></File><File path="EEprom.h"></File><File path="elf.cpp"></File><File path="elf.h"></File><File path="Flash.cpp"></File><File path="Flash.h"></File><File path="GBA-arm.cpp"></File><File path="GBA-thumb.cpp"></File><File path="GBA.cpp"></File><File path="GBA.h"></File><File path="GBAcpu.h"></File><File path="GBAGfx.cpp"></File><File path="GBAGfx.h"></File><File path="GBAinline.h"></File><File path="Globals.cpp"></File><File path="Globals.h"></File><File path="Mode0.cpp"></File><File path="Mode1.cpp"></File><File path="Mode2.cpp"></File><File path="Mode3.cpp"></File><File path="Mode4.cpp"></File><File path="Mode5.cpp"></File><File path="RTC.cpp"></File><File path="RTC.h"></File><File path="Sound.cpp"></File><File path="Sound.h"></File><File path="Sram.cpp"></File><File path="Sram.h"></File></MagicFolder><File path="NLS.h"></File><File path="System.h"></File><File path="Util.cpp"></File><File path="Util.h"></File></MagicFolder></MagicFolder><File path="Makefile"></File><File path="Makefile.wii"></File><File path="Makefile.gc"></File><File path="readme.txt"></File><File path="update.xml"></File></Project>
\ No newline at end of file
+<Project name="vba-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ngc" path="ngc\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fonts" path="fonts\"><File path="font.ttf"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="gui.h"></File><File path="gui_button.cpp"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_keyboard.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_savebrowser.cpp"></File><File path="gui_sound.cpp"></File><File path="gui_text.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="images" path="images\"><File path="battery.png"></File><File path="battery_bar.png"></File><File path="battery_red.png"></File><File path="bg_bottom.png"></File><File path="bg_game_selection.png"></File><File path="bg_game_selection_entry.png"></File><File path="bg_options.png"></File><File path="bg_options_entry.png"></File><File path="bg_top.png"></File><File path="button.png"></File><File path="button_arrow_down.png"></File><File path="button_arrow_down_over.png"></File><File path="button_arrow_left.png"></File><File path="button_arrow_left_over.png"></File><File path="button_arrow_right.png"></File><File path="button_arrow_right_over.png"></File><File path="button_arrow_up.png"></File><File path="button_arrow_up_over.png"></File><File path="button_gamesave.png"></File><File path="button_gamesave_blank.png"></File><File path="button_gamesave_over.png"></File><File path="button_large.png"></File><File path="button_large_over.png"></File><File path="button_over.png"></File><File path="button_small.png"></File><File path="button_small_over.png"></File><File path="credits_box.png"></File><File path="dialogue_box.png"></File><File path="folder.png"></File><File path="icon_game_cheats.png"></File><File path="icon_game_load.png"></File><File path="icon_game_reset.png"></File><File path="icon_game_save.png"></File><File path="icon_home.png"></File><File path="icon_settings.png"></File><File path="icon_settings_classic.png"></File><File path="icon_settings_file.png"></File><File path="icon_settings_gamecube.png"></File><File path="icon_settings_mappings.png"></File><File path="icon_settings_menu.png"></File><File path="icon_settings_network.png"></File><File path="icon_settings_nunchuk.png"></File><File path="icon_settings_video.png"></File><File path="icon_settings_wiimote.png"></File><File path="keyboard_key.png"></File><File path="keyboard_key_over.png"></File><File path="keyboard_largekey.png"></File><File path="keyboard_largekey_over.png"></File><File path="keyboard_mediumkey.png"></File><File path="keyboard_mediumkey_over.png"></File><File path="keyboard_textbox.png"></File><File path="logo.png"></File><File path="logo_over.png"></File><File path="player1_grab.png"></File><File path="player1_point.png"></File><File path="player2_grab.png"></File><File path="player2_point.png"></File><File path="player3_grab.png"></File><File path="player3_point.png"></File><File path="player4_grab.png"></File><File path="player4_point.png"></File><File path="progressbar.png"></File><File path="progressbar_empty.png"></File><File path="progressbar_outline.png"></File><File path="saveicon.h"></File><File path="screen_position.png"></File><File path="scrollbar.png"></File><File path="scrollbar_arrowdown.png"></File><File path="scrollbar_arrowdown_over.png"></File><File path="scrollbar_arrowup.png"></File><File path="scrollbar_arrowup_over.png"></File><File path="scrollbar_box.png"></File><File path="scrollbar_box_over.png"></File><File path="throbber.png"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sounds" path="sounds\"><File path="bg_music.ogg"></File><File path="button_click.pcm"></File><File path="button_over.pcm"></File><File path="enter.ogg"></File><File path="exit.ogg"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="button_mapping.c"></File><File path="button_mapping.h"></File><File path="dvd.cpp"></File><File path="dvd.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="filelist.h"></File><File path="fileop.cpp"></File><File path="fileop.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gameinput.cpp"></File><File path="gameinput.h"></File><File path="gamesettings.cpp"></File><File path="gamesettings.h"></File><File path="gcunzip.cpp"></File><File path="gcunzip.h"></File><File path="http.cpp"></File><File path="http.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="inputmario.cpp"></File><File path="inputmetroid.cpp"></File><File path="inputmortalkombat.cpp"></File><File path="inputzelda.cpp"></File><File path="memcardop.cpp"></File><File path="memcardop.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="networkop.cpp"></File><File path="networkop.h"></File><File path="oggplayer.c"></File><File path="oggplayer.h"></File><File path="preferences.cpp"></File><File path="preferences.h"></File><File path="tbtime.c"></File><File path="tbtime.h"></File><File path="vba.cpp"></File><File path="vba.h"></File><File path="vbaconfig.cpp"></File><File path="vbaconfig.h"></File><File path="vbasupport.cpp"></File><File path="vbasupport.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="vmmem.cpp"></File><File path="vmmem.h"></File><File path="wiiusbsupport.cpp"></File><File path="wiiusbsupport.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="sz" path="sz\"><File path="7zAlloc.c"></File><File path="7zAlloc.h"></File><File path="7zBuffer.c"></File><File path="7zBuffer.h"></File><File path="7zCrc.c"></File><File path="7zCrc.h"></File><File path="7zDecode.c"></File><File path="7zDecode.h"></File><File path="7zExtract.c"></File><File path="7zExtract.h"></File><File path="7zHeader.c"></File><File path="7zHeader.h"></File><File path="7zIn.c"></File><File path="7zIn.h"></File><File path="7zItem.c"></File><File path="7zItem.h"></File><File path="7zMethodID.c"></File><File path="7zMethodID.h"></File><File path="7zTypes.h"></File><File path="LzmaDecode.c"></File><File path="LzmaDecode.h"></File><File path="LzmaTypes.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="unzip" path="unzip\"><File path="crypt.h"></File><File path="ioapi.c"></File><File path="ioapi.h"></File><File path="miniunz.cpp"></File><File path="miniunz.h"></File><File path="unzip.c"></File><File path="unzip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="vba" path="vba\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="apu" path="apu\"><File path="blargg_common.h"></File><File path="blargg_config.h"></File><File path="blargg_source.h"></File><File path="Blip_Buffer.cpp"></File><File path="Blip_Buffer.h"></File><File path="Effects_Buffer.cpp"></File><File path="Effects_Buffer.h"></File><File path="Gb_Apu.cpp"></File><File path="Gb_Apu.h"></File><File path="Gb_Apu_State.cpp"></File><File path="Gb_Oscs.cpp"></File><File path="Gb_Oscs.h"></File><File path="Multi_Buffer.cpp"></File><File path="Multi_Buffer.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="common" path="common\"><File path="memfile.cpp"></File><File path="memfile.h"></File><File path="memgzio.c"></File><File path="memgzio.h"></File><File path="Patch.cpp"></File><File path="Patch.h"></File><File path="Port.h"></File><File path="SoundDriver.h"></File><File path="Types.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gb" path="gb\"><File path="GB.cpp"></File><File path="gb.h"></File><File path="gbCheats.cpp"></File><File path="gbCheats.h"></File><File path="gbCodes.h"></File><File path="gbCodesCB.h"></File><File path="gbDis.cpp"></File><File path="gbGfx.cpp"></File><File path="gbGlobals.cpp"></File><File path="gbGlobals.h"></File><File path="gbMemory.cpp"></File><File path="gbMemory.h"></File><File path="gbPrinter.cpp"></File><File path="gbPrinter.h"></File><File path="gbSGB.cpp"></File><File path="gbSGB.h"></File><File path="gbSound.cpp"></File><File path="gbSound.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gba" path="gba\"><File path="agbprint.cpp"></File><File path="agbprint.h"></File><File path="armdis.cpp"></File><File path="armdis.h"></File><File path="bios.cpp"></File><File path="bios.h"></File><File path="Cheats.cpp"></File><File path="Cheats.h"></File><File path="CheatSearch.cpp"></File><File path="CheatSearch.h"></File><File path="EEprom.cpp"></File><File path="EEprom.h"></File><File path="elf.cpp"></File><File path="elf.h"></File><File path="Flash.cpp"></File><File path="Flash.h"></File><File path="GBA-arm.cpp"></File><File path="GBA-thumb.cpp"></File><File path="GBA.cpp"></File><File path="GBA.h"></File><File path="GBAcpu.h"></File><File path="GBAGfx.cpp"></File><File path="GBAGfx.h"></File><File path="GBAinline.h"></File><File path="Globals.cpp"></File><File path="Globals.h"></File><File path="Mode0.cpp"></File><File path="Mode1.cpp"></File><File path="Mode2.cpp"></File><File path="Mode3.cpp"></File><File path="Mode4.cpp"></File><File path="Mode5.cpp"></File><File path="RTC.cpp"></File><File path="RTC.h"></File><File path="Sound.cpp"></File><File path="Sound.h"></File><File path="Sram.cpp"></File><File path="Sram.h"></File></MagicFolder><File path="NLS.h"></File><File path="System.h"></File><File path="Util.cpp"></File><File path="Util.h"></File></MagicFolder></MagicFolder><File path="Makefile"></File><File path="Makefile.wii"></File><File path="Makefile.gc"></File><File path="readme.txt"></File><File path="update.xml"></File></Project>
\ No newline at end of file