diff --git a/desmume/src/addons/slot2_rumblepak.cpp b/desmume/src/addons/slot2_rumblepak.cpp
index 798e800a7..6f8ec6195 100644
--- a/desmume/src/addons/slot2_rumblepak.cpp
+++ b/desmume/src/addons/slot2_rumblepak.cpp
@@ -18,7 +18,7 @@
 
 #include "../slot2.h"
 
-void (*FeedbackON)(BOOL enable) = NULL;
+void (*FeedbackON)(bool enable) = NULL;
 
 class Slot2_RumblePak : public ISlot2Interface
 {
diff --git a/desmume/src/slot2.cpp b/desmume/src/slot2.cpp
index 6f0c16ea3..658900fb1 100644
--- a/desmume/src/slot2.cpp
+++ b/desmume/src/slot2.cpp
@@ -247,6 +247,7 @@ NDS_SLOT2_TYPE slot2_DetermineTypeByGameCode(const char *theGameCode)
 		{"CB6", NDS_SLOT2_PADDLE},			// Space Bust-A-Move
 		{"YXX", NDS_SLOT2_PADDLE},			// Space Invaders Extreme
 		{"CV8", NDS_SLOT2_PADDLE},			// Space Invaders Extreme 2
+		{"AP2", NDS_SLOT2_RUMBLEPAK},		// Metroid Prime Hunters Pinball
 	};
 	
 	for(size_t i = 0; i < ARRAY_SIZE(gameCodeDeviceTypes); i++)
diff --git a/desmume/src/slot2.h b/desmume/src/slot2.h
index 20425a166..6e4ef9977 100644
--- a/desmume/src/slot2.h
+++ b/desmume/src/slot2.h
@@ -135,7 +135,7 @@ bool slot2_read(u32 addr, T &val);
 
 // =================================================================================
 extern char GBAgameName[MAX_PATH];					// file name for GBA game (rom)
-extern void (*FeedbackON)(BOOL enable);				// feedback on/off
+extern void (*FeedbackON)(bool enable);				// feedback on/off
 
 enum ADDON_CFLASH_MODE
 {
diff --git a/desmume/src/windows/inputdx.cpp b/desmume/src/windows/inputdx.cpp
index f999a66e1..be636d5b8 100644
--- a/desmume/src/windows/inputdx.cpp
+++ b/desmume/src/windows/inputdx.cpp
@@ -2627,7 +2627,7 @@ void S9xWinScanJoypads ()
 
 #include "directx/xinput.h"
 
-void input_feedback(BOOL enable)
+void input_feedback(bool enable)
 {
 	
 	for(int C=0;C<16;C++)