ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1411 from ProjectRevoTPP/sio32intr

Browse Source 
Resolve sio32intr_clock_slave fakematching. One left!
This commit is contained in:
GriffinR 2021-04-20 14:50:51 -04:00 committed by GitHub
commit f8e5bac883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librfu_intr.c
View File

@ -148,11 +148,7 @@ static void sio32intr_clock_slave(void)
{ {
u32 regSIODATA32; u32 regSIODATA32;
u32 r0; u32 r0;
#ifndef NONMATCHING u32 reqLen;
register u32 reqLen asm("r2");
#else
u32 reqLen;
#endif
gSTWIStatus->timerActive = 0; gSTWIStatus->timerActive = 0;
STWI_set_timer_in_RAM(100); STWI_set_timer_in_RAM(100);
@ -165,10 +161,14 @@ static void sio32intr_clock_slave(void)
((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32; ((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32;
gSTWIStatus->reqNext = 1; gSTWIStatus->reqNext = 1;
r0 = 0x99660000; r0 = 0x99660000;
if ((regSIODATA32 >> 16) == (r0 >> 16)) // variable reuse required
reqLen = (regSIODATA32 >> 16);
if (reqLen == (r0 >> 16))
{ {
gSTWIStatus->reqLength = reqLen = regSIODATA32 >> 8; // only reqLen = regSIODATA32 >> 8 is needed to match, but it looks a bit
gSTWIStatus->reqActiveCommand = regSIODATA32; // more consistent when both lines update the variables. Might have been a macro?
gSTWIStatus->reqLength = reqLen = (regSIODATA32 >> 8);
gSTWIStatus->reqActiveCommand = reqLen = (regSIODATA32 >> 0);
if (gSTWIStatus->reqLength == 0) if (gSTWIStatus->reqLength == 0)
{ {
if ( if (