From 48bea330525ed4f795cd9fd4928292904800671e Mon Sep 17 00:00:00 2001 From: someone2639 Date: Wed, 27 Sep 2023 11:54:00 -0400 Subject: [PATCH 1/3] spawn lakitu at the origin (#712) Co-authored-by: someone2639 --- src/game/behaviors/intro_scene.inc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/behaviors/intro_scene.inc.c b/src/game/behaviors/intro_scene.inc.c index b879ba4d..b7be1861 100644 --- 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: From 38f25d2b8304a3b6e158b51ab969469c80d942ba Mon Sep 17 00:00:00 2001 From: thecozies <79979276+thecozies@users.noreply.github.com> Date: Wed, 27 Sep 2023 10:55:14 -0500 Subject: [PATCH 2/3] rename flips src dir (#711) --- tools/{Flips => FlipsSrc}/Flips.cpp | 0 tools/{Flips => FlipsSrc}/Flips.h | 0 tools/Makefile | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename tools/{Flips => FlipsSrc}/Flips.cpp (100%) rename tools/{Flips => FlipsSrc}/Flips.h (100%) diff --git a/tools/Flips/Flips.cpp b/tools/FlipsSrc/Flips.cpp similarity index 100% rename from tools/Flips/Flips.cpp rename to tools/FlipsSrc/Flips.cpp diff --git a/tools/Flips/Flips.h b/tools/FlipsSrc/Flips.h similarity index 100% rename from tools/Flips/Flips.h rename to tools/FlipsSrc/Flips.h diff --git a/tools/Makefile b/tools/Makefile index a6ad61f9..cd5d6b10 100644 --- 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 \ From 01c3f20c6f1cbc98eac513f230f0f053b61cfd4a Mon Sep 17 00:00:00 2001 From: Gregory Heskett Date: Wed, 27 Sep 2023 12:13:53 -0400 Subject: [PATCH 3/3] v2.1.2 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 826e1424..59696826 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -v2.1.1 +v2.1.2