Merge branch 'mr-origin-84'

2024-09-26 19:28:18 -05:00
parent 6ce93c3cd2 2e10d1803c
commit 5fd7e7f3cc
83 changed files with 428 additions and 397 deletions
--- a/src/lair/code_86F0.c
+++ b/src/lair/code_86F0.c
@@ -437,7 +437,7 @@ void lair_func_8038F924(Actor *this) {
                return;
            }
            if (!fileProgressFlag_get(FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE)) {
-                func_802C9334(0x20, this);
+                __bundle_spawnFromFirstActor(0x20, this);
                func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 0x7FFF);
                func_80324D2C(2.1f, COMUSIC_43_ENTER_LEVEL_GLITTER);
                func_8030E6D4(SFX_113_PAD_APPEARS);