GBC: Enabled SIREN GB2 and DONKEY KONG game-specific hack detection

Author: ducalex

components/odroid/odroid_overlay.h

@@ -29,11 +29,11 @@ struct odroid_dialog_choice {
     int  id;
     char label[32];
     char value[16];
-    int8_t enabled;
+    int  enabled;
     bool (*update_cb)(odroid_dialog_choice_t *, odroid_dialog_event_t);
 };
 
-#define ODROID_DIALOG_CHOICE_LAST {0x0F0F0F0F, "LAST", "LAST", 0xFF, NULL}
+#define ODROID_DIALOG_CHOICE_LAST {0x0F0F0F0F, "LAST", "LAST", 0xFFFF, NULL}
 
 extern odroid_menu_state_t odroid_menu_state;
 

gnuboy-go/components/gnuboy/cpu.c

@@ -332,7 +332,9 @@ int IRAM_ATTR cpu_emulate(int cycles)
 	}
 	IME = IMA;
 
-	if (debug_trace) debug_disassemble(PC, 1);
+	if (enable_disassembler)
+		debug_disassemble(PC, 1);
+
 	op = FETCH;
 	clen = cycles_table[op];
 

gnuboy-go/components/gnuboy/cpu.h

@@ -52,7 +52,7 @@ struct cpu
 	int timer, div;
 };
 
-extern int debug_trace;
+extern int enable_disassembler;
 extern struct cpu cpu;
 
 void cpu_reset();

gnuboy-go/components/gnuboy/debug.c

@@ -550,7 +550,7 @@ static const byte operand_count[256] =
 
 /* replace with a real interactive debugger eventually... */
 
-int debug_trace = 0;
+int enable_disassembler = 0;
 
 void debug_disassemble(addr a, int c)
 {

gnuboy-go/components/gnuboy/lcd.c

@@ -50,6 +50,9 @@ static int dmg_selected_pal = 0;
 static byte *vdest;
 static byte pix[8];
 
+// Fix for Fushigi no Dungeon - Fuurai no Shiren GB2 and Donkey Kong
+int enable_window_offset_hack = 0;
+
 
 /**
  * Drawing routines
@@ -578,10 +581,9 @@ static inline void lcd_renderline()
 
 	// Fix for Fushigi no Dungeon - Fuurai no Shiren GB2 and Donkey Kong
 	// This is a hack, the real problem is elsewhere
-	if ((R_LCDC & 0x20) && WT > 12)
+	if (enable_window_offset_hack && (R_LCDC & 0x20))
 	{
-		// printf("WT=%d\n", WT);
-		// WT %= 12;
+		WT %= 12;
 	}
 
 	spr_enum();

gnuboy-go/components/gnuboy/lcd.h

@@ -61,6 +61,8 @@ extern struct lcd lcd;
 extern struct scan scan;
 extern struct fb fb;
 
+extern int enable_window_offset_hack;
+
 void lcd_reset();
 void lcd_emulate();
 

gnuboy-go/components/gnuboy/loader.c

@@ -12,7 +12,6 @@
 #include "rtc.h"
 #include "sound.h"
 
-#include "esp_heap_caps.h"
 #include "odroid_system.h"
 
 static const byte mbc_table[256] =
@@ -74,7 +73,6 @@ static const byte ramsize_table[256] =
 	4 /* FIXME - what value should this be?! */
 };
 
-
 static FILE* fpRomFile = NULL;
 
 static char *romfile=NULL;
@@ -86,19 +84,13 @@ static int forcebatt=0, nobatt=0;
 static int forcedmg=0, gbamode=0;
 
 
-static inline void initmem(void *mem, int size)
-{
-	memset(mem, 0xff, size);
-}
-
-
 int IRAM_ATTR rom_loadbank(short bank)
 {
 	const size_t BANK_SIZE = 0x4000;
 	const size_t OFFSET = bank * BANK_SIZE;
 
 	printf("bank_load: loading bank %d.\n", bank);
-	rom.bank[bank] = (byte*)heap_caps_malloc(BANK_SIZE, MALLOC_CAP_SPIRAM);
+	rom.bank[bank] = (byte*)malloc(BANK_SIZE);
 	if (rom.bank[bank] == NULL) {
 		while (true) {
 			uint8_t i = esp_random() & 0xFF;
@@ -111,10 +103,6 @@ int IRAM_ATTR rom_loadbank(short bank)
 		}
 	}
 
-	if (rom.bank[bank] == NULL) {
-		odroid_system_panic("Out of memory");
-	}
-
 	// Make sure no transaction is running
 	odroid_system_spi_lock_acquire(SPI_LOCK_SDCARD);
 
@@ -195,27 +183,37 @@ int rom_load()
 		mbcName, mbc.romsize, rom.length / 1024, mbc.ramsize, mbc.ramsize * 8);
 
 	// SRAM
-	ram.sbank = heap_caps_malloc_prefer(8192 * mbc.ramsize, MALLOC_CAP_INTERNAL, MALLOC_CAP_SPIRAM);
+	ram.sbank = rg_alloc(8192 * mbc.ramsize, MEM_FAST);
 	ram.sram_dirty = 0;
 
-	initmem(ram.sbank, 8192 * mbc.ramsize);
-	initmem(ram.ibank, 4096 * 8);
+	memset(ram.sbank, 0xff, 8192 * mbc.ramsize);
+	memset(ram.ibank, 0xff, 4096 * 8);
 
 	mbc.rombank = 1;
 	mbc.rambank = 0;
 
 	int preload = mbc.romsize < 64 ? mbc.romsize : 64;
 
-	if (strncmp(rom.name, "RAYMAN", 6) == 0) {
+	// RAYMAN stutters too much if we don't fully preload it
+	if (strncmp(rom.name, "RAYMAN", 6) == 0)
+	{
 		printf("loader: Special preloading for Rayman 1/2\n");
 		preload = mbc.romsize - 8;
 	}
 
 	printf("loader: Preloading the first %d banks\n", preload);
-	for (int i = 1; i < preload; i++) {
+	for (int i = 1; i < preload; i++)
+	{
 		rom_loadbank(i);
 	}
 
+	// Apply game-specific hacks
+	if (strncmp(rom.name, "SIREN GB2 ", 11) == 0 || strncmp(rom.name, "DONKEY KONG", 11) == 0)
+	{
+		printf("loader: HACK: Window offset hack enabled\n");
+		enable_window_offset_hack = 1;
+	}
+
 	return 0;
 }
 

gnuboy-go/main/main.c

@@ -41,9 +41,7 @@ static uint skipFrames = 0;
 static bool netplay = false;
 
 static bool saveSRAM = false;
-static int  sramSaveTimer = 0;
-
-extern int debug_trace;
+static int  saveSRAM_Timer = 0;
 // --- MAIN
 
 
@@ -317,11 +315,11 @@ void app_main(void)
         {
             if (ram.sram_dirty)
             {
-                sramSaveTimer = 90;
+                saveSRAM_Timer = 90;
                 ram.sram_dirty = 0;
             }
 
-            if (sramSaveTimer > 0 && --sramSaveTimer == 0)
+            if (saveSRAM_Timer > 0 && --saveSRAM_Timer == 0)
             {
                 // TO DO: Try compressing the sram file, it might reduce stuttering
                 sram_save();

handy-go/components/handy/system.cpp

@@ -75,6 +75,7 @@ ULONG   gThrottleLastTimerCount=0;
 ULONG   gThrottleNextCycleCheckpoint=0;
 ULONG   gEndOfFrame=0;
 ULONG   gTimerCount=0;
+ULONG   gRenderFrame=1;
 
 ULONG   gAudioEnabled=FALSE;
 UBYTE   *gAudioBuffer;//[HANDY_AUDIO_BUFFER_SIZE];

handy-go/components/handy/system.h

@@ -116,6 +116,7 @@ extern ULONG    gThrottleLastTimerCount;
 extern ULONG    gThrottleNextCycleCheckpoint;
 extern ULONG    gEndOfFrame;
 extern ULONG    gTimerCount;
+extern ULONG    gRenderFrame;
 
 extern ULONG    gAudioEnabled;
 extern UBYTE    *gAudioBuffer;
@@ -216,9 +217,10 @@ class CSystem : public CSystemBase
          //         fprintf(stderr, "end sys update\n");
       }
 
-      inline void UpdateFrame(void)
+      inline void UpdateFrame(bool draw)
       {
          gEndOfFrame = FALSE;
+         gRenderFrame = draw;
 
          while(gEndOfFrame != TRUE)
          {

handy-go/main/main.cpp

@@ -16,17 +16,14 @@ extern "C" {
 #define PIXEL_MASK 0xFF
 #define PAL_SHIFT_MASK 0x00
 
-DMA_ATTR static short audioBuffer[AUDIO_BUFFER_LENGTH * 2];
+static DMA_ATTR short audioBuffer[AUDIO_BUFFER_LENGTH * 2];
 
 static odroid_video_frame update1;
 static odroid_video_frame update2;
 static odroid_video_frame *currentUpdate = &update1;
 static odroid_video_frame *previousUpdate = &update2;
 
 static CSystem *lynx = NULL;
-
-static uint startTime = 0;
-static uint frameTime = 16667;
 // static bool netplay = false;
 // --- MAIN
 
@@ -67,6 +64,7 @@ extern "C" void app_main(void)
     lynx = new CSystem(romFile);
     lynx->DisplaySetAttributes(MIKIE_NO_ROTATE, MIKIE_PIXEL_FORMAT_16BPP_565_BE, update1.stride);
 
+    gPrimaryFrameBuffer = (UBYTE*)currentUpdate->buffer + currentUpdate->stride;
     gAudioBuffer = (UBYTE*)&audioBuffer;
     gAudioEnabled = 0;
 
@@ -76,8 +74,10 @@ extern "C" void app_main(void)
     }
 
     odroid_gamepad_state joystick;
-    ULONG buttons;
-    bool fullFrame;
+
+    uint frameTime = get_frame_time(60);
+    uint skipFrames = 0;
+    bool fullFrame = 0;
 
     // Start emulation
     while (1)
@@ -88,13 +88,17 @@ extern "C" void app_main(void)
             odroid_overlay_game_menu();
         }
         else if (joystick.values[ODROID_INPUT_VOLUME]) {
-            odroid_overlay_game_settings_menu(NULL);
+            odroid_dialog_choice_t options[] = {
+                {100, "Rotation", "Off  ", 0, NULL},
+                ODROID_DIALOG_CHOICE_LAST
+            };
+            odroid_overlay_game_settings_menu(options);
         }
 
-        gPrimaryFrameBuffer = (UBYTE*)currentUpdate->buffer + currentUpdate->stride;
+        uint startTime = get_elapsed_time();
+        bool drawFrame = !skipFrames;
 
-        startTime = get_elapsed_time();
-        buttons = 0;
+        ULONG buttons = 0;
 
     	if (joystick.values[ODROID_INPUT_UP])     buttons |= BUTTON_UP;
     	if (joystick.values[ODROID_INPUT_DOWN])   buttons |= BUTTON_DOWN;
@@ -107,13 +111,28 @@ extern "C" void app_main(void)
 
         lynx->SetButtonData(buttons);
 
-        lynx->UpdateFrame();
+        lynx->UpdateFrame(drawFrame);
+
+        if (drawFrame)
+        {
+            fullFrame = odroid_display_queue_update(currentUpdate, previousUpdate) == SCREEN_UPDATE_FULL;
+            previousUpdate = currentUpdate;
+            currentUpdate = (currentUpdate == &update1) ? &update2 : &update1;
+            gPrimaryFrameBuffer = (UBYTE*)currentUpdate->buffer + currentUpdate->stride;
+        }
 
-        fullFrame = odroid_display_queue_update(currentUpdate, previousUpdate) == SCREEN_UPDATE_FULL;
-        previousUpdate = currentUpdate;
-        currentUpdate = (currentUpdate == &update1) ? &update2 : &update1;
+        // See if we need to skip a frame to keep up
+        if (skipFrames == 0)
+        {
+            if (get_elapsed_time_since(startTime) > frameTime) skipFrames = 1;
+            if (speedupEnabled) skipFrames += speedupEnabled * 2.5;
+        }
+        else if (skipFrames > 0)
+        {
+            skipFrames--;
+        }
 
-        odroid_system_tick(0, fullFrame, get_elapsed_time_since(startTime));
+        odroid_system_tick(!drawFrame, fullFrame, get_elapsed_time_since(startTime));
 
         if (!speedupEnabled)
         {

handy-go/sdkconfig

@@ -236,7 +236,7 @@ CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
-CONFIG_MAIN_TASK_STACK_SIZE=24576
+CONFIG_MAIN_TASK_STACK_SIZE=16384
 CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_TIMER_TASK_STACK_SIZE=2048
 CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y

mkfw.sh

@@ -14,7 +14,7 @@ release=`date +%Y%m%d`;
 $mkfw "Retro-Go ($release)" assets/tile.raw \
 	0  16  524288  frontend   retro-go/build/retro-go.bin         \
 	0  17  458752  nofrendo   nofrendo-go/build/nofrendo-go.bin   \
-	0  18  393216  gnuboy     gnuboy-go/build/gnuboy-go.bin       \
+	0  18  458752  gnuboy     gnuboy-go/build/gnuboy-go.bin       \
 	0  19  458752  smsplusgx  smsplusgx-go/build/smsplusgx-go.bin \
 	0  20  393216  huexpress  huexpress-go/build/huexpress-go.bin \
 	0  21  393216  handy      handy-go/build/handy-go.bin