Add Rumble support

include/PR/region.h

@@ -73,8 +73,8 @@ extern "C" {
  */
 
 /* Perform alignment on input 's' */
-#define	ALIGN(s, align)	(((u32)(s) + ((align)-1)) & ~((align)-1))
-
+//#define	ALIGN(s, align)	(((u32)(s) + ((align)-1)) & ~((align)-1))
+//commented out due to sm64 conflict
 
 /***************************************
  *

include/config.h

@@ -23,6 +23,9 @@
 /// Fixes bug where it shows a star when you grab a key in bowser battle stages
 #define BUGFIX_STAR_BOWSER_KEY (0 || VERSION_US || VERSION_EU || VERSION_SH)
 
+// Support Rumble Pak
+#define ENABLE_RUMBLE (1 || VERSION_SH)
+
 // Screen Size Defines
 #define SCREEN_WIDTH 320
 #define SCREEN_HEIGHT 240

include/types.h

@@ -6,6 +6,7 @@
 
 #include <ultra64.h>
 #include "macros.h"
+#include "config.h"
 
 
 // Certain functions are marked as having return values, but do not
@@ -30,7 +31,7 @@ struct Controller
   /*0x12*/ u16 buttonPressed;
   /*0x14*/ OSContStatus *statusData;
   /*0x18*/ OSContPad *controllerData;
-#ifdef VERSION_SH
+#if ENABLE_RUMBLE
   /*0x1C*/ int port;
 #endif
 };