thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-05-31 13:11:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Finish most of wiggler, still need one or two more things one on it

Browse source
This commit is contained in:
EmeraldLockdown 2026-04-17 20:41:20 -05:00
parent bd566998e0
commit 8d7d9cf90e
9 changed files with 258 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
autogen/lua_definitions/constants.lua
View file

@ -5581,6 +5581,69 @@ BBH_DYNAMIC_SURFACE_ROOM = 0
--- @type integer
BBH_OUTSIDE_ROOM = 13
--- @type integer
BOWSER_ACT_DEFAULT = 0
--- @type integer
BOWSER_ACT_THROWN = 1
--- @type integer
BOWSER_ACT_JUMP_ONTO_STAGE = 2
--- @type integer
BOWSER_ACT_DANCE = 3
--- @type integer
BOWSER_ACT_DEAD = 4
--- @type integer
BOWSER_ACT_WAIT = 5
--- @type integer
BOWSER_ACT_INTRO_WALK = 6
--- @type integer
BOWSER_ACT_CHARGE_MARIO = 7
--- @type integer
BOWSER_ACT_SPIT_FIRE_INTO_SKY = 8
--- @type integer
BOWSER_ACT_SPIT_FIRE_ONTO_FLOOR = 9
--- @type integer
BOWSER_ACT_HIT_EDGE = 10
--- @type integer
BOWSER_ACT_TURN_FROM_EDGE = 11
--- @type integer
BOWSER_ACT_HIT_MINE = 12
--- @type integer
BOWSER_ACT_BIG_JUMP = 13
--- @type integer
BOWSER_ACT_WALK_TO_MARIO = 14
--- @type integer
BOWSER_ACT_BREATH_FIRE = 15
--- @type integer
BOWSER_ACT_TELEPORT = 16
--- @type integer
BOWSER_ACT_QUICK_JUMP = 17
--- @type integer
BOWSER_ACT_UNUSED_SLOW_WALK = 18
--- @type integer
BOWSER_ACT_TILT_LAVA_PLATFORM = 19
--- @type integer
BOWSER_ACT_NOTHING = 20
--- @type integer
COFFIN_SPAWNER_ACT_COFFINS_UNLOADED = 0

5
autogen/lua_definitions/structs.lua
View file

@ -1716,6 +1716,9 @@
--- @field public oKoopaRaceEndpointRaceStatus integer
--- @field public oKoopaRaceEndpointUnk100 integer
--- @field public oKoopaRaceEndpointRaceEnded integer
--- @field public oKoopaRaceEndpointRaceCheated integer
--- @field public oKoopaRaceEndpointRaceStartTime integer
--- @field public oKoopaRaceEndpointRaceWinner integer
--- @field public oKoopaShellFlameUnkF4 number
--- @field public oKoopaShellFlameUnkF8 number
--- @field public oCameraLakituBlinkTimer integer
@ -2033,7 +2036,7 @@
--- @field public oWigglerTimeUntilRandomTurn integer
--- @field public oWigglerTargetYaw integer
--- @field public oWigglerWalkAwayFromWallTimer integer
--- @field public oWigglerUnused integer
--- @field public oWigglerFinishedTalking integer
--- @field public oWigglerTextStatus integer
--- @field public oLllWoodPieceOscillationTimer integer
--- @field public oWoodenPostTotalMarioAngle integer

5
data/dynos_bin_behavior.cpp
View file

@ -1363,6 +1363,9 @@ s64 DynOS_Bhv_ParseBehaviorScriptConstants(const String &_Arg, bool *found) {
bhv_constant(oKoopaRaceEndpointRaceStatus);
bhv_constant(oKoopaRaceEndpointUnk100);
bhv_constant(oKoopaRaceEndpointRaceEnded);
bhv_constant(oKoopaRaceEndpointRaceCheated);
bhv_constant(oKoopaRaceEndpointRaceStartTime);
bhv_constant(oKoopaRaceEndpointRaceWinner);
/* KoopaShellFlame */
bhv_constant(oKoopaShellFlameUnkF4);
@ -1884,7 +1887,7 @@ s64 DynOS_Bhv_ParseBehaviorScriptConstants(const String &_Arg, bool *found) {
bhv_constant(oWigglerTimeUntilRandomTurn);
bhv_constant(oWigglerTargetYaw);
bhv_constant(oWigglerWalkAwayFromWallTimer);
bhv_constant(oWigglerUnused);
bhv_constant(oWigglerFinishedTalking);
bhv_constant(oWigglerTextStatus);
/* LllWoodPiece */

21
docs/lua/constants.md
View file

@ -2538,6 +2538,27 @@
- BBH_NEAR_MERRY_GO_ROUND_ROOM
- BBH_DYNAMIC_SURFACE_ROOM
- BBH_OUTSIDE_ROOM
- BOWSER_ACT_DEFAULT
- BOWSER_ACT_THROWN
- BOWSER_ACT_JUMP_ONTO_STAGE
- BOWSER_ACT_DANCE
- BOWSER_ACT_DEAD
- BOWSER_ACT_WAIT
- BOWSER_ACT_INTRO_WALK
- BOWSER_ACT_CHARGE_MARIO
- BOWSER_ACT_SPIT_FIRE_INTO_SKY
- BOWSER_ACT_SPIT_FIRE_ONTO_FLOOR
- BOWSER_ACT_HIT_EDGE
- BOWSER_ACT_TURN_FROM_EDGE
- BOWSER_ACT_HIT_MINE
- BOWSER_ACT_BIG_JUMP
- BOWSER_ACT_WALK_TO_MARIO
- BOWSER_ACT_BREATH_FIRE
- BOWSER_ACT_TELEPORT
- BOWSER_ACT_QUICK_JUMP
- BOWSER_ACT_UNUSED_SLOW_WALK
- BOWSER_ACT_TILT_LAVA_PLATFORM
- BOWSER_ACT_NOTHING
- COFFIN_SPAWNER_ACT_COFFINS_UNLOADED
- COFFIN_ACT_IDLE
- COFFIN_ACT_STAND_UP

5
docs/lua/structs.md
View file

@ -2314,6 +2314,9 @@
| oKoopaRaceEndpointRaceStatus | `integer` | |
| oKoopaRaceEndpointUnk100 | `integer` | |
| oKoopaRaceEndpointRaceEnded | `integer` | |
| oKoopaRaceEndpointRaceCheated | `integer` | |
| oKoopaRaceEndpointRaceStartTime | `integer` | |
| oKoopaRaceEndpointRaceWinner | `integer` | |
| oKoopaShellFlameUnkF4 | `number` | |
| oKoopaShellFlameUnkF8 | `number` | |
| oCameraLakituBlinkTimer | `integer` | |
@ -2631,7 +2634,7 @@
| oWigglerTimeUntilRandomTurn | `integer` | |
| oWigglerTargetYaw | `integer` | |
| oWigglerWalkAwayFromWallTimer | `integer` | |
| oWigglerUnused | `integer` | |
| oWigglerFinishedTalking | `integer` | |
| oWigglerTextStatus | `integer` | |
| oLllWoodPieceOscillationTimer | `integer` | |
| oWoodenPostTotalMarioAngle | `integer` | |

4
include/object_fields.h
View file

@ -1157,8 +1157,8 @@
#define /*0x108*/ oWigglerTimeUntilRandomTurn OBJECT_FIELD_S32(0x20)
#define /*0x10C*/ oWigglerTargetYaw OBJECT_FIELD_S32(0x21)
#define /*0x110*/ oWigglerWalkAwayFromWallTimer OBJECT_FIELD_S32(0x22)
#define /*0x1AC*/ oWigglerUnused OBJECT_FIELD_S16(0x49, 0)
#define /*0x1AE*/ oWigglerTextStatus OBJECT_FIELD_S16(0x49, + 1)
#define /*0x1AC*/ oWigglerFinishedTalking OBJECT_FIELD_S16(0x49, 0)
#define /*0x1AE*/ oWigglerTextStatus OBJECT_FIELD_S16(0x49, 1)
/* Lll Wood Piece */
#define /*0x0F4*/ oLllWoodPieceOscillationTimer OBJECT_FIELD_S32(0x1B)

221
src/game/behaviors/wiggler.inc.c
View file

@ -63,19 +63,19 @@ static f32 sWigglerSpeeds[] = { 2.0f, 40.0f, 30.0f, 16.0f };
*/
void bhv_wiggler_body_part_update(void) {
if (o == NULL) { return; }
struct Object *parent = o->parentObj;
if (parent == NULL) { return; }
// Sanity check the array size of our segments,
// This should never be higher then 3
// in normal circumstances.
if (o->oBehParams2ndByte > 3 || o->oBehParams2ndByte < 0) { return; }
if (!parent->oWigglerSegments) { return; }
struct ChainSegment *segment = &parent->oWigglerSegments[o->oBehParams2ndByte];
if (segment == NULL) { return; }
cur_obj_scale(parent->header.gfx.scale[0]);
@ -100,8 +100,7 @@ void bhv_wiggler_body_part_update(void) {
// the floor
o->oPosY += -30.0f;
cur_obj_update_floor_height();
if (o->oFloorHeight > o->oPosY) // TODO: Check ineq swap
{
if (o->oFloorHeight > o->oPosY) { // TODO: Check ineq swap
o->oPosY = o->oFloorHeight;
}
}
@ -117,7 +116,9 @@ void bhv_wiggler_body_part_update(void) {
if (parent->oAction == WIGGLER_ACT_SHRINK) {
cur_obj_become_intangible();
} else {
cur_obj_become_tangible();
if (parent->oAction == wiggler_act_walk) {
cur_obj_become_tangible();
}
obj_check_attacks(&sWigglerBodyPartHitbox, o->oAction);
}
}
@ -206,7 +207,101 @@ void wiggler_update_segments(void) {
}
}
u8 wiggler_act_walk_continue_dialog(void) { return o->oAction == WIGGLER_ACT_WALK && o->oWigglerTextStatus < WIGGLER_TEXT_STATUS_COMPLETED_DIALOG; }
u8 wiggler_act_walk_continue_dialog(void) { return o->oAction == WIGGLER_ACT_WALK && o->oWigglerTextStatus < WIGGLER_TEXT_STATUS_COMPLETED_DIALOG; }
static void wiggler_act_walk_subact_talk(void) {
if (o->oWigglerTextStatus == WIGGLER_TEXT_STATUS_AWAIT_DIALOG && !gDjuiInMainMenu) {
seq_player_lower_volume(SEQ_PLAYER_LEVEL, 60, 40);
o->oWigglerTextStatus = WIGGLER_TEXT_STATUS_SHOWING_DIALOG;
}
if (o->globalPlayerIndex >= MAX_PLAYERS) o->globalPlayerIndex = 0;
u8 prevGlobalIndex = o->globalPlayerIndex;
struct MarioState *marioState = &gMarioStates[network_local_index_from_global(o->globalPlayerIndex)];
if (!is_player_active(marioState) || marioState->pos[1] < o->oPosY - 300) { // 300 is roughly the maximum y difference for mario to be covered in the arena
// scan for the closest valid player to talk to wiggler
for (int i = 0; i < MAX_PLAYERS; i++) {
// use global index to keep order of for loop equivalent for all players
marioState = &gMarioStates[network_local_index_from_global(i)];
if (!is_player_active(marioState) || marioState->pos[1] < o->oPosY - 300) {
marioState = NULL;
continue;
}
o->globalPlayerIndex = i;
if (o->globalPlayerIndex != prevGlobalIndex && marioState->playerIndex == 0) {
network_send_object(o);
}
break;
}
}
if (!marioState || marioState->playerIndex != 0) return;
if (cur_obj_update_dialog_with_cutscene(marioState, 2, 0, CUTSCENE_DIALOG, gBehaviorValues.dialogs.WigglerDialog, wiggler_act_walk_continue_dialog) != 0) {
o->oWigglerTextStatus = WIGGLER_TEXT_STATUS_COMPLETED_DIALOG;
o->oWigglerFinishedTalking = 1;
network_send_object_reliability(o, TRUE);
}
}
static void wiggler_act_walk_subact_walk(void) {
struct MarioState *marioState = nearest_mario_state_to_object(o);
struct Object *player = marioState ? marioState->marioObj : NULL;
s32 distanceToPlayer = player ? dist_between_objects(o, player) : 25000;
s32 angleToPlayer = player ? obj_angle_to_object(o, player) : 0;
treat_far_home_as_mario(1200.0f, &distanceToPlayer, &angleToPlayer);
//! Every object's health is initially 2048, and wiggler's doesn't change
// to 4 until after this runs the first time. It indexes out of bounds
// and uses the value 113762.3 for one frame on US. This is fixed up
// in wiggler_init_segments if AVOID_UB is defined.
obj_forward_vel_approach(BHV_ARR(sWigglerSpeeds, o->oHealth - 1, f32), 1.0f);
if (o->oWigglerWalkAwayFromWallTimer != 0) {
o->oWigglerWalkAwayFromWallTimer -= 1;
} else {
if (distanceToPlayer >= 25000.0f) {
// If >1200 away from home, turn to home
o->oWigglerTargetYaw = angleToPlayer;
}
if (obj_bounce_off_walls_edges_objects(&o->oWigglerTargetYaw)) {
//! If the wiggler could self-intersect, or intersect a different
// non-mario object, this could potentially be used to force
// the wiggler to walk straight - past his usual radius
o->oWigglerWalkAwayFromWallTimer = random_linear_offset(30, 30);
} else {
if (o->oHealth < 4) {
o->oWigglerTargetYaw = angleToPlayer;
} else if (o->oWigglerTimeUntilRandomTurn != 0) {
o->oWigglerTimeUntilRandomTurn -= 1;
} else {
o->oWigglerTargetYaw = o->oMoveAngleYaw + 0x4000 * (s16) random_sign();
o->oWigglerTimeUntilRandomTurn = random_linear_offset(30, 50);
}
}
}
// If moving at high speeds, could overflow. But can't reach such speeds
// in practice
s16 yawTurnSpeed = (s16)(30.0f * o->oForwardVel);
cur_obj_rotate_yaw_toward(o->oWigglerTargetYaw, yawTurnSpeed);
obj_face_yaw_approach(o->oMoveAngleYaw, 2 * yawTurnSpeed);
obj_face_pitch_approach(0, 0x320);
// For the first two seconds of walking, stay invulnerable
cur_obj_become_tangible();
if (o->oTimer < 60) {
obj_check_attacks(&sWigglerHitbox, o->oAction);
} else if (obj_handle_attacks(&sWigglerHitbox, o->oAction, sWigglerAttackHandlers)) {
if (o->oAction != WIGGLER_ACT_JUMPED_ON) {
o->oAction = WIGGLER_ACT_KNOCKBACK;
}
o->oWigglerWalkAwayFromWallTimer = 0;
o->oWigglerWalkAnimSpeed = 0.0f;
}
}
/**
* Show text if necessary. Then walk toward mario if not at full health, and
@ -214,79 +309,19 @@ void wiggler_update_segments(void) {
* If attacked by mario, enter either the jumped on or knockback action.
*/
static void wiggler_act_walk(void) {
struct MarioState *marioState = nearest_mario_state_to_object(o);
struct Object* player = marioState ? marioState->marioObj : NULL;
s32 distanceToPlayer = player ? dist_between_objects(o, player) : 25000;
s32 angleToPlayer = player ? obj_angle_to_object(o, player) : 0;
treat_far_home_as_mario(1200.0f, &distanceToPlayer, &angleToPlayer);
o->oWigglerWalkAnimSpeed = 0.06f * o->oForwardVel;
// If Mario is positioned below the wiggler, assume he entered through the
// lower cave entrance, so don't display text.
if (o->oWigglerTextStatus < WIGGLER_TEXT_STATUS_COMPLETED_DIALOG && gMarioStates[0].pos[1] < o->oPosY - 300) {
o->oWigglerTextStatus = WIGGLER_TEXT_STATUS_COMPLETED_DIALOG;
}
// Update text if necessary
if (o->oWigglerTextStatus < WIGGLER_TEXT_STATUS_COMPLETED_DIALOG) {
if (o->oWigglerTextStatus == WIGGLER_TEXT_STATUS_AWAIT_DIALOG && !gDjuiInMainMenu) {
seq_player_lower_volume(SEQ_PLAYER_LEVEL, 60, 40);
o->oWigglerTextStatus = WIGGLER_TEXT_STATUS_SHOWING_DIALOG;
}
// If Mario is positioned below the wiggler, assume he entered through the
// lower cave entrance, so don't display text.
if ((player && player->oPosY < o->oPosY) || (cur_obj_update_dialog_with_cutscene(&gMarioStates[0], 2, 0, CUTSCENE_DIALOG, gBehaviorValues.dialogs.WigglerDialog, wiggler_act_walk_continue_dialog) != 0)) {
o->oWigglerTextStatus = WIGGLER_TEXT_STATUS_COMPLETED_DIALOG;
network_send_object_reliability(o, TRUE);
}
if (o->oWigglerTextStatus < WIGGLER_TEXT_STATUS_COMPLETED_DIALOG && o->oWigglerFinishedTalking == 0) {
wiggler_act_walk_subact_talk();
} else {
//! Every object's health is initially 2048, and wiggler's doesn't change
// to 4 until after this runs the first time. It indexes out of bounds
// and uses the value 113762.3 for one frame on US. This is fixed up
// in wiggler_init_segments if AVOID_UB is defined.
obj_forward_vel_approach(BHV_ARR(sWigglerSpeeds, o->oHealth - 1, f32), 1.0f);
if (o->oWigglerWalkAwayFromWallTimer != 0) {
o->oWigglerWalkAwayFromWallTimer -= 1;
} else {
if (distanceToPlayer >= 25000.0f) {
// If >1200 away from home, turn to home
o->oWigglerTargetYaw = angleToPlayer;
}
if (obj_bounce_off_walls_edges_objects(&o->oWigglerTargetYaw)) {
//! If the wiggler could self-intersect, or intersect a different
// non-mario object, this could potentially be used to force
// the wiggler to walk straight - past his usual radius
o->oWigglerWalkAwayFromWallTimer = random_linear_offset(30, 30);
} else {
if (o->oHealth < 4) {
o->oWigglerTargetYaw = angleToPlayer;
} else if (o->oWigglerTimeUntilRandomTurn != 0) {
o->oWigglerTimeUntilRandomTurn -= 1;
} else {
o->oWigglerTargetYaw = o->oMoveAngleYaw + 0x4000 * (s16) random_sign();
o->oWigglerTimeUntilRandomTurn = random_linear_offset(30, 50);
}
}
}
// If moving at high speeds, could overflow. But can't reach such speeds
// in practice
s16 yawTurnSpeed = (s16)(30.0f * o->oForwardVel);
cur_obj_rotate_yaw_toward(o->oWigglerTargetYaw, yawTurnSpeed);
obj_face_yaw_approach(o->oMoveAngleYaw, 2 * yawTurnSpeed);
obj_face_pitch_approach(0, 0x320);
// For the first two seconds of walking, stay invulnerable
cur_obj_become_tangible();
if (o->oTimer < 60) {
obj_check_attacks(&sWigglerHitbox, o->oAction);
} else if (obj_handle_attacks(&sWigglerHitbox, o->oAction, sWigglerAttackHandlers)) {
if (o->oAction != WIGGLER_ACT_JUMPED_ON) {
o->oAction = WIGGLER_ACT_KNOCKBACK;
}
o->oWigglerWalkAwayFromWallTimer = 0;
o->oWigglerWalkAnimSpeed = 0.0f;
}
wiggler_act_walk_subact_walk();
}
}
@ -297,16 +332,21 @@ u8 wiggler_act_jumped_on_continue_dialog(void) { return o->oAction == WIGGLER_AC
* action.
*/
static void wiggler_act_jumped_on(void) {
struct MarioState* marioState = nearest_mario_state_to_object(o);
if (o->globalPlayerIndex >= MAX_PLAYERS) o->globalPlayerIndex = 0;
struct MarioState *marioState = &gMarioStates[network_local_index_from_global(o->globalPlayerIndex)];
if (!is_player_active(marioState)) {
// use player with the smallest global index instead
marioState = &gMarioStates[get_network_player_smallest_global()->localIndex];
}
// Text to show on first, second, and third attack.
enum DialogId* attackText[3] = {
enum DialogId *attackText[3] = {
&gBehaviorValues.dialogs.WigglerAttack1Dialog,
&gBehaviorValues.dialogs.WigglerAttack2Dialog,
&gBehaviorValues.dialogs.WigglerAttack3Dialog
};
// Shrink until the squish speed becomes 0, then unisquish
// Shrink until the squish speed becomes 0, then unsquish
if (approach_f32_ptr(&o->oWigglerSquishSpeed, 0.0f, 0.05f)) {
// Note that 4 is the default scale
approach_f32_ptr(&o->header.gfx.scale[1], 4.0f, 0.2f);
@ -375,16 +415,15 @@ static void wiggler_act_shrink(void) {
// 4 is the default scale, so shrink to 1/4 of regular size
if (approach_f32_ptr(&o->header.gfx.scale[0], 1.0f, 0.1f)) {
f32* starPos = gLevelValues.starPositions.WigglerStarPos;
f32 *starPos = gLevelValues.starPositions.WigglerStarPos;
struct Object *star = spawn_default_star(starPos[0], starPos[1], starPos[2]);
// If we're not the closet to Wiggler,
// Don't play this cutscene!
if (star != NULL && nearest_mario_state_to_object(o) != &gMarioStates[0]) {
star->oStarSpawnExtCutsceneFlags = 0;
}
o->oAction = WIGGLER_ACT_FALL_THROUGH_FLOOR;
}
@ -424,6 +463,8 @@ void wiggler_jumped_on_attack_handler(void) {
o->oAction = WIGGLER_ACT_JUMPED_ON;
o->oForwardVel = o->oVelY = 0.0f;
o->oWigglerSquishSpeed = 0.4f;
o->globalPlayerIndex = network_global_index_from_local(0);
network_send_object(o);
}
u8 bhv_wiggler_ignore_if_true(void) {
@ -462,8 +503,9 @@ void bhv_wiggler_on_received_post(UNUSED u8 localIndex) {
*/
void bhv_wiggler_update(void) {
// PARTIAL_UPDATE
// uses standard distance-based syncing
if (!sync_object_is_initialized(o->oSyncID)) {
struct SyncObject* so = sync_object_init(o, 4000.0f);
struct SyncObject *so = sync_object_init(o, 4000.0f);
if (so) {
so->ignore_if_true = bhv_wiggler_ignore_if_true;
so->on_received_pre = bhv_wiggler_on_received_pre;
@ -475,15 +517,17 @@ void bhv_wiggler_update(void) {
sync_object_init_field(o, o->oWigglerTimeUntilRandomTurn);
sync_object_init_field(o, o->oWigglerTargetYaw);
sync_object_init_field(o, o->oWigglerWalkAwayFromWallTimer);
sync_object_init_field(o, o->oWigglerFinishedTalking);
sync_object_init_field(o, o->oHealth);
sync_object_init_field(o, o->header.gfx.scale[0]);
sync_object_init_field(o, o->header.gfx.scale[1]);
sync_object_init_field(o, o->header.gfx.scale[2]);
sync_object_init_field(o, o->oFaceAngleYaw);
sync_object_init_field(o, o->globalPlayerIndex);
}
}
struct Object* player = nearest_player_to_object(o);
struct Object *player = nearest_player_to_object(o);
s32 distanceToPlayer = player ? dist_between_objects(o, player) : 25000;
s32 angleToPlayer = player ? obj_angle_to_object(o, player) : 0;
o->oDistanceToMario = distanceToPlayer;
@ -500,8 +544,7 @@ void bhv_wiggler_update(void) {
// Walking animation and sound
cur_obj_init_animation_with_accel_and_sound(0, o->oWigglerWalkAnimSpeed);
if (o->oWigglerWalkAnimSpeed != 0.0f) {
cur_obj_play_sound_at_anim_range(0, 13,
o->oHealth >= 4 ? SOUND_OBJ_WIGGLER_LOW_PITCH : SOUND_OBJ_WIGGLER_HIGH_PITCH);
cur_obj_play_sound_at_anim_range(0, 13, o->oHealth >= 4 ? SOUND_OBJ_WIGGLER_LOW_PITCH : SOUND_OBJ_WIGGLER_HIGH_PITCH);
} else {
cur_obj_reverse_animation();
}

11
src/pc/lua/smlua_cobject_autogen.c
View file

@ -1580,7 +1580,7 @@ static struct LuaObjectField sNetworkPlayerFields[LUA_NETWORK_PLAYER_FIELD_COUNT
{ "type", LVT_U8, offsetof(struct NetworkPlayer, type), true, LOT_NONE, 1, sizeof(u8) },
};
#define LUA_OBJECT_FIELD_COUNT 763
#define LUA_OBJECT_FIELD_COUNT 766
static struct LuaObjectField sObjectFields[LUA_OBJECT_FIELD_COUNT] = {
{ "activeFlags", LVT_S16, offsetof(struct Object, activeFlags), false, LOT_NONE, 1, sizeof(s16) },
{ "allowRemoteInteractions", LVT_U8, offsetof(struct Object, allowRemoteInteractions), false, LOT_NONE, 1, sizeof(u8) },
@ -1975,8 +1975,11 @@ static struct LuaObjectField sObjectFields[LUA_OBJECT_FIELD_COUNT] = {
{ "oKoopaMovementType", LVT_S32, offsetof(struct Object, oKoopaMovementType), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointKoopaFinished", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointKoopaFinished), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceBegun", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceBegun), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceCheated", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceCheated), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceEnded", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceEnded), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceStartTime", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceStartTime), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceStatus", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceStatus), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointRaceWinner", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointRaceWinner), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaRaceEndpointUnk100", LVT_S32, offsetof(struct Object, oKoopaRaceEndpointUnk100), false, LOT_NONE, 1, sizeof(s32) },
{ "oKoopaShellFlameUnkF4", LVT_F32, offsetof(struct Object, oKoopaShellFlameUnkF4), false, LOT_NONE, 1, sizeof(f32) },
{ "oKoopaShellFlameUnkF8", LVT_F32, offsetof(struct Object, oKoopaShellFlameUnkF8), false, LOT_NONE, 1, sizeof(f32) },
@ -2332,12 +2335,12 @@ static struct LuaObjectField sObjectFields[LUA_OBJECT_FIELD_COUNT] = {
{ "oWhitePuffUnkFC", LVT_S32, offsetof(struct Object, oWhitePuffUnkFC), false, LOT_NONE, 1, sizeof(s32) },
{ "oWhompShakeVal", LVT_S32, offsetof(struct Object, oWhompShakeVal), false, LOT_NONE, 1, sizeof(s32) },
{ "oWigglerFallThroughFloorsHeight", LVT_F32, offsetof(struct Object, oWigglerFallThroughFloorsHeight), false, LOT_NONE, 1, sizeof(f32) },
{ "oWigglerFinishedTalking", LVT_S16, offsetof(struct Object, oWigglerFinishedTalking), false, LOT_NONE, 1, sizeof(s16) },
{ "oWigglerSegments", LVT_COBJECT_P, offsetof(struct Object, oWigglerSegments), true, LOT_CHAINSEGMENT, 1, sizeof(struct ChainSegment*) },
{ "oWigglerSquishSpeed", LVT_F32, offsetof(struct Object, oWigglerSquishSpeed), false, LOT_NONE, 1, sizeof(f32) },
{ "oWigglerTargetYaw", LVT_S32, offsetof(struct Object, oWigglerTargetYaw), false, LOT_NONE, 1, sizeof(s32) },
{ "oWigglerTextStatus", LVT_S16, offsetof(struct Object, oWigglerTextStatus), false, LOT_NONE, 1, sizeof(s16) },
{ "oWigglerTimeUntilRandomTurn", LVT_S32, offsetof(struct Object, oWigglerTimeUntilRandomTurn), false, LOT_NONE, 1, sizeof(s32) },
{ "oWigglerUnused", LVT_S16, offsetof(struct Object, oWigglerUnused), false, LOT_NONE, 1, sizeof(s16) },
{ "oWigglerWalkAnimSpeed", LVT_F32, offsetof(struct Object, oWigglerWalkAnimSpeed), false, LOT_NONE, 1, sizeof(f32) },
{ "oWigglerWalkAwayFromWallTimer", LVT_S32, offsetof(struct Object, oWigglerWalkAwayFromWallTimer), false, LOT_NONE, 1, sizeof(s32) },
{ "oWoodenPostMarioPounding", LVT_S32, offsetof(struct Object, oWoodenPostMarioPounding), false, LOT_NONE, 1, sizeof(s32) },
@ -2872,8 +2875,8 @@ const char *smlua_get_lot_name(u16 lot) {
return sLuaLotNames[lot];
}
struct LuaObjectField *smlua_get_object_field_autogen(u16 lot, const char *key) {
struct LuaObjectTable *ot = &sLuaObjectAutogenTable[lot - LOT_AUTOGEN_MIN - 1];
struct LuaObjectField* smlua_get_object_field_autogen(u16 lot, const char* key) {
struct LuaObjectTable* ot = &sLuaObjectAutogenTable[lot - LOT_AUTOGEN_MIN - 1];
return smlua_get_object_field_from_ot(ot, key);
}

21
src/pc/lua/smlua_constants_autogen.c
View file

@ -2614,6 +2614,27 @@ char gSmluaConstants[] = ""
"BBH_NEAR_MERRY_GO_ROUND_ROOM=10\n"
"BBH_DYNAMIC_SURFACE_ROOM=0\n"
"BBH_OUTSIDE_ROOM=13\n"
"BOWSER_ACT_DEFAULT=0\n"
"BOWSER_ACT_THROWN=1\n"
"BOWSER_ACT_JUMP_ONTO_STAGE=2\n"
"BOWSER_ACT_DANCE=3\n"
"BOWSER_ACT_DEAD=4\n"
"BOWSER_ACT_WAIT=5\n"
"BOWSER_ACT_INTRO_WALK=6\n"
"BOWSER_ACT_CHARGE_MARIO=7\n"
"BOWSER_ACT_SPIT_FIRE_INTO_SKY=8\n"
"BOWSER_ACT_SPIT_FIRE_ONTO_FLOOR=9\n"
"BOWSER_ACT_HIT_EDGE=10\n"
"BOWSER_ACT_TURN_FROM_EDGE=11\n"
"BOWSER_ACT_HIT_MINE=12\n"
"BOWSER_ACT_BIG_JUMP=13\n"
"BOWSER_ACT_WALK_TO_MARIO=14\n"
"BOWSER_ACT_BREATH_FIRE=15\n"
"BOWSER_ACT_TELEPORT=16\n"
"BOWSER_ACT_QUICK_JUMP=17\n"
"BOWSER_ACT_UNUSED_SLOW_WALK=18\n"
"BOWSER_ACT_TILT_LAVA_PLATFORM=19\n"
"BOWSER_ACT_NOTHING=20\n"
"COFFIN_SPAWNER_ACT_COFFINS_UNLOADED=0\n"
"COFFIN_ACT_IDLE=0\n"
"COFFIN_ACT_STAND_UP=1\n"