From 80f422d0cad6580f81028c1bdfb91b6aadf609f7 Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Sun, 11 Apr 2021 23:16:31 +0300
Subject: [PATCH] Respect TPP1 feature flags for rumble and RTC

---
 Core/debugger.c | 7 +++++--
 Core/gb.c       | 4 ++++
 Core/rumble.c   | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Core/debugger.c b/Core/debugger.c
index 73bd80ae..be80fd00 100644
--- a/Core/debugger.c
+++ b/Core/debugger.c
@@ -1523,7 +1523,9 @@ static bool mbc(GB_gameboy_t *gb, char *arguments, char *modifiers, const debugg
     const GB_cartridge_t *cartridge = gb->cartridge_type;
 
     if (cartridge->has_ram) {
-        GB_log(gb, "Cartridge includes%s RAM: $%x bytes\n", cartridge->has_battery? " battery-backed": "", gb->mbc_ram_size);
+        bool has_battery = gb->cartridge_type->has_battery &&
+                           (gb->cartridge_type->mbc_type != GB_TPP1 || (gb->rom[0x153] & 8));
+        GB_log(gb, "Cartridge includes%s RAM: $%x bytes\n", has_battery? " battery-backed": "", gb->mbc_ram_size);
     }
     else {
         GB_log(gb, "No cartridge RAM\n");
@@ -1565,7 +1567,8 @@ static bool mbc(GB_gameboy_t *gb, char *arguments, char *modifiers, const debugg
         GB_log(gb, "No MBC\n");
     }
 
-    if (cartridge->has_rumble) {
+    if (gb->cartridge_type->has_rumble &&
+       (gb->cartridge_type->mbc_type != GB_TPP1 || (gb->rom[0x153] & 1))) {
         GB_log(gb, "Cart contains a Rumble Pak\n");
     }
 
diff --git a/Core/gb.c b/Core/gb.c
index 3a0864d4..e6747c67 100644
--- a/Core/gb.c
+++ b/Core/gb.c
@@ -609,6 +609,8 @@ typedef union {
 int GB_save_battery_size(GB_gameboy_t *gb)
 {
     if (!gb->cartridge_type->has_battery) return 0; // Nothing to save.
+    if (gb->cartridge_type->mbc_type == GB_TPP1 && !(gb->rom[0x153] & 8)) return 0; // Nothing to save.
+
     if (gb->mbc_ram_size == 0 && !gb->cartridge_type->has_rtc) return 0; /* Claims to have battery, but has no RAM or RTC */
 
     if (gb->cartridge_type->mbc_type == GB_HUC3) {
@@ -621,6 +623,7 @@ int GB_save_battery_size(GB_gameboy_t *gb)
 int GB_save_battery_to_buffer(GB_gameboy_t *gb, uint8_t *buffer, size_t size)
 {
     if (!gb->cartridge_type->has_battery) return 0; // Nothing to save.
+    if (gb->cartridge_type->mbc_type == GB_TPP1 && !(gb->rom[0x153] & 8)) return 0; // Nothing to save.
     if (gb->mbc_ram_size == 0 && !gb->cartridge_type->has_rtc) return 0; /* Claims to have battery, but has no RAM or RTC */
 
     if (size < GB_save_battery_size(gb)) return EIO;
@@ -678,6 +681,7 @@ int GB_save_battery_to_buffer(GB_gameboy_t *gb, uint8_t *buffer, size_t size)
 int GB_save_battery(GB_gameboy_t *gb, const char *path)
 {
     if (!gb->cartridge_type->has_battery) return 0; // Nothing to save.
+    if (gb->cartridge_type->mbc_type == GB_TPP1 && !(gb->rom[0x153] & 8)) return 0; // Nothing to save.
     if (gb->mbc_ram_size == 0 && !gb->cartridge_type->has_rtc) return 0; /* Claims to have battery, but has no RAM or RTC */
     FILE *f = fopen(path, "wb");
     if (!f) {
diff --git a/Core/rumble.c b/Core/rumble.c
index 87eb8703..5f83c479 100644
--- a/Core/rumble.c
+++ b/Core/rumble.c
@@ -15,7 +15,8 @@ void GB_handle_rumble(GB_gameboy_t *gb)
         if (gb->rumble_mode == GB_RUMBLE_DISABLED) {
             return;
         }
-        if (gb->cartridge_type->has_rumble) {
+        if (gb->cartridge_type->has_rumble &&
+            (gb->cartridge_type->mbc_type != GB_TPP1 || (gb->rom[0x153] & 1))) {
             if (gb->rumble_on_cycles + gb->rumble_off_cycles) {
                 gb->rumble_callback(gb, gb->rumble_on_cycles / (double)(gb->rumble_on_cycles + gb->rumble_off_cycles));
                 gb->rumble_on_cycles = gb->rumble_off_cycles = 0;