@@ -110,8 +110,7 @@
 	void (*getGameTitle)(const struct mCore*, char* title);
 	void (*getGameCode)(const struct mCore*, char* title);
 
-	void (*setRotation)(struct mCore*, struct mRotationSource*);
-	void (*setRumble)(struct mCore*, struct mRumble*);
+	void (*setPeripheral)(struct mCore*, int type, void*);
 
 	uint32_t (*busRead8)(struct mCore*, uint32_t address);
 	uint32_t (*busRead16)(struct mCore*, uint32_t address);

@@ -54,6 +54,12 @@ struct mKeyCallback {
 	uint16_t (*readKeys)(struct mKeyCallback*);
 };
 
+enum mPeripheral {
+	mPERIPH_ROTATION = 1,
+	mPERIPH_RUMBLE,
+	mPERIPH_CUSTOM = 0x1000
+};
+
 struct mRotationSource {
 	void (*sample)(struct mRotationSource*);
 

@@ -408,14 +408,18 @@ static void _GBCoreGetGameCode(const struct mCore* core, char* title) {
 	GBGetGameCode(core->board, title);
 }
 
-static void _GBCoreSetRotation(struct mCore* core, struct mRotationSource* rotation) {
+static void _GBCoreSetPeripheral(struct mCore* core, int type, void* periph) {
 	struct GB* gb = core->board;
-	gb->memory.rotation = rotation;
-}
-
-static void _GBCoreSetRumble(struct mCore* core, struct mRumble* rumble) {
-	struct GB* gb = core->board;
-	gb->memory.rumble = rumble;
+	switch (type) {
+	case mPERIPH_ROTATION:
+		gb->memory.rotation = periph;
+		break;
+	case mPERIPH_RUMBLE:
+		gb->memory.rumble = periph;
+		break;
+	default:
+		return;
+	}
 }
 
 static uint32_t _GBCoreBusRead8(struct mCore* core, uint32_t address) {
@@ -620,8 +624,7 @@ core->frameCycles = _GBCoreFrameCycles;
 	core->frequency = _GBCoreFrequency;
 	core->getGameTitle = _GBCoreGetGameTitle;
 	core->getGameCode = _GBCoreGetGameCode;
-	core->setRotation = _GBCoreSetRotation;
-	core->setRumble = _GBCoreSetRumble;
+	core->setPeripheral = _GBCoreSetPeripheral;
 	core->busRead8 = _GBCoreBusRead8;
 	core->busRead16 = _GBCoreBusRead16;
 	core->busRead32 = _GBCoreBusRead32;

@@ -405,14 +405,18 @@ static void _GBACoreGetGameCode(const struct mCore* core, char* title) {
 	GBAGetGameCode(core->board, title);
 }
 
-static void _GBACoreSetRotation(struct mCore* core, struct mRotationSource* rotation) {
+static void _GBACoreSetPeripheral(struct mCore* core, int type, void* periph) {
 	struct GBA* gba = core->board;
-	gba->rotationSource = rotation;
-}
-
-static void _GBACoreSetRumble(struct mCore* core, struct mRumble* rumble) {
-	struct GBA* gba = core->board;
-	gba->rumble = rumble;
+	switch (type) {
+	case mPERIPH_ROTATION:
+		gba->rotationSource = periph;
+		break;
+	case mPERIPH_RUMBLE:
+		gba->rumble = periph;
+		break;
+	default:
+		return;
+	}
 }
 
 static uint32_t _GBACoreBusRead8(struct mCore* core, uint32_t address) {
@@ -619,8 +623,7 @@ core->frameCycles = _GBACoreFrameCycles;
 	core->frequency = _GBACoreFrequency;
 	core->getGameTitle = _GBACoreGetGameTitle;
 	core->getGameCode = _GBACoreGetGameCode;
-	core->setRotation = _GBACoreSetRotation;
-	core->setRumble = _GBACoreSetRumble;
+	core->setPeripheral = _GBACoreSetPeripheral;
 	core->busRead8 = _GBACoreBusRead8;
 	core->busRead16 = _GBACoreBusRead16;
 	core->busRead32 = _GBACoreBusRead32;

@@ -242,7 +242,7 @@ mCoreConfigSetDefaultIntValue(&runner->config, "threadedVideo", 1);
 		mCoreLoadForeignConfig(runner->core, &runner->config);
 	}
 
-	runner->core->setRotation(runner->core, &rotation.d);
+	runner->core->setPeripheral(runner->core, mPERIPH_ROTATION, &rotation.d);
 	if (hasSound != NO_SOUND) {
 		runner->core->setAVStream(runner->core, &stream);
 	}

@@ -398,7 +398,7 @@
 	blip_set_rates(core->getAudioChannel(core, 0), core->frequency(core), 32768);
 	blip_set_rates(core->getAudioChannel(core, 1), core->frequency(core), 32768);
 
-	core->setRumble(core, &rumble);
+	core->setPeripheral(core, mPERIPH_RUMBLE, &rumble);
 
 	savedata = anonymousMemoryMap(SIZE_CART_FLASH1M);
 	struct VFile* save = VFileFromMemory(savedata, SIZE_CART_FLASH1M);

@@ -203,11 +203,11 @@ rotation.d.sample = _sampleRotation;
 	rotation.d.readTiltX = _readTiltX;
 	rotation.d.readTiltY = _readTiltY;
 	rotation.d.readGyroZ = _readGyroZ;
-	runner->core->setRotation(runner->core, &rotation.d);
+	runner->core->setPeripheral(runner->core, mPERIPH_ROTATION, &rotation.d);
 
 	rumble.d.setRumble = _setRumble;
 	CircleBufferInit(&rumble.history, RUMBLE_PWM);
-	runner->core->setRumble(runner->core, &rumble.d);
+	runner->core->setPeripheral(runner->core, mPERIPH_RUMBLE, &rumble.d);
 
 	frameLimiter = true;
 	backdrop = vita2d_load_PNG_buffer(_binary_backdrop_png_start);

@@ -87,8 +87,8 @@ #endif
 
 	m_threadContext.startCallback = [](mCoreThread* context) {
 		GameController* controller = static_cast<GameController*>(context->userData);
-		context->core->setRotation(context->core, controller->m_inputController->rotationSource());
-		context->core->setRumble(context->core, controller->m_inputController->rumble());
+		context->core->setPeripheral(context->core, mPERIPH_ROTATION, controller->m_inputController->rotationSource());
+		context->core->setPeripheral(context->core, mPERIPH_RUMBLE, controller->m_inputController->rumble());
 
 #ifdef M_CORE_GBA
 		GBA* gba = static_cast<GBA*>(context->core->board);

@@ -130,7 +130,7 @@ mSDLAttachPlayer(&renderer.events, &renderer.player);
 	mSDLPlayerLoadConfig(&renderer.player, mCoreConfigGetInput(&renderer.core->config));
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-	renderer.core->setRumble(renderer.core, &renderer.player.rumble.d);
+	renderer.core->setPeripheral(renderer.core, mPERIPH_RUMBLE, &renderer.player.rumble.d);
 #endif
 
 	int ret;

@@ -641,8 +641,8 @@ _reproj2(vmode->fbWidth * guiScale * wAdjust, vmode->efbHeight * guiScale * hAdjust);
 }
 
 void _setup(struct mGUIRunner* runner) {
-	runner->core->setRotation(runner->core, &rotation);
-	runner->core->setRumble(runner->core, &rumble);
+	runner->core->setPeripheral(runner->core, mPERIPH_ROTATION, &rotation);
+	runner->core->setPeripheral(runner->core, mPERIPH_RUMBLE, &rumble);
 
 	_mapKey(&runner->core->inputMap, GCN1_INPUT, PAD_BUTTON_A, GBA_KEY_A);
 	_mapKey(&runner->core->inputMap, GCN1_INPUT, PAD_BUTTON_B, GBA_KEY_B);