thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-05 15:43:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unused/unusable structs from autogen

Browse source
This commit is contained in:
PeachyPeachSM64 2025-11-04 22:19:12 +01:00
parent 5fd55ffac1
commit 9a3d3a7640
17 changed files with 935 additions and 1843 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
autogen/common.py
View file

@ -17,13 +17,40 @@ type_mappings = {
'double': 'f64', 'double': 'f64',
'uintptr_t': 'u64', # this is assumed 'uintptr_t': 'u64', # this is assumed
'size_t': 'u64', # this is assumed
} }
exclude_structs = [ exclude_structs = [
'SPTask', 'AnimationTable',
'VblankHandler', 'BullyCollisionData',
'CameraFOVStatus',
'CameraStoredInfo',
'CameraTrigger',
'ChainSegment',
'Cutscene',
'CutsceneSplinePoint',
'CutsceneVariable',
'FloorGeometry',
'GraphNode_802A45E4',
'HandheldShakePoint',
'LinearTransitionPoint',
'MarioAnimDmaRelatedThing', 'MarioAnimDmaRelatedThing',
'ModAudioSampleCopies',
'ModFile',
'ModeTransitionInfo',
'OffsetSizePair',
'PaintingMeshVertex',
'ParallelTrackingPoint',
'PlayerGeometry',
'PlayerPalette',
'SPTask',
'SoundState',
'TransitionInfo',
'UnusedArea28', 'UnusedArea28',
'VblankHandler',
'Vtx_Interp',
'WarpTransition',
'WarpTransitionData',
] ]
override_types = { "Gfx", "Vtx" } override_types = { "Gfx", "Vtx" }

1
autogen/convert_structs.py
View file

@ -116,6 +116,7 @@ override_field_immutable = {
"Object": ["oSyncID", "coopFlags", "oChainChompSegments", "oWigglerSegments", "oHauntedChairUnk100", "oTTCTreadmillBigSurface", "oTTCTreadmillSmallSurface", "bhvStackIndex", "respawnInfoType", "numSurfaces" ], "Object": ["oSyncID", "coopFlags", "oChainChompSegments", "oWigglerSegments", "oHauntedChairUnk100", "oTTCTreadmillBigSurface", "oTTCTreadmillSmallSurface", "bhvStackIndex", "respawnInfoType", "numSurfaces" ],
"GlobalObjectAnimations": [ "*"], "GlobalObjectAnimations": [ "*"],
"SpawnParticlesInfo": [ "model" ], "SpawnParticlesInfo": [ "model" ],
"WaterDropletParams": [ "model" ],
"MarioBodyState": [ "updateTorsoTime", "updateHeadPosTime", "animPartsPos", "currAnimPart" ], "MarioBodyState": [ "updateTorsoTime", "updateHeadPosTime", "animPartsPos", "currAnimPart" ],
"Area": [ "localAreaTimer", "nextSyncID", "objectSpawnInfos", "paintingWarpNodes", "warpNodes" ], "Area": [ "localAreaTimer", "nextSyncID", "objectSpawnInfos", "paintingWarpNodes", "warpNodes" ],
"Mod": [ "*" ], "Mod": [ "*" ],

37
autogen/lua_definitions/functions.lua
View file

@ -3615,12 +3615,6 @@ function rotate_camera_around_walls(c, cPos, avoidYaw, yawRange)
-- ... -- ...
end end
--- @param pg PlayerGeometry
--- Finds the floor and ceiling directly above and below Mario's position. Updates Mario's geometry information for camera calculations
function find_mario_floor_and_ceil(pg)
-- ...
end
--- @param cutscene integer --- @param cutscene integer
--- @return integer --- @return integer
--- Starts a cutscene focused on an object without requiring focus to remain locked. This is useful for dynamic events where the camera adjusts freely --- Starts a cutscene focused on an object without requiring focus to remain locked. This is useful for dynamic events where the camera adjusts freely
@ -6399,17 +6393,6 @@ function mario_bonk_reflection(m, negateSpeed)
-- ... -- ...
end end
--- @param data BullyCollisionData
--- @param posX number
--- @param posZ number
--- @param forwardVel number
--- @param yaw integer
--- @param conversionRatio number
--- @param radius number
function init_bully_collision_data(data, posX, posZ, forwardVel, yaw, conversionRatio, radius)
-- ...
end
--- @param m MarioState --- @param m MarioState
--- @param sinkingSpeed number --- @param sinkingSpeed number
--- @return integer --- @return integer
@ -8832,13 +8815,6 @@ function cur_obj_init_animation_with_accel_and_sound(animIndex, accel)
-- ... -- ...
end end
--- @param obj Object
--- @param animations AnimationTable
--- @param animIndex integer
function obj_init_animation_with_sound(obj, animations, animIndex)
-- ...
end
--- @param obj Object --- @param obj Object
function cur_obj_enable_rendering_and_become_tangible(obj) function cur_obj_enable_rendering_and_become_tangible(obj)
-- ... -- ...
@ -9450,11 +9426,6 @@ function cur_obj_follow_path(unusedArg)
-- ... -- ...
end end
--- @param segment ChainSegment
function chain_segment_init(segment)
-- ...
end
--- @param diameter number --- @param diameter number
--- @return number --- @return number
function random_f32_around_zero(diameter) function random_f32_around_zero(diameter)
@ -11841,6 +11812,14 @@ function obj_get_temp_spawn_particles_info(modelId)
-- ... -- ...
end end
--- @param modelId ModelExtendedId
--- @param behaviorId BehaviorId
--- @return WaterDropletParams
--- Returns a temporary water droplet params pointer with its model and behavior loaded in from `modelId` and `behaviorId`
function obj_get_temp_water_droplet_params(modelId, behaviorId)
-- ...
end
--- @return ObjectHitbox --- @return ObjectHitbox
--- Returns a temporary object hitbox pointer --- Returns a temporary object hitbox pointer
function get_temp_object_hitbox() function get_temp_object_hitbox()

188
autogen/lua_definitions/structs.lua
View file

@ -25,9 +25,6 @@
--- @field public valuesLength integer --- @field public valuesLength integer
--- @field public indexLength integer --- @field public indexLength integer
--- @class AnimationTable
--- @field public count integer
--- @class Area --- @class Area
--- @field public index integer --- @field public index integer
--- @field public flags integer --- @field public flags integer
@ -203,14 +200,6 @@
--- @field public dialogs BehaviorDialogs --- @field public dialogs BehaviorDialogs
--- @field public trajectories BehaviorTrajectories --- @field public trajectories BehaviorTrajectories
--- @class BullyCollisionData
--- @field public conversionRatio number
--- @field public radius number
--- @field public posX number
--- @field public posZ number
--- @field public velX number
--- @field public velZ number
--- @class Camera --- @class Camera
--- @field public mode integer --- @field public mode integer
--- @field public defMode integer --- @field public defMode integer
@ -228,44 +217,6 @@
--- @field public areaCenY number --- @field public areaCenY number
--- @field public mtx Mat4 --- @field public mtx Mat4
--- @class CameraFOVStatus
--- @field public fovFunc integer
--- @field public fov number
--- @field public fovOffset number
--- @field public unusedIsSleeping integer
--- @field public shakeAmplitude number
--- @field public shakePhase integer
--- @field public shakeSpeed integer
--- @field public decay integer
--- @class CameraOverride
--- @field public value integer
--- @field public override boolean
--- @class CameraStoredInfo
--- @field public pos Vec3f
--- @field public focus Vec3f
--- @field public panDist number
--- @field public cannonYOffset number
--- @class CameraTrigger
--- @field public area integer
--- @field public centerX integer
--- @field public centerY integer
--- @field public centerZ integer
--- @field public boundsX integer
--- @field public boundsY integer
--- @field public boundsZ integer
--- @field public boundsYaw integer
--- @class ChainSegment
--- @field public posX number
--- @field public posY number
--- @field public posZ number
--- @field public pitch integer
--- @field public yaw integer
--- @field public roll integer
--- @class Character --- @class Character
--- @field public type CharacterType --- @field public type CharacterType
--- @field public name string --- @field public name string
@ -567,21 +518,6 @@
--- @field public modIndex integer --- @field public modIndex integer
--- @field public next CustomLevelInfo --- @field public next CustomLevelInfo
--- @class Cutscene
--- @field public duration integer
--- @class CutsceneSplinePoint
--- @field public index integer
--- @field public speed integer
--- @field public point Vec3s
--- @class CutsceneVariable
--- @field public unused1 integer
--- @field public point Vec3f
--- @field public unusedPoint Vec3f
--- @field public angle Vec3s
--- @field public unused2 integer
--- @class DateTime --- @class DateTime
--- @field public year integer --- @field public year integer
--- @field public month integer --- @field public month integer
@ -651,13 +587,6 @@
--- @field public fov number --- @field public fov number
--- @field public offset Vec3f --- @field public offset Vec3f
--- @class FloorGeometry
--- @field public unused number[]
--- @field public normalX number
--- @field public normalY number
--- @field public normalZ number
--- @field public originOffset number
--- @class FnGraphNode --- @class FnGraphNode
--- @field public node GraphNode --- @field public node GraphNode
@ -1015,19 +944,6 @@
--- @field public translation Vec3s --- @field public translation Vec3s
--- @field public rotation Vec3s --- @field public rotation Vec3s
--- @class GraphNode_802A45E4
--- @field public unk18 integer
--- @field public unk1A integer
--- @field public unk1C integer
--- @field public unk1E integer
--- @field public unk20 integer
--- @field public unk22 integer
--- @class HandheldShakePoint
--- @field public index integer
--- @field public pad integer
--- @field public point Vec3s
--- @class HudUtilsRotation --- @class HudUtilsRotation
--- @field public rotation number --- @field public rotation number
--- @field public rotationDiff number --- @field public rotationDiff number
@ -1139,13 +1055,6 @@
--- @field public floorNormalMinY number --- @field public floorNormalMinY number
--- @field public ceilNormalMaxY number --- @field public ceilNormalMaxY number
--- @class LinearTransitionPoint
--- @field public focus Vec3f
--- @field public pos Vec3f
--- @field public dist number
--- @field public pitch integer
--- @field public yaw integer
--- @class MarioAnimation --- @class MarioAnimation
--- @field public currentAnimAddr Pointer_integer --- @field public currentAnimAddr Pointer_integer
--- @field public targetAnim Animation --- @field public targetAnim Animation
@ -1277,6 +1186,7 @@
--- @field public renderBehindHud boolean --- @field public renderBehindHud boolean
--- @field public pausable boolean --- @field public pausable boolean
--- @field public ignoreScriptWarnings boolean --- @field public ignoreScriptWarnings boolean
--- @field public size integer
--- @field public customBehaviorIndex integer --- @field public customBehaviorIndex integer
--- @class ModAudio --- @class ModAudio
@ -1285,19 +1195,6 @@
--- @field public baseVolume number --- @field public baseVolume number
--- @field public loaded boolean --- @field public loaded boolean
--- @class ModAudioSampleCopies
--- @field public next ModAudioSampleCopies
--- @field public prev ModAudioSampleCopies
--- @field public parent ModAudio
--- @class ModFile
--- @field public relativePath string
--- @field public modifiedTimestamp integer
--- @field public isLoadedLuaModule boolean
--- @field public wroteBytes integer
--- @field public dataHash integer[]
--- @field public cachedPath string
--- @class ModFs --- @class ModFs
--- @field public mod Mod --- @field public mod Mod
--- @field public modPath string --- @field public modPath string
@ -1342,14 +1239,6 @@
--- @field public set_text_mode fun(file: ModFsFile, text: boolean): boolean --- @field public set_text_mode fun(file: ModFsFile, text: boolean): boolean
--- @field public set_public fun(file: ModFsFile, pub: boolean): boolean --- @field public set_public fun(file: ModFsFile, pub: boolean): boolean
--- @class ModeTransitionInfo
--- @field public newMode integer
--- @field public lastMode integer
--- @field public max integer
--- @field public frame integer
--- @field public transitionStart LinearTransitionPoint
--- @field public transitionEnd LinearTransitionPoint
--- @class NametagsSettings --- @class NametagsSettings
--- @field public showHealth boolean --- @field public showHealth boolean
--- @field public showSelfTag boolean --- @field public showSelfTag boolean
@ -1374,7 +1263,6 @@
--- @field public onRxSeqId integer --- @field public onRxSeqId integer
--- @field public modelIndex integer --- @field public modelIndex integer
--- @field public ping integer --- @field public ping integer
--- @field public palette PlayerPalette
--- @field public name string --- @field public name string
--- @field public description string --- @field public description string
--- @field public descriptionR integer --- @field public descriptionR integer
@ -1383,7 +1271,6 @@
--- @field public descriptionA integer --- @field public descriptionA integer
--- @field public overrideLocation string --- @field public overrideLocation string
--- @field public overrideModelIndex integer --- @field public overrideModelIndex integer
--- @field public overridePalette PlayerPalette
--- @field public paletteIndex integer --- @field public paletteIndex integer
--- @field public overridePaletteIndex integer --- @field public overridePaletteIndex integer
--- @field public overridePaletteIndexLp integer --- @field public overridePaletteIndexLp integer
@ -1638,7 +1525,6 @@
--- @field public oCannonPlayerIndex integer --- @field public oCannonPlayerIndex integer
--- @field public oCapUnkF4 integer --- @field public oCapUnkF4 integer
--- @field public oCapUnkF8 integer --- @field public oCapUnkF8 integer
--- @field public oChainChompSegments ChainSegment
--- @field public oChainChompMaxDistFromPivotPerChainPart number --- @field public oChainChompMaxDistFromPivotPerChainPart number
--- @field public oChainChompMaxDistBetweenChainParts number --- @field public oChainChompMaxDistBetweenChainParts number
--- @field public oChainChompDistToPivot number --- @field public oChainChompDistToPivot number
@ -2132,7 +2018,6 @@
--- @field public oStrongWindParticlePenguinObj Object --- @field public oStrongWindParticlePenguinObj Object
--- @field public oWhompShakeVal integer --- @field public oWhompShakeVal integer
--- @field public oWigglerFallThroughFloorsHeight number --- @field public oWigglerFallThroughFloorsHeight number
--- @field public oWigglerSegments ChainSegment
--- @field public oWigglerWalkAnimSpeed number --- @field public oWigglerWalkAnimSpeed number
--- @field public oWigglerSquishSpeed number --- @field public oWigglerSquishSpeed number
--- @field public oWigglerTimeUntilRandomTurn integer --- @field public oWigglerTimeUntilRandomTurn integer
@ -2173,10 +2058,6 @@
--- @field public object Object --- @field public object Object
--- @field public next ObjectWarpNode --- @field public next ObjectWarpNode
--- @class OffsetSizePair
--- @field public offset integer
--- @field public size integer
--- @class Painting --- @class Painting
--- @field public id integer --- @field public id integer
--- @field public imageCount integer --- @field public imageCount integer
@ -2215,10 +2096,6 @@
--- @field public marioWentUnder integer --- @field public marioWentUnder integer
--- @field public size number --- @field public size number
--- @class PaintingMeshVertex
--- @field public pos integer[]
--- @field public norm integer[]
--- @class PaintingValues --- @class PaintingValues
--- @field public cotmc_painting Painting --- @field public cotmc_painting Painting
--- @field public bob_painting Painting --- @field public bob_painting Painting
@ -2237,12 +2114,6 @@
--- @field public thi_huge_painting Painting --- @field public thi_huge_painting Painting
--- @field public ttm_slide_painting Painting --- @field public ttm_slide_painting Painting
--- @class ParallelTrackingPoint
--- @field public startOfPath integer
--- @field public pos Vec3f
--- @field public distThresh number
--- @field public zoom number
--- @class PlayerCameraState --- @class PlayerCameraState
--- @field public action integer --- @field public action integer
--- @field public pos Vec3f --- @field public pos Vec3f
@ -2252,23 +2123,6 @@
--- @field public cameraEvent integer --- @field public cameraEvent integer
--- @field public usedObj Object --- @field public usedObj Object
--- @class PlayerGeometry
--- @field public currFloor Surface
--- @field public currFloorHeight number
--- @field public currFloorType integer
--- @field public currCeil Surface
--- @field public currCeilType integer
--- @field public currCeilHeight number
--- @field public prevFloor Surface
--- @field public prevFloorHeight number
--- @field public prevFloorType integer
--- @field public prevCeil Surface
--- @field public prevCeilHeight number
--- @field public prevCeilType integer
--- @field public waterHeight number
--- @class PlayerPalette
--- @class RayIntersectionInfo --- @class RayIntersectionInfo
--- @field public surface Surface --- @field public surface Surface
--- @field public hitPos Vec3f --- @field public hitPos Vec3f
@ -2300,12 +2154,6 @@
--- @field public maxPlayers integer --- @field public maxPlayers integer
--- @field public pauseAnywhere integer --- @field public pauseAnywhere integer
--- @class SoundState
--- @field public playSound integer
--- @field public animFrame1 integer
--- @field public animFrame2 integer
--- @field public soundMagic integer
--- @class SpawnInfo --- @class SpawnInfo
--- @field public startPos Vec3s --- @field public startPos Vec3s
--- @field public startAngle Vec3s --- @field public startAngle Vec3s
@ -2395,17 +2243,6 @@
--- @field public height integer --- @field public height integer
--- @field public bitSize integer --- @field public bitSize integer
--- @class TransitionInfo
--- @field public posPitch integer
--- @field public posYaw integer
--- @field public posDist number
--- @field public focPitch integer
--- @field public focYaw integer
--- @field public focDist number
--- @field public framesLeft integer
--- @field public marioPos Vec3f
--- @field public pad integer
--- @class Vtx --- @class Vtx
--- @field public x number --- @field public x number
--- @field public y number --- @field public y number
@ -2421,10 +2258,6 @@
--- @field public nz integer --- @field public nz integer
--- @field public a integer --- @field public a integer
--- @class Vtx_Interp
--- @field public ob number[]
--- @field public n string
--- @class WallCollisionData --- @class WallCollisionData
--- @field public x number --- @field public x number
--- @field public y number --- @field public y number
@ -2443,25 +2276,6 @@
--- @field public destArea integer --- @field public destArea integer
--- @field public destNode integer --- @field public destNode integer
--- @class WarpTransition
--- @field public isActive integer
--- @field public type integer
--- @field public time integer
--- @field public pauseRendering integer
--- @field public data WarpTransitionData
--- @class WarpTransitionData
--- @field public red integer
--- @field public green integer
--- @field public blue integer
--- @field public startTexRadius integer
--- @field public endTexRadius integer
--- @field public startTexX integer
--- @field public startTexY integer
--- @field public endTexX integer
--- @field public endTexY integer
--- @field public texTimer integer
--- @class WaterDropletParams --- @class WaterDropletParams
--- @field public flags integer --- @field public flags integer
--- @field public model integer --- @field public model integer

23
docs/lua/functions-3.md
View file

@ -2121,29 +2121,6 @@ Rotates the camera to avoid walls or other obstructions. Ensures clear visibilit
<br /> <br />
## [find_mario_floor_and_ceil](#find_mario_floor_and_ceil)
### Description
Finds the floor and ceiling directly above and below Mario's position. Updates Mario's geometry information for camera calculations
### Lua Example
`find_mario_floor_and_ceil(pg)`
### Parameters
| Field | Type |
| ----- | ---- |
| pg | [PlayerGeometry](structs.md#PlayerGeometry) |
### Returns
- None
### C Prototype
`void find_mario_floor_and_ceil(struct PlayerGeometry *pg);`
[:arrow_up_small:](#)
<br />
## [start_object_cutscene_without_focus](#start_object_cutscene_without_focus) ## [start_object_cutscene_without_focus](#start_object_cutscene_without_focus)
### Description ### Description

26
docs/lua/functions-4.md
View file

@ -3923,32 +3923,6 @@ Reflects Mario off a wall if he is colliding with one and flips forward velocity
<br /> <br />
## [init_bully_collision_data](#init_bully_collision_data)
### Lua Example
`init_bully_collision_data(data, posX, posZ, forwardVel, yaw, conversionRatio, radius)`
### Parameters
| Field | Type |
| ----- | ---- |
| data | [BullyCollisionData](structs.md#BullyCollisionData) |
| posX | `number` |
| posZ | `number` |
| forwardVel | `number` |
| yaw | `integer` |
| conversionRatio | `number` |
| radius | `number` |
### Returns
- None
### C Prototype
`void init_bully_collision_data(struct BullyCollisionData *data, f32 posX, f32 posZ, f32 forwardVel, s16 yaw, f32 conversionRatio, f32 radius);`
[:arrow_up_small:](#)
<br />
## [mario_update_quicksand](#mario_update_quicksand) ## [mario_update_quicksand](#mario_update_quicksand)
### Description ### Description

42
docs/lua/functions-6.md
View file

@ -1007,28 +1007,6 @@ Multiplies a vector by the transpose of a matrix of the form: `| ? ? ? 0 |` `| ?
<br /> <br />
## [obj_init_animation_with_sound](#obj_init_animation_with_sound)
### Lua Example
`obj_init_animation_with_sound(obj, animations, animIndex)`
### Parameters
| Field | Type |
| ----- | ---- |
| obj | [Object](structs.md#Object) |
| animations | [AnimationTable](structs.md#AnimationTable) |
| animIndex | `integer` |
### Returns
- None
### C Prototype
`void obj_init_animation_with_sound(struct Object *obj, const struct AnimationTable* animations, s32 animIndex);`
[:arrow_up_small:](#)
<br />
## [cur_obj_enable_rendering_and_become_tangible](#cur_obj_enable_rendering_and_become_tangible) ## [cur_obj_enable_rendering_and_become_tangible](#cur_obj_enable_rendering_and_become_tangible)
### Lua Example ### Lua Example
@ -3214,26 +3192,6 @@ Transforms the vector at `localTranslateIndex` into the object's local coordinat
<br /> <br />
## [chain_segment_init](#chain_segment_init)
### Lua Example
`chain_segment_init(segment)`
### Parameters
| Field | Type |
| ----- | ---- |
| segment | [ChainSegment](structs.md#ChainSegment) |
### Returns
- None
### C Prototype
`void chain_segment_init(struct ChainSegment *segment);`
[:arrow_up_small:](#)
<br />
## [random_f32_around_zero](#random_f32_around_zero) ## [random_f32_around_zero](#random_f32_around_zero)
### Lua Example ### Lua Example

24
docs/lua/functions-7.md
View file

@ -3014,6 +3014,30 @@ Returns a temporary particle spawn info pointer with its model loaded in from `m
<br /> <br />
## [obj_get_temp_water_droplet_params](#obj_get_temp_water_droplet_params)
### Description
Returns a temporary water droplet params pointer with its model and behavior loaded in from `modelId` and `behaviorId`
### Lua Example
`local WaterDropletParamsValue = obj_get_temp_water_droplet_params(modelId, behaviorId)`
### Parameters
| Field | Type |
| ----- | ---- |
| modelId | [enum ModelExtendedId](constants.md#enum-ModelExtendedId) |
| behaviorId | [enum BehaviorId](constants.md#enum-BehaviorId) |
### Returns
[WaterDropletParams](structs.md#WaterDropletParams)
### C Prototype
`struct WaterDropletParams* obj_get_temp_water_droplet_params(enum ModelExtendedId modelId, enum BehaviorId behaviorId);`
[:arrow_up_small:](#)
<br />
## [get_temp_object_hitbox](#get_temp_object_hitbox) ## [get_temp_object_hitbox](#get_temp_object_hitbox)
### Description ### Description

5
docs/lua/functions.md
View file

@ -711,7 +711,6 @@
- [camera_course_processing](functions-3.md#camera_course_processing) - [camera_course_processing](functions-3.md#camera_course_processing)
- [resolve_geometry_collisions](functions-3.md#resolve_geometry_collisions) - [resolve_geometry_collisions](functions-3.md#resolve_geometry_collisions)
- [rotate_camera_around_walls](functions-3.md#rotate_camera_around_walls) - [rotate_camera_around_walls](functions-3.md#rotate_camera_around_walls)
- [find_mario_floor_and_ceil](functions-3.md#find_mario_floor_and_ceil)
- [start_object_cutscene_without_focus](functions-3.md#start_object_cutscene_without_focus) - [start_object_cutscene_without_focus](functions-3.md#start_object_cutscene_without_focus)
- [cutscene_object_with_dialog](functions-3.md#cutscene_object_with_dialog) - [cutscene_object_with_dialog](functions-3.md#cutscene_object_with_dialog)
- [cutscene_object_without_dialog](functions-3.md#cutscene_object_without_dialog) - [cutscene_object_without_dialog](functions-3.md#cutscene_object_without_dialog)
@ -1194,7 +1193,6 @@
- mario_step.h - mario_step.h
- [get_additive_y_vel_for_jumps](functions-4.md#get_additive_y_vel_for_jumps) - [get_additive_y_vel_for_jumps](functions-4.md#get_additive_y_vel_for_jumps)
- [mario_bonk_reflection](functions-4.md#mario_bonk_reflection) - [mario_bonk_reflection](functions-4.md#mario_bonk_reflection)
- [init_bully_collision_data](functions-4.md#init_bully_collision_data)
- [mario_update_quicksand](functions-4.md#mario_update_quicksand) - [mario_update_quicksand](functions-4.md#mario_update_quicksand)
- [mario_push_off_steep_floor](functions-4.md#mario_push_off_steep_floor) - [mario_push_off_steep_floor](functions-4.md#mario_push_off_steep_floor)
- [mario_update_moving_sand](functions-4.md#mario_update_moving_sand) - [mario_update_moving_sand](functions-4.md#mario_update_moving_sand)
@ -1566,7 +1564,6 @@
- [cur_obj_init_animation_with_sound](functions-6.md#cur_obj_init_animation_with_sound) - [cur_obj_init_animation_with_sound](functions-6.md#cur_obj_init_animation_with_sound)
- [obj_init_animation_with_accel_and_sound](functions-6.md#obj_init_animation_with_accel_and_sound) - [obj_init_animation_with_accel_and_sound](functions-6.md#obj_init_animation_with_accel_and_sound)
- [cur_obj_init_animation_with_accel_and_sound](functions-6.md#cur_obj_init_animation_with_accel_and_sound) - [cur_obj_init_animation_with_accel_and_sound](functions-6.md#cur_obj_init_animation_with_accel_and_sound)
- [obj_init_animation_with_sound](functions-6.md#obj_init_animation_with_sound)
- [cur_obj_enable_rendering_and_become_tangible](functions-6.md#cur_obj_enable_rendering_and_become_tangible) - [cur_obj_enable_rendering_and_become_tangible](functions-6.md#cur_obj_enable_rendering_and_become_tangible)
- [cur_obj_enable_rendering](functions-6.md#cur_obj_enable_rendering) - [cur_obj_enable_rendering](functions-6.md#cur_obj_enable_rendering)
- [cur_obj_disable_rendering_and_become_intangible](functions-6.md#cur_obj_disable_rendering_and_become_intangible) - [cur_obj_disable_rendering_and_become_intangible](functions-6.md#cur_obj_disable_rendering_and_become_intangible)
@ -1677,7 +1674,6 @@
- [cur_obj_rotate_face_angle_using_vel](functions-6.md#cur_obj_rotate_face_angle_using_vel) - [cur_obj_rotate_face_angle_using_vel](functions-6.md#cur_obj_rotate_face_angle_using_vel)
- [cur_obj_set_face_angle_to_move_angle](functions-6.md#cur_obj_set_face_angle_to_move_angle) - [cur_obj_set_face_angle_to_move_angle](functions-6.md#cur_obj_set_face_angle_to_move_angle)
- [cur_obj_follow_path](functions-6.md#cur_obj_follow_path) - [cur_obj_follow_path](functions-6.md#cur_obj_follow_path)
- [chain_segment_init](functions-6.md#chain_segment_init)
- [random_f32_around_zero](functions-6.md#random_f32_around_zero) - [random_f32_around_zero](functions-6.md#random_f32_around_zero)
- [obj_scale_random](functions-6.md#obj_scale_random) - [obj_scale_random](functions-6.md#obj_scale_random)
- [obj_translate_xyz_random](functions-6.md#obj_translate_xyz_random) - [obj_translate_xyz_random](functions-6.md#obj_translate_xyz_random)
@ -2103,6 +2099,7 @@
- [obj_set_field_f32](functions-7.md#obj_set_field_f32) - [obj_set_field_f32](functions-7.md#obj_set_field_f32)
- [obj_set_field_s16](functions-7.md#obj_set_field_s16) - [obj_set_field_s16](functions-7.md#obj_set_field_s16)
- [obj_get_temp_spawn_particles_info](functions-7.md#obj_get_temp_spawn_particles_info) - [obj_get_temp_spawn_particles_info](functions-7.md#obj_get_temp_spawn_particles_info)
- [obj_get_temp_water_droplet_params](functions-7.md#obj_get_temp_water_droplet_params)
- [get_temp_object_hitbox](functions-7.md#get_temp_object_hitbox) - [get_temp_object_hitbox](functions-7.md#get_temp_object_hitbox)
- [obj_is_attackable](functions-7.md#obj_is_attackable) - [obj_is_attackable](functions-7.md#obj_is_attackable)
- [obj_is_breakable_object](functions-7.md#obj_is_breakable_object) - [obj_is_breakable_object](functions-7.md#obj_is_breakable_object)

380
docs/lua/structs.md
View file

@ -11,7 +11,6 @@
- [BullyCollisionData](#BullyCollisionData) - [BullyCollisionData](#BullyCollisionData)
- [Camera](#Camera) - [Camera](#Camera)
- [CameraFOVStatus](#CameraFOVStatus) - [CameraFOVStatus](#CameraFOVStatus)
- [CameraOverride](#CameraOverride)
- [CameraStoredInfo](#CameraStoredInfo) - [CameraStoredInfo](#CameraStoredInfo)
- [CameraTrigger](#CameraTrigger) - [CameraTrigger](#CameraTrigger)
- [ChainSegment](#ChainSegment) - [ChainSegment](#ChainSegment)
@ -171,16 +170,6 @@
<br /> <br />
## [AnimationTable](#AnimationTable)
| Field | Type | Access |
| ----- | ---- | ------ |
| count | `integer` | read-only |
[:arrow_up_small:](#)
<br />
## [Area](#Area) ## [Area](#Area)
| Field | Type | Access | | Field | Type | Access |
@ -384,21 +373,6 @@
<br /> <br />
## [BullyCollisionData](#BullyCollisionData)
| Field | Type | Access |
| ----- | ---- | ------ |
| conversionRatio | `number` | |
| radius | `number` | |
| posX | `number` | |
| posZ | `number` | |
| velX | `number` | |
| velZ | `number` | |
[:arrow_up_small:](#)
<br />
## [Camera](#Camera) ## [Camera](#Camera)
| Field | Type | Access | | Field | Type | Access |
@ -423,79 +397,6 @@
<br /> <br />
## [CameraFOVStatus](#CameraFOVStatus)
| Field | Type | Access |
| ----- | ---- | ------ |
| fovFunc | `integer` | |
| fov | `number` | |
| fovOffset | `number` | |
| unusedIsSleeping | `integer` | |
| shakeAmplitude | `number` | |
| shakePhase | `integer` | |
| shakeSpeed | `integer` | |
| decay | `integer` | |
[:arrow_up_small:](#)
<br />
## [CameraOverride](#CameraOverride)
| Field | Type | Access |
| ----- | ---- | ------ |
| value | `integer` | |
| override | `boolean` | |
[:arrow_up_small:](#)
<br />
## [CameraStoredInfo](#CameraStoredInfo)
| Field | Type | Access |
| ----- | ---- | ------ |
| pos | [Vec3f](structs.md#Vec3f) | read-only |
| focus | [Vec3f](structs.md#Vec3f) | read-only |
| panDist | `number` | |
| cannonYOffset | `number` | |
[:arrow_up_small:](#)
<br />
## [CameraTrigger](#CameraTrigger)
| Field | Type | Access |
| ----- | ---- | ------ |
| area | `integer` | |
| centerX | `integer` | |
| centerY | `integer` | |
| centerZ | `integer` | |
| boundsX | `integer` | |
| boundsY | `integer` | |
| boundsZ | `integer` | |
| boundsYaw | `integer` | |
[:arrow_up_small:](#)
<br />
## [ChainSegment](#ChainSegment)
| Field | Type | Access |
| ----- | ---- | ------ |
| posX | `number` | |
| posY | `number` | |
| posZ | `number` | |
| pitch | `integer` | |
| yaw | `integer` | |
| roll | `integer` | |
[:arrow_up_small:](#)
<br />
## [Character](#Character) ## [Character](#Character)
| Field | Type | Access | | Field | Type | Access |
@ -830,42 +731,6 @@
<br /> <br />
## [Cutscene](#Cutscene)
| Field | Type | Access |
| ----- | ---- | ------ |
| duration | `integer` | |
[:arrow_up_small:](#)
<br />
## [CutsceneSplinePoint](#CutsceneSplinePoint)
| Field | Type | Access |
| ----- | ---- | ------ |
| index | `integer` | |
| speed | `integer` | |
| point | [Vec3s](structs.md#Vec3s) | read-only |
[:arrow_up_small:](#)
<br />
## [CutsceneVariable](#CutsceneVariable)
| Field | Type | Access |
| ----- | ---- | ------ |
| unused1 | `integer` | |
| point | [Vec3f](structs.md#Vec3f) | read-only |
| unusedPoint | [Vec3f](structs.md#Vec3f) | read-only |
| angle | [Vec3s](structs.md#Vec3s) | read-only |
| unused2 | `integer` | |
[:arrow_up_small:](#)
<br />
## [DateTime](#DateTime) ## [DateTime](#DateTime)
| Field | Type | Access | | Field | Type | Access |
@ -1005,20 +870,6 @@
<br /> <br />
## [FloorGeometry](#FloorGeometry)
| Field | Type | Access |
| ----- | ---- | ------ |
| unused | `Array` <`number`> | |
| normalX | `number` | |
| normalY | `number` | |
| normalZ | `number` | |
| originOffset | `number` | |
[:arrow_up_small:](#)
<br />
## [FnGraphNode](#FnGraphNode) ## [FnGraphNode](#FnGraphNode)
| Field | Type | Access | | Field | Type | Access |
@ -1586,33 +1437,6 @@
<br /> <br />
## [GraphNode_802A45E4](#GraphNode_802A45E4)
| Field | Type | Access |
| ----- | ---- | ------ |
| unk18 | `integer` | |
| unk1A | `integer` | |
| unk1C | `integer` | |
| unk1E | `integer` | |
| unk20 | `integer` | |
| unk22 | `integer` | |
[:arrow_up_small:](#)
<br />
## [HandheldShakePoint](#HandheldShakePoint)
| Field | Type | Access |
| ----- | ---- | ------ |
| index | `integer` | |
| pad | `integer` | |
| point | [Vec3s](structs.md#Vec3s) | read-only |
[:arrow_up_small:](#)
<br />
## [HudUtilsRotation](#HudUtilsRotation) ## [HudUtilsRotation](#HudUtilsRotation)
| Field | Type | Access | | Field | Type | Access |
@ -1752,20 +1576,6 @@
<br /> <br />
## [LinearTransitionPoint](#LinearTransitionPoint)
| Field | Type | Access |
| ----- | ---- | ------ |
| focus | [Vec3f](structs.md#Vec3f) | read-only |
| pos | [Vec3f](structs.md#Vec3f) | read-only |
| dist | `number` | |
| pitch | `integer` | |
| yaw | `integer` | |
[:arrow_up_small:](#)
<br />
## [MarioAnimation](#MarioAnimation) ## [MarioAnimation](#MarioAnimation)
| Field | Type | Access | | Field | Type | Access |
@ -1946,6 +1756,7 @@
| renderBehindHud | `boolean` | read-only | | renderBehindHud | `boolean` | read-only |
| pausable | `boolean` | read-only | | pausable | `boolean` | read-only |
| ignoreScriptWarnings | `boolean` | read-only | | ignoreScriptWarnings | `boolean` | read-only |
| size | `integer` | read-only |
| customBehaviorIndex | `integer` | read-only | | customBehaviorIndex | `integer` | read-only |
[:arrow_up_small:](#) [:arrow_up_small:](#)
@ -1965,33 +1776,6 @@
<br /> <br />
## [ModAudioSampleCopies](#ModAudioSampleCopies)
| Field | Type | Access |
| ----- | ---- | ------ |
| next | [ModAudioSampleCopies](structs.md#ModAudioSampleCopies) | |
| prev | [ModAudioSampleCopies](structs.md#ModAudioSampleCopies) | |
| parent | [ModAudio](structs.md#ModAudio) | |
[:arrow_up_small:](#)
<br />
## [ModFile](#ModFile)
| Field | Type | Access |
| ----- | ---- | ------ |
| relativePath | `string` | read-only |
| modifiedTimestamp | `integer` | read-only |
| isLoadedLuaModule | `boolean` | read-only |
| wroteBytes | `integer` | read-only |
| dataHash | `Array` <`integer`> | read-only |
| cachedPath | `string` | read-only |
[:arrow_up_small:](#)
<br />
## [ModFs](#ModFs) ## [ModFs](#ModFs)
| Field | Type | Access | | Field | Type | Access |
@ -2060,21 +1844,6 @@
<br /> <br />
## [ModeTransitionInfo](#ModeTransitionInfo)
| Field | Type | Access |
| ----- | ---- | ------ |
| newMode | `integer` | |
| lastMode | `integer` | |
| max | `integer` | |
| frame | `integer` | |
| transitionStart | [LinearTransitionPoint](structs.md#LinearTransitionPoint) | read-only |
| transitionEnd | [LinearTransitionPoint](structs.md#LinearTransitionPoint) | read-only |
[:arrow_up_small:](#)
<br />
## [NametagsSettings](#NametagsSettings) ## [NametagsSettings](#NametagsSettings)
| Field | Type | Access | | Field | Type | Access |
@ -2109,7 +1878,6 @@
| onRxSeqId | `integer` | read-only | | onRxSeqId | `integer` | read-only |
| modelIndex | `integer` | read-only | | modelIndex | `integer` | read-only |
| ping | `integer` | read-only | | ping | `integer` | read-only |
| palette | [PlayerPalette](structs.md#PlayerPalette) | read-only |
| name | `string` | read-only | | name | `string` | read-only |
| description | `string` | read-only | | description | `string` | read-only |
| descriptionR | `integer` | read-only | | descriptionR | `integer` | read-only |
@ -2118,7 +1886,6 @@
| descriptionA | `integer` | read-only | | descriptionA | `integer` | read-only |
| overrideLocation | `string` | read-only | | overrideLocation | `string` | read-only |
| overrideModelIndex | `integer` | | | overrideModelIndex | `integer` | |
| overridePalette | [PlayerPalette](structs.md#PlayerPalette) | |
[:arrow_up_small:](#) [:arrow_up_small:](#)
@ -2385,7 +2152,6 @@
| oCannonPlayerIndex | `integer` | | | oCannonPlayerIndex | `integer` | |
| oCapUnkF4 | `integer` | | | oCapUnkF4 | `integer` | |
| oCapUnkF8 | `integer` | | | oCapUnkF8 | `integer` | |
| oChainChompSegments | [ChainSegment](structs.md#ChainSegment) | read-only |
| oChainChompMaxDistFromPivotPerChainPart | `number` | | | oChainChompMaxDistFromPivotPerChainPart | `number` | |
| oChainChompMaxDistBetweenChainParts | `number` | | | oChainChompMaxDistBetweenChainParts | `number` | |
| oChainChompDistToPivot | `number` | | | oChainChompDistToPivot | `number` | |
@ -2879,7 +2645,6 @@
| oStrongWindParticlePenguinObj | [Object](structs.md#Object) | | | oStrongWindParticlePenguinObj | [Object](structs.md#Object) | |
| oWhompShakeVal | `integer` | | | oWhompShakeVal | `integer` | |
| oWigglerFallThroughFloorsHeight | `number` | | | oWigglerFallThroughFloorsHeight | `number` | |
| oWigglerSegments | [ChainSegment](structs.md#ChainSegment) | read-only |
| oWigglerWalkAnimSpeed | `number` | | | oWigglerWalkAnimSpeed | `number` | |
| oWigglerSquishSpeed | `number` | | | oWigglerSquishSpeed | `number` | |
| oWigglerTimeUntilRandomTurn | `integer` | | | oWigglerTimeUntilRandomTurn | `integer` | |
@ -2945,17 +2710,6 @@
<br /> <br />
## [OffsetSizePair](#OffsetSizePair)
| Field | Type | Access |
| ----- | ---- | ------ |
| offset | `integer` | |
| size | `integer` | |
[:arrow_up_small:](#)
<br />
## [Painting](#Painting) ## [Painting](#Painting)
| Field | Type | Access | | Field | Type | Access |
@ -3001,17 +2755,6 @@
<br /> <br />
## [PaintingMeshVertex](#PaintingMeshVertex)
| Field | Type | Access |
| ----- | ---- | ------ |
| pos | `Array` <`integer`> | |
| norm | `Array` <`integer`> | |
[:arrow_up_small:](#)
<br />
## [PaintingValues](#PaintingValues) ## [PaintingValues](#PaintingValues)
| Field | Type | Access | | Field | Type | Access |
@ -3037,19 +2780,6 @@
<br /> <br />
## [ParallelTrackingPoint](#ParallelTrackingPoint)
| Field | Type | Access |
| ----- | ---- | ------ |
| startOfPath | `integer` | |
| pos | [Vec3f](structs.md#Vec3f) | read-only |
| distThresh | `number` | |
| zoom | `number` | |
[:arrow_up_small:](#)
<br />
## [PlayerCameraState](#PlayerCameraState) ## [PlayerCameraState](#PlayerCameraState)
| Field | Type | Access | | Field | Type | Access |
@ -3066,37 +2796,6 @@
<br /> <br />
## [PlayerGeometry](#PlayerGeometry)
| Field | Type | Access |
| ----- | ---- | ------ |
| currFloor | [Surface](structs.md#Surface) | |
| currFloorHeight | `number` | |
| currFloorType | `integer` | |
| currCeil | [Surface](structs.md#Surface) | |
| currCeilType | `integer` | |
| currCeilHeight | `number` | |
| prevFloor | [Surface](structs.md#Surface) | |
| prevFloorHeight | `number` | |
| prevFloorType | `integer` | |
| prevCeil | [Surface](structs.md#Surface) | |
| prevCeilHeight | `number` | |
| prevCeilType | `integer` | |
| waterHeight | `number` | |
[:arrow_up_small:](#)
<br />
## [PlayerPalette](#PlayerPalette)
| Field | Type | Access |
| ----- | ---- | ------ |
[:arrow_up_small:](#)
<br />
## [RayIntersectionInfo](#RayIntersectionInfo) ## [RayIntersectionInfo](#RayIntersectionInfo)
| Field | Type | Access | | Field | Type | Access |
@ -3149,19 +2848,6 @@
<br /> <br />
## [SoundState](#SoundState)
| Field | Type | Access |
| ----- | ---- | ------ |
| playSound | `integer` | |
| animFrame1 | `integer` | |
| animFrame2 | `integer` | |
| soundMagic | `integer` | |
[:arrow_up_small:](#)
<br />
## [SpawnInfo](#SpawnInfo) ## [SpawnInfo](#SpawnInfo)
| Field | Type | Access | | Field | Type | Access |
@ -3300,24 +2986,6 @@
<br /> <br />
## [TransitionInfo](#TransitionInfo)
| Field | Type | Access |
| ----- | ---- | ------ |
| posPitch | `integer` | |
| posYaw | `integer` | |
| posDist | `number` | |
| focPitch | `integer` | |
| focYaw | `integer` | |
| focDist | `number` | |
| framesLeft | `integer` | |
| marioPos | [Vec3f](structs.md#Vec3f) | read-only |
| pad | `integer` | |
[:arrow_up_small:](#)
<br />
## [Vec2f](#Vec2f) ## [Vec2f](#Vec2f)
| Field | Type | Access | | Field | Type | Access |
@ -3448,17 +3116,6 @@
<br /> <br />
## [Vtx_Interp](#Vtx_Interp)
| Field | Type | Access |
| ----- | ---- | ------ |
| ob | `Array` <`number`> | |
| n | `string` | |
[:arrow_up_small:](#)
<br />
## [WallCollisionData](#WallCollisionData) ## [WallCollisionData](#WallCollisionData)
| Field | Type | Access | | Field | Type | Access |
@ -3491,45 +3148,12 @@
<br /> <br />
## [WarpTransition](#WarpTransition)
| Field | Type | Access |
| ----- | ---- | ------ |
| isActive | `integer` | |
| type | `integer` | |
| time | `integer` | |
| pauseRendering | `integer` | |
| data | [WarpTransitionData](structs.md#WarpTransitionData) | read-only |
[:arrow_up_small:](#)
<br />
## [WarpTransitionData](#WarpTransitionData)
| Field | Type | Access |
| ----- | ---- | ------ |
| red | `integer` | |
| green | `integer` | |
| blue | `integer` | |
| startTexRadius | `integer` | |
| endTexRadius | `integer` | |
| startTexX | `integer` | |
| startTexY | `integer` | |
| endTexX | `integer` | |
| endTexY | `integer` | |
| texTimer | `integer` | |
[:arrow_up_small:](#)
<br />
## [WaterDropletParams](#WaterDropletParams) ## [WaterDropletParams](#WaterDropletParams)
| Field | Type | Access | | Field | Type | Access |
| ----- | ---- | ------ | | ----- | ---- | ------ |
| flags | `integer` | | | flags | `integer` | |
| model | `integer` | | | model | `integer` | read-only |
| behavior | `Pointer` <`BehaviorScript`> | read-only | | behavior | `Pointer` <`BehaviorScript`> | read-only |
| moveAngleRange | `integer` | | | moveAngleRange | `integer` | |
| moveRange | `integer` | | | moveRange | `integer` | |

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

File diff suppressed because it is too large Load diff

27
src/pc/lua/smlua_cobject_autogen.h
View file

@ -25,24 +25,14 @@ enum LuaObjectAutogenType {
LOT_AUTOGEN_MIN = 1000, LOT_AUTOGEN_MIN = 1000,
LOT_ANIMINFO, LOT_ANIMINFO,
LOT_ANIMATION, LOT_ANIMATION,
LOT_ANIMATIONTABLE,
LOT_AREA, LOT_AREA,
LOT_BEHAVIORDIALOGS, LOT_BEHAVIORDIALOGS,
LOT_BEHAVIORTRAJECTORIES, LOT_BEHAVIORTRAJECTORIES,
LOT_BEHAVIORVALUES, LOT_BEHAVIORVALUES,
LOT_BULLYCOLLISIONDATA,
LOT_CAMERA, LOT_CAMERA,
LOT_CAMERAFOVSTATUS,
LOT_CAMERAOVERRIDE,
LOT_CAMERASTOREDINFO,
LOT_CAMERATRIGGER,
LOT_CHAINSEGMENT,
LOT_CHARACTER, LOT_CHARACTER,
LOT_CONTROLLER, LOT_CONTROLLER,
LOT_CUSTOMLEVELINFO, LOT_CUSTOMLEVELINFO,
LOT_CUTSCENE,
LOT_CUTSCENESPLINEPOINT,
LOT_CUTSCENEVARIABLE,
LOT_DATETIME, LOT_DATETIME,
LOT_DIALOGENTRY, LOT_DIALOGENTRY,
LOT_DISPLAYLISTNODE, LOT_DISPLAYLISTNODE,
@ -53,7 +43,6 @@ enum LuaObjectAutogenType {
LOT_DJUITHREEPANELTHEME, LOT_DJUITHREEPANELTHEME,
LOT_EXCLAMATIONBOXCONTENT, LOT_EXCLAMATIONBOXCONTENT,
LOT_FIRSTPERSONCAMERA, LOT_FIRSTPERSONCAMERA,
LOT_FLOORGEOMETRY,
LOT_FNGRAPHNODE, LOT_FNGRAPHNODE,
LOT_GFX, LOT_GFX,
LOT_GLOBALOBJECTANIMATIONS, LOT_GLOBALOBJECTANIMATIONS,
@ -84,41 +73,29 @@ enum LuaObjectAutogenType {
LOT_GRAPHNODESWITCHCASE, LOT_GRAPHNODESWITCHCASE,
LOT_GRAPHNODETRANSLATION, LOT_GRAPHNODETRANSLATION,
LOT_GRAPHNODETRANSLATIONROTATION, LOT_GRAPHNODETRANSLATIONROTATION,
LOT_GRAPHNODE_802A45E4,
LOT_HANDHELDSHAKEPOINT,
LOT_HUDUTILSROTATION, LOT_HUDUTILSROTATION,
LOT_INSTANTWARP, LOT_INSTANTWARP,
LOT_LAKITUSTATE, LOT_LAKITUSTATE,
LOT_LEVELVALUES, LOT_LEVELVALUES,
LOT_LINEARTRANSITIONPOINT,
LOT_MARIOANIMATION, LOT_MARIOANIMATION,
LOT_MARIOBODYSTATE, LOT_MARIOBODYSTATE,
LOT_MARIOSTATE, LOT_MARIOSTATE,
LOT_MOD, LOT_MOD,
LOT_MODAUDIO, LOT_MODAUDIO,
LOT_MODAUDIOSAMPLECOPIES,
LOT_MODFILE,
LOT_MODFS, LOT_MODFS,
LOT_MODFSFILE, LOT_MODFSFILE,
LOT_MODETRANSITIONINFO,
LOT_NAMETAGSSETTINGS, LOT_NAMETAGSSETTINGS,
LOT_NETWORKPLAYER, LOT_NETWORKPLAYER,
LOT_OBJECT, LOT_OBJECT,
LOT_OBJECTHITBOX, LOT_OBJECTHITBOX,
LOT_OBJECTNODE, LOT_OBJECTNODE,
LOT_OBJECTWARPNODE, LOT_OBJECTWARPNODE,
LOT_OFFSETSIZEPAIR,
LOT_PAINTING, LOT_PAINTING,
LOT_PAINTINGMESHVERTEX,
LOT_PAINTINGVALUES, LOT_PAINTINGVALUES,
LOT_PARALLELTRACKINGPOINT,
LOT_PLAYERCAMERASTATE, LOT_PLAYERCAMERASTATE,
LOT_PLAYERGEOMETRY,
LOT_PLAYERPALETTE,
LOT_RAYINTERSECTIONINFO, LOT_RAYINTERSECTIONINFO,
LOT_ROMHACKCAMERASETTINGS, LOT_ROMHACKCAMERASETTINGS,
LOT_SERVERSETTINGS, LOT_SERVERSETTINGS,
LOT_SOUNDSTATE,
LOT_SPAWNINFO, LOT_SPAWNINFO,
LOT_SPAWNPARTICLESINFO, LOT_SPAWNPARTICLESINFO,
LOT_STARPOSITIONS, LOT_STARPOSITIONS,
@ -126,13 +103,9 @@ enum LuaObjectAutogenType {
LOT_STATICOBJECTCOLLISION, LOT_STATICOBJECTCOLLISION,
LOT_SURFACE, LOT_SURFACE,
LOT_TEXTUREINFO, LOT_TEXTUREINFO,
LOT_TRANSITIONINFO,
LOT_VTX, LOT_VTX,
LOT_VTX_INTERP,
LOT_WALLCOLLISIONDATA, LOT_WALLCOLLISIONDATA,
LOT_WARPNODE, LOT_WARPNODE,
LOT_WARPTRANSITION,
LOT_WARPTRANSITIONDATA,
LOT_WATERDROPLETPARAMS, LOT_WATERDROPLETPARAMS,
LOT_WAYPOINT, LOT_WAYPOINT,
LOT_WHIRLPOOL, LOT_WHIRLPOOL,

44
src/pc/lua/smlua_functions_autogen.c
View file

@ -11861,6 +11861,7 @@ int smlua_func_rotate_camera_around_walls(lua_State* L) {
return 1; return 1;
} }
/*
int smlua_func_find_mario_floor_and_ceil(lua_State* L) { int smlua_func_find_mario_floor_and_ceil(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -11870,13 +11871,14 @@ int smlua_func_find_mario_floor_and_ceil(lua_State* L) {
return 0; return 0;
} }
struct PlayerGeometry* pg = (struct PlayerGeometry*)smlua_to_cobject(L, 1, LOT_PLAYERGEOMETRY); // struct PlayerGeometry* pg = (struct PlayerGeometry*)smlua_to_cobject(L, 1, LOT_???); <--- UNIMPLEMENTED
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "find_mario_floor_and_ceil"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "find_mario_floor_and_ceil"); return 0; }
find_mario_floor_and_ceil(pg); find_mario_floor_and_ceil(pg);
return 1; return 1;
} }
*/
int smlua_func_start_object_cutscene_without_focus(lua_State* L) { int smlua_func_start_object_cutscene_without_focus(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -19305,6 +19307,7 @@ int smlua_func_mario_bonk_reflection(lua_State* L) {
return 1; return 1;
} }
/*
int smlua_func_init_bully_collision_data(lua_State* L) { int smlua_func_init_bully_collision_data(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -19314,7 +19317,7 @@ int smlua_func_init_bully_collision_data(lua_State* L) {
return 0; return 0;
} }
struct BullyCollisionData* data = (struct BullyCollisionData*)smlua_to_cobject(L, 1, LOT_BULLYCOLLISIONDATA); // struct BullyCollisionData* data = (struct BullyCollisionData*)smlua_to_cobject(L, 1, LOT_???); <--- UNIMPLEMENTED
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "init_bully_collision_data"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "init_bully_collision_data"); return 0; }
f32 posX = smlua_to_number(L, 2); f32 posX = smlua_to_number(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "init_bully_collision_data"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "init_bully_collision_data"); return 0; }
@ -19333,6 +19336,7 @@ int smlua_func_init_bully_collision_data(lua_State* L) {
return 1; return 1;
} }
*/
int smlua_func_mario_update_quicksand(lua_State* L) { int smlua_func_mario_update_quicksand(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -26452,6 +26456,7 @@ int smlua_func_cur_obj_init_animation_with_accel_and_sound(lua_State* L) {
return 1; return 1;
} }
/*
int smlua_func_obj_init_animation_with_sound(lua_State* L) { int smlua_func_obj_init_animation_with_sound(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -26463,7 +26468,7 @@ int smlua_func_obj_init_animation_with_sound(lua_State* L) {
struct Object* obj = (struct Object*)smlua_to_cobject(L, 1, LOT_OBJECT); struct Object* obj = (struct Object*)smlua_to_cobject(L, 1, LOT_OBJECT);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "obj_init_animation_with_sound"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "obj_init_animation_with_sound"); return 0; }
struct AnimationTable* animations = (struct AnimationTable*)smlua_to_cobject(L, 2, LOT_ANIMATIONTABLE); // struct AnimationTable* animations = (struct AnimationTable*)smlua_to_cobject(L, 2, LOT_???); <--- UNIMPLEMENTED
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "obj_init_animation_with_sound"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "obj_init_animation_with_sound"); return 0; }
s32 animIndex = smlua_to_integer(L, 3); s32 animIndex = smlua_to_integer(L, 3);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 3, "obj_init_animation_with_sound"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 3, "obj_init_animation_with_sound"); return 0; }
@ -26473,6 +26478,7 @@ int smlua_func_obj_init_animation_with_sound(lua_State* L) {
return 1; return 1;
} }
*/
int smlua_func_cur_obj_enable_rendering_and_become_tangible(lua_State* L) { int smlua_func_cur_obj_enable_rendering_and_become_tangible(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -28494,6 +28500,7 @@ int smlua_func_cur_obj_follow_path(lua_State* L) {
return 1; return 1;
} }
/*
int smlua_func_chain_segment_init(lua_State* L) { int smlua_func_chain_segment_init(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -28503,7 +28510,7 @@ int smlua_func_chain_segment_init(lua_State* L) {
return 0; return 0;
} }
struct ChainSegment* segment = (struct ChainSegment*)smlua_to_cobject(L, 1, LOT_CHAINSEGMENT); // struct ChainSegment* segment = (struct ChainSegment*)smlua_to_cobject(L, 1, LOT_???); <--- UNIMPLEMENTED
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "chain_segment_init"); return 0; } if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "chain_segment_init"); return 0; }
extern void chain_segment_init(struct ChainSegment *segment); extern void chain_segment_init(struct ChainSegment *segment);
@ -28511,6 +28518,7 @@ int smlua_func_chain_segment_init(lua_State* L) {
return 1; return 1;
} }
*/
int smlua_func_random_f32_around_zero(lua_State* L) { int smlua_func_random_f32_around_zero(lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -35165,6 +35173,25 @@ int smlua_func_obj_get_temp_spawn_particles_info(lua_State* L) {
return 1; return 1;
} }
int smlua_func_obj_get_temp_water_droplet_params(lua_State* L) {
if (L == NULL) { return 0; }
int top = lua_gettop(L);
if (top != 2) {
LOG_LUA_LINE("Improper param count for '%s': Expected %u, Received %u", "obj_get_temp_water_droplet_params", 2, top);
return 0;
}
int modelId = smlua_to_integer(L, 1);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 1, "obj_get_temp_water_droplet_params"); return 0; }
int behaviorId = smlua_to_integer(L, 2);
if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %u for function '%s'", 2, "obj_get_temp_water_droplet_params"); return 0; }
smlua_push_object(L, LOT_WATERDROPLETPARAMS, obj_get_temp_water_droplet_params(modelId, behaviorId), NULL);
return 1;
}
int smlua_func_get_temp_object_hitbox(UNUSED lua_State* L) { int smlua_func_get_temp_object_hitbox(UNUSED lua_State* L) {
if (L == NULL) { return 0; } if (L == NULL) { return 0; }
@ -37393,7 +37420,7 @@ void smlua_bind_functions_autogen(void) {
smlua_bind_function(L, "camera_course_processing", smlua_func_camera_course_processing); smlua_bind_function(L, "camera_course_processing", smlua_func_camera_course_processing);
smlua_bind_function(L, "resolve_geometry_collisions", smlua_func_resolve_geometry_collisions); smlua_bind_function(L, "resolve_geometry_collisions", smlua_func_resolve_geometry_collisions);
smlua_bind_function(L, "rotate_camera_around_walls", smlua_func_rotate_camera_around_walls); smlua_bind_function(L, "rotate_camera_around_walls", smlua_func_rotate_camera_around_walls);
smlua_bind_function(L, "find_mario_floor_and_ceil", smlua_func_find_mario_floor_and_ceil); //smlua_bind_function(L, "find_mario_floor_and_ceil", smlua_func_find_mario_floor_and_ceil); <--- UNIMPLEMENTED
smlua_bind_function(L, "start_object_cutscene_without_focus", smlua_func_start_object_cutscene_without_focus); smlua_bind_function(L, "start_object_cutscene_without_focus", smlua_func_start_object_cutscene_without_focus);
smlua_bind_function(L, "cutscene_object_with_dialog", smlua_func_cutscene_object_with_dialog); smlua_bind_function(L, "cutscene_object_with_dialog", smlua_func_cutscene_object_with_dialog);
smlua_bind_function(L, "cutscene_object_without_dialog", smlua_func_cutscene_object_without_dialog); smlua_bind_function(L, "cutscene_object_without_dialog", smlua_func_cutscene_object_without_dialog);
@ -37831,7 +37858,7 @@ void smlua_bind_functions_autogen(void) {
// mario_step.h // mario_step.h
smlua_bind_function(L, "get_additive_y_vel_for_jumps", smlua_func_get_additive_y_vel_for_jumps); smlua_bind_function(L, "get_additive_y_vel_for_jumps", smlua_func_get_additive_y_vel_for_jumps);
smlua_bind_function(L, "mario_bonk_reflection", smlua_func_mario_bonk_reflection); smlua_bind_function(L, "mario_bonk_reflection", smlua_func_mario_bonk_reflection);
smlua_bind_function(L, "init_bully_collision_data", smlua_func_init_bully_collision_data); //smlua_bind_function(L, "init_bully_collision_data", smlua_func_init_bully_collision_data); <--- UNIMPLEMENTED
smlua_bind_function(L, "mario_update_quicksand", smlua_func_mario_update_quicksand); smlua_bind_function(L, "mario_update_quicksand", smlua_func_mario_update_quicksand);
smlua_bind_function(L, "mario_push_off_steep_floor", smlua_func_mario_push_off_steep_floor); smlua_bind_function(L, "mario_push_off_steep_floor", smlua_func_mario_push_off_steep_floor);
smlua_bind_function(L, "mario_update_moving_sand", smlua_func_mario_update_moving_sand); smlua_bind_function(L, "mario_update_moving_sand", smlua_func_mario_update_moving_sand);
@ -38184,7 +38211,7 @@ void smlua_bind_functions_autogen(void) {
smlua_bind_function(L, "cur_obj_init_animation_with_sound", smlua_func_cur_obj_init_animation_with_sound); smlua_bind_function(L, "cur_obj_init_animation_with_sound", smlua_func_cur_obj_init_animation_with_sound);
smlua_bind_function(L, "obj_init_animation_with_accel_and_sound", smlua_func_obj_init_animation_with_accel_and_sound); smlua_bind_function(L, "obj_init_animation_with_accel_and_sound", smlua_func_obj_init_animation_with_accel_and_sound);
smlua_bind_function(L, "cur_obj_init_animation_with_accel_and_sound", smlua_func_cur_obj_init_animation_with_accel_and_sound); smlua_bind_function(L, "cur_obj_init_animation_with_accel_and_sound", smlua_func_cur_obj_init_animation_with_accel_and_sound);
smlua_bind_function(L, "obj_init_animation_with_sound", smlua_func_obj_init_animation_with_sound); //smlua_bind_function(L, "obj_init_animation_with_sound", smlua_func_obj_init_animation_with_sound); <--- UNIMPLEMENTED
smlua_bind_function(L, "cur_obj_enable_rendering_and_become_tangible", smlua_func_cur_obj_enable_rendering_and_become_tangible); smlua_bind_function(L, "cur_obj_enable_rendering_and_become_tangible", smlua_func_cur_obj_enable_rendering_and_become_tangible);
smlua_bind_function(L, "cur_obj_enable_rendering", smlua_func_cur_obj_enable_rendering); smlua_bind_function(L, "cur_obj_enable_rendering", smlua_func_cur_obj_enable_rendering);
smlua_bind_function(L, "cur_obj_disable_rendering_and_become_intangible", smlua_func_cur_obj_disable_rendering_and_become_intangible); smlua_bind_function(L, "cur_obj_disable_rendering_and_become_intangible", smlua_func_cur_obj_disable_rendering_and_become_intangible);
@ -38295,7 +38322,7 @@ void smlua_bind_functions_autogen(void) {
smlua_bind_function(L, "cur_obj_rotate_face_angle_using_vel", smlua_func_cur_obj_rotate_face_angle_using_vel); smlua_bind_function(L, "cur_obj_rotate_face_angle_using_vel", smlua_func_cur_obj_rotate_face_angle_using_vel);
smlua_bind_function(L, "cur_obj_set_face_angle_to_move_angle", smlua_func_cur_obj_set_face_angle_to_move_angle); smlua_bind_function(L, "cur_obj_set_face_angle_to_move_angle", smlua_func_cur_obj_set_face_angle_to_move_angle);
smlua_bind_function(L, "cur_obj_follow_path", smlua_func_cur_obj_follow_path); smlua_bind_function(L, "cur_obj_follow_path", smlua_func_cur_obj_follow_path);
smlua_bind_function(L, "chain_segment_init", smlua_func_chain_segment_init); //smlua_bind_function(L, "chain_segment_init", smlua_func_chain_segment_init); <--- UNIMPLEMENTED
smlua_bind_function(L, "random_f32_around_zero", smlua_func_random_f32_around_zero); smlua_bind_function(L, "random_f32_around_zero", smlua_func_random_f32_around_zero);
smlua_bind_function(L, "obj_scale_random", smlua_func_obj_scale_random); smlua_bind_function(L, "obj_scale_random", smlua_func_obj_scale_random);
smlua_bind_function(L, "obj_translate_xyz_random", smlua_func_obj_translate_xyz_random); smlua_bind_function(L, "obj_translate_xyz_random", smlua_func_obj_translate_xyz_random);
@ -38702,6 +38729,7 @@ void smlua_bind_functions_autogen(void) {
smlua_bind_function(L, "obj_set_field_f32", smlua_func_obj_set_field_f32); smlua_bind_function(L, "obj_set_field_f32", smlua_func_obj_set_field_f32);
smlua_bind_function(L, "obj_set_field_s16", smlua_func_obj_set_field_s16); smlua_bind_function(L, "obj_set_field_s16", smlua_func_obj_set_field_s16);
smlua_bind_function(L, "obj_get_temp_spawn_particles_info", smlua_func_obj_get_temp_spawn_particles_info); smlua_bind_function(L, "obj_get_temp_spawn_particles_info", smlua_func_obj_get_temp_spawn_particles_info);
smlua_bind_function(L, "obj_get_temp_water_droplet_params", smlua_func_obj_get_temp_water_droplet_params);
smlua_bind_function(L, "get_temp_object_hitbox", smlua_func_get_temp_object_hitbox); smlua_bind_function(L, "get_temp_object_hitbox", smlua_func_get_temp_object_hitbox);
smlua_bind_function(L, "obj_is_attackable", smlua_func_obj_is_attackable); smlua_bind_function(L, "obj_is_attackable", smlua_func_obj_is_attackable);
smlua_bind_function(L, "obj_is_breakable_object", smlua_func_obj_is_breakable_object); smlua_bind_function(L, "obj_is_breakable_object", smlua_func_obj_is_breakable_object);

5
src/pc/lua/utils/smlua_camera_utils.c
View file

@ -2,6 +2,11 @@
#include "game/bettercamera.h" #include "game/bettercamera.h"
#include "game/object_list_processor.h" #include "game/object_list_processor.h"
struct CameraOverride {
u32 value;
bool override;
};
static struct CameraOverride sOverrideCameraXSens = { 0 }; static struct CameraOverride sOverrideCameraXSens = { 0 };
static struct CameraOverride sOverrideCameraYSens = { 0 }; static struct CameraOverride sOverrideCameraYSens = { 0 };
static struct CameraOverride sOverrideCameraAggr = { 0 }; static struct CameraOverride sOverrideCameraAggr = { 0 };

5
src/pc/lua/utils/smlua_camera_utils.h
View file

@ -4,11 +4,6 @@
#include "types.h" #include "types.h"
#include "game/camera.h" #include "game/camera.h"
struct CameraOverride {
unsigned int value;
bool override;
};
/* |description|Resets camera config overrides|descriptionEnd| */ /* |description|Resets camera config overrides|descriptionEnd| */
void camera_reset_overrides(void); void camera_reset_overrides(void);
/* |description|Freezes the camera by not updating it|descriptionEnd| */ /* |description|Freezes the camera by not updating it|descriptionEnd| */

14
src/pc/lua/utils/smlua_obj_utils.c
View file

@ -367,6 +367,20 @@ struct SpawnParticlesInfo* obj_get_temp_spawn_particles_info(enum ModelExtendedI
return &sTmpSpi; return &sTmpSpi;
} }
struct WaterDropletParams* obj_get_temp_water_droplet_params(enum ModelExtendedId modelId, enum BehaviorId behaviorId) {
static struct WaterDropletParams sTmpWdp = { 0 };
memset(&sTmpWdp, 0, sizeof(struct WaterDropletParams));
s16 loadedModelId = smlua_model_util_load(modelId);
sTmpWdp.model = loadedModelId;
const BehaviorScript *behavior = get_behavior_from_id(behaviorId);
behavior = smlua_override_behavior(behavior);
sTmpWdp.behavior = behavior;
return &sTmpWdp;
}
struct ObjectHitbox* get_temp_object_hitbox(void) { struct ObjectHitbox* get_temp_object_hitbox(void) {
static struct ObjectHitbox sTmpHitbox = { 0 }; static struct ObjectHitbox sTmpHitbox = { 0 };
memset(&sTmpHitbox, 0, sizeof(struct ObjectHitbox)); memset(&sTmpHitbox, 0, sizeof(struct ObjectHitbox));

2
src/pc/lua/utils/smlua_obj_utils.h
View file

@ -118,6 +118,8 @@ void obj_set_field_s16(struct Object *o, s32 fieldIndex, s32 fieldSubIndex, s16
/* |description|Returns a temporary particle spawn info pointer with its model loaded in from `modelId`|descriptionEnd| */ /* |description|Returns a temporary particle spawn info pointer with its model loaded in from `modelId`|descriptionEnd| */
struct SpawnParticlesInfo* obj_get_temp_spawn_particles_info(enum ModelExtendedId modelId); struct SpawnParticlesInfo* obj_get_temp_spawn_particles_info(enum ModelExtendedId modelId);
/* |description|Returns a temporary water droplet params pointer with its model and behavior loaded in from `modelId` and `behaviorId`|descriptionEnd| */
struct WaterDropletParams* obj_get_temp_water_droplet_params(enum ModelExtendedId modelId, enum BehaviorId behaviorId);
/* |description|Returns a temporary object hitbox pointer|descriptionEnd| */ /* |description|Returns a temporary object hitbox pointer|descriptionEnd| */
struct ObjectHitbox* get_temp_object_hitbox(void); struct ObjectHitbox* get_temp_object_hitbox(void);