From b3c0b00c76ef024f2bac08284ead0e6e8b652d8b Mon Sep 17 00:00:00 2001 From: Rainchus Date: Sun, 31 Mar 2024 13:50:06 -0500 Subject: [PATCH] match kerent.c --- config/GMPE01_00/config.yml | 2 +- config/GMPE01_00/symbols.txt | 2 +- src/game/kerent.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/GMPE01_00/config.yml b/config/GMPE01_00/config.yml index 2c8e44d5..8e687a60 100644 --- a/config/GMPE01_00/config.yml +++ b/config/GMPE01_00/config.yml @@ -4,7 +4,7 @@ symbols: config/GMPE01_00/symbols.txt splits: config/GMPE01_00/splits.txt quick_analysis: true # Faster re-runs after initial analysis mw_comment_version: 10 # GC 2.6 linker -force_active: [__register_global_object, lbl_801D40D0] +force_active: [__register_global_object, lbl_801D40D0, _kerent] modules: - object: orig/GMPE01_00/files/dll/_minigameDll.rel diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 84e0ce5a..76969889 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -3580,7 +3580,7 @@ msmStreamDvdCallback = .text:0x8011C304; // type:function size:0x4A8 scope:local msmStreamDvdCallback2 = .text:0x8011C7AC; // type:function size:0x188 scope:local msmStreamUpdateFunc = .text:0x8011C934; // type:function size:0x17C scope:local msmStreamSlotInit = .text:0x8011CAB0; // type:function size:0x214 scope:local -kerent = .text:0x8011CCC4; // type:function size:0xFE4 +_kerent = .text:0x8011CCC4; // type:function size:0xFE4 scope:global _ctors = .ctors:0x8011DCC0; // type:label scope:global data:4byte __init_cpp_exceptions_reference = .ctors:0x8011DCC0; // type:object size:0x4 scope:global _dtors = .dtors:0x8011DCE0; // type:label scope:global data:4byte diff --git a/src/game/kerent.c b/src/game/kerent.c index f83afec2..fb99d976 100644 --- a/src/game/kerent.c +++ b/src/game/kerent.c @@ -1,3 +1,4 @@ +//fake function signatures void OSDumpStopwatch(void); void PSVECDotProduct(void); void PSVECDistance(void); @@ -2033,7 +2034,7 @@ extern void _kerjmp_BoardShopTutorialExec(void); extern void _kerjmp_BoardLotteryTutorialExec(void); extern void _kerjmp_BoardBooHouseTutorialExec(void); -asm void kerent(void) { +asm void _kerent(void) { #ifdef __MWERKS__ // clang-format off nofralloc entry _kerjmp_OSDumpStopwatch