diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/build.bat b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/build.bat new file mode 100644 index 000000000..34b395334 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/build.bat @@ -0,0 +1 @@ +python ../../../../../tools/mod-builder/main.py \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/buildList.txt b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/buildList.txt new file mode 100644 index 000000000..1d05d4200 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_CharacterRandomizer_and_ReservesMeter/buildList.txt @@ -0,0 +1,55 @@ +// Include anti-anti-piracy patches for PAL and NTSC-J // +1006, exe, 0x80012534, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1111, exe, 0x80012570, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1020, exe, 0x80031cc8, 0x0, ../../Patches/EurLibcrypt/src/libcrypt.s + +// OxideFix // + +// Import SaveRAM +// common, exe, LOAD_DriverMPK, 0x0, ../../../decompile/General/LOAD_DriverMPK.c +// ^ Commented out as OverrideMPK's modification of the LOAD_DriverMPK function will be used instead +common, exe, AllocateAllPools, 0x0, ../../Patches/SaveRAM/src/Mem_AllocateAllPools.c +common, exe, Camera110_InitStructs, 0x0, ../../../decompile/General/Camera110_InitStructs.c ../../Patches/SaveRAM/src/Mem_DriverPool.c, Mem_DriverPool.bin +common, exe, ClearAllMemPools, 0x0, ../../Patches/SaveRAM/src/Mem_hookClearAllPools.s +common, exe, DrawRaceClock, 0x0, ../../../decompile/General/DrawRaceClock.c ../../Patches/SaveRAM/src/Mem_ThreadPool.c, Mem_ThreadPool.bin + +// Custom version of AdvBosses +common, 233, CS_Garage_GetMenuBox, -0x8, ../../Modules/OxideFix/src/AdvBosses_hook233.s +common, 233, CS_EndOfFile, 0x0, ../../Modules/OxideFix/src/AdvBosses_main.c + +// Modify the Main Menu to show Oxide +common, exe, LOAD_Callback_Overlay_231, -0x8, ../../Modules/OxideFix/src/MM_hookCallback230.s +common, 230, MM_Characters_GetModelByName, 0x0, ../../Modules/OxideFix/src/MM_NewModelSearch.c +common, 230, MM_EndOfFile, 0x0, ../../Modules/OxideFix/src/MM_End230_IconArrays.c ../../Modules/OxideFix/src/MM_End230_OxideModel.c ../../Modules/OxideFix/src/MM_End230_Callback230.c, MM_End230.bin + +// Fix Podium +common, exe, LOAD_CDRequestCallback, -0x8, ../../Modules/OxideFix/src/PodiumFix_hookAppendQueue.s +926, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1006, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1020, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1111, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c + +// CharacterRandomizer // + +// Include OverrideMPK +926, exe, 0x80033f3c, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1006, exe, 0x80035520, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1020, exe, 0x800342f8, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1111, exe, 0x80035b5C, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +common, exe, LOAD_AppendQueue, 0x8, ../../Modules/OverrideMPK/src/numDriversPlusOne.s +common, exe, Driver_GetModelByName, 0x0, ../../Modules/OverrideMPK/src/OvMPK_StringSearch.c +common, exe, LOAD_DriverMPK, 0x0, ../../Modules/OverrideMPK/src/OvMPK_LoadMPK.c + +common, exe, LOAD_Robots1P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook1P.s +common, exe, LOAD_Robots2P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook2P.s + +// ReservesMeter // + +// Compile the ASM injection that will load our code +926, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1006, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1020, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1111, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +common, exe, Turbo_Increment, 0x0, ../../Modules/ReservesMeter/src/Turbo_Increment_Hook.s + +common, exe, rdata_free, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_main.c ../../Modules/ReservesMeter/src/main.c ../../Modules/ReservesMeter/src/Turbo_Increment.c \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/build.bat b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/build.bat new file mode 100644 index 000000000..34b395334 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/build.bat @@ -0,0 +1 @@ +python ../../../../../tools/mod-builder/main.py \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/buildList.txt b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/buildList.txt new file mode 100644 index 000000000..66cd9e1ff --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_EngineSelectEdit_OnlyUSA/buildList.txt @@ -0,0 +1,51 @@ +// Include anti-anti-piracy patches for PAL and NTSC-J // +1006, exe, 0x80012534, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1111, exe, 0x80012570, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1020, exe, 0x80031cc8, 0x0, ../../Patches/EurLibcrypt/src/libcrypt.s + +// OxideFix // + +// Import SaveRAM +common, exe, LOAD_DriverMPK, 0x0, ../../../decompile/General/LOAD_DriverMPK.c +common, exe, AllocateAllPools, 0x0, ../../Patches/SaveRAM/src/Mem_AllocateAllPools.c +common, exe, Camera110_InitStructs, 0x0, ../../../decompile/General/Camera110_InitStructs.c ../../Patches/SaveRAM/src/Mem_DriverPool.c, Mem_DriverPool.bin +common, exe, ClearAllMemPools, 0x0, ../../Patches/SaveRAM/src/Mem_hookClearAllPools.s +common, exe, DrawRaceClock, 0x0, ../../../decompile/General/DrawRaceClock.c ../../Patches/SaveRAM/src/Mem_ThreadPool.c, Mem_ThreadPool.bin + +// Modify the Main Menu to show Oxide +common, exe, LOAD_Callback_Overlay_231, -0x8, ../../Modules/OxideFix/src/MM_hookCallback230.s +common, 230, MM_Characters_GetModelByName, 0x0, ../../Modules/OxideFix/src/MM_NewModelSearch.c +common, 230, MM_EndOfFile, 0x0, ../../Modules/OxideFix/src/MM_End230_IconArrays.c ../../Modules/OxideFix/src/MM_End230_OxideModel.c ../../Modules/OxideFix/src/MM_End230_Callback230.c ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_main.c, MM_End230.bin + +// Fix Podium +common, exe, LOAD_CDRequestCallback, -0x8, ../../Modules/OxideFix/src/PodiumFix_hookAppendQueue.s +926, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1006, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1020, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1111, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c + +// USAMaxStatsPenta // + +// Inject compiled code for Penta's stats into the executable +926, exe, 0x80088A0C, 0x0, ../../Patches/USAMaxStatsPenta/assets/stats.bin + +// Compile modified Driver_SetConsts +926, exe, Driver_SetConsts, 0x0, ../../Patches/USAMaxStatsPenta/src/USAMaxStatsPenta.c + +// FixAdventureModeCharacterSelectArrows // +// the same bug is also present here of course + +// Replace the DecalHUD_Arrow2D function +common, exe, DecalHUD_Arrow2D, 0x0, ../../Patches/FixAdventureModeCharacterSelectArrows/src/DecalHUD_Arrow2D.c + +// EngineSelect // + +926, 233, 0x800b8544, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_hook233.s +926, 233, 0x800b7ae4, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_JALhook233.s +common, 233, CS_EndOfFile, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_233.c + +// EngineSelectEdit // + +common, 230, MM_TrackSelect_Video_SetDefaults, -0x8, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_hook230.s +926, 230, 0x800aefe4, 0x0, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_nop.s +926, 230, 0x800af6a8, 0x0, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_hookCharacterName.s \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/build.bat b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/build.bat new file mode 100644 index 000000000..34b395334 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/build.bat @@ -0,0 +1 @@ +python ../../../../../tools/mod-builder/main.py \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/buildList.txt b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/buildList.txt new file mode 100644 index 000000000..ead45c2a7 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/buildList.txt @@ -0,0 +1,77 @@ +// Include anti-anti-piracy patches for PAL and NTSC-J // +1006, exe, 0x80012534, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1111, exe, 0x80012570, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1020, exe, 0x80031cc8, 0x0, ../../Patches/EurLibcrypt/src/libcrypt.s + +// OxideFix // + +// Import SaveRAM +// common, exe, LOAD_DriverMPK, 0x0, ../../../decompile/General/LOAD_DriverMPK.c +// ^ Commented out as OverrideMPK's modification of the LOAD_DriverMPK function will be used instead +common, exe, AllocateAllPools, 0x0, ../../Patches/SaveRAM/src/Mem_AllocateAllPools.c +common, exe, Camera110_InitStructs, 0x0, ../../../decompile/General/Camera110_InitStructs.c ../../Patches/SaveRAM/src/Mem_DriverPool.c, Mem_DriverPool.bin +common, exe, ClearAllMemPools, 0x0, ../../Patches/SaveRAM/src/Mem_hookClearAllPools.s +common, exe, DrawRaceClock, 0x0, ../../../decompile/General/DrawRaceClock.c ../../Patches/SaveRAM/src/Mem_ThreadPool.c, Mem_ThreadPool.bin + +// Modify the Main Menu to show Oxide +common, exe, LOAD_Callback_Overlay_231, -0x8, ../../Modules/OxideFix/src/MM_hookCallback230.s +common, 230, MM_Characters_GetModelByName, 0x0, ../../Modules/OxideFix/src/MM_NewModelSearch.c +common, 230, MM_EndOfFile, 0x0, ../../Modules/OxideFix/src/MM_End230_IconArrays.c ../../Modules/OxideFix/src/MM_End230_OxideModel.c ../../Modules/OxideFix/src/MM_End230_Callback230.c ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_main.c, MM_End230.bin + +// Fix Podium +common, exe, LOAD_CDRequestCallback, -0x8, ../../Modules/OxideFix/src/PodiumFix_hookAppendQueue.s +926, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1006, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1020, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1111, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c + +// CharacterRandomizer // + +// Include OverrideMPK +926, exe, 0x80033f3c, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1006, exe, 0x80035520, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1020, exe, 0x800342f8, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1111, exe, 0x80035b5C, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +common, exe, LOAD_AppendQueue, 0x8, ../../Modules/OverrideMPK/src/numDriversPlusOne.s +common, exe, Driver_GetModelByName, 0x0, ../../Modules/OverrideMPK/src/OvMPK_StringSearch.c +common, exe, LOAD_DriverMPK, 0x0, ../../Modules/OverrideMPK/src/OvMPK_LoadMPK.c + +common, exe, LOAD_Robots1P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook1P.s +common, exe, LOAD_Robots2P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook2P.s + +// ReservesMeter // + +// Compile the ASM injection that will load our code +926, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1006, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1020, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +1111, exe, DrawHUD_AdvStrings, -0x8, ../../Modules/ReservesMeter/src/reserveshook.s +common, exe, Turbo_Increment, 0x0, ../../Modules/ReservesMeter/src/Turbo_Increment_Hook.s + +// USAMaxStatsPenta // + +// Inject compiled code for Penta's stats into the executable +926, exe, 0x80088A0C, 0x0, ../../Patches/USAMaxStatsPenta/assets/stats.bin + +// Compile modified Driver_SetConsts +926, exe, Driver_SetConsts, 0x0, ../../Patches/USAMaxStatsPenta/src/USAMaxStatsPenta.c + +// FixAdventureModeCharacterSelectArrows // +// the same bug is also present here of course + +// Replace the DecalHUD_Arrow2D function +common, exe, DecalHUD_Arrow2D, 0x0, ../../Patches/FixAdventureModeCharacterSelectArrows/src/DecalHUD_Arrow2D.c + +// EngineSelect // + +926, 233, 0x800b8544, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_hook233.s +926, 233, 0x800b7ae4, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_JALhook233.s +common, 233, CS_EndOfFile, 0x0, ../../Modules/EngineSelect_OnlyUSA/src/ES_233.c + +// EngineSelectEdit // + +common, 230, MM_TrackSelect_Video_SetDefaults, -0x8, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_hook230.s +926, 230, 0x800aefe4, 0x0, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_nop.s +926, 230, 0x800af6a8, 0x0, ../../Modules/EngineSelectEdit_OnlyUSA/src/ES_hookCharacterName.s + +common, exe, rdata_free, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_main.c ../../Modules/ReservesMeter/src/main.c ../../Modules/ReservesMeter/src/Turbo_Increment.c \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/readme.txt b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/readme.txt new file mode 100644 index 000000000..578fc4d47 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/OxideFix_and_Everything_Ever_OnlyUSA/readme.txt @@ -0,0 +1 @@ +OxideFix and CharacterRandomizer and ReservesMeter and EngineSelectEdit \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/build.bat b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/build.bat new file mode 100644 index 000000000..34b395334 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/build.bat @@ -0,0 +1 @@ +python ../../../../../tools/mod-builder/main.py \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/buildList.txt b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/buildList.txt new file mode 100644 index 000000000..51364bc33 --- /dev/null +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/ModPacks/Retro-Fueled_and_CharacterRandomizer_NitrosOxideEdition/buildList.txt @@ -0,0 +1,62 @@ +// Include anti-anti-piracy patches for PAL and NTSC-J // +1111, exe, 0x80012570, 0x0, ../../Patches/JpnModchips/src/jpnModchips.s +1020, exe, 0x80031cc8, 0x0, ../../Patches/EurLibcrypt/src/libcrypt.s + +// OxideFix // + +// Import SaveRAM +// common, exe, LOAD_DriverMPK, 0x0, ../../../decompile/General/LOAD_DriverMPK.c +// ^ Commented out as OverrideMPK's modification of the LOAD_DriverMPK function will be used instead +common, exe, AllocateAllPools, 0x0, ../../Patches/SaveRAM/src/Mem_AllocateAllPools.c +common, exe, Camera110_InitStructs, 0x0, ../../../decompile/General/Camera110_InitStructs.c ../../Patches/SaveRAM/src/Mem_DriverPool.c, Mem_DriverPool.bin +common, exe, ClearAllMemPools, 0x0, ../../Patches/SaveRAM/src/Mem_hookClearAllPools.s +common, exe, DrawRaceClock, 0x0, ../../../decompile/General/DrawRaceClock.c ../../Patches/SaveRAM/src/Mem_ThreadPool.c, Mem_ThreadPool.bin + +// Custom version of AdvBosses +common, 233, CS_Garage_GetMenuBox, -0x8, ../../Modules/OxideFix/src/AdvBosses_hook233.s +common, 233, CS_EndOfFile, 0x0, ../../Modules/OxideFix/src/AdvBosses_main.c + +// Modify the Main Menu to show Oxide +common, exe, LOAD_Callback_Overlay_231, -0x8, ../../Modules/OxideFix/src/MM_hookCallback230.s +common, 230, MM_Characters_GetModelByName, 0x0, ../../Modules/OxideFix/src/MM_NewModelSearch.c +common, 230, MM_EndOfFile, 0x0, ../../Modules/OxideFix/src/MM_End230_IconArrays.c ../../Modules/OxideFix/src/MM_End230_OxideModel.c ../../Modules/OxideFix/src/MM_End230_Callback230.c, MM_End230.bin + +// Fix Podium +common, exe, LOAD_CDRequestCallback, -0x8, ../../Modules/OxideFix/src/PodiumFix_hookAppendQueue.s +926, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1020, exe, 0x80011380, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c +1111, exe, 0x80011468, 0x0, ../../Modules/OxideFix/src/PodiumFix_AppendQueue.c + +// Retro-Fueled // + +// Hooks +// 926, exe, GAMEPROG_GetPtrHighScoreTrack, -0x8, ../../Modules/Retro-Fueled/src/hookNewGame.s +// 1020, exe, GAMEPROG_GetPtrHighScoreTrack, -0x8, ../../Modules/Retro-Fueled/src/hookNewGame.s +// Disable texture replacements as OxideFix will need the kernel space instead +common, exe, BOTS_SetRotation, -0x8, ../../Modules/Retro-Fueled/src/hookUpdate.s +// 926, exe, LOAD_VramFile, -0x8, ../../Modules/Retro-Fueled/src/hookVRAM.s +// 1020, exe, LOAD_VramFile, -0x8, ../../Modules/Retro-Fueled/src/hookVRAM.s +// Disable texture replacements as OxideFix will need the kernel space instead +common, exe, __main, 0x68, ../../Modules/Retro-Fueled/src/hookEntry.s + +// Don't compile texture replacements for reasons stated above + +// Modify Turbo_Increment function to allow for USF stacking +common, exe, Turbo_Increment, 0x0, ../../Modules/Retro-Fueled/src/Turbo_Increment_AllowUSFStacking.c + +// CharacterRandomizer // + +// Include OverrideMPK +926, exe, 0x80033f3c, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1006, exe, 0x80035520, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1020, exe, 0x800342f8, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +1111, exe, 0x80035b5C, 0x0, ../../Modules/OverrideMPK/src/numDrivers.s +common, exe, LOAD_AppendQueue, 0x8, ../../Modules/OverrideMPK/src/numDriversPlusOne.s +common, exe, Driver_GetModelByName, 0x0, ../../Modules/OverrideMPK/src/OvMPK_StringSearch.c +common, exe, LOAD_DriverMPK, 0x0, ../../Modules/OverrideMPK/src/OvMPK_LoadMPK.c + +common, exe, LOAD_Robots1P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook1P.s +common, exe, LOAD_Robots2P, 0x0, ../../Modules/CharacterRandomizer/src/ChRand_hook2P.s + +// Compile code to empty spaces in RDATA // +common, exe, rdata_free, 0x0, ../../Modules/Retro-Fueled/src/main.c ../../Modules/CharacterRandomizer/src/ChRand_main.c \ No newline at end of file diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment.c b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment.c index fd5e0c830..68fec8fec 100644 --- a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment.c +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment.c @@ -102,7 +102,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int if (driver->japanTurboUnknown == 0) { driver->numTurbos = 1; - if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode & 0x200000) == 0)) + if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) { driver->numTurbosBackup = 1; } @@ -110,7 +110,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int else { driver->numTurbos++; - if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode & 0x200000) == 0)) + if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) { driver->numTurbosBackup = driver->numTurbos; } @@ -210,7 +210,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif } } @@ -230,7 +230,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int driver->numTurbos++; #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif } diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment_Retro-Fueled.c b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment_Retro-Fueled.c index c555be7ce..fce01e2d4 100644 --- a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment_Retro-Fueled.c +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/ReservesMeter/src/Turbo_Increment_Retro-Fueled.c @@ -102,7 +102,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int if (driver->japanTurboUnknown == 0) { driver->numTurbos = 1; - if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode & 0x200000) == 0)) + if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) { driver->numTurbosBackup = 1; } @@ -110,7 +110,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int else { driver->numTurbos++; - if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode & 0x200000) == 0)) + if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) { driver->numTurbosBackup = driver->numTurbos; } @@ -210,7 +210,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif } } @@ -230,7 +230,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int driver->numTurbos++; #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif } diff --git a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/Retro-Fueled/src/Turbo_Increment_AllowUSFStacking.c b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/Retro-Fueled/src/Turbo_Increment_AllowUSFStacking.c index ecadbb8bc..141d27836 100644 --- a/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/Retro-Fueled/src/Turbo_Increment_AllowUSFStacking.c +++ b/psx-modding-toolchain/games/CrashTeamRacing/mods/Modules/Retro-Fueled/src/Turbo_Increment_AllowUSFStacking.c @@ -102,7 +102,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int if (driver->japanTurboUnknown == 0) { driver->numTurbos = 1; - if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) + if ((driver->numTurbosBackup < 1) && ((sdata.gGT->gameMode11 & 0x200000) == 0)) { driver->numTurbosBackup = 1; } @@ -110,7 +110,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int else { driver->numTurbos++; - if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode1 & 0x200000) == 0)) + if ((driver->numTurbosBackup < driver->numTurbos) && ((sdata.gGT->gameMode11 & 0x200000) == 0)) { driver->numTurbosBackup = driver->numTurbos; } @@ -210,7 +210,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode11 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif } } @@ -226,7 +226,7 @@ void DECOMP_Turbo_Increment(struct Driver* driver, int reserves, u_int type, int driver->numTurbos++; #if BUILD == JpnRetail // probably some sort of overflow safety check - if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode1 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; + if (driver->numTurbosBackup < driver->numTurbos && (sdata.gGT->gameMode11 & 0x200000) == 0) driver->numTurbosBackup = driver->numTurbos; #endif }