Merge branch 'dev' into dev

Author: GreenestBeen

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 5.8.4
+current_version = 5.8.8
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

.gitignore

@@ -193,7 +193,6 @@ tests/test_spoiler.py
 coloredbananas.txt
 balloons.txt
 static/py_libraries/dk64rando*.whl
-!cutscenes_skipped.csv
 test.bps
 rom_tester.html
 tools/dumps

CHANGELOG.MD

@@ -1,38 +1,18 @@
 """Builds Cutscene Database from CSV."""
 
 from BuildLib import newROMName
+from skipped_cutscenes import skipped
 
-csv_file = "assets/cutscenes/cutscenes_skipped.csv"
-write_file = "src/misc/cutscene_database.c"
-
-# https://docs.google.com/spreadsheets/d/1X7lYw9l7xpfEcQjvD0WzucBwi3uUHW4FfsjrOqDwj_o/edit#gid=308050567
-
-with open(csv_file, "r") as csv:
-    rows = csv.read().split("\n")
-    data = []
-    for row in rows[2:]:
-        data.append(row.split(","))
-    map_data = []
+with open(newROMName, "r+b") as fh:
+    fh.seek(0x1FF3800)
     for map_index in range(216):
-        cutscenes_skipped = []
-        for cs in data:
-            col = (2 * map_index) + 1
-            cs_name = cs[2 * map_index]
-            bool_v = False
-            if cs_name != "":
-                text = cs[col]
-                bool_v = text == "TRUE"
-            cutscenes_skipped.append(bool_v)
         cs_lo = 0
         cs_hi = 0
-        for cs_index, cs in enumerate(cutscenes_skipped):
-            if cs:
+        if map_index in list(skipped.keys()):
+            for cs_index in skipped[map_index]:
                 if cs_index < 32:
                     cs_lo |= 1 << cs_index
                 else:
                     cs_hi |= 1 << (cs_index - 32)
-        map_data.extend([cs_lo, cs_hi])
-    with open(newROMName, "r+b") as fh:
-        fh.seek(0x1FF3800)
-        for m in map_data:
-            fh.write(m.to_bytes(4, "big"))
+        fh.write(cs_lo.to_bytes(4, "big"))
+        fh.write(cs_hi.to_bytes(4, "big"))

base-hack/Build/build_cutscene_dict.py

@@ -0,0 +1,62 @@
+"""Database of skipped cutscenes."""
+
+from BuildEnums import Maps
+
+skipped = {
+    Maps.JapesMountain: [0, 1, 2],
+    Maps.Japes: [2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 19, 20, 26],
+    Maps.JapesDillo: [2],
+    Maps.JapesShell: [0, 1],
+    Maps.JapesPainting: [0, 1, 2],
+    Maps.AztecTinyTemple: [0, 1, 3, 5, 7, 8, 9, 10, 12],
+    Maps.Helm: [0, 1, 2],
+    Maps.AztecLlamaTemple: [0, 1, 2, 4, 5, 6, 7, 8, 9],
+    Maps.Factory: [0, 1, 2, 3, 4, 5, 10, 11, 12, 13, 14, 21, 22, 25, 26, 27, 28, 32, 33, 34, 35, 36, 45],
+    Maps.FactoryPowerShed: [1],
+    Maps.Galleon: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 25, 26, 27, 28, 32, 33, 34],
+    Maps.JapesUnderground: [0, 1],
+    Maps.Isles: [2, 3, 10, 11, 12, 13, 14, 15, 16, 20, 23],
+    Maps.Aztec: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 18, 20, 22],
+    Maps.Fungi: [1, 2, 4, 5, 6, 8, 13, 14, 16, 18, 23, 24, 25, 27, 32],
+    Maps.GalleonLighthouse: [1],
+    Maps.FungiAntHill: [0, 2],
+    Maps.FungiMinecart: [0, 1, 3, 4],
+    Maps.FungiDiddyBarn: [0],
+    Maps.FungiLankyAttic: [0, 1],
+    Maps.FungiDKBarn: [0, 1],
+    Maps.FungiMillFront: [0, 3, 4],
+    Maps.FungiMushroomSlam: [0],
+    Maps.FungiGiantMushroom: [0, 1, 5],
+    Maps.FungiShootingGame: [1],
+    Maps.Caves: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 20, 21, 22, 23, 24],
+    Maps.Caves5DITiny: [0, 1, 2],
+    Maps.Caves5DILanky: [0, 1],
+    Maps.Castle: [0, 1, 2, 3, 4, 5],
+    Maps.CastleBallroom: [0, 1],
+    Maps.CavesRotatingRoom: [0],
+    Maps.Caves5DCChunky: [0],
+    Maps.Caves5DCDK: [0],
+    Maps.Caves5DCDiddyLow: [0, 1, 2],
+    Maps.Caves5DCTiny: [0],
+    Maps.CavesTileFlip: [4],
+    Maps.Caves5DIDiddy: [0, 1, 2],
+    Maps.CastleTower: [0, 1, 2, 3, 4],
+    Maps.CastleCryptLankyTiny: [0, 1, 2],
+    Maps.CastleCryptDKDiddyChunky: [1, 2, 3],
+    Maps.CastleMuseum: [0, 1],
+    Maps.CastleLibrary: [0, 1, 2, 3],
+    Maps.CastleBasement: [0, 1, 2, 3],
+    Maps.CastleTree: [0, 1, 2, 3, 4, 5, 6],
+    Maps.CastleShed: [0, 1],
+    Maps.CastleTrash: [0],
+    Maps.CastleGreenhouse: [0, 1],
+    Maps.HelmLobby: [0, 1],
+    Maps.AztecLobby: [2, 3, 4],
+    Maps.GalleonLobby: [2],
+    Maps.FactoryLobby: [2, 3],
+    Maps.CastleCrypt: [0, 1],
+    Maps.CavesShackDiddyHigh: [0, 2],
+    Maps.KRoolDiddy: [0],
+    Maps.KRoolLanky: [0, 1],
+    Maps.KRoolChunky: [0, 2],
+}

base-hack/Build/skipped_cutscenes.py

@@ -103,18 +103,19 @@ Gfx* drawTextContainer(Gfx* dl, int style, float x, float y, char* str, int red,
 	return drawText(dl,style,x,y,str,red,green,blue,opacity);
 }
 
+#define CHAR_LIMIT 0x60
 static char* character_recoloring_str = 0;
 static char use_character_recoloring = 0;
-static char char_color_data[0x40];
-static unsigned char char_opacity_data[0x40];
+static char char_color_data[CHAR_LIMIT];
+static unsigned char char_opacity_data[CHAR_LIMIT];
 
 void setCharacterRecoloring(int output, char* stored_str) {
 	use_character_recoloring = output;
 	character_recoloring_str = stored_str;
 }
 
 void wipeTextColorData(void) {
-	for (int i = 0; i < 0x40; i++) {
+	for (int i = 0; i < CHAR_LIMIT; i++) {
 		char_color_data[i] = 0;
 		char_opacity_data[i] = 0xFF;
 	}

base-hack/assets/cutscenes/cutscenes_skipped.csv

@@ -388,7 +388,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					}
 				} else if ((param2 == AZTEC_LLAMACOCONUT) || (param2 == AZTEC_LLAMAGRAPE) || (param2 == AZTEC_LLAMAFEATHER)) {
 					if ((index == 0) && (param2 == AZTEC_LLAMACOCONUT)) {
-						if (!Rando.cutscene_skip_setting != CSSKIP_AUTO) {
+						if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 							PlayCutsceneFromModelTwoScript(behaviour_pointer,23,1,0);
 						}
 					} else if (index == 1) {
@@ -532,7 +532,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					}
 					return Character == Rando.free_source_llama;
 				} else if (param2 == LLAMA_LAVAGATE) {
-					if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
+					if (Rando.cutscene_skip_setting == CSSKIP_AUTO) {
 						hideObject(behaviour_pointer);
 						behaviour_pointer->pause_state = 1;
 					}
@@ -812,7 +812,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 					if (MovesBase[KONG_DIDDY].special_moves & MOVECHECK_CHARGE) {
 						return 1;
 					}
-					if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
+					if (Rando.cutscene_skip_setting == CSSKIP_AUTO) {
 						return 1;
 					}
 					return 0;
@@ -1197,7 +1197,7 @@ int change_object_scripts(behaviour_data* behaviour_pointer, int id, int index,
 						}
 
 						//play grape switch cutscene
-						if (!Rando.cutscene_skip_setting != CSSKIP_AUTO) {
+						if (Rando.cutscene_skip_setting != CSSKIP_AUTO) {
 							PlayCutsceneFromModelTwoScript(behaviour_pointer, 0, 1, 0);
 							behaviour_pointer->timer = 110;
 						}

base-hack/src/f3dex2.c

@@ -1546,7 +1546,7 @@ void exitBoss(void) {
 		reference_map = MAP_KROOLTINY;
 	}
 	for (int i = 0; i < 5; i++) {
-		if (Rando.k_rool_order[i] == reference_map) {
+		if (getWorld(CurrentMap, 0) > LEVEL_CASTLE) {
 			initiateTransition(MAP_ISLES, 0xC);
 			return;
 		}

base-hack/src/instances/instances.c

@@ -802,7 +802,7 @@ def sumChecks(spoiler, ownedItems, locations: list) -> int:
 
 def getHolidaySetting(settings):
     """Get the holiday setting."""
-    is_offseason = False
+    is_offseason = True
     if is_offseason:
         return settings.holiday_setting_offseason
     return settings.holiday_setting