Skip to content

Commit 7ded282

Browse files
author
Niko
committed
profiler fixes
1 parent e056323 commit 7ded282

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

decompile/General/MAIN/MainDrawCb_00_DrawSync.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@ void DECOMP_MainDrawCb_DrawSync()
66
gGT = sdata->gGT;
77

88
if (gGT->bool_DrawOTag_InProgress == 1)
9+
{
910
gGT->bool_DrawOTag_InProgress = 0;
1011

11-
#ifdef USE_PROFILER
12-
void DebugProfiler_Subsection(int flag);
13-
DebugProfiler_Subsection(2);
14-
#endif
12+
#ifdef USE_PROFILER
13+
void DebugProfiler_Subsection(int flag);
14+
DebugProfiler_Subsection(2);
15+
#endif
16+
}
1517

1618
return;
1719
}

mods/Standalones/Profiler/src/main.c

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,22 @@ void Hook_RA_Vsync()
486486
DebugProfiler_Subsection(1);
487487
}
488488

489-
void Hook_RA_DrawSync()
489+
void Hook_ENTER_DrawSync()
490490
{
491-
void DebugProfiler_Subsection(int flag);
492-
DebugProfiler_Subsection(2);
491+
struct GameTracker* gGT;
492+
gGT = sdata->gGT;
493+
494+
if (gGT->bool_DrawOTag_InProgress == 1)
495+
{
496+
gGT->bool_DrawOTag_InProgress = 0;
497+
498+
#ifdef USE_PROFILER
499+
void DebugProfiler_Subsection(int flag);
500+
DebugProfiler_Subsection(2);
501+
#endif
502+
}
503+
504+
return;
493505
}
494506

495507
#define JMP(dest) (((unsigned long)dest & 0x3FFFFFF) >> 2 | 0x8000000)
@@ -543,5 +555,6 @@ void RunEntryHook()
543555

544556
// JMPs for vsync/drawsync on JR $RA
545557
*(int*)0x80034b40 = JMP(Hook_RA_Vsync);
546-
*(int*)0x80034a9c = JMP(Hook_RA_DrawSync);
558+
*(int*)0x80034a80 = JMP(Hook_ENTER_DrawSync);
559+
*(int*)0x80034a84 = 0;
547560
}

0 commit comments

Comments
 (0)