Merge pull request #714 from HackerN64/develop/2.1.2

Release: v2.1.2
2026-01-21 10:17:19 -08:00 · 2023-09-27 16:54:38 -05:00
parent b8f770ae48 01c3f20c6f
commit 7de18d10fc
5 changed files with 3 additions and 3 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.1.1
+v2.1.2
--- a/src/game/behaviors/intro_scene.inc.c
+++ b/src/game/behaviors/intro_scene.inc.c
@@ -35,7 +35,7 @@ void bhv_intro_scene_loop(void) {

        switch (gCutsceneObjSpawn) {
            case CUTSCENE_OBJ_BEGINNING_LAKITU:
-                spawn_object(o, MODEL_LAKITU, bhvBeginningLakitu);
+                spawn_object_at_origin(o, 0, MODEL_LAKITU, bhvBeginningLakitu);
                break;

            case CUTSCENE_OBJ_BEGINNING_PEACH:
--- a/tools/FlipsSrc/Flips.cpp
+++ b/tools/FlipsSrc/Flips.cpp
--- a/tools/FlipsSrc/Flips.h
+++ b/tools/FlipsSrc/Flips.h
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -65,7 +65,7 @@ ifeq ($(HOST_ENV),MinGW)
 endif

 flips: CC := $(CXX)
-flips_SOURCES := Flips/Flips.cpp
+flips_SOURCES := FlipsSrc/Flips.cpp
 flips_CFLAGS := -Wall -Wextra -fopenmp -Os -flto -fuse-linker-plugin -fomit-frame-pointer -fmerge-all-constants \
 -fvisibility=hidden -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables \
 -ffunction-sections -fdata-sections -Wl,--gc-sections \