From 1f452ce23240f73967dcbcb3c69f216050cbb91a Mon Sep 17 00:00:00 2001 From: petrie911 <69443847+petrie911@users.noreply.github.com> Date: Sun, 12 May 2024 11:18:36 -0500 Subject: [PATCH] Forgot an update to first_diff (#242) * verbose * indices * small updates --- first_diff.py | 6 +++--- src/mods/levelselect.c | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/first_diff.py b/first_diff.py index a2ff93e4..71b8d63d 100755 --- a/first_diff.py +++ b/first_diff.py @@ -46,10 +46,10 @@ def firstDiffMain(): buildFolder = Path("build") - BUILTROM = Path(buildFolder / f"starfox64.us.uncompressed.z64") - BUILTMAP = buildFolder / f"starfox64.us.map" + BUILTROM = Path(buildFolder / f"starfox64.us.rev1.uncompressed.z64") + BUILTMAP = buildFolder / f"starfox64.us.rev1.map" - EXPECTEDROM = Path("baserom.us.uncompressed.z64") + EXPECTEDROM = Path("baserom.us.rev1.uncompressed.z64") EXPECTEDMAP = "expected" / BUILTMAP mapfile_parser.frontends.first_diff.doFirstDiff(BUILTMAP, EXPECTEDMAP, BUILTROM, EXPECTEDROM, args.count, mismatchSize=True, addColons=args.add_colons, bytesConverterCallback=decodeInstruction) diff --git a/src/mods/levelselect.c b/src/mods/levelselect.c index 1a515339..22496015 100644 --- a/src/mods/levelselect.c +++ b/src/mods/levelselect.c @@ -28,6 +28,8 @@ void Map_LevelSelect(void) { "ZONESS", "CORNERIA", "TITANIA", "AQUAS", "FORTUNA", "VENOM 1", "SOLAR", "VENOM 2", }; static s32 startOption = 0; + // static f32 zStart = 0.0f; + // f32 zInc; s32 nextPlanetId; if (gControllerPress[0].button & L_JPAD) { @@ -70,6 +72,25 @@ void Map_LevelSelect(void) { startOption ^= 1; } + // if (gControllerPress[0].button & U_CBUTTONS) { + // zInc = 100.0f; + // } else if (gControllerPress[0].button & R_CBUTTONS) { + // zInc = 1000.0f; + // } else if (gControllerPress[0].button & D_CBUTTONS) { + // zInc = -100.0f; + // } else if (gControllerPress[0].button & L_CBUTTONS) { + // zInc = -1000.0f; + // } + // if (gControllerHold[0].button & R_TRIG) { + // zInc *= 100.0f; + // } + // zStart += zInc; + // if(zStart < 0.0f) { + // zStart = 0.0f; + // } else if (zStart > 500000.0f) { + // zStart = 500000.0f; + // } + /* Draw */ if ((sCurrentPlanetId >= 0) && (sCurrentPlanetId < PLANET_MAX)) { RCP_SetupDL(&gMasterDisp, 0x53); @@ -108,5 +129,6 @@ void Map_LevelSelect(void) { (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2))) { gLevelPhase = 1; } + // gSavedPathProgress = gPathProgress = zStart; } }