From 53f19c4f6c5e565df113a61a34806441966b665d Mon Sep 17 00:00:00 2001 From: Rainchus Date: Sun, 16 Mar 2025 15:05:13 -0500 Subject: [PATCH] match targimpl for US versions (#576) --- config/GMPE01_00/splits.txt | 2 +- config/GMPE01_01/splits.txt | 2 +- configure.py | 2 +- src/TRK_MINNOW_DOLPHIN/targimpl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index 4751f858..0c85aae7 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -1216,7 +1216,7 @@ TRK_MINNOW_DOLPHIN/mem_TRK.c: .text start:0x800F0398 end:0x800F0454 TRK_MINNOW_DOLPHIN/targimpl.c: - .text start:0x800F0454 end:0x800F1CF0 + .text start:0x800F0454 end:0x800F1CE4 .rodata start:0x8011EA90 end:0x8011EB18 .data start:0x8013EA58 end:0x8013EA88 .bss start:0x801A9138 end:0x801A96B8 diff --git a/config/GMPE01_01/splits.txt b/config/GMPE01_01/splits.txt index 4751f858..0c85aae7 100644 --- a/config/GMPE01_01/splits.txt +++ b/config/GMPE01_01/splits.txt @@ -1216,7 +1216,7 @@ TRK_MINNOW_DOLPHIN/mem_TRK.c: .text start:0x800F0398 end:0x800F0454 TRK_MINNOW_DOLPHIN/targimpl.c: - .text start:0x800F0454 end:0x800F1CF0 + .text start:0x800F0454 end:0x800F1CE4 .rodata start:0x8011EA90 end:0x8011EB18 .data start:0x8013EA58 end:0x8013EA88 .bss start:0x801A9138 end:0x801A96B8 diff --git a/configure.py b/configure.py index 28660567..3721f4c9 100644 --- a/configure.py +++ b/configure.py @@ -749,7 +749,7 @@ config.libs = [ Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/notify.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/flush_cache.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/mem_TRK.c"), - Object(NonMatching, "TRK_MINNOW_DOLPHIN/targimpl.c"), + Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/targimpl.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/targsupp.s"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/__exception.s"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "TRK_MINNOW_DOLPHIN/dolphin_trk.c"), diff --git a/src/TRK_MINNOW_DOLPHIN/targimpl.c b/src/TRK_MINNOW_DOLPHIN/targimpl.c index c25b33d4..ab925687 100644 --- a/src/TRK_MINNOW_DOLPHIN/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/targimpl.c @@ -1192,7 +1192,7 @@ DSError TRKPPCAccessSpecialReg(void* value, u32* access_func, BOOL read) #endif // Flush cache - TRK_flush_cache(access_func, (sizeof(access_func) * 10)); + TRK_flush_cache((void*)(u32)access_func, (sizeof(access_func) * 10)); (*asm_access)((u32*)value, (void*)&TRKvalue128_temp); return DS_NoError;