diff --git a/data/ship/data/injections/lara_animations.bin b/data/ship/data/injections/lara_animations.bin index ac5f19d33..ac69d7b19 100644 Binary files a/data/ship/data/injections/lara_animations.bin and b/data/ship/data/injections/lara_animations.bin differ diff --git a/src/global/types.h b/src/global/types.h index a6cba0448..41c589164 100644 --- a/src/global/types.h +++ b/src/global/types.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -87,208 +88,6 @@ typedef enum GAME_STATIC_ID { STATIC_NUMBER_OF = 50, } GAME_STATIC_ID; -typedef enum SOUND_EFFECT_ID { - SFX_LARA_FEET = 0, - SFX_LARA_CLIMB2 = 1, - SFX_LARA_NO = 2, - SFX_LARA_SLIPPING = 3, - SFX_LARA_LAND = 4, - SFX_LARA_CLIMB1 = 5, - SFX_LARA_DRAW = 6, - SFX_LARA_HOLSTER = 7, - SFX_LARA_FIRE = 8, - SFX_LARA_RELOAD = 9, - SFX_LARA_RICOCHET = 10, - SFX_BEAR_GROWL = 11, - SFX_BEAR_FEET = 12, - SFX_BEAR_ATTACK = 13, - SFX_BEAR_SNARL = 14, - SFX_LARA_WET_FEET = 15, - SFX_BEAR_HURT = 16, - SFX_BEAR_DEATH = 18, - SFX_WOLF_JUMP = 19, - SFX_WOLF_HURT = 20, - SFX_WOLF_DEATH = 22, - SFX_WOLF_HOWL = 24, - SFX_WOLF_ATTACK = 25, - SFX_LARA_CLIMB3 = 26, - SFX_LARA_BODYSL = 27, - SFX_LARA_SHIMMY2 = 28, - SFX_LARA_JUMP = 29, - SFX_LARA_FALL = 30, - SFX_LARA_INJURY = 31, - SFX_LARA_ROLL = 32, - SFX_LARA_SPLASH = 33, - SFX_LARA_GETOUT = 34, - SFX_LARA_SWIM = 35, - SFX_LARA_BREATH = 36, - SFX_LARA_BUBBLES = 37, - SFX_LARA_SWITCH = 38, - SFX_LARA_KEY = 39, - SFX_LARA_OBJECT = 40, - SFX_LARA_GENERAL_DEATH = 41, - SFX_LARA_KNEES_DEATH = 42, - SFX_LARA_UZI_FIRE = 43, - SFX_LARA_MAGNUMS = 44, - SFX_LARA_SHOTGUN = 45, - SFX_LARA_BLOCK_PUSH1 = 46, - SFX_LARA_BLOCK_PUSH2 = 47, - SFX_LARA_EMPTY = 48, - SFX_LARA_BULLETHIT = 50, - SFX_LARA_BLKPULL = 51, - SFX_LARA_FLOATING = 52, - SFX_LARA_FALLDETH = 53, - SFX_LARA_GRABHAND = 54, - SFX_LARA_GRABBODY = 55, - SFX_LARA_GRABFEET = 56, - SFX_LARA_SWITCHUP = 57, - SFX_BAT_SQK = 58, - SFX_BAT_FLAP = 59, - SFX_UNDERWATER = 60, - SFX_UNDERWATER_SWITCH = 61, - SFX_BLOCK_SOUND = 63, - SFX_DOOR = 64, - SFX_PENDULUM_BLADES = 65, - SFX_ROCK_FALL_CRUMBLE = 66, - SFX_ROCK_FALL_FALL = 67, - SFX_ROCK_FALL_LAND = 68, - SFX_T_REX_DEATH = 69, - SFX_T_REX_FOOTSTOMP = 70, - SFX_T_REX_ROAR = 71, - SFX_T_REX_ATTACK = 72, - SFX_RAPTOR_ROAR = 73, - SFX_RAPTOR_ATTACK = 74, - SFX_RAPTOR_FEET = 75, - SFX_MUMMY_GROWL = 76, - SFX_LARSON_FIRE = 77, - SFX_LARSON_RICOCHET = 78, - SFX_WATERFALL_LOOP = 79, - SFX_WATER_LOOP = 80, - SFX_WATERFALL_BIG = 81, - SFX_CHAINDOOR_UP = 82, - SFX_CHAINDOOR_DOWN = 83, - SFX_COGS = 84, - SFX_LION_HURT = 85, - SFX_LION_ATTACK = 86, - SFX_LION_ROAR = 87, - SFX_LION_DEATH = 88, - SFX_GORILLA_FEET = 89, - SFX_GORILLA_PANT = 90, - SFX_GORILLA_DEATH = 91, - SFX_CROC_FEET = 92, - SFX_CROC_ATTACK = 93, - SFX_RAT_FEET = 94, - SFX_RAT_CHIRP = 95, - SFX_RAT_ATTACK = 96, - SFX_RAT_DEATH = 97, - SFX_THUNDER = 98, - SFX_EXPLOSION = 99, - SFX_GORILLA_GRUNT = 100, - SFX_GORILLA_GRUNTS = 101, - SFX_CROC_DEATH = 102, - SFX_DAMOCLES_SWORD = 103, - SFX_ATLANTEAN_EXPLODE = 104, - SFX_MENU_ROTATE = 108, - SFX_MENU_CHOOSE = 109, - SFX_MENU_GAMEBOY = 110, - SFX_MENU_SPININ = 111, - SFX_MENU_SPINOUT = 112, - SFX_MENU_COMPASS = 113, - SFX_MENU_GUNS = 114, - SFX_MENU_PASSPORT = 115, - SFX_MENU_MEDI = 116, - SFX_RAISINGBLOCK_FX = 117, - SFX_SAND_FX = 118, - SFX_STAIRS2SLOPE_FX = 119, - SFX_ATLANTEAN_WALK = 120, - SFX_ATLANTEAN_ATTACK = 121, - SFX_ATLANTEAN_JUMP_ATTACK = 122, - SFX_ATLANTEAN_NEEDLE = 123, - SFX_ATLANTEAN_BALL = 124, - SFX_ATLANTEAN_WINGS = 125, - SFX_ATLANTEAN_RUN = 126, - SFX_SLAMDOOR_CLOSE = 127, - SFX_SLAMDOOR_OPEN = 128, - SFX_SKATEBOARD_MOVE = 129, - SFX_SKATEBOARD_STOP = 130, - SFX_SKATEBOARD_SHOOT = 131, - SFX_SKATEBOARD_HIT = 132, - SFX_SKATEBOARD_START = 133, - SFX_SKATEBOARD_DEATH = 134, - SFX_SKATEBOARD_HIT_GROUND = 135, - SFX_TORSO_HIT_GROUND = 136, - SFX_TORSO_ATTACK1 = 137, - SFX_TORSO_ATTACK2 = 138, - SFX_TORSO_DEATH = 139, - SFX_TORSO_ARM_SWING = 140, - SFX_TORSO_MOVE = 141, - SFX_TORSO_HIT = 142, - SFX_CENTAUR_FEET = 143, - SFX_CENTAUR_ROAR = 144, - SFX_LARA_SPIKE_DEATH = 145, - SFX_LARA_DEATH3 = 146, - SFX_ROLLING_BALL = 147, - SFX_LAVA_LOOP = 148, - SFX_LAVA_FOUNTAIN = 149, - SFX_FIRE = 150, - SFX_DARTS = 151, - SFX_METAL_DOOR_CLOSE = 152, - SFX_METAL_DOOR_OPEN = 153, - SFX_ALTAR_LOOP = 154, - SFX_POWERUP_FX = 155, - SFX_COWBOY_DEATH = 156, - SFX_BLACK_GOON_DEATH = 157, - SFX_LARSON_DEATH = 158, - SFX_PIERRE_DEATH = 159, - SFX_NATLA_DEATH = 160, - SFX_TRAPDOOR_OPEN = 161, - SFX_TRAPDOOR_CLOSE = 162, - SFX_ATLANTEAN_EGG_LOOP = 163, - SFX_ATLANTEAN_EGG_HATCH = 164, - SFX_DRILL_ENGINE_START = 165, - SFX_DRILL_ENGINE_LOOP = 166, - SFX_CONVEYOR_BELT = 167, - SFX_HUT_LOWERED = 168, - SFX_HUT_HIT_GROUND = 169, - SFX_EXPLOSION_FX = 170, - SFX_ATLANTEAN_DEATH = 171, - SFX_CHAINBLOCK_FX = 172, - SFX_SECRET = 173, - SFX_GYM_HINT_01 = 174, - SFX_GYM_HINT_02 = 175, - SFX_GYM_HINT_03 = 176, - SFX_GYM_HINT_04 = 177, - SFX_GYM_HINT_05 = 178, - SFX_GYM_HINT_06 = 179, - SFX_GYM_HINT_07 = 180, - SFX_GYM_HINT_08 = 181, - SFX_GYM_HINT_09 = 182, - SFX_GYM_HINT_10 = 183, - SFX_GYM_HINT_11 = 184, - SFX_GYM_HINT_12 = 185, - SFX_GYM_HINT_13 = 186, - SFX_GYM_HINT_14 = 187, - SFX_GYM_HINT_15 = 188, - SFX_GYM_HINT_16 = 189, - SFX_GYM_HINT_17 = 190, - SFX_GYM_HINT_18 = 191, - SFX_GYM_HINT_19 = 192, - SFX_GYM_HINT_20 = 193, - SFX_GYM_HINT_21 = 194, - SFX_GYM_HINT_22 = 195, - SFX_GYM_HINT_23 = 196, - SFX_GYM_HINT_24 = 197, - SFX_GYM_HINT_25 = 198, - SFX_BALDY_SPEECH = 199, - SFX_COWBOY_SPEECH = 200, - SFX_LARSON_SPEECH = 201, - SFX_NATLA_SPEECH = 202, - SFX_PIERRE_SPEECH = 203, - SFX_SKATEKID_SPEECH = 204, - SFX_LARA_SETUP = 205, - SFX_EXPLOSION_CHEAT = 206, -} SOUND_EFFECT_ID; - typedef enum MUSIC_TRACK_ID { MX_INACTIVE = -1, MX_UNUSED_0 = 0, diff --git a/subprojects/libtrx b/subprojects/libtrx index c984f369d..17e2ce904 160000 --- a/subprojects/libtrx +++ b/subprojects/libtrx @@ -1 +1 @@ -Subproject commit c984f369d2e7903ec0cd4c5fa5724aeaa8d571b2 +Subproject commit 17e2ce9042401bbc04baf6fd2e02b4c752c0ea1f