Pass CI checks

OoTRandomizer · Jan 15, 2024 · 26da0b3 · 26da0b3
1 parent 092d614
commit 26da0b3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/ASM/c/actor.c b/ASM/c/actor.c
@@ -90,7 +90,7 @@ void Actor_StoreFlag(z64_actor_t* actor, z64_game_t* game, xflag_t flag) {
 // Flag consists of the room #, scene setup, and the actor index
 void Actor_StoreFlagByIndex(z64_actor_t* actor, z64_game_t* game, uint16_t actor_index) {
     // Zeroize extra data;
-    
+
     xflag_t flag = (xflag_t) { 0 };
 
     flag.scene = z64_game.scene_index;

diff --git a/ASM/c/en_wonderitem.c b/ASM/c/en_wonderitem.c
@@ -132,13 +132,13 @@ void EnWonderItem_Update_Hack(EnWonderItem* this) {
 
 // Hack to not kill wonderitem when switch flag is set if we need to override still
 uint32_t EnWonderItem_Kill_Hack(EnWonderItem* this) {
-    
+
     xflag_t flag = { 0 };
     flag.flag = CURR_ACTOR_SPAWN_INDEX;
     flag.scene = z64_game.scene_index;
     flag.room = this->actor.room_index;
     flag.setup = curr_scene_setup;
-    
+
     // Check if the Wonderitem should be overridden
     override_t override = lookup_override_by_newflag(&flag);
 
@@ -147,4 +147,4 @@ uint32_t EnWonderItem_Kill_Hack(EnWonderItem* this) {
     if ((this->switchFlag >= 0) && z64_Flags_GetSwitch(&z64_game, this->switchFlag))
         return 1;
     return 0;
-}
+}
diff --git a/ASM/c/obj_mure3.c b/ASM/c/obj_mure3.c
@@ -5,8 +5,8 @@
 z64_actor_t* Obj_Mure3_RupeeCircle_DropRupee(z64_actor_t* this, z64_xyzf_t* pos, uint16_t params, uint32_t index) {
     xflag_t flag = Actor_GetAdditionalData(this)->flag;
     if(flag.all) {
-        flag.subflag = index;   
-    } 
+        flag.subflag = index;
+    }
     if(!Get_NewOverrideFlag(&flag)) {
         drop_collectible_override_flag = flag;
         z64_actor_t* spawned = (z64_actor_t*)z64_Item_DropCollectible2(&z64_game, pos, params);

diff --git a/data/presets_default.json b/data/presets_default.json
@@ -76,7 +76,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -240,7 +242,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -420,7 +424,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -596,7 +602,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -783,7 +791,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -960,7 +970,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -1155,7 +1167,9 @@
         ],
         "shuffle_freestanding_items": "all",
         "shuffle_pots": "all",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "all",
+        "shuffle_empty_crates": false,
         "shuffle_cows": true,
         "shuffle_beehives": true,
         "shuffle_wonderitems": true,
@@ -1494,7 +1508,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -1660,7 +1676,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,
@@ -1845,7 +1863,9 @@
         "shuffle_child_trade": [],
         "shuffle_freestanding_items": "off",
         "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
         "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
         "shuffle_cows": false,
         "shuffle_beehives": false,
         "shuffle_wonderitems": false,