From 55fe506b82c287d7c43c851dcfaa9c68a92ce055 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Mon, 4 Mar 2024 19:26:44 -0500 Subject: [PATCH] Add ENVFX_MODE_NO_OVERRIDE constant --- autogen/lua_definitions/constants.lua | 3 +++ docs/lua/constants.md | 1 + src/game/envfx_snow.h | 4 +++- src/pc/lua/smlua_constants_autogen.c | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 5109e9b6..e6ca3b06 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -3524,6 +3524,9 @@ ENVFX_LAVA_BUBBLES = 12 --- @type integer ENVFX_MODE_NONE = 0 +--- @type integer +ENVFX_MODE_NO_OVERRIDE = -1 + --- @type integer ENVFX_SNOW_BLIZZARD = 3 diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 08b99a7a..fad9143c 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -1198,6 +1198,7 @@ - ENVFX_JETSTREAM_BUBBLES - ENVFX_LAVA_BUBBLES - ENVFX_MODE_NONE +- ENVFX_MODE_NO_OVERRIDE - ENVFX_SNOW_BLIZZARD - ENVFX_SNOW_NORMAL - ENVFX_SNOW_WATER diff --git a/src/game/envfx_snow.h b/src/game/envfx_snow.h index b0842192..63acd736 100644 --- a/src/game/envfx_snow.h +++ b/src/game/envfx_snow.h @@ -9,13 +9,15 @@ #define ENVFX_SNOW_WATER 2 // Secret Aquarium, Sunken Ship #define ENVFX_SNOW_BLIZZARD 3 // unused -#define ENVFX_BUBBLE_START 10 // Separates snow effects and flower/bubble effects +#define ENVFX_BUBBLE_START 10 // separates snow effects and flower/bubble effects #define ENVFX_FLOWERS 11 // unused #define ENVFX_LAVA_BUBBLES 12 // LLL, BitFS, Bowser 2 #define ENVFX_WHIRLPOOL_BUBBLES 13 // DDD #define ENVFX_JETSTREAM_BUBBLES 14 // JRB, DDD (submarine area) +#define ENVFX_MODE_NO_OVERRIDE -1 // used for set_override_envfx() + struct EnvFxParticle { s8 isAlive; s16 animFrame; // lava bubbles and flowers have frame animations diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index f9786a92..0fdf098d 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -1394,6 +1394,7 @@ char gSmluaConstants[] = "" "ENVFX_LAVA_BUBBLES = 12\n" "ENVFX_WHIRLPOOL_BUBBLES = 13\n" "ENVFX_JETSTREAM_BUBBLES = 14\n" +"ENVFX_MODE_NO_OVERRIDE = -1\n" "SEQ_PLAYER_LEVEL = 0\n" "SEQ_PLAYER_ENV = 1\n" "SEQ_PLAYER_SFX = 2\n"