PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-02 16:23:57 +03:00
Code Issues Actions 2 Packages Projects Releases 1 Wiki Activity

Forgot an update to first_diff (#242)

Browse Source 
* verbose

* indices

* small updates
This commit is contained in:
petrie911 2024-05-12 11:18:36 -05:00 committed by GitHub
parent 7168299be4
commit 1f452ce232
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
first_diff.py
View File

@ -46,10 +46,10 @@ def firstDiffMain():
buildFolder = Path("build") buildFolder = Path("build")
BUILTROM = Path(buildFolder / f"starfox64.us.uncompressed.z64") BUILTROM = Path(buildFolder / f"starfox64.us.rev1.uncompressed.z64")
BUILTMAP = buildFolder / f"starfox64.us.map" BUILTMAP = buildFolder / f"starfox64.us.rev1.map"
EXPECTEDROM = Path("baserom.us.uncompressed.z64") EXPECTEDROM = Path("baserom.us.rev1.uncompressed.z64")
EXPECTEDMAP = "expected" / BUILTMAP EXPECTEDMAP = "expected" / BUILTMAP
mapfile_parser.frontends.first_diff.doFirstDiff(BUILTMAP, EXPECTEDMAP, BUILTROM, EXPECTEDROM, args.count, mismatchSize=True, addColons=args.add_colons, bytesConverterCallback=decodeInstruction) mapfile_parser.frontends.first_diff.doFirstDiff(BUILTMAP, EXPECTEDMAP, BUILTROM, EXPECTEDROM, args.count, mismatchSize=True, addColons=args.add_colons, bytesConverterCallback=decodeInstruction)

22
src/mods/levelselect.c
View File

@ -28,6 +28,8 @@ void Map_LevelSelect(void) {
"ZONESS", "CORNERIA", "TITANIA", "AQUAS", "FORTUNA", "VENOM 1", "SOLAR", "VENOM 2", "ZONESS", "CORNERIA", "TITANIA", "AQUAS", "FORTUNA", "VENOM 1", "SOLAR", "VENOM 2",
}; };
static s32 startOption = 0; static s32 startOption = 0;
// static f32 zStart = 0.0f;
// f32 zInc;
s32 nextPlanetId; s32 nextPlanetId;
if (gControllerPress[0].button & L_JPAD) { if (gControllerPress[0].button & L_JPAD) {
@ -70,6 +72,25 @@ void Map_LevelSelect(void) {
startOption ^= 1; 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 */ /* Draw */
if ((sCurrentPlanetId >= 0) && (sCurrentPlanetId < PLANET_MAX)) { if ((sCurrentPlanetId >= 0) && (sCurrentPlanetId < PLANET_MAX)) {
RCP_SetupDL(&gMasterDisp, 0x53); RCP_SetupDL(&gMasterDisp, 0x53);
@ -108,5 +129,6 @@ void Map_LevelSelect(void) {
(sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2))) { (sPlanetArray[mission][difficulty] == SAVE_SLOT_VENOM_2))) {
gLevelPhase = 1; gLevelPhase = 1;
} }
// gSavedPathProgress = gPathProgress = zStart;
} }
} }