diff --git a/mods/Levels/2024_NewSetup/StepsToFollow.txt b/mods/Levels/2024_NewSetup/StepsToFollow.txt deleted file mode 100644 index ea7d4feab..000000000 --- a/mods/Levels/2024_NewSetup/StepsToFollow.txt +++ /dev/null @@ -1,15 +0,0 @@ -[to-do] generate source code pseudo-auto - -First build with ./build.bat, -this generates .lev file - -Then run textures/start.bat, -this patches .lev and generates .vrm - -Boot retail game in duckstation -Go to Time Trial Crash Cove -Pause -Use "sendToDuck.bat" -Restart Race (from pause) - -[to-do] need to load VRAM file \ No newline at end of file diff --git a/mods/Levels/2024_NewSetup/buildList.txt b/mods/Levels/2024_NewSetup/buildList.txt deleted file mode 100644 index e8a2d5e47..000000000 --- a/mods/Levels/2024_NewSetup/buildList.txt +++ /dev/null @@ -1,4 +0,0 @@ - -// sets lev to bigfile 221 -926, 221, 0x8009f6fc, 0x0, src/Lev221.c -926, 222, 0x8009f6fc, 0x0, src/dataVRAM.bin \ No newline at end of file diff --git a/mods/Levels/2024_NewSetup/sendToDuck.bat b/mods/Levels/2024_NewSetup/sendToDuck.bat deleted file mode 100644 index 1e11aabff..000000000 --- a/mods/Levels/2024_NewSetup/sendToDuck.bat +++ /dev/null @@ -1 +0,0 @@ -..\Automate\LevelUploader\x64\Debug\LevelUploader.exe %cd%\textures\data.lev \ No newline at end of file diff --git a/mods/Levels/Automate/CTRFramework.dll b/mods/Levels/Automate/CTRFramework.dll deleted file mode 100644 index 23943eeee..000000000 Binary files a/mods/Levels/Automate/CTRFramework.dll and /dev/null differ diff --git a/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.exe b/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.exe deleted file mode 100644 index 602df1f64..000000000 Binary files a/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.exe and /dev/null differ diff --git a/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.pdb b/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.pdb deleted file mode 100644 index 5d1e44df3..000000000 Binary files a/mods/Levels/Automate/LevelPatcher/Debug/LevelPatcher.pdb and /dev/null differ diff --git a/mods/Levels/Automate/model_reader.exe b/mods/Levels/Automate/model_reader.exe deleted file mode 100644 index aaa33e966..000000000 Binary files a/mods/Levels/Automate/model_reader.exe and /dev/null differ diff --git a/mods/Levels/Automate/vrmtool.exe b/mods/Levels/Automate/vrmtool.exe deleted file mode 100644 index 8e7443a13..000000000 Binary files a/mods/Levels/Automate/vrmtool.exe and /dev/null differ diff --git a/mods/Levels/Automate/LevelPatcher/LevelPatcher.sln b/mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher.sln similarity index 100% rename from mods/Levels/Automate/LevelPatcher/LevelPatcher.sln rename to mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher.sln diff --git a/mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.c b/mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.c similarity index 100% rename from mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.c rename to mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.c diff --git a/mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj b/mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj similarity index 100% rename from mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj rename to mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj diff --git a/mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.filters b/mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.filters similarity index 100% rename from mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.filters rename to mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.filters diff --git a/mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.user b/mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.user similarity index 100% rename from mods/Levels/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.user rename to mods/Levels/Legacy/Automate/LevelPatcher/LevelPatcher/LevelPatcher.vcxproj.user diff --git a/mods/Levels/Automate/blankVRAM_dontErase.vrm b/mods/Levels/Legacy/Automate/blankVRAM_dontErase.vrm similarity index 100% rename from mods/Levels/Automate/blankVRAM_dontErase.vrm rename to mods/Levels/Legacy/Automate/blankVRAM_dontErase.vrm diff --git a/mods/Levels/2024_NewSetup/build.bat b/mods/Levels/Legacy/RoadToRainbow/build.bat similarity index 100% rename from mods/Levels/2024_NewSetup/build.bat rename to mods/Levels/Legacy/RoadToRainbow/build.bat diff --git a/mods/Levels/RoadToRainbow/buildList.txt b/mods/Levels/Legacy/RoadToRainbow/buildList.txt similarity index 100% rename from mods/Levels/RoadToRainbow/buildList.txt rename to mods/Levels/Legacy/RoadToRainbow/buildList.txt diff --git a/mods/Levels/RoadToRainbow/src/230_31_MM_MENUBOX_Main.c b/mods/Levels/Legacy/RoadToRainbow/src/230_31_MM_MENUBOX_Main.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/230_31_MM_MENUBOX_Main.c rename to mods/Levels/Legacy/RoadToRainbow/src/230_31_MM_MENUBOX_Main.c diff --git a/mods/Levels/RoadToRainbow/src/230_50_MM_Characters_MenuBox.c b/mods/Levels/Legacy/RoadToRainbow/src/230_50_MM_Characters_MenuBox.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/230_50_MM_Characters_MenuBox.c rename to mods/Levels/Legacy/RoadToRainbow/src/230_50_MM_Characters_MenuBox.c diff --git a/mods/Levels/RoadToRainbow/src/LOAD_TenStages.c b/mods/Levels/Legacy/RoadToRainbow/src/LOAD_TenStages.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/LOAD_TenStages.c rename to mods/Levels/Legacy/RoadToRainbow/src/LOAD_TenStages.c diff --git a/mods/Levels/RoadToRainbow/src/Lev221.c b/mods/Levels/Legacy/RoadToRainbow/src/Lev221.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/Lev221.c rename to mods/Levels/Legacy/RoadToRainbow/src/Lev221.c diff --git a/mods/Levels/RawTrackInjection/src/battle_hookInit.s b/mods/Levels/Legacy/RoadToRainbow/src/battle_hookInit.s similarity index 100% rename from mods/Levels/RawTrackInjection/src/battle_hookInit.s rename to mods/Levels/Legacy/RoadToRainbow/src/battle_hookInit.s diff --git a/mods/Levels/RawTrackInjection/src/battle_hookUpdate.s b/mods/Levels/Legacy/RoadToRainbow/src/battle_hookUpdate.s similarity index 100% rename from mods/Levels/RawTrackInjection/src/battle_hookUpdate.s rename to mods/Levels/Legacy/RoadToRainbow/src/battle_hookUpdate.s diff --git a/mods/Levels/RoadToRainbow/src/battle_runtime.c b/mods/Levels/Legacy/RoadToRainbow/src/battle_runtime.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/battle_runtime.c rename to mods/Levels/Legacy/RoadToRainbow/src/battle_runtime.c diff --git a/mods/Levels/RawTrackInjection/src/disableQueueLevInst.c b/mods/Levels/Legacy/RoadToRainbow/src/disableQueueLevInst.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/disableQueueLevInst.c rename to mods/Levels/Legacy/RoadToRainbow/src/disableQueueLevInst.c diff --git a/mods/Levels/RawTrackInjection/src/return1.c b/mods/Levels/Legacy/RoadToRainbow/src/return1.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/return1.c rename to mods/Levels/Legacy/RoadToRainbow/src/return1.c diff --git a/mods/Levels/RoadToRainbow/src/return2.c b/mods/Levels/Legacy/RoadToRainbow/src/return2.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/return2.c rename to mods/Levels/Legacy/RoadToRainbow/src/return2.c diff --git a/mods/Levels/RawTrackInjection/src/return3.c b/mods/Levels/Legacy/RoadToRainbow/src/return3.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/return3.c rename to mods/Levels/Legacy/RoadToRainbow/src/return3.c diff --git a/mods/Levels/2024_NewSetup/textures/.gitignore b/mods/Levels/Legacy/RoadToRainbow/textures/.gitignore similarity index 100% rename from mods/Levels/2024_NewSetup/textures/.gitignore rename to mods/Levels/Legacy/RoadToRainbow/textures/.gitignore diff --git a/mods/Levels/RoadToRainbow/textures/newtex/512_0_32_20_16_16_0.png b/mods/Levels/Legacy/RoadToRainbow/textures/newtex/512_0_32_20_16_16_0.png similarity index 100% rename from mods/Levels/RoadToRainbow/textures/newtex/512_0_32_20_16_16_0.png rename to mods/Levels/Legacy/RoadToRainbow/textures/newtex/512_0_32_20_16_16_0.png diff --git a/mods/Levels/RoadToRainbow/textures/newtex/576_0_32_21_32_16_0.png b/mods/Levels/Legacy/RoadToRainbow/textures/newtex/576_0_32_21_32_16_0.png similarity index 100% rename from mods/Levels/RoadToRainbow/textures/newtex/576_0_32_21_32_16_0.png rename to mods/Levels/Legacy/RoadToRainbow/textures/newtex/576_0_32_21_32_16_0.png diff --git a/mods/Levels/RoadToRainbow/textures/newtex/576_16_32_21_32_16_0.png b/mods/Levels/Legacy/RoadToRainbow/textures/newtex/576_16_32_21_32_16_0.png similarity index 100% rename from mods/Levels/RoadToRainbow/textures/newtex/576_16_32_21_32_16_0.png rename to mods/Levels/Legacy/RoadToRainbow/textures/newtex/576_16_32_21_32_16_0.png diff --git a/mods/Levels/2024_NewSetup/textures/start.bat b/mods/Levels/Legacy/RoadToRainbow/textures/start.bat similarity index 100% rename from mods/Levels/2024_NewSetup/textures/start.bat rename to mods/Levels/Legacy/RoadToRainbow/textures/start.bat diff --git a/mods/Levels/RawTrackInjection/build.bat b/mods/Levels/Legacy/TileTrauma/build.bat similarity index 100% rename from mods/Levels/RawTrackInjection/build.bat rename to mods/Levels/Legacy/TileTrauma/build.bat diff --git a/mods/Levels/TileTrauma/buildList.txt b/mods/Levels/Legacy/TileTrauma/buildList.txt similarity index 100% rename from mods/Levels/TileTrauma/buildList.txt rename to mods/Levels/Legacy/TileTrauma/buildList.txt diff --git a/mods/Levels/TileTrauma/src/230_31_MM_MENUBOX_Main.c b/mods/Levels/Legacy/TileTrauma/src/230_31_MM_MENUBOX_Main.c similarity index 100% rename from mods/Levels/TileTrauma/src/230_31_MM_MENUBOX_Main.c rename to mods/Levels/Legacy/TileTrauma/src/230_31_MM_MENUBOX_Main.c diff --git a/mods/Levels/TileTrauma/src/230_50_MM_Characters_MenuBox.c b/mods/Levels/Legacy/TileTrauma/src/230_50_MM_Characters_MenuBox.c similarity index 100% rename from mods/Levels/TileTrauma/src/230_50_MM_Characters_MenuBox.c rename to mods/Levels/Legacy/TileTrauma/src/230_50_MM_Characters_MenuBox.c diff --git a/mods/Levels/RawTrackInjection/src/LOAD_TenStages.c b/mods/Levels/Legacy/TileTrauma/src/LOAD_TenStages.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/LOAD_TenStages.c rename to mods/Levels/Legacy/TileTrauma/src/LOAD_TenStages.c diff --git a/mods/Levels/TileTrauma/src/Lev221.c b/mods/Levels/Legacy/TileTrauma/src/Lev221.c similarity index 100% rename from mods/Levels/TileTrauma/src/Lev221.c rename to mods/Levels/Legacy/TileTrauma/src/Lev221.c diff --git a/mods/Levels/RoadToRainbow/src/battle_hookInit.s b/mods/Levels/Legacy/TileTrauma/src/battle_hookInit.s similarity index 100% rename from mods/Levels/RoadToRainbow/src/battle_hookInit.s rename to mods/Levels/Legacy/TileTrauma/src/battle_hookInit.s diff --git a/mods/Levels/RoadToRainbow/src/battle_hookUpdate.s b/mods/Levels/Legacy/TileTrauma/src/battle_hookUpdate.s similarity index 100% rename from mods/Levels/RoadToRainbow/src/battle_hookUpdate.s rename to mods/Levels/Legacy/TileTrauma/src/battle_hookUpdate.s diff --git a/mods/Levels/TileTrauma/src/battle_runtime.c b/mods/Levels/Legacy/TileTrauma/src/battle_runtime.c similarity index 100% rename from mods/Levels/TileTrauma/src/battle_runtime.c rename to mods/Levels/Legacy/TileTrauma/src/battle_runtime.c diff --git a/mods/Levels/RoadToRainbow/src/disableQueueLevInst.c b/mods/Levels/Legacy/TileTrauma/src/disableQueueLevInst.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/disableQueueLevInst.c rename to mods/Levels/Legacy/TileTrauma/src/disableQueueLevInst.c diff --git a/mods/Levels/TileTrauma/src/navData2.h b/mods/Levels/Legacy/TileTrauma/src/navData2.h similarity index 100% rename from mods/Levels/TileTrauma/src/navData2.h rename to mods/Levels/Legacy/TileTrauma/src/navData2.h diff --git a/mods/Levels/RoadToRainbow/src/return1.c b/mods/Levels/Legacy/TileTrauma/src/return1.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/return1.c rename to mods/Levels/Legacy/TileTrauma/src/return1.c diff --git a/mods/Levels/RoadToRainbow/src/return3.c b/mods/Levels/Legacy/TileTrauma/src/return3.c similarity index 100% rename from mods/Levels/RoadToRainbow/src/return3.c rename to mods/Levels/Legacy/TileTrauma/src/return3.c diff --git a/mods/Levels/TileTrauma/src/trackSpecificData.h b/mods/Levels/Legacy/TileTrauma/src/trackSpecificData.h similarity index 100% rename from mods/Levels/TileTrauma/src/trackSpecificData.h rename to mods/Levels/Legacy/TileTrauma/src/trackSpecificData.h diff --git a/mods/Levels/RoadToRainbow/textures/.gitignore b/mods/Levels/Legacy/TileTrauma/textures/.gitignore similarity index 100% rename from mods/Levels/RoadToRainbow/textures/.gitignore rename to mods/Levels/Legacy/TileTrauma/textures/.gitignore diff --git a/mods/Levels/TileTrauma/textures/light_map.png b/mods/Levels/Legacy/TileTrauma/textures/light_map.png similarity index 100% rename from mods/Levels/TileTrauma/textures/light_map.png rename to mods/Levels/Legacy/TileTrauma/textures/light_map.png diff --git a/mods/Levels/TileTrauma/textures/newtex/512_0_32_128_64_64_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/512_0_32_128_64_64_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/512_0_32_128_64_64_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/512_0_32_128_64_64_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/528_0_32_129_64_64_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/528_0_32_129_64_64_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/528_0_32_129_64_64_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/528_0_32_129_64_64_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/544_0_32_130_64_64_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/544_0_32_130_64_64_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/544_0_32_130_64_64_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/544_0_32_130_64_64_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/560_0_32_131_64_64_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/560_0_32_131_64_64_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/560_0_32_131_64_64_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/560_0_32_131_64_64_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/576_0_32_135_64_64_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/576_0_32_135_64_64_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/576_0_32_135_64_64_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/576_0_32_135_64_64_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/592_0_32_132_16_16_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/592_0_32_132_16_16_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/592_0_32_132_16_16_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/592_0_32_132_16_16_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/596_0_32_133_32_16_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/596_0_32_133_32_16_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/596_0_32_133_32_16_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/596_0_32_133_32_16_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/596_16_32_133_32_16_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/596_16_32_133_32_16_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/596_16_32_133_32_16_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/596_16_32_133_32_16_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/604_0_32_134_32_16_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/604_0_32_134_32_16_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/604_0_32_134_32_16_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/604_0_32_134_32_16_0.png diff --git a/mods/Levels/TileTrauma/textures/newtex/604_16_32_134_32_16_0.png b/mods/Levels/Legacy/TileTrauma/textures/newtex/604_16_32_134_32_16_0.png similarity index 100% rename from mods/Levels/TileTrauma/textures/newtex/604_16_32_134_32_16_0.png rename to mods/Levels/Legacy/TileTrauma/textures/newtex/604_16_32_134_32_16_0.png diff --git a/mods/Levels/RoadToRainbow/textures/start.bat b/mods/Levels/Legacy/TileTrauma/textures/start.bat similarity index 100% rename from mods/Levels/RoadToRainbow/textures/start.bat rename to mods/Levels/Legacy/TileTrauma/textures/start.bat diff --git a/mods/Levels/RoadToRainbow/build.bat b/mods/Levels/Legacy/WallTest/build.bat similarity index 100% rename from mods/Levels/RoadToRainbow/build.bat rename to mods/Levels/Legacy/WallTest/build.bat diff --git a/mods/Levels/WallTest/buildList.txt b/mods/Levels/Legacy/WallTest/buildList.txt similarity index 100% rename from mods/Levels/WallTest/buildList.txt rename to mods/Levels/Legacy/WallTest/buildList.txt diff --git a/mods/Levels/WallTest/src/230_31_MM_MenuProc_Main.c b/mods/Levels/Legacy/WallTest/src/230_31_MM_MenuProc_Main.c similarity index 100% rename from mods/Levels/WallTest/src/230_31_MM_MenuProc_Main.c rename to mods/Levels/Legacy/WallTest/src/230_31_MM_MenuProc_Main.c diff --git a/mods/Levels/RawTrackInjection/src/230_50_MM_Characters_MenuProc.c b/mods/Levels/Legacy/WallTest/src/230_50_MM_Characters_MenuProc.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/230_50_MM_Characters_MenuProc.c rename to mods/Levels/Legacy/WallTest/src/230_50_MM_Characters_MenuProc.c diff --git a/mods/Levels/WallTest/src/LOAD_TenStages.c b/mods/Levels/Legacy/WallTest/src/LOAD_TenStages.c similarity index 100% rename from mods/Levels/WallTest/src/LOAD_TenStages.c rename to mods/Levels/Legacy/WallTest/src/LOAD_TenStages.c diff --git a/mods/Levels/WallTest/src/Lev221.c b/mods/Levels/Legacy/WallTest/src/Lev221.c similarity index 100% rename from mods/Levels/WallTest/src/Lev221.c rename to mods/Levels/Legacy/WallTest/src/Lev221.c diff --git a/mods/Levels/TileTrauma/src/battle_hookInit.s b/mods/Levels/Legacy/WallTest/src/battle_hookInit.s similarity index 100% rename from mods/Levels/TileTrauma/src/battle_hookInit.s rename to mods/Levels/Legacy/WallTest/src/battle_hookInit.s diff --git a/mods/Levels/TileTrauma/src/battle_hookUpdate.s b/mods/Levels/Legacy/WallTest/src/battle_hookUpdate.s similarity index 100% rename from mods/Levels/TileTrauma/src/battle_hookUpdate.s rename to mods/Levels/Legacy/WallTest/src/battle_hookUpdate.s diff --git a/mods/Levels/WallTest/src/battle_runtime.c b/mods/Levels/Legacy/WallTest/src/battle_runtime.c similarity index 100% rename from mods/Levels/WallTest/src/battle_runtime.c rename to mods/Levels/Legacy/WallTest/src/battle_runtime.c diff --git a/mods/Levels/TileTrauma/src/disableQueueLevInst.c b/mods/Levels/Legacy/WallTest/src/disableQueueLevInst.c similarity index 100% rename from mods/Levels/TileTrauma/src/disableQueueLevInst.c rename to mods/Levels/Legacy/WallTest/src/disableQueueLevInst.c diff --git a/mods/Levels/TileTrauma/src/return1.c b/mods/Levels/Legacy/WallTest/src/return1.c similarity index 100% rename from mods/Levels/TileTrauma/src/return1.c rename to mods/Levels/Legacy/WallTest/src/return1.c diff --git a/mods/Levels/WallTest/src/return2.c b/mods/Levels/Legacy/WallTest/src/return2.c similarity index 100% rename from mods/Levels/WallTest/src/return2.c rename to mods/Levels/Legacy/WallTest/src/return2.c diff --git a/mods/Levels/TileTrauma/src/return3.c b/mods/Levels/Legacy/WallTest/src/return3.c similarity index 100% rename from mods/Levels/TileTrauma/src/return3.c rename to mods/Levels/Legacy/WallTest/src/return3.c diff --git a/mods/Levels/WallTest/src/trackSpecificData.h b/mods/Levels/Legacy/WallTest/src/trackSpecificData.h similarity index 100% rename from mods/Levels/WallTest/src/trackSpecificData.h rename to mods/Levels/Legacy/WallTest/src/trackSpecificData.h diff --git a/mods/Levels/TileTrauma/textures/.gitignore b/mods/Levels/Legacy/WallTest/textures/.gitignore similarity index 100% rename from mods/Levels/TileTrauma/textures/.gitignore rename to mods/Levels/Legacy/WallTest/textures/.gitignore diff --git a/mods/Levels/WallTest/textures/newtex/512_0_32_20_16_16_0.png b/mods/Levels/Legacy/WallTest/textures/newtex/512_0_32_20_16_16_0.png similarity index 100% rename from mods/Levels/WallTest/textures/newtex/512_0_32_20_16_16_0.png rename to mods/Levels/Legacy/WallTest/textures/newtex/512_0_32_20_16_16_0.png diff --git a/mods/Levels/TileTrauma/textures/start.bat b/mods/Levels/Legacy/WallTest/textures/start.bat similarity index 100% rename from mods/Levels/TileTrauma/textures/start.bat rename to mods/Levels/Legacy/WallTest/textures/start.bat diff --git a/mods/Levels/TileTrauma/build.bat b/mods/Levels/Legacy/WorkingLapTest/build.bat similarity index 100% rename from mods/Levels/TileTrauma/build.bat rename to mods/Levels/Legacy/WorkingLapTest/build.bat diff --git a/mods/Levels/WorkingLapTest/buildList.txt b/mods/Levels/Legacy/WorkingLapTest/buildList.txt similarity index 100% rename from mods/Levels/WorkingLapTest/buildList.txt rename to mods/Levels/Legacy/WorkingLapTest/buildList.txt diff --git a/mods/Levels/WorkingLapTest/niikasdtrack.png b/mods/Levels/Legacy/WorkingLapTest/niikasdtrack.png similarity index 100% rename from mods/Levels/WorkingLapTest/niikasdtrack.png rename to mods/Levels/Legacy/WorkingLapTest/niikasdtrack.png diff --git a/mods/Levels/WorkingLapTest/niikasdtrack.pngtest.c b/mods/Levels/Legacy/WorkingLapTest/niikasdtrack.pngtest.c similarity index 100% rename from mods/Levels/WorkingLapTest/niikasdtrack.pngtest.c rename to mods/Levels/Legacy/WorkingLapTest/niikasdtrack.pngtest.c diff --git a/mods/Levels/WorkingLapTest/pngtotrack.py b/mods/Levels/Legacy/WorkingLapTest/pngtotrack.py similarity index 100% rename from mods/Levels/WorkingLapTest/pngtotrack.py rename to mods/Levels/Legacy/WorkingLapTest/pngtotrack.py diff --git a/mods/Levels/WorkingLapTest/src/230_31_MM_MENUBOX_Main.c b/mods/Levels/Legacy/WorkingLapTest/src/230_31_MM_MENUBOX_Main.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/230_31_MM_MENUBOX_Main.c rename to mods/Levels/Legacy/WorkingLapTest/src/230_31_MM_MENUBOX_Main.c diff --git a/mods/Levels/WorkingLapTest/src/230_50_MM_Characters_MenuBox.c b/mods/Levels/Legacy/WorkingLapTest/src/230_50_MM_Characters_MenuBox.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/230_50_MM_Characters_MenuBox.c rename to mods/Levels/Legacy/WorkingLapTest/src/230_50_MM_Characters_MenuBox.c diff --git a/mods/Levels/TileTrauma/src/LOAD_TenStages.c b/mods/Levels/Legacy/WorkingLapTest/src/LOAD_TenStages.c similarity index 100% rename from mods/Levels/TileTrauma/src/LOAD_TenStages.c rename to mods/Levels/Legacy/WorkingLapTest/src/LOAD_TenStages.c diff --git a/mods/Levels/2024_NewSetup/src/Lev221.c b/mods/Levels/Legacy/WorkingLapTest/src/Lev221.c similarity index 100% rename from mods/Levels/2024_NewSetup/src/Lev221.c rename to mods/Levels/Legacy/WorkingLapTest/src/Lev221.c diff --git a/mods/Levels/WallTest/src/battle_hookInit.s b/mods/Levels/Legacy/WorkingLapTest/src/battle_hookInit.s similarity index 100% rename from mods/Levels/WallTest/src/battle_hookInit.s rename to mods/Levels/Legacy/WorkingLapTest/src/battle_hookInit.s diff --git a/mods/Levels/WallTest/src/battle_hookUpdate.s b/mods/Levels/Legacy/WorkingLapTest/src/battle_hookUpdate.s similarity index 100% rename from mods/Levels/WallTest/src/battle_hookUpdate.s rename to mods/Levels/Legacy/WorkingLapTest/src/battle_hookUpdate.s diff --git a/mods/Levels/WorkingLapTest/src/battle_runtime.c b/mods/Levels/Legacy/WorkingLapTest/src/battle_runtime.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/battle_runtime.c rename to mods/Levels/Legacy/WorkingLapTest/src/battle_runtime.c diff --git a/mods/Levels/WallTest/src/disableQueueLevInst.c b/mods/Levels/Legacy/WorkingLapTest/src/disableQueueLevInst.c similarity index 100% rename from mods/Levels/WallTest/src/disableQueueLevInst.c rename to mods/Levels/Legacy/WorkingLapTest/src/disableQueueLevInst.c diff --git a/mods/Levels/WallTest/src/return1.c b/mods/Levels/Legacy/WorkingLapTest/src/return1.c similarity index 100% rename from mods/Levels/WallTest/src/return1.c rename to mods/Levels/Legacy/WorkingLapTest/src/return1.c diff --git a/mods/Levels/WorkingLapTest/src/return2.c b/mods/Levels/Legacy/WorkingLapTest/src/return2.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/return2.c rename to mods/Levels/Legacy/WorkingLapTest/src/return2.c diff --git a/mods/Levels/WallTest/src/return3.c b/mods/Levels/Legacy/WorkingLapTest/src/return3.c similarity index 100% rename from mods/Levels/WallTest/src/return3.c rename to mods/Levels/Legacy/WorkingLapTest/src/return3.c diff --git a/mods/Levels/WorkingLapTest/src/return4.c b/mods/Levels/Legacy/WorkingLapTest/src/return4.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/return4.c rename to mods/Levels/Legacy/WorkingLapTest/src/return4.c diff --git a/mods/Levels/WorkingLapTest/testtrack.png b/mods/Levels/Legacy/WorkingLapTest/testtrack.png similarity index 100% rename from mods/Levels/WorkingLapTest/testtrack.png rename to mods/Levels/Legacy/WorkingLapTest/testtrack.png diff --git a/mods/Levels/WorkingLapTest/testtrack.pngtest.c b/mods/Levels/Legacy/WorkingLapTest/testtrack.pngtest.c similarity index 100% rename from mods/Levels/WorkingLapTest/testtrack.pngtest.c rename to mods/Levels/Legacy/WorkingLapTest/testtrack.pngtest.c diff --git a/mods/Levels/WallTest/textures/.gitignore b/mods/Levels/Legacy/WorkingLapTest/textures/.gitignore similarity index 100% rename from mods/Levels/WallTest/textures/.gitignore rename to mods/Levels/Legacy/WorkingLapTest/textures/.gitignore diff --git a/mods/Levels/2024_NewSetup/textures/newtex/512_0_32_128_32_32_1.png b/mods/Levels/Legacy/WorkingLapTest/textures/newtex/512_0_32_128_32_32_1.png similarity index 100% rename from mods/Levels/2024_NewSetup/textures/newtex/512_0_32_128_32_32_1.png rename to mods/Levels/Legacy/WorkingLapTest/textures/newtex/512_0_32_128_32_32_1.png diff --git a/mods/Levels/WallTest/textures/start.bat b/mods/Levels/Legacy/WorkingLapTest/textures/start.bat similarity index 100% rename from mods/Levels/WallTest/textures/start.bat rename to mods/Levels/Legacy/WorkingLapTest/textures/start.bat diff --git a/mods/Levels/ctrlev.hexpat b/mods/Levels/Legacy/ctrlev.hexpat similarity index 100% rename from mods/Levels/ctrlev.hexpat rename to mods/Levels/Legacy/ctrlev.hexpat diff --git a/mods/Levels/levelBuilder.h b/mods/Levels/Legacy/levelBuilder.h similarity index 100% rename from mods/Levels/levelBuilder.h rename to mods/Levels/Legacy/levelBuilder.h diff --git a/mods/Levels/Automate/LevelUploader/LevelUploader.sln b/mods/Levels/PC_TrackLoader/LevelUploader.sln similarity index 100% rename from mods/Levels/Automate/LevelUploader/LevelUploader.sln rename to mods/Levels/PC_TrackLoader/LevelUploader.sln diff --git a/mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj b/mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj similarity index 100% rename from mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj rename to mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj diff --git a/mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj.filters b/mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj.filters similarity index 100% rename from mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj.filters rename to mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj.filters diff --git a/mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj.user b/mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj.user similarity index 100% rename from mods/Levels/Automate/LevelUploader/LevelUploader/LevelUploader.vcxproj.user rename to mods/Levels/PC_TrackLoader/LevelUploader/LevelUploader.vcxproj.user diff --git a/mods/Levels/Automate/LevelUploader/LevelUploader/main.c b/mods/Levels/PC_TrackLoader/LevelUploader/main.c similarity index 85% rename from mods/Levels/Automate/LevelUploader/LevelUploader/main.c rename to mods/Levels/PC_TrackLoader/LevelUploader/main.c index da67e0702..56271f4e4 100644 --- a/mods/Levels/Automate/LevelUploader/LevelUploader/main.c +++ b/mods/Levels/PC_TrackLoader/LevelUploader/main.c @@ -36,12 +36,48 @@ struct DramPointerMap #define DRAM_GETOFFSETS(x) \ ((char*)x + sizeof(struct DramPointerMap)) +void wait() +{ + while (*(int*)&pBuf[(0x8000c000) & 0xffffff] != 3) + { + // do nothing + } +} + void UploadToDuck(char** argv) { - FILE* f = fopen("dataLEV.bin", "rb"); + FILE* f; + int size; + + // tell emu to pause, cause LEV is overwritten by VRM + *(int*)&pBuf[(0x8000c000) & 0xffffff] = 1; + + // wait 0.1s for emu to actually stop + Sleep(100); + + f = fopen("data.vrm", "rb"); + + fseek(f, 0, SEEK_END); + size = ftell(f); + rewind(f); + + // read to 4mb on PS1 + fread(&pBuf[0x200000], size, 1, f); + + fclose(f); + + // tell PS1 to load VRAM + *(int*)&pBuf[(0x8000c000) & 0xffffff] = 2; + + // wait for VRAM to finish uploading + wait(); + + // ============================================ + + f = fopen("data.lev", "rb"); fseek(f, 0, SEEK_END); - int size = ftell(f); + size = ftell(f); rewind(f); // read to 2mb on PS1 @@ -63,21 +99,11 @@ void UploadToDuck(char** argv) // set level file pointer *(int*)&pBuf[(0x80096b20 + 0x160) & 0xffffff] = 0x80200004; - // ============================================ - - f = fopen("dataVRAM.bin", "rb"); - - fseek(f, 0, SEEK_END); - size = ftell(f); - rewind(f); - - // read to 4mb on PS1 - fread(&pBuf[0x400000], size, 1, f); + // tell PS1 to start level + *(int*)&pBuf[(0x8000c000) & 0xffffff] = 4; - fclose(f); + // ============================================ - *(int*)&pBuf[(0x8000c000) & 0xffffff] = 1; - printf("Here\n"); system("pause"); exit(0); diff --git a/mods/Levels/WallTest/build.bat b/mods/Levels/PS1_TrackROM/build.bat similarity index 100% rename from mods/Levels/WallTest/build.bat rename to mods/Levels/PS1_TrackROM/build.bat diff --git a/mods/Levels/RawTrackInjection/buildList.txt b/mods/Levels/PS1_TrackROM/buildList.txt similarity index 100% rename from mods/Levels/RawTrackInjection/buildList.txt rename to mods/Levels/PS1_TrackROM/buildList.txt diff --git a/mods/Levels/RawTrackInjection/src/230_31_MM_MenuProc_Main.c b/mods/Levels/PS1_TrackROM/src/230_31_MM_MenuProc_Main.c similarity index 100% rename from mods/Levels/RawTrackInjection/src/230_31_MM_MenuProc_Main.c rename to mods/Levels/PS1_TrackROM/src/230_31_MM_MenuProc_Main.c diff --git a/mods/Levels/WallTest/src/230_50_MM_Characters_MenuProc.c b/mods/Levels/PS1_TrackROM/src/230_50_MM_Characters_MenuProc.c similarity index 100% rename from mods/Levels/WallTest/src/230_50_MM_Characters_MenuProc.c rename to mods/Levels/PS1_TrackROM/src/230_50_MM_Characters_MenuProc.c diff --git a/mods/Levels/WorkingLapTest/src/LOAD_TenStages.c b/mods/Levels/PS1_TrackROM/src/LOAD_TenStages.c similarity index 96% rename from mods/Levels/WorkingLapTest/src/LOAD_TenStages.c rename to mods/Levels/PS1_TrackROM/src/LOAD_TenStages.c index 58d69bb56..78ff95844 100644 --- a/mods/Levels/WorkingLapTest/src/LOAD_TenStages.c +++ b/mods/Levels/PS1_TrackROM/src/LOAD_TenStages.c @@ -235,6 +235,27 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* MainInit_PrimMem(gGT); MainInit_OTMem(gGT); + + for(int i = 0; i < 2; i++) + { + struct PrimMem* primMem = &gGT->db[i].primMem; + + void* pvVar1 = 0x80600000 + i*0x100000; + + // 1MB, take away some padding + int size = 0x100000 - 0x1000; + + primMem->size = size; + primMem->unk2 = (int)pvVar1; + primMem->curr = pvVar1; + primMem->start = pvVar1; + + // skip alignment by & 0xfffffffc, + // all possible size inputs are already aligned + pvVar1 = (void*)((int)pvVar1 + size); + primMem->end = pvVar1; + primMem->endMin100 = (void*)((int)pvVar1 - 0x100); + } // if cutscene, adventure arena, or credits if @@ -418,6 +439,10 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* if (*piVar15 != 0) *piVar15 += 4; }; + // for a test rom, dont do this, + // just load it somewhere in 8mb + #if 0 + // If the world you're in is made of multiple LEV files if ((gGT->gameMode2 & LEV_SWAP) != 0) { @@ -481,6 +506,8 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* // make all futuere allocations in subpacks MEMPACK_SwapPacks(gGT->activeMempackIndex); } + + #endif // game is now loading sdata->load_inProgress = 1; @@ -616,6 +643,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* } iVar9 = 7; + #if 0 // podium reward if (gGT->podiumRewardID != 0) { @@ -685,6 +713,7 @@ int LOAD_TenStages(struct GameTracker* gGT, int loadingStage, struct BigHeader* // Disable LEV instances on Adv Hub, for podium scene gGT->gameMode2 = gGT->gameMode2 | 0x100; } + #endif break; case 8: diff --git a/mods/Levels/WorkingLapTest/src/battle_hookInit.s b/mods/Levels/PS1_TrackROM/src/battle_hookInit.s similarity index 100% rename from mods/Levels/WorkingLapTest/src/battle_hookInit.s rename to mods/Levels/PS1_TrackROM/src/battle_hookInit.s diff --git a/mods/Levels/WorkingLapTest/src/battle_hookUpdate.s b/mods/Levels/PS1_TrackROM/src/battle_hookUpdate.s similarity index 100% rename from mods/Levels/WorkingLapTest/src/battle_hookUpdate.s rename to mods/Levels/PS1_TrackROM/src/battle_hookUpdate.s diff --git a/mods/Levels/RawTrackInjection/src/battle_runtime.c b/mods/Levels/PS1_TrackROM/src/battle_runtime.c similarity index 94% rename from mods/Levels/RawTrackInjection/src/battle_runtime.c rename to mods/Levels/PS1_TrackROM/src/battle_runtime.c index 74902e9d5..afea43e74 100644 --- a/mods/Levels/RawTrackInjection/src/battle_runtime.c +++ b/mods/Levels/PS1_TrackROM/src/battle_runtime.c @@ -179,19 +179,31 @@ void RunUpdateHook() // this gets triggered by the injector if(*(int*)0x8000c000 == 1) { - *(int*)0x8000c000 = 0; + while(!ReadyToContinue(2)) {} void FakeVramCallback(); FakeVramCallback(); - + + // finished uploading + *(int*)0x8000c000 = 3; + while(!ReadyToContinue(4)) {} + gGT->visMem1 = gGT->level1->visMem; gGT->visMem2 = gGT->visMem1; + + *(int*)0x8000c000 = 0; } } +__attribute__((optimize("O0"))) +int ReadyToContinue(int x) +{ + return *(int*)0x8000c000 == x; +} + void FakeVramCallback() { - int* vramBuf = 0x80400000; + int* vramBuf = 0x80200000; struct VramHeader* vh = vramBuf; // if multiple TIMs are packed together diff --git a/mods/Levels/WorkingLapTest/src/disableQueueLevInst.c b/mods/Levels/PS1_TrackROM/src/disableQueueLevInst.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/disableQueueLevInst.c rename to mods/Levels/PS1_TrackROM/src/disableQueueLevInst.c diff --git a/mods/Levels/WorkingLapTest/src/return1.c b/mods/Levels/PS1_TrackROM/src/return1.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/return1.c rename to mods/Levels/PS1_TrackROM/src/return1.c diff --git a/mods/Levels/WorkingLapTest/src/return3.c b/mods/Levels/PS1_TrackROM/src/return3.c similarity index 100% rename from mods/Levels/WorkingLapTest/src/return3.c rename to mods/Levels/PS1_TrackROM/src/return3.c diff --git a/mods/Levels/TileTrauma/src/dataVRAM.bin b/mods/Levels/TileTrauma/src/dataVRAM.bin deleted file mode 100644 index 8f8ea1b3e..000000000 Binary files a/mods/Levels/TileTrauma/src/dataVRAM.bin and /dev/null differ diff --git a/mods/Levels/WorkingLapTest/build.bat b/mods/Levels/WorkingLapTest/build.bat deleted file mode 100644 index 34b395334..000000000 --- a/mods/Levels/WorkingLapTest/build.bat +++ /dev/null @@ -1 +0,0 @@ -python ../../../../../tools/mod-builder/main.py \ No newline at end of file diff --git a/mods/Levels/WorkingLapTest/src/Lev221.c b/mods/Levels/WorkingLapTest/src/Lev221.c deleted file mode 100644 index cad17bdc9..000000000 --- a/mods/Levels/WorkingLapTest/src/Lev221.c +++ /dev/null @@ -1,362 +0,0 @@ -// Only for generating LEV files -#pragma GCC diagnostic ignored "-Wint-conversion" -#pragma GCC diagnostic ignored "-Woverride-init" -#pragma GCC diagnostic ignored "-Woverflow" - -#include -#include "../../levelBuilder.h" - -#define NUM_BLOCKS 20 - -struct LevelFile -{ - void* ptrMap; - struct Level level; - struct mesh_info mInfo; - struct IconGroup4 test_texture; - struct SpawnType1 spawnType1; - struct CheckpointNode noderespawnsthing[16]; - struct QuadBlock quadBlock[NUM_BLOCKS]; - struct LevVertex levVertex[NUM_BLOCKS*9]; - struct BSP bsp[3]; - struct PVS pvs; - int visBitIndex[4]; - struct VisMem visMem; - - // leave empty - // DstMemcpy must be big for PVS to copy into, - // RenderList must be big enough for 2 pointers to all BSP nodes - int VisMem_bitIndex_DstMemcpyP1[8]; - int VisMem_bspList_RenderListP1[3*2]; - int VisMem_bitIndex_DstMemcpyP2[8]; - int VisMem_bspList_RenderListP2[3*2]; - int VisMem_bitIndex_DstMemcpyP3[8]; - int VisMem_bspList_RenderListP3[3*2]; - int VisMem_bitIndex_DstMemcpyP4[8]; - int VisMem_bspList_RenderListP4[3*2]; - - int map[(3)+1]; -}; - -struct LevelFile file = -{ - .ptrMap = LEV_OFFSETOF(map[0]), - - .level = - { - .ptr_mesh_info = LEV_OFFSETOF(mInfo), - .visMem = LEV_OFFSETOF(visMem), - - // the game will add +0x400 to the yaw of spawn positions automatically - // we should probably look into why this even happens... - .DriverSpawn[0].pos = {0,0,0}, - .DriverSpawn[0].rot = {0,0-0x400,0}, - - .DriverSpawn[1].pos = {0,0,0}, - .DriverSpawn[1].rot = {0,0-0x400,0}, - - .DriverSpawn[2].pos = {0,0,0}, - .DriverSpawn[2].rot = {0,0-0x400,0}, - - .DriverSpawn[3].pos = {0,0,0}, - .DriverSpawn[3].rot = {0,0-0x400,0}, - - .ptrSpawnType1 = LEV_OFFSETOF(spawnType1), - - .configFlags = 1, - - .glowGradient[0] = - { - .pointFrom = -0xF0, - .pointTo = -0x10, - .colorFrom = 0x8000, - .colorTo = 0, - }, - - // amount of respawn points in the track - // and pointer to respawn data itself - .cnt_restart_points = 16, - .ptr_restart_points = LEV_OFFSETOF(noderespawnsthing[0]), - }, - - // pointers and amounts of variables - .mInfo = - { - .numQuadBlock = NUM_BLOCKS, - .numVertex = NUM_BLOCKS*9, // not really used - .unk1 = 0, // idk, fine to leave null - .ptrQuadBlockArray = LEV_OFFSETOF(quadBlock[0]), - .ptrVertexArray = LEV_OFFSETOF(levVertex[0]), - .unk2 = 0, // idk, fine to leave null - .bspRoot = LEV_OFFSETOF(bsp[0]), - .numBspNodes = 3, - }, - - // quadblock texture type - // see IconGroup4 in namespace_Decal.h - .test_texture = - { - .far = ImageName_Blend(512, 0, 32, 128, 32, 32, BPP_4, ADD), // very far - .middle = ImageName_Blend(512, 0, 32, 128, 32, 32, BPP_4, ADD), // far - .near = ImageName_Blend(512, 0, 32, 128, 32, 32, BPP_4, ADD), // close - .mosaic = ImageName_Blend(512, 0, 32, 128, 32, 32, BPP_4, ADD), // close - }, - - // this must exist, or else camera fly-in checks for "count" without nullptr check, and crashes dereferencing nullptr on real PSX - .spawnType1 = - { - .count = 0, - }, - - // automatically-generated quadblock insertions courtesy of pngtotrack.py - NEW_BLOCK(0, test_texture, 0x0000, 0x0000, NULL, 0x1800, (0xFFFFFF)),NEW_BLOCK(1, test_texture, 0x0300, 0x0000, NULL, 0x1800, (0x000000)), - NEW_BLOCK(2, test_texture, -0x300, 0x0300, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(3, test_texture, 0x0000, 0x0300, NULL, 0x1800, (0xFFFFFF)),NEW_BLOCK(4, test_texture, 0x0300, 0x0300, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(5, test_texture, 0x0600, 0x0300, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(6, test_texture, -0x300, 0x0600, NULL, 0x1800, RGBtoBGR(0x804000)), NEW_BLOCK(7, test_texture, 0x0600, 0x0600, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(8, test_texture, -0x300, 0x0900, NULL, 0x1800, RGBtoBGR(0x804000)), NEW_BLOCK(9, test_texture, 0x0600, 0x0900, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(10, test_texture, -0x300, 0x0c00, NULL, 0x1800, RGBtoBGR(0x804000)), NEW_BLOCK(11, test_texture, 0x0600, 0x0c00, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(12, test_texture, -0x300, 0x0f00, NULL, 0x1800, RGBtoBGR(0x804000)), NEW_BLOCK(13, test_texture, 0x0600, 0x0f00, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(14, test_texture, -0x300, 0x1200, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(15, test_texture, 0x0000, 0x1200, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(16, test_texture, 0x0300, 0x1200, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(17, test_texture, 0x0600, 0x1200, NULL, 0x1800, RGBtoBGR(0x804000)), - NEW_BLOCK(18, test_texture, 0x0000, 0x1500, NULL, 0x1800, RGBtoBGR(0x804000)),NEW_BLOCK(19, test_texture, 0x0300, 0x1500, NULL, 0x1800, RGBtoBGR(0x804000)), - - /* - - 00 01 - 02 03 04 05 - 06 07 - 08 09 - 10 11 - 12 13 - 14 15 16 17 - 18 19 - - */ - - // checkpoint and respawn indices - // starts at 2 and ends at 3, which are the first and last quadblocks in terms of progression respectively - // 0, 1, 18, and 19 aren't used for progression - .quadBlock[2].checkpointIndex = 0, - .quadBlock[6].checkpointIndex = 1, - .quadBlock[8].checkpointIndex = 2, - .quadBlock[10].checkpointIndex = 3, - .quadBlock[12].checkpointIndex = 4, - .quadBlock[14].checkpointIndex = 5, - .quadBlock[15].checkpointIndex = 6, - .quadBlock[16].checkpointIndex = 7, - .quadBlock[17].checkpointIndex = 8, - .quadBlock[13].checkpointIndex = 9, - .quadBlock[11].checkpointIndex = 10, - .quadBlock[9].checkpointIndex = 11, - .quadBlock[7].checkpointIndex = 12, - .quadBlock[5].checkpointIndex = 13, - .quadBlock[4].checkpointIndex = 14, - .quadBlock[3].checkpointIndex = 15, - - // checkpoint and respawn data, split into 16 nodes - // the positions of each node are the same as certain quadblocks - .noderespawnsthing = - { - [0] = - { - .pos = {-0x300, 0, 0x300}, // same as quadblock 2 - .distToFinish = 0x200*15, - .nextIndex_forward = 1, - .nextIndex_left = -1, - .nextIndex_backward = 15, - .nextIndex_right = -1, - }, - [1] = - { - .pos = {-0x300, 0, 0x600}, // same as quadblock 6 - .distToFinish = 0x200*14, - .nextIndex_forward = 2, - .nextIndex_left = -1, - .nextIndex_backward = 0, - .nextIndex_right = -1, - }, - [2] = - { - .pos = {-0x300, 0, 0x300*3}, // same as quadblock 8 - .distToFinish = 0x200*13, - .nextIndex_forward = 3, - .nextIndex_left = -1, - .nextIndex_backward = 1, - .nextIndex_right = -1, - }, - [3] = - { - .pos = {-0x300, 0, 0x300*4}, // same as quadblock 10 - .distToFinish = 0x200*12, - .nextIndex_forward = 4, - .nextIndex_left = -1, - .nextIndex_backward = 2, - .nextIndex_right = -1, - }, - [4] = - { - .pos = {-0x300, 0, 0x300*5}, // same as quadblock 12 - .distToFinish = 0x200*11, - .nextIndex_forward = 5, - .nextIndex_left = -1, - .nextIndex_backward = 3, - .nextIndex_right = -1, - }, - [5] = - { - .pos = {-0x300, 0, 0x300*6}, // same as quadblock 14 - .distToFinish = 0x200*10, - .nextIndex_forward = 6, - .nextIndex_left = -1, - .nextIndex_backward = 4, - .nextIndex_right = -1, - }, - [6] = - { - .pos = {0, 0, 0x300*6}, // same as quadblock 15 - .distToFinish = 0x200*9, - .nextIndex_forward = 7, - .nextIndex_left = -1, - .nextIndex_backward = 5, - .nextIndex_right = -1, - }, - [7] = - { - .pos = {0x300, 0, 0x300*6}, // same as quadblock 16 - .distToFinish = 0x200*8, - .nextIndex_forward = 8, - .nextIndex_left = -1, - .nextIndex_backward = 6, - .nextIndex_right = -1, - }, - [8] = - { - .pos = {0x600, 0, 0x300*6}, // same as quadblock 17 - .distToFinish = 0x200*7, - .nextIndex_forward = 9, - .nextIndex_left = -1, - .nextIndex_backward = 7, - .nextIndex_right = -1, - }, - [9] = - { - .pos = {0x600, 0, 0x300*5}, // same as quadblock 13 - .distToFinish = 0x200*6, - .nextIndex_forward = 10, - .nextIndex_left = -1, - .nextIndex_backward = 8, - .nextIndex_right = -1, - }, - [10] = - { - .pos = {0x600, 0, 0x300*4}, // same as quadblock 11 - .distToFinish = 0x200*5, - .nextIndex_forward = 11, - .nextIndex_left = -1, - .nextIndex_backward = 9, - .nextIndex_right = -1, - }, - [11] = - { - .pos = {0x600, 0, 0x300*3}, // same as quadblock 9 - .distToFinish = 0x200*4, - .nextIndex_forward = 12, - .nextIndex_left = -1, - .nextIndex_backward = 10, - .nextIndex_right = -1, - }, - [12] = - { - .pos = {0x600, 0, 0x300*2}, // same as quadblock 7 - .distToFinish = 0x200*3, - .nextIndex_forward = 13, - .nextIndex_left = -1, - .nextIndex_backward = 11, - .nextIndex_right = -1, - }, - [13] = - { - .pos = {0x600, 0, 0x300*1}, // same as quadblock 5 - .distToFinish = 0x200*2, - .nextIndex_forward = 14, - .nextIndex_left = -1, - .nextIndex_backward = 12, - .nextIndex_right = -1, - }, - [14] = - { - .pos = {0x300, 0, 0x300*1}, // same as quadblock 4 - .distToFinish = 0x200*1, - .nextIndex_forward = 15, - .nextIndex_left = -1, - .nextIndex_backward = 13, - .nextIndex_right = -1, - }, - [15] = - { - .pos = {0, 0, 0x300*1}, // same as quadblock 3 - .distToFinish = 0x200*0, - .nextIndex_forward = 0, - .nextIndex_left = -1, - .nextIndex_backward = 14, - .nextIndex_right = -1, - }, - }, - - // ========== bsp ====================== - - .bsp = - { - // root node - BSP_BRANCH(0, SPLIT_Z, 0x1, 0x2), - - // bsp[1], start with quadblock[0], 2 quadblocks - BSP_LEAF(1, 0, 2), - - // bsp[2], start with quadblock[2], 18 quadblocks - BSP_LEAF(2, 2, 18), - }, - - .pvs = - { - .visLeafSrc = LEV_OFFSETOF(visBitIndex[0]), - .visFaceSrc = LEV_OFFSETOF(visBitIndex[0]), - .visInstSrc = 0, - .visExtraSrc = 0, - }, - - .visBitIndex = - { - // all 0xFFFFFFFFFFFF - -1, -1, -1, -1 - }, - - .visMem = - { - // P1 - .visLeafList[0] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP1[0]), - .visFaceList[0] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP1[4]), - .bspList[0] = LEV_OFFSETOF(VisMem_bspList_RenderListP1[0]), - - // P2 - .visLeafList[1] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP2[0]), - .visFaceList[1] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP2[4]), - .bspList[1] = LEV_OFFSETOF(VisMem_bspList_RenderListP2[0]), - - // P3 - .visLeafList[2] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP3[0]), - .visFaceList[2] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP3[4]), - .bspList[2] = LEV_OFFSETOF(VisMem_bspList_RenderListP3[0]), - - // P4 - .visLeafList[3] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP4[0]), - .visFaceList[3] = LEV_OFFSETOF(VisMem_bitIndex_DstMemcpyP4[4]), - .bspList[3] = LEV_OFFSETOF(VisMem_bspList_RenderListP4[0]), - }, - - .map = - { - (2)<<2, - - LEV_OFFSETOF(pvs.visLeafSrc), - LEV_OFFSETOF(pvs.visFaceSrc), - }, -}; \ No newline at end of file diff --git a/mods/Levels/WorkingLapTest/src/dataVRAM.bin b/mods/Levels/WorkingLapTest/src/dataVRAM.bin deleted file mode 100644 index 4d3ca2509..000000000 Binary files a/mods/Levels/WorkingLapTest/src/dataVRAM.bin and /dev/null differ diff --git a/mods/Levels/WorkingLapTest/textures/.gitignore b/mods/Levels/WorkingLapTest/textures/.gitignore deleted file mode 100644 index 05271de56..000000000 --- a/mods/Levels/WorkingLapTest/textures/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -data -data.lev -data.vrm -data.vrm.bkp -debug_vram_first.bmp -debug_vram_latest.bmp \ No newline at end of file diff --git a/mods/Levels/WorkingLapTest/textures/newtex/512_0_32_128_32_32_1.png b/mods/Levels/WorkingLapTest/textures/newtex/512_0_32_128_32_32_1.png deleted file mode 100644 index c485b13cd..000000000 Binary files a/mods/Levels/WorkingLapTest/textures/newtex/512_0_32_128_32_32_1.png and /dev/null differ diff --git a/mods/Levels/WorkingLapTest/textures/start.bat b/mods/Levels/WorkingLapTest/textures/start.bat deleted file mode 100644 index c08773c02..000000000 --- a/mods/Levels/WorkingLapTest/textures/start.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off -cd %~dp0 - -:: Get Newest Level File -copy ..\output\Lev221c.bin .\data.lev - -:: Get Blank VRAM File -copy ..\..\Automate\blankVRAM_dontErase.vrm .\data.vrm - -:: Patch Level with Automation -..\..\Automate\LevelPatcher\Debug\LevelPatcher.exe %cd%\data.lev - -:: Generate Layout -..\..\Automate\model_reader.exe .\data.lev - -:: Generate VRAM -..\..\Automate\vrmtool.exe .\data.vrm - -:: Submit Level File -copy .\data.lev ..\output\Lev221c.bin - -:: Submit VRAM File -copy .\data.vrm ..\src\dataVRAM.bin - -pause \ No newline at end of file