Cleanup

Actually names symbol, removes debug logging, updates actions

Author: lilousky

.github/workflows/main.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ubuntu-20.04
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Cache
         id: cache-1
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: cache
           key: ${{ runner.os }}-cache-33

src/include/racemodeonline.h

@@ -30,4 +30,3 @@ typedef struct {
 } RaceModeOnlineVs; // Total size 0x174
 
 RaceHeader2VS* GetRaceHeader2Buffer(u32 param_1, u32 playerId);
-void unk80653d78(u32 param_1) __attribute__((noreturn));

src/payload/main/trackcheck.S

@@ -1,12 +1,12 @@
 .include "asm_setup.S"
 
-.extern DoInsertTrackIdent, unk80653d78
+.extern DoInsertTrackIdent, clearSendRH2
 .global InsertTrackIdent
 
 InsertTrackIdent:
 mflr r9
 stw r0, 0x110(r3) # Original instruction
 b DoInsertTrackIdent
 mtlr r9
-b unk80653d78
+b clearSendRH2
 

src/payload/main/trackcheck.c

@@ -11,7 +11,6 @@ bool finishedTrackCheck;
 
 void DoInsertTrackIdent(RaceModeOnlineVs *RaceModeOnlineVs) {
     if(!DWC_IsServerMyself()){
-        OSReport("ENPTCRC: %x\n", ENPTCRC);
         RaceModeOnlineVs->outPacket.minimumRaceFinishTime = ENPTCRC; // Replace unused field with CRC32 of the ENPT section for the current track
     }
     return;
@@ -20,26 +19,18 @@ void DoInsertTrackIdent(RaceModeOnlineVs *RaceModeOnlineVs) {
 void CheckTrackIdent() {
     if(DWC_IsServerMyself()){
         u8 playerId;
-        OSReport("Racedata->main.scenarios[0].playerCount: %x\n", Racedata->main.scenarios[0].playerCount);
         for (playerId = 0; playerId < Racedata->main.scenarios[0].playerCount; playerId++) {
             if (HideNSeekData.players[RKNetController->aidsToPids[playerId]].doneTrackCheck) {
-                OSReport("Player %x has already checked track ident\n", playerId);
                 continue;
             }
-            OSReport("Checking Track Ident for %x\n", playerId);
-            OSReport("Player Type: %x\n", Racedata->main.scenarios->players[playerId].playerType);
             if (Racedata->main.scenarios->players[playerId].playerType == PLAYER_REAL_LOCAL) {
-                OSReport("Player %x is local\n", playerId);
                 continue;
             }
             RaceHeader2VS* RH2 = GetRaceHeader2Buffer(ptr_miscPacketHandler, playerId);
-            OSReport("Player returned %x, expecting %x\n", RH2->minimumRaceFinishTime, ENPTCRC);
             if (RH2->minimumRaceFinishTime == 0) {
-                OSReport("Player %x has not sent track ident\n", playerId);
                 continue;
             }
             if (RH2->minimumRaceFinishTime != ENPTCRC) {
-                OSReport("Player %x has a different track\n", playerId);
                 bool ret = OSDisableInterrupts();
                 DWC_CloseConnectionHard(RKNetController->aidsToPids[playerId]);
                 OSRestoreInterrupts(ret);

src/rmce.ld

@@ -358,5 +358,5 @@ SECTIONS {
 	/* Track Check */
 	InsertTrackIdentHook = 0x80538f34;
 	CheckTrackIdentHook = 0x80539f60;
-	unk80653d78 = 0x8064f8f0;
+	clearSendRH2 = 0x8064f8f0;
 }

src/rmcj.ld

@@ -358,5 +358,5 @@ SECTIONS {
 	/* Track Check */
 	InsertTrackIdentHook = 0x8053ddf0;
 	CheckTrackIdentHook = 0x8053ee1c;
-	unk80653d78 = 0x806533e4;
+	clearSendRH2 = 0x806533e4;
 }

src/rmck.ld

@@ -358,5 +358,5 @@ SECTIONS {
 	/* Track Check */
 	InsertTrackIdentHook = 0x8052c4c8;
 	CheckTrackIdentHook = 0x8052d4f4;
-	unk80653d78 = 0x80642090;
+	clearSendRH2 = 0x80642090;
 }

src/rmcp.ld

@@ -358,5 +358,5 @@ SECTIONS {
 	/* Track Check */
 	InsertTrackIdentHook = 0x8053e470;
 	CheckTrackIdentHook = 0x8053f49c;
-	unk80653d78 = 0x80653d78;
+	clearSendRH2 = 0x80653d78;
 }