Merge pull request #12 from lilousky/TrackCheck

Update to 2.0.4

.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
@@ -33,7 +33,7 @@ jobs:
 
       - name: Compile
         run: |
-          PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro
+          cp -r $(pwd)/devkitpro/devkitPPC devkitPPC/
           cd src
           python3 make.py
 

.gitignore

@@ -5,3 +5,5 @@ src/bin
 files/UIPatches/*.szs
 __pycache__/
 *.zip
+devkitPPC/
+.vscode/

build/ISO/Build.bat

@@ -107,7 +107,7 @@ echo.
 SET /P FRAMERATE=Force 30 FPS? (Y/N):
 IF /i %FRAMERATE%==Y (wit\wit.exe dolpatch mkw.d/sys/main.dol 8000400F=01 -q) ELSE (wit\wit.exe dolpatch mkw.d/sys/main.dol 8000400F=00 -q)
 
-wit\wit.exe dolpatch mkw.d/sys/main.dol 8000629C=4BFFDF4C load=80004010,hns/Loader.bin -q
+wit\wit.exe dolpatch mkw.d/sys/main.dol 8000629C=4BFFDF58 load=80004010,hns/Loader.bin -q
 
 echo.
 echo Format Selection:

build/Riivo/riivolution/hns.xml

@@ -38,7 +38,7 @@
 		<folder disc="/Scene/UI" external="/hns/UI" create="true" />
 		<!--Load Code-->
 		<memory valuefile="/hns/Loader.bin" offset="0x80004010" />
-		<memory offset="0x8000629C" value="4BFFDF4C" />
+		<memory offset="0x8000629C" value="4BFFDF58" />
 		<folder external="/hns/hns" disc="/hns" create="true"/>
 	</patch>
 	<patch id="mythingsctgp">

src/include/dwc.h

@@ -0,0 +1,5 @@
+#pragma once
+#include "common.h"
+
+int DWC_CloseConnectionHard(u8 playerAid);
+bool DWC_IsServerMyself();

src/include/hidenseek.h

@@ -1,8 +1,8 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 typedef struct {
- 	u8 isStopped, isSeeker, isRealSeeker, unused;
+ 	u8 isStopped, isSeeker, isRealSeeker, doneTrackCheck;
 } HideNSeekPlayer;
 
 typedef struct {

src/include/inputdata.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Seeky, SwareJonge and _tZ
 

src/include/itemholder.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 typedef struct {
 	u8 unk[0x8C];

src/include/jgpt.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <common.h>
-#include <vec.h>
+#include "common.h"
+#include "vec.h"
 
 typedef struct {
 	VEC3 pos, rot;

src/include/killdata.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <common.h>
-#include <screentext.h>
+#include "common.h"
+#include "screentext.h"
 
 extern void* GetBMGPlayer(u16 pid);
 extern void ApplyKillData(screenText* textData);

src/include/menudata.h

@@ -1,6 +1,6 @@
 #pragma once
-#include <common.h>
-#include <inputdata.h>
+#include "common.h"
+#include "inputdata.h"
 
 typedef struct {
 	u32 controllerInfo, unk, wantsController;

src/include/musichandler.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 typedef struct {
 	u8 unk[0x40];

src/include/os.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "common.h"
+
+bool OSDisableInterrupts();
+bool OSRestoreInterrupts(bool);
+void OSReport(const char *format, ...);

src/include/player.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by stebler, SwareJonge and 1superchip
 

src/include/racedata.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Seeky, TheLordScruffy, WhatIsLoaf and riidefi
 

src/include/raceinfo.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Seeky, _tZ, Kevin, Leseratte, stebler and Melg
 
@@ -60,14 +60,16 @@ typedef struct {
 } RaceinfoPlayer;	// Total size 0x54
 
 typedef struct {
-	void* vtable;
-	void* random1;
-	void* random2;
-	RaceinfoPlayer **players;
-	void* gamemodeData;
-	TimerManager* timerManager;
-	u8 unk[0x10];
-	u32 raceState;
+    void* vtable;
+    void* random1;
+    void* random2;
+    RaceinfoPlayer **players;
+    void* gamemodeData;
+    TimerManager* timerManager;
+    u8 unk[8];
+    u32 timer;
+    u8 unk2[4];
+    u32 raceState;
 } _Raceinfo;
 
 extern _Raceinfo* Raceinfo;

src/include/racemodeonline.h

@@ -0,0 +1,33 @@
+#pragma once
+#include "common.h"
+#include "raceinfo.h"
+
+typedef struct {
+    u8 packedBits[15];
+    u8 _F;
+    u8 localPlayerId[2];
+    u8 _12;
+    u8 localPlayerCount;
+    u32 timeSinceLeaderFinish;
+    u32 minimumRaceFinishTime;
+    bool disconnecting;
+    u8 _1D;
+    u16 idleTimers[2];
+    u16 idleCountdowns[2];
+    u16 _26;
+} RaceHeader2VS;
+
+typedef struct {
+    void* vtable;
+    _Raceinfo *raceinfo;
+} RaceMode;
+
+typedef struct {
+    RaceMode inherit;
+    u8 unk[0xF0];
+    RaceHeader2VS outPacket;
+    u8 unk2[0x54];
+} RaceModeOnlineVs; // Total size 0x174
+
+RaceHeader2VS* GetRaceHeader2Buffer(u32 param_1, u32 playerId);
+void clearSendRH2(u32 ptr_miscPacketHandler);

src/include/racepacket.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 typedef struct {
 	u32 checksum[2];

src/include/rknetcontroller.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Seeky
 

src/include/screentext.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Kevin
 

src/include/selecthandler.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 // Documentation by Seeky
 

src/include/utils.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <common.h>
-#include <player.h>
-#include <raceinfo.h>
+#include "common.h"
+#include "player.h"
+#include "raceinfo.h"
 
 int UtilRandint(int lo, int hi);
 void UtilRandomSeed(int seed);

src/include/vec.h

@@ -1,5 +1,5 @@
 #pragma once
-#include <common.h>
+#include "common.h"
 
 typedef struct {
 	float x, y, z;

src/make.py

@@ -4,8 +4,8 @@
 from elftools.elf.elffile import ELFFile as elf
 
 # Locate various things
-gcc = 'powerpc-eabi-gcc'
-objcopy = 'powerpc-eabi-objcopy'
+gcc = os.path.join("..", "devkitPPC", "bin", "powerpc-eabi-gcc")
+objcopy = os.path.join("..", "devkitPPC", "bin", "powerpc-eabi-objcopy")
 destdir = 'bin'
 
 # Initialize variables
@@ -73,6 +73,7 @@ def build(isBootStrap: bool):
             print('Insert', hex(instruction), 'at', hex(startHook))
 
         # Convert to binary
+        print(f'Converting {region} to binary...')
         c = call([objcopy, '-O', 'binary', '-R', '.eh_frame', '-R', '.eh_frame_hdr', outputfile + 'o', outputfile + 'bin'])
         if c != 0:
             print('Build failed!')

src/payload/main.c

@@ -1,5 +1,4 @@
 #include "common.h"
-
 // Forward declarations
 void CupScreenPatch();
 void BattleCupScreenPatch();
@@ -143,7 +142,7 @@ void loadCodes() {
 	directWriteBranch(GuestSendHook, GuestSend, false);
 	directWriteBranch(HostCheckHook, HostCheck, false);
 	directWriteBranch(HostCheckHelperHook, HostCheckHelper, true);
-	directWrite8(Version, 7);
+	directWrite8(Version, 8);
 
 	// Improved Position Interpolation (by stebler)
 	directWrite32(NoInterpolation, 0x3F800000);
@@ -345,6 +344,10 @@ void loadCodes() {
 	directWriteBranch(TagDistanceHook2, TagDistanceFunc, true);
 	directWriteBranch(TagShowHook, HandleTags, true);
 
+	// Track Check (by CLF78 and Lami)
+	directWriteBranch(InsertTrackIdentHook, InsertTrackIdent, false);
+	directWriteBranch(CheckTrackIdentHook, CheckTrackIdent, false);
+
 	// Disable Track Music (by CosmoCourtney)
 	if (NoMusic == 1) {
 		directWrite32(NoMusicHook, 0x38600000);

src/payload/main/battlefixes.c

@@ -1,9 +1,9 @@
-#include <common.h>
-#include <hidenseek.h>
-#include <jgpt.h>
-#include <raceinfo.h>
-#include <player.h>
-#include <vec.h>
+#include "common.h"
+#include "hidenseek.h"
+#include "jgpt.h"
+#include "raceinfo.h"
+#include "player.h"
+#include "vec.h"
 
 #define DELFINOPIERCRC 0x72836BEE
 

src/payload/main/hnsdata.c

@@ -1,8 +1,8 @@
-#include <common.h>
-#include <hidenseek.h>
-#include <racedata.h>
-#include <rknetcontroller.h>
-#include <utils.h>
+#include "common.h"
+#include "hidenseek.h"
+#include "racedata.h"
+#include "rknetcontroller.h"
+#include "utils.h"
 
 int pidHelper(char currentpid, char prevaid1, char prevaid2, int index) {
 

src/payload/main/hudedits.c

@@ -1,7 +1,7 @@
-#include <common.h>
-#include <hidenseek.h>
-#include <racedata.h>
-#include <raceinfo.h>
+#include "common.h"
+#include "hidenseek.h"
+#include "racedata.h"
+#include "raceinfo.h"
 
 int ScoreSound(int score) {
 

src/payload/main/invisibility.c

@@ -1,9 +1,9 @@
-#include <common.h>
-#include <hidenseek.h>
-#include <racedata.h>
-#include <racepacket.h>
-#include <rknetcontroller.h>
-#include <utils.h>
+#include "common.h"
+#include "hidenseek.h"
+#include "racedata.h"
+#include "racepacket.h"
+#include "rknetcontroller.h"
+#include "utils.h"
 
 void InvisibilityFunc(RacePacket* packet, int length, int aid) {
 

src/payload/main/itemhit.c

@@ -1,12 +1,12 @@
-#include <common.h>
-#include <hidenseek.h>
-#include <killdata.h>
-#include <musichandler.h>
-#include <player.h>
-#include <racedata.h>
-#include <racepacket.h>
-#include <rknetcontroller.h>
-#include <utils.h>
+#include "common.h"
+#include "hidenseek.h"
+#include "killdata.h"
+#include "musichandler.h"
+#include "player.h"
+#include "racedata.h"
+#include "racepacket.h"
+#include "rknetcontroller.h"
+#include "utils.h"
 
 void PlayerKiller(char pid) {
 

src/payload/main/killdata.c

@@ -1,6 +1,6 @@
-#include <common.h>
-#include <killdata.h>
-#include <screentext.h>
+#include "common.h"
+#include "killdata.h"
+#include "screentext.h"
 
 void AddNewKillData(u16 type, u16 int1, u16 int2) {
 

src/payload/main/noclip.c

@@ -1,5 +1,5 @@
-#include <hidenseek.h>
-#include <player.h>
+#include "hidenseek.h"
+#include "player.h"
 
 bool NoClip(PlayerPointers** player1) {
 	register PlayerSub18* player2 asm("r30");