diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index 4e6d34be..5bafaa13 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -525,10 +525,12 @@ --- @field public wooden_signpost_seg3_collision_0302DD80 Pointer_Collision --- @class GlobalTextures +--- @field public apostrophe TextureInfo --- @field public arrow_down TextureInfo --- @field public arrow_up TextureInfo --- @field public camera TextureInfo --- @field public coin TextureInfo +--- @field public double_quote TextureInfo --- @field public lakitu TextureInfo --- @field public luigi_head TextureInfo --- @field public mario_head TextureInfo @@ -642,8 +644,8 @@ --- @field public floorLowerLimitShadow integer --- @field public metalCapDuration integer --- @field public metalCapDurationCotmc integer ---- @field public pauseExitAnywhere boolean --- @field public metalCapSequence integer +--- @field public pauseExitAnywhere boolean --- @field public pssSlideStarIndex integer --- @field public pssSlideStarTime integer --- @field public skipCreditsAt LevelNum @@ -754,7 +756,6 @@ --- @field public unkC4 number --- @field public usedObj Object --- @field public vel Vec3f ---- @field public visibleToEnemies integer --- @field public wall Surface --- @field public wallKickTimer integer --- @field public wallNormal Vec3f diff --git a/docs/lua/structs.md b/docs/lua/structs.md index 20677e63..3f0d5a59 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -771,10 +771,12 @@ | Field | Type | Access | | ----- | ---- | ------ | +| apostrophe | [TextureInfo](structs.md#TextureInfo) | read-only | | arrow_down | [TextureInfo](structs.md#TextureInfo) | read-only | | arrow_up | [TextureInfo](structs.md#TextureInfo) | read-only | | camera | [TextureInfo](structs.md#TextureInfo) | read-only | | coin | [TextureInfo](structs.md#TextureInfo) | read-only | +| double_quote | [TextureInfo](structs.md#TextureInfo) | read-only | | lakitu | [TextureInfo](structs.md#TextureInfo) | read-only | | luigi_head | [TextureInfo](structs.md#TextureInfo) | read-only | | mario_head | [TextureInfo](structs.md#TextureInfo) | read-only | @@ -937,8 +939,8 @@ | floorLowerLimitShadow | `integer` | | | metalCapDuration | `integer` | | | metalCapDurationCotmc | `integer` | | -| pauseExitAnywhere | `boolean` | | | metalCapSequence | `integer` | | +| pauseExitAnywhere | `boolean` | | | pssSlideStarIndex | `integer` | | | pssSlideStarTime | `integer` | | | skipCreditsAt | [enum LevelNum](constants.md#enum-LevelNum) | | @@ -1077,7 +1079,6 @@ | unkC4 | `number` | | | usedObj | [Object](structs.md#Object) | | | vel | [Vec3f](structs.md#Vec3f) | read-only | -| visibleToEnemies | `integer` | | | wall | [Surface](structs.md#Surface) | | | wallKickTimer | `integer` | | | wallNormal | [Vec3f](structs.md#Vec3f) | read-only | diff --git a/src/pc/djui/djui_hud_utils.c b/src/pc/djui/djui_hud_utils.c index ea830d63..8ae75ff3 100644 --- a/src/pc/djui/djui_hud_utils.c +++ b/src/pc/djui/djui_hud_utils.c @@ -36,6 +36,8 @@ extern ALIGNED8 const u8 texture_hud_char_luigi_head[]; extern ALIGNED8 const u8 texture_hud_char_toad_head[]; extern ALIGNED8 const u8 texture_hud_char_waluigi_head[]; extern ALIGNED8 const u8 texture_hud_char_wario_head[]; +extern ALIGNED8 const u8 texture_hud_char_apostrophe[]; +extern ALIGNED8 const u8 texture_hud_char_double_quote[]; struct GlobalTextures gGlobalTextures = { .camera = { .texture = (u8*)texture_hud_char_camera, .bitSize = 8, .width = 16, .height = 16 }, @@ -45,6 +47,8 @@ struct GlobalTextures gGlobalTextures = { .arrow_down = { .texture = (u8*)texture_hud_char_arrow_down, .bitSize = 8, .width = 8, .height = 8 }, .coin = { .texture = (u8*)texture_hud_char_coin, .bitSize = 8, .width = 16, .height = 16 }, .star = { .texture = (u8*)texture_hud_char_star, .bitSize = 8, .width = 16, .height = 16 }, + .apostrophe = { .texture = (u8*)texture_hud_char_apostrophe, .bitSize = 8, .width = 16, .height = 16 }, + .double_quote = { .texture = (u8*)texture_hud_char_double_quote, .bitSize = 8, .width = 16, .height = 16 }, .mario_head = { .texture = (u8*)texture_hud_char_mario_head, .bitSize = 8, .width = 16, .height = 16 }, .luigi_head = { .texture = (u8*)texture_hud_char_luigi_head, .bitSize = 8, .width = 16, .height = 16 }, .toad_head = { .texture = (u8*)texture_hud_char_toad_head, .bitSize = 8, .width = 16, .height = 16 }, diff --git a/src/pc/djui/djui_hud_utils.h b/src/pc/djui/djui_hud_utils.h index b4443d00..f0990dc8 100644 --- a/src/pc/djui/djui_hud_utils.h +++ b/src/pc/djui/djui_hud_utils.h @@ -22,6 +22,8 @@ struct GlobalTextures { struct TextureInfo arrow_down; struct TextureInfo coin; struct TextureInfo star; + struct TextureInfo apostrophe; + struct TextureInfo double_quote; struct TextureInfo mario_head; struct TextureInfo luigi_head; struct TextureInfo toad_head; diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index 13efee1f..ea2b5154 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -605,12 +605,14 @@ static struct LuaObjectField sGlobalObjectCollisionDataFields[LUA_GLOBAL_OBJECT_ { "wooden_signpost_seg3_collision_0302DD80", LVT_COLLISION_P, offsetof(struct GlobalObjectCollisionData, wooden_signpost_seg3_collision_0302DD80), false, LOT_POINTER }, }; -#define LUA_GLOBAL_TEXTURES_FIELD_COUNT 12 +#define LUA_GLOBAL_TEXTURES_FIELD_COUNT 14 static struct LuaObjectField sGlobalTexturesFields[LUA_GLOBAL_TEXTURES_FIELD_COUNT] = { + { "apostrophe", LVT_COBJECT, offsetof(struct GlobalTextures, apostrophe), true, LOT_TEXTUREINFO }, { "arrow_down", LVT_COBJECT, offsetof(struct GlobalTextures, arrow_down), true, LOT_TEXTUREINFO }, { "arrow_up", LVT_COBJECT, offsetof(struct GlobalTextures, arrow_up), true, LOT_TEXTUREINFO }, { "camera", LVT_COBJECT, offsetof(struct GlobalTextures, camera), true, LOT_TEXTUREINFO }, { "coin", LVT_COBJECT, offsetof(struct GlobalTextures, coin), true, LOT_TEXTUREINFO }, + { "double_quote", LVT_COBJECT, offsetof(struct GlobalTextures, double_quote), true, LOT_TEXTUREINFO }, { "lakitu", LVT_COBJECT, offsetof(struct GlobalTextures, lakitu), true, LOT_TEXTUREINFO }, { "luigi_head", LVT_COBJECT, offsetof(struct GlobalTextures, luigi_head), true, LOT_TEXTUREINFO }, { "mario_head", LVT_COBJECT, offsetof(struct GlobalTextures, mario_head), true, LOT_TEXTUREINFO }, @@ -743,8 +745,8 @@ static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = { "floorLowerLimitShadow", LVT_S16, offsetof(struct LevelValues, floorLowerLimitShadow), false, LOT_NONE }, { "metalCapDuration", LVT_U16, offsetof(struct LevelValues, metalCapDuration), false, LOT_NONE }, { "metalCapDurationCotmc", LVT_U16, offsetof(struct LevelValues, metalCapDurationCotmc), false, LOT_NONE }, - { "pauseExitAnywhere", LVT_BOOL, offsetof(struct LevelValues, pauseExitAnywhere), false, LOT_NONE }, { "metalCapSequence", LVT_U8, offsetof(struct LevelValues, metalCapSequence), false, LOT_NONE }, + { "pauseExitAnywhere", LVT_BOOL, offsetof(struct LevelValues, pauseExitAnywhere), false, LOT_NONE }, { "pssSlideStarIndex", LVT_U8, offsetof(struct LevelValues, pssSlideStarIndex), false, LOT_NONE }, { "pssSlideStarTime", LVT_U16, offsetof(struct LevelValues, pssSlideStarTime), false, LOT_NONE }, { "skipCreditsAt", LVT_S32, offsetof(struct LevelValues, skipCreditsAt), false, LOT_NONE }, @@ -793,7 +795,7 @@ static struct LuaObjectField sMarioBodyStateFields[LUA_MARIO_BODY_STATE_FIELD_CO { "wingFlutter", LVT_S8, offsetof(struct MarioBodyState, wingFlutter), false, LOT_NONE }, }; -#define LUA_MARIO_STATE_FIELD_COUNT 77 +#define LUA_MARIO_STATE_FIELD_COUNT 76 static struct LuaObjectField sMarioStateFields[LUA_MARIO_STATE_FIELD_COUNT] = { { "action", LVT_U32, offsetof(struct MarioState, action), false, LOT_NONE }, { "actionArg", LVT_U32, offsetof(struct MarioState, actionArg), false, LOT_NONE }, @@ -866,7 +868,6 @@ static struct LuaObjectField sMarioStateFields[LUA_MARIO_STATE_FIELD_COUNT] = { { "unkC4", LVT_F32, offsetof(struct MarioState, unkC4), false, LOT_NONE }, { "usedObj", LVT_COBJECT_P, offsetof(struct MarioState, usedObj), false, LOT_OBJECT }, { "vel", LVT_COBJECT, offsetof(struct MarioState, vel), true, LOT_VEC3F }, - { "visibleToEnemies", LVT_U8, offsetof(struct MarioState, visibleToEnemies), false, LOT_NONE }, { "wall", LVT_COBJECT_P, offsetof(struct MarioState, wall), false, LOT_SURFACE }, { "wallKickTimer", LVT_U8, offsetof(struct MarioState, wallKickTimer), false, LOT_NONE }, { "wallNormal", LVT_COBJECT, offsetof(struct MarioState, wallNormal), true, LOT_VEC3F },