etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 13:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-ran autogen

Browse source
This commit is contained in:
MysterD 2022-03-13 00:25:36 -08:00
parent b695cbd55a
commit 85d4012e89
1 changed files with 9 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
autogen/lua_definitions/constants.lua
View file

@ -5263,22 +5263,25 @@ HOOK_ON_SET_MARIO_ACTION = 3
HOOK_BEFORE_PHYS_STEP = 4 HOOK_BEFORE_PHYS_STEP = 4
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_ON_PVP_ATTACK = 5 HOOK_ALLOW_PVP_ATTACK = 5
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_ON_PLAYER_CONNECTED = 6 HOOK_ON_PVP_ATTACK = 6
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_ON_PLAYER_DISCONNECTED = 7 HOOK_ON_PLAYER_CONNECTED = 7
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_ON_HUD_RENDER = 8 HOOK_ON_PLAYER_DISCONNECTED = 8
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_ON_INTERACT = 9 HOOK_ON_HUD_RENDER = 9
--- @type LuaHookedEventType --- @type LuaHookedEventType
HOOK_MAX = 10 HOOK_ON_INTERACT = 10
--- @type LuaHookedEventType
HOOK_MAX = 11
--- @class ModelExtendedId --- @class ModelExtendedId
@ -6731,28 +6734,6 @@ SOUND_ENV_ELEVATOR3 = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x0C, 0x00, 0)
--- @type integer --- @type integer
SOUND_ENV_ELEVATOR4 = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x0D, 0x00, 0) SOUND_ENV_ELEVATOR4 = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x0D, 0x00, 0)
<<<<<<< HEAD
--- @type LuaHookedEventType
HOOK_ALLOW_PVP_ATTACK = 5
--- @type LuaHookedEventType
HOOK_ON_PVP_ATTACK = 6
--- @type LuaHookedEventType
HOOK_ON_PLAYER_CONNECTED = 7
--- @type LuaHookedEventType
HOOK_ON_PLAYER_DISCONNECTED = 8
--- @type LuaHookedEventType
HOOK_ON_HUD_RENDER = 9
--- @type LuaHookedEventType
HOOK_ON_INTERACT = 10
--- @type LuaHookedEventType
HOOK_MAX = 11
=======
--- @type integer --- @type integer
SOUND_ENV_ELEVATOR4_2 = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x0D, 0x00, SOUND_NO_VOLUME_LOSS) SOUND_ENV_ELEVATOR4_2 = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x0D, 0x00, SOUND_NO_VOLUME_LOSS)
@ -6770,7 +6751,6 @@ SOUND_ENV_MOVING_SAND_SNOW = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x06, 0x00, 0)
--- @type integer --- @type integer
SOUND_ENV_SINK_QUICKSAND = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x18, 0x80, 0) SOUND_ENV_SINK_QUICKSAND = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x18, 0x80, 0)
>>>>>>> 84aa5ad890e47bb4d73815ba102789cc368dc288
--- @type integer --- @type integer
SOUND_ENV_SLIDING = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x13, 0x00, 0) SOUND_ENV_SLIDING = SOUND_ARG_LOAD(SOUND_BANK_ENV, 0x13, 0x00, 0)