From fa36ed308e4e7b21998f80b71ae4ef9124b2f68e Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 25 Feb 2022 22:44:37 -0800 Subject: [PATCH] Add more constants to Lua --- autogen/convert_constants.py | 1 + docs/lua/constants.md | 48 ++++++++++++++++++++++++++++ src/pc/lua/smlua_constants_autogen.c | 23 +++++++++++++ 3 files changed, 72 insertions(+) diff --git a/autogen/convert_constants.py b/autogen/convert_constants.py index f8ab8700..2b5916e7 100644 --- a/autogen/convert_constants.py +++ b/autogen/convert_constants.py @@ -23,6 +23,7 @@ in_files = [ "include/behavior_table.h", "src/pc/lua/smlua_model_utils.h", "include/object_constants.h", + "include/mario_geo_switch_case_ids.h", ] exclude_constants = { diff --git a/docs/lua/constants.md b/docs/lua/constants.md index f9b15126..1f9db0d4 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -17,6 +17,11 @@ - [InteractionType](#InteractionType) - [mario_animation_ids.h](#mario_animation_ids.h) - [MarioAnimID](#MarioAnimID) +- [mario_geo_switch_case_ids.h](#mario_geo_switch_case_ids.h) + - [MarioCapGSCId](#MarioCapGSCId) + - [MarioEyesGSCId](#MarioEyesGSCId) + - [MarioGrabPosGSCId](#MarioGrabPosGSCId) + - [MarioHandGSCId](#MarioHandGSCId) - [network_player.h](#network_player.h) - [NetworkPlayerType](#NetworkPlayerType) - [object_constants.h](#object_constants.h) @@ -1609,6 +1614,49 @@
+## [mario_geo_switch_case_ids.h](#mario_geo_switch_case_ids.h) + +### [enum MarioCapGSCId](#MarioCapGSCId) +| Identifier | Value | +| :--------- | :---- | +| MARIO_HAS_DEFAULT_CAP_ON | 0 | +| MARIO_HAS_DEFAULT_CAP_OFF | 1 | +| MARIO_HAS_WING_CAP_ON | 2 | +| MARIO_HAS_WING_CAP_OFF | 3 | + +### [enum MarioEyesGSCId](#MarioEyesGSCId) +| Identifier | Value | +| :--------- | :---- | +| MARIO_EYES_BLINK | 0 | +| MARIO_EYES_OPEN | 1 | +| MARIO_EYES_HALF_CLOSED | 2 | +| MARIO_EYES_CLOSED | 3 | +| MARIO_EYES_LOOK_LEFT | 4 | +| MARIO_EYES_LOOK_RIGHT | 5 | +| MARIO_EYES_LOOK_UP | 6 | +| MARIO_EYES_LOOK_DOWN | 7 | +| MARIO_EYES_DEAD | 8 | + +### [enum MarioGrabPosGSCId](#MarioGrabPosGSCId) +| Identifier | Value | +| :--------- | :---- | +| GRAB_POS_NULL | 0 | +| GRAB_POS_LIGHT_OBJ | 1 | +| GRAB_POS_HEAVY_OBJ | 2 | +| GRAB_POS_BOWSER | 3 | + +### [enum MarioHandGSCId](#MarioHandGSCId) +| Identifier | Value | +| :--------- | :---- | +| MARIO_HAND_FISTS | 0 | +| MARIO_HAND_OPEN | 1 | +| MARIO_HAND_PEACE_SIGN | 2 | +| MARIO_HAND_HOLDING_CAP | 3 | +| MARIO_HAND_HOLDING_WING_CAP | 4 | +| MARIO_HAND_RIGHT_OPEN | 5 | + +
+ ## [network_player.h](#network_player.h) - MAX_RX_SEQ_IDS - NETWORK_PLAYER_TIMEOUT diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 29ac099e..9f694cd5 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -1658,6 +1658,29 @@ char gSmluaConstants[] = "" "MARIO_ANIM_RETURN_FROM_STAR_DANCE = 206\n" "MARIO_ANIM_FORWARD_SPINNING_FLIP = 207\n" "MARIO_ANIM_TRIPLE_JUMP_FLY = 208\n" +"MARIO_EYES_BLINK = 0\n" +"MARIO_EYES_OPEN = 1\n" +"MARIO_EYES_HALF_CLOSED = 2\n" +"MARIO_EYES_CLOSED = 3\n" +"MARIO_EYES_LOOK_LEFT = 4\n" +"MARIO_EYES_LOOK_RIGHT = 5\n" +"MARIO_EYES_LOOK_UP = 6\n" +"MARIO_EYES_LOOK_DOWN = 7\n" +"MARIO_EYES_DEAD = 8\n" +"MARIO_HAND_FISTS = 0\n" +"MARIO_HAND_OPEN = 1\n" +"MARIO_HAND_PEACE_SIGN = 2\n" +"MARIO_HAND_HOLDING_CAP = 3\n" +"MARIO_HAND_HOLDING_WING_CAP = 4\n" +"MARIO_HAND_RIGHT_OPEN = 5\n" +"MARIO_HAS_DEFAULT_CAP_ON = 0\n" +"MARIO_HAS_DEFAULT_CAP_OFF = 1\n" +"MARIO_HAS_WING_CAP_ON = 2\n" +"MARIO_HAS_WING_CAP_OFF = 3\n" +"GRAB_POS_NULL = 0\n" +"GRAB_POS_LIGHT_OBJ = 1\n" +"GRAB_POS_HEAVY_OBJ = 2\n" +"GRAB_POS_BOWSER = 3\n" "UNKNOWN_LOCAL_INDEX = (-1)\n" "UNKNOWN_GLOBAL_INDEX = (-1)\n" "UNKNOWN_NETWORK_INDEX = (-1)\n"