Merge pull request #126 from SlyCooperReloadCoded/working

Matched ResetGsb
TheOnlyZac · Nov 24, 2024 · d2e46dd · d2e46dd
2 parents 4f5d128 + 05d80a6
commit d2e46dd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/config/sly1.yaml b/config/sly1.yaml
@@ -128,7 +128,7 @@ segments:
 
     - [0x529e0, c, P2/difficulty]
     - [0x53438, c, P2/dl]
-
+    - [0x5380C, asm, dl_padding] # Needed to align dmas
     - [0x53810, c, P2/dmas]
     - [0x53E28, asm, P2/dsp]
     #- [0x, asm, P2/dysh]

diff --git a/config/symbol_addrs.txt b/config/symbol_addrs.txt
@@ -1210,7 +1210,7 @@ g_abRenderLoopStack = 0x6056d0; // size:0x20000
 __11CTransition = 0x1E4E38; // type:func
 Set__11CTransitionPc3OIDT2i = 0x1E4E80; // type:func
 Execute__11CTransition = 0x1e4ea8; // type:func
-ResetWorld__F6TRANS = 0x1E5278; // type:func
+ResetWorld__F6FTRANS = 0x1E5278; // type:func
 transition__static_initialization_and_destruction_0 = 0x1E5328; // type:func
 _GLOBAL_$I$g_transition = 0x1E5358; // type:func
 

diff --git a/src/P2/dl.c b/src/P2/dl.c
@@ -92,4 +92,18 @@ bool FIsDlEmpty(DL *pdl)
 
 INCLUDE_ASM(const s32, "P2/dl", MergeDl__FP2DLT0);
 
-INCLUDE_ASM(const s32, "P2/dl", CPvDl__FP2DL);
+int CPvDl(DL* pdl)
+{
+  void* pCurItem = pdl->head;
+  int iCount = 0;
+
+  if (pCurItem != 0) {   
+    while(pCurItem) {
+      DLE* pDle = (DLE*)((unsigned char*)pCurItem + pdl->ibDle);
+
+      pCurItem = pDle->next;
+      iCount++;
+    }
+  }
+  return iCount;
+}
diff --git a/src/P2/gs.c b/src/P2/gs.c
@@ -38,7 +38,10 @@ void InitGsb(GSB *pgsb, int igsMin, int igsMax)
     pgsb->igsMax = igsMax;
 }
 
-INCLUDE_ASM(const s32, "P2/gs", ResetGsb__FP3GSB);
+void ResetGsb(GSB* pGsb)
+{
+  pGsb->igsMac = pGsb->igsMin;
+}
 
 INCLUDE_ASM(const s32, "P2/gs", IgsAllocGsb__FP3GSBi);
 

diff --git a/src/P2/joy.c b/src/P2/joy.c
@@ -222,12 +222,11 @@ void _MatchCodes(JOY *pjoy, GRFBTN button)
 
 INCLUDE_ASM(const s32, "P2/joy", UpdateCodes__Fv);
 
-INCLUDE_ASM(const s32, "P2/joy", ClearFchts__Fv);
-// void ClearFchts()
-// {
-//     g_grfcht = FCHT_None;
-//     ResetWorld(FTRANS_None);
-// }
+void ClearFchts(void)
+{
+    g_grfcht = FCHT_None;
+    ResetWorld(FTRANS_None);
+}
 
 INCLUDE_ASM(const s32, "P2/joy", AddFcht__Fi);
 // void AddFcht(int nParam)

diff --git a/src/P2/transition.c b/src/P2/transition.c
@@ -29,7 +29,7 @@ void CTransition::Set(char *pchzWorld, OID oidWarp, OID oidWarpContext, GRFTRANS
 INCLUDE_ASM(const s32, "P2/transition", Execute__11CTransition);
 
 // Matching, blocked by broken references in joy.c
-INCLUDE_ASM(const s32, "P2/transition", ResetWorld__F6TRANS);
+INCLUDE_ASM(const s32, "P2/transition", ResetWorld__F6FTRANS);
 // void ResetWorld(FTRANS ftrans)
 // {
 //     GRFTRANS grftrans;