From 6b67c983ec426fe458e846d791d226e0b91bfb99 Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 15 Apr 2022 21:51:18 -0700 Subject: [PATCH] exposed sequence ids to lua --- autogen/convert_constants.py | 1 + autogen/lua_definitions/constants.lua | 116 ++++++++++++++++++++++++++ docs/lua/constants.md | 50 +++++++++++ src/pc/lua/smlua_constants_autogen.c | 38 +++++++++ 4 files changed, 205 insertions(+) diff --git a/autogen/convert_constants.py b/autogen/convert_constants.py index c9e1c87f..0cd9044f 100644 --- a/autogen/convert_constants.py +++ b/autogen/convert_constants.py @@ -33,6 +33,7 @@ in_files = [ "src/game/save_file.h", "src/game/obj_behaviors_2.h", "include/dialog_ids.h", + "include/seq_ids.h", ] exclude_constants = { diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 6209f0be..7e5419cb 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -6608,6 +6608,122 @@ SAVE_FILE_C = 2 --- @type SaveFileIndex SAVE_FILE_D = 3 +--- @type integer +SEQ_BASE_ID = 0x7f + +--- @type integer +SEQ_VARIATION = 0x80 + +--- @class SeqId + +--- @type SeqId +SEQ_SOUND_PLAYER = 0 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_COLLECT_STAR = 1 + +--- @type SeqId +SEQ_MENU_TITLE_SCREEN = 2 + +--- @type SeqId +SEQ_LEVEL_GRASS = 3 + +--- @type SeqId +SEQ_LEVEL_INSIDE_CASTLE = 4 + +--- @type SeqId +SEQ_LEVEL_WATER = 5 + +--- @type SeqId +SEQ_LEVEL_HOT = 6 + +--- @type SeqId +SEQ_LEVEL_BOSS_KOOPA = 7 + +--- @type SeqId +SEQ_LEVEL_SNOW = 8 + +--- @type SeqId +SEQ_LEVEL_SLIDE = 9 + +--- @type SeqId +SEQ_LEVEL_SPOOKY = 10 + +--- @type SeqId +SEQ_EVENT_PIRANHA_PLANT = 11 + +--- @type SeqId +SEQ_LEVEL_UNDERGROUND = 12 + +--- @type SeqId +SEQ_MENU_STAR_SELECT = 13 + +--- @type SeqId +SEQ_EVENT_POWERUP = 14 + +--- @type SeqId +SEQ_EVENT_METAL_CAP = 15 + +--- @type SeqId +SEQ_EVENT_KOOPA_MESSAGE = 16 + +--- @type SeqId +SEQ_LEVEL_KOOPA_ROAD = 17 + +--- @type SeqId +SEQ_EVENT_HIGH_SCORE = 18 + +--- @type SeqId +SEQ_EVENT_MERRY_GO_ROUND = 19 + +--- @type SeqId +SEQ_EVENT_RACE = 20 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_STAR_SPAWN = 21 + +--- @type SeqId +SEQ_EVENT_BOSS = 22 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_COLLECT_KEY = 23 + +--- @type SeqId +SEQ_EVENT_ENDLESS_STAIRS = 24 + +--- @type SeqId +SEQ_LEVEL_BOSS_KOOPA_FINAL = 25 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_CREDITS = 26 + +--- @type SeqId +SEQ_EVENT_SOLVE_PUZZLE = 27 + +--- @type SeqId +SEQ_EVENT_TOAD_MESSAGE = 28 + +--- @type SeqId +SEQ_EVENT_PEACH_MESSAGE = 29 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_INTRO = 30 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_VICTORY = 31 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_ENDING = 32 + +--- @type SeqId +SEQ_MENU_FILE_SELECT = 33 + +--- @type SeqId +SEQ_EVENT_CUTSCENE_LAKITU = 34 + +--- @type SeqId +SEQ_COUNT = 35 + --- @type integer ACT_AIR_HIT_WALL = 0x000008A7 diff --git a/docs/lua/constants.md b/docs/lua/constants.md index 092ca31b..e3ba58f6 100644 --- a/docs/lua/constants.md +++ b/docs/lua/constants.md @@ -39,6 +39,8 @@ - [os_cont.h](#os_conth) - [save_file.h](#save_fileh) - [enum SaveFileIndex](#enum-SaveFileIndex) +- [seq_ids.h](#seq_idsh) + - [enum SeqId](#enum-SeqId) - [sm64.h](#sm64h) - [smlua_hooks.h](#smlua_hooksh) - [enum LuaHookedEventType](#enum-LuaHookedEventType) @@ -2319,6 +2321,54 @@
+## [seq_ids.h](#seq_ids.h) +- SEQ_BASE_ID +- SEQ_VARIATION + +### [enum SeqId](#SeqId) +| Identifier | Value | +| :--------- | :---- | +| SEQ_SOUND_PLAYER | 0 | +| SEQ_EVENT_CUTSCENE_COLLECT_STAR | 1 | +| SEQ_MENU_TITLE_SCREEN | 2 | +| SEQ_LEVEL_GRASS | 3 | +| SEQ_LEVEL_INSIDE_CASTLE | 4 | +| SEQ_LEVEL_WATER | 5 | +| SEQ_LEVEL_HOT | 6 | +| SEQ_LEVEL_BOSS_KOOPA | 7 | +| SEQ_LEVEL_SNOW | 8 | +| SEQ_LEVEL_SLIDE | 9 | +| SEQ_LEVEL_SPOOKY | 10 | +| SEQ_EVENT_PIRANHA_PLANT | 11 | +| SEQ_LEVEL_UNDERGROUND | 12 | +| SEQ_MENU_STAR_SELECT | 13 | +| SEQ_EVENT_POWERUP | 14 | +| SEQ_EVENT_METAL_CAP | 15 | +| SEQ_EVENT_KOOPA_MESSAGE | 16 | +| SEQ_LEVEL_KOOPA_ROAD | 17 | +| SEQ_EVENT_HIGH_SCORE | 18 | +| SEQ_EVENT_MERRY_GO_ROUND | 19 | +| SEQ_EVENT_RACE | 20 | +| SEQ_EVENT_CUTSCENE_STAR_SPAWN | 21 | +| SEQ_EVENT_BOSS | 22 | +| SEQ_EVENT_CUTSCENE_COLLECT_KEY | 23 | +| SEQ_EVENT_ENDLESS_STAIRS | 24 | +| SEQ_LEVEL_BOSS_KOOPA_FINAL | 25 | +| SEQ_EVENT_CUTSCENE_CREDITS | 26 | +| SEQ_EVENT_SOLVE_PUZZLE | 27 | +| SEQ_EVENT_TOAD_MESSAGE | 28 | +| SEQ_EVENT_PEACH_MESSAGE | 29 | +| SEQ_EVENT_CUTSCENE_INTRO | 30 | +| SEQ_EVENT_CUTSCENE_VICTORY | 31 | +| SEQ_EVENT_CUTSCENE_ENDING | 32 | +| SEQ_MENU_FILE_SELECT | 33 | +| SEQ_EVENT_CUTSCENE_LAKITU | 34 | +| SEQ_COUNT | 35 | + +[:arrow_up_small:](#) + +
+ ## [sm64.h](#sm64.h) - ACT_AIR_HIT_WALL - ACT_AIR_THROW diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index aa30c5d3..ff95997c 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -2385,6 +2385,44 @@ char gSmluaConstants[] = "" "SAVE_FLAG_COLLECTED_TOAD_STAR_3 = (1 << 26)\n" "SAVE_FLAG_COLLECTED_MIPS_STAR_1 = (1 << 27)\n" "SAVE_FLAG_COLLECTED_MIPS_STAR_2 = (1 << 28)\n" +"SEQ_BASE_ID = 0x7f\n" +"SEQ_VARIATION = 0x80\n" +"SEQ_SOUND_PLAYER = 0\n" +"SEQ_EVENT_CUTSCENE_COLLECT_STAR = 1\n" +"SEQ_MENU_TITLE_SCREEN = 2\n" +"SEQ_LEVEL_GRASS = 3\n" +"SEQ_LEVEL_INSIDE_CASTLE = 4\n" +"SEQ_LEVEL_WATER = 5\n" +"SEQ_LEVEL_HOT = 6\n" +"SEQ_LEVEL_BOSS_KOOPA = 7\n" +"SEQ_LEVEL_SNOW = 8\n" +"SEQ_LEVEL_SLIDE = 9\n" +"SEQ_LEVEL_SPOOKY = 10\n" +"SEQ_EVENT_PIRANHA_PLANT = 11\n" +"SEQ_LEVEL_UNDERGROUND = 12\n" +"SEQ_MENU_STAR_SELECT = 13\n" +"SEQ_EVENT_POWERUP = 14\n" +"SEQ_EVENT_METAL_CAP = 15\n" +"SEQ_EVENT_KOOPA_MESSAGE = 16\n" +"SEQ_LEVEL_KOOPA_ROAD = 17\n" +"SEQ_EVENT_HIGH_SCORE = 18\n" +"SEQ_EVENT_MERRY_GO_ROUND = 19\n" +"SEQ_EVENT_RACE = 20\n" +"SEQ_EVENT_CUTSCENE_STAR_SPAWN = 21\n" +"SEQ_EVENT_BOSS = 22\n" +"SEQ_EVENT_CUTSCENE_COLLECT_KEY = 23\n" +"SEQ_EVENT_ENDLESS_STAIRS = 24\n" +"SEQ_LEVEL_BOSS_KOOPA_FINAL = 25\n" +"SEQ_EVENT_CUTSCENE_CREDITS = 26\n" +"SEQ_EVENT_SOLVE_PUZZLE = 27\n" +"SEQ_EVENT_TOAD_MESSAGE = 28\n" +"SEQ_EVENT_PEACH_MESSAGE = 29\n" +"SEQ_EVENT_CUTSCENE_INTRO = 30\n" +"SEQ_EVENT_CUTSCENE_VICTORY = 31\n" +"SEQ_EVENT_CUTSCENE_ENDING = 32\n" +"SEQ_MENU_FILE_SELECT = 33\n" +"SEQ_EVENT_CUTSCENE_LAKITU = 34\n" +"SEQ_COUNT = 35\n" "LAYER_FORCE = 0\n" "LAYER_OPAQUE = 1\n" "LAYER_OPAQUE_DECAL = 2\n"