diff --git a/include/common_structs.h b/include/common_structs.h index e26662f9dc0..4cb6682c39b 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -2066,15 +2066,6 @@ typedef struct PlayerStatus { /* 0x281 */ char unk_281[7]; } PlayerStatus; // size = 0x288 -typedef struct SaveMetadata { - /* 0x00 */ s32 timePlayed; - /* 0x04 */ u8 spiritsRescued; - /* 0x05 */ char unk_05[1]; - /* 0x06 */ s8 level; - /* 0x07 */ unsigned char filename[8]; - /* 0x0F */ char unk_0F[9]; -} SaveMetadata; // size = 0x18 - typedef struct SaveGlobals { /* 0x00 */ char magicString[16]; /* "Mario Story 006" string */ /* 0x10 */ s8 pad[32]; /* always zero */ @@ -2085,6 +2076,15 @@ typedef struct SaveGlobals { /* 0x40 */ s8 reserved[64]; // unused } SaveGlobals; // size = 0x80 +typedef struct SaveMetadata { + /* 0x00 */ s32 timePlayed; + /* 0x04 */ u8 spiritsRescued; + /* 0x05 */ char unk_05[1]; + /* 0x06 */ s8 level; + /* 0x07 */ unsigned char filename[8]; + /* 0x0F */ char unk_0F[9]; +} SaveMetadata; // size = 0x18 + typedef struct SaveData { /* 0x0000 */ char magicString[16]; /* "Mario Story 006" string */ /* 0x0010 */ s8 pad[32]; /* always zero */ diff --git a/include/enums.h b/include/enums.h index 970afc8b09d..c3d48f9c732 100644 --- a/include/enums.h +++ b/include/enums.h @@ -155,10 +155,10 @@ enum StoryProgress { STORY_CH5_GOT_JADE_RAVEN = 17, STORY_CH5_MOVED_RAVEN_STATUE = 18, STORY_CH5_DEFEATED_PIRANHAS_MINIBOSS = 19, - STORY_CH5_REACHED_RAFAELS_TREE = 20, - STORY_CH5_RAFAEL_LEFT_NEST = 21, - STORY_CH5_RAFAEL_MOVED_ROOT = 22, - STORY_CH5_RAFAEL_WAITING_FOR_MARIO = 23, + STORY_CH5_REACHED_RAPHAELS_TREE = 20, + STORY_CH5_RAPHAEL_LEFT_NEST = 21, + STORY_CH5_RAPHAEL_MOVED_ROOT = 22, + STORY_CH5_RAPHAEL_WAITING_FOR_MARIO = 23, STORY_CH5_ZIP_LINE_READY = 24, STORY_CH5_ENTERED_MT_LAVA_LAVA = 25, STORY_CH5_KOLORADO_FELL_IN_LAVA = 26, @@ -571,18 +571,18 @@ enum SoundIDs { SOUND_OSR_SMOKE_RISING_1 = 0x00000036, SOUND_OSR_SMOKE_RISING_2 = 0x00000037, SOUND_OSR_SMOKE_RISING_3 = 0x00000038, - SOUND_LRAW_MAC_HARBOR_WATER = 0x00000039, // loops - SOUND_PRA_SHIFT_FLOORS_RUMBLE = 0x0000003F, // loops + SOUND_LRAW_MAC_HARBOR_WATER = 0x00000039, // #looping + SOUND_PRA_SHIFT_FLOORS_RUMBLE = 0x0000003F, // #looping SOUND_PRA_SHIFT_FLOORS_THUD = 0x00000040, SOUND_WHALE_JIGGLE = 0x00000041, SOUND_WHALE_FILL = 0x00000042, - SOUND_LRAW_WHALE_GEYSER = 0x00000043, // loops + SOUND_LRAW_WHALE_GEYSER = 0x00000043, // #looping SOUND_WHALE_EJECT = 0x00000044, SOUND_JR_TROOPA_SPLASH = 0x00000045, SOUND_LRAW_JR_TROOPA_SWIM = 0x00000046, SOUND_BOO_SPOOK = 0x00000047, SOUND_OBJECT_LAND = 0x00000048, - SOUND_UNUSED_WATER_RUNNING = 0x00000049, // loops + SOUND_UNUSED_WATER_RUNNING = 0x00000049, // #looping SOUND_LRAW_JAN_BEACH_WAVES = 0x0000004A, SOUND_LRAW_OSR_FOUNTAIN_INTACT = 0x0000004C, SOUND_LRAW_OSR_FOUNTAIN_BROKEN = 0x0000004D, @@ -591,7 +591,7 @@ enum SoundIDs { SOUND_LRAW_WINDMILL_EXT = 0x00000050, SOUND_OMO_FLIP_TRACK_THUD = 0x00000051, SOUND_LRAW_TROMP_ROLL = 0x00000052, - SOUND_ISK_DRAINING_SAND = 0x00000053, // loops + SOUND_ISK_DRAINING_SAND = 0x00000053, // #looping SOUND_ISK_FLIP_STAIRS = 0x00000054, SOUND_LENS_FLARE = 0x00000055, SOUND_LRAW_ISK_LOWER_STAIRS = 0x00000056, @@ -637,7 +637,7 @@ enum SoundIDs { SOUND_QUIZMO_VANISH = 0x0000008F, SOUND_LRAW_PUFF_PUFF_MACHINE = 0x00000091, SOUND_KKJ_USE_SNEAKY_PARASOL = 0x00000092, - SOUND_KKJ_ROTATING_WALL = 0x00000093, // loops + SOUND_KKJ_ROTATING_WALL = 0x00000093, // #looping SOUND_LRAW_DGB_COLLAPSE = 0x00000094, SOUND_DGB_COLLAPSE_1 = 0x00000095, SOUND_DGB_COLLAPSE_2 = 0x00000096, @@ -727,10 +727,10 @@ enum SoundIDs { SOUND_ACTOR_HURT = 0x0000010F, SOUND_HIT_RATTLE = 0x00000110, SOUND_HEART_BLOCK = 0x00000131, - SOUND_0132 = 0x00000132, // unused - SOUND_0133 = 0x00000133, // unused - SOUND_ASCENDING_CHIMES = 0x00000134, // unused - SOUND_DESCENDING_CHIMES = 0x00000135, // unused + SOUND_0132 = 0x00000132, // #unused + SOUND_0133 = 0x00000133, // #unused + SOUND_ASCENDING_CHIMES = 0x00000134, // #unused + SOUND_DESCENDING_CHIMES = 0x00000135, // #unused SOUND_STAR_CARD_APPEARS = 0x00000137, SOUND_RESCUE_STAR_SPIRIT = 0x00000138, SOUND_RECEIVE_STAR_POWER = 0x00000139, @@ -753,75 +753,76 @@ enum SoundIDs { SOUND_SEARCH_BUSH = 0x00000153, SOUND_PLAYER_CHARGE = 0x00000156, SOUND_BLOCK_SHATTER = 0x00000158, - SOUND_0159 = 0x00000159, // unused - SOUND_ACTOR_JUMPED_1 = 0x0000015A, // unused - SOUND_ACTOR_JUMPED_2 = 0x0000015B, // unused - SOUND_ACTOR_JUMPED_3 = 0x0000015C, // unused + SOUND_0159 = 0x00000159, // #unused + SOUND_ACTOR_JUMPED_1 = 0x0000015A, // #unused + SOUND_ACTOR_JUMPED_2 = 0x0000015B, // #unused + SOUND_ACTOR_JUMPED_3 = 0x0000015C, // #unused SOUND_PLAYER_RUN_IN_PLACE = 0x0000015D, SOUND_PLAYER_RUN_AWAY = 0x0000015E, SOUND_PLAYER_JUMP = 0x00000160, SOUND_PLAYER_LONG_FALL = 0x00000161, SOUND_TRIP = 0x00000162, SOUND_ENTER_PIPE = 0x00000163, - SOUND_LRAW_0164 = 0x00000164, // unused, no data + SOUND_LRAW_NOTHING_26 = 0x00000164, // #unused #nodata SOUND_SMACK_TREE = 0x00000165, SOUND_SHAKE_TREE_LEAVES = 0x00000166, - SOUND_SLIDE = 0x00000167, // loops + SOUND_SLIDE = 0x00000167, // #looping SOUND_LRAW_ZIPLINE_RIDE = 0x00000168, SOUND_DUST_OFF = 0x00000172, - SOUND_0173 = 0x00000173, - SOUND_0174 = 0x00000174, - SOUND_0175 = 0x00000175, - SOUND_0176 = 0x00000176, + SOUND_RUN_AWAY_BUILDUP = 0x00000173, + SOUND_RUN_AWAY = 0x00000174, + SOUND_PAPER_GLIDE_1 = 0x00000175, + SOUND_PAPER_GLIDE_2 = 0x00000176, SOUND_LUIGI_STEP_A = 0x00000179, SOUND_LUIGI_STEP_B = 0x0000017A, - SOUND_017B = 0x0000017B, - SOUND_017C = 0x0000017C, - SOUND_017D = 0x0000017D, - SOUND_017E = 0x0000017E, - SOUND_017F = 0x0000017F, - SOUND_0180 = 0x00000180, - SOUND_0181 = 0x00000181, - SOUND_0182 = 0x00000182, - SOUND_0183 = 0x00000183, + SOUND_ISPY = 0x0000017B, + SOUND_STARSHIP_ENGINE_LOOP = 0x0000017C, // #looping + SOUND_STARSHIP_TAKEOFF_LONG = 0x0000017D, + SOUND_STARSHIP_TAKEOFF_SHORT = 0x0000017E, + SOUND_STARSHIP_ARRIVE = 0x0000017F, + SOUND_STARSHIP_NEAR_FLYBY = 0x00000180, + SOUND_STARSHIP_ASCEND = 0x00000181, + SOUND_STARSHIP_FLY_AWAY = 0x00000182, + SOUND_STARSHIP_FLY_TOWARD = 0x00000183, + SOUND_SPRINKLE_MAGIC = 0x00000184, // #unused SOUND_LRAW_ZIPLINE_RETURN = 0x00000185, - SOUND_0186 = 0x00000186, - SOUND_0187 = 0x00000187, + SOUND_JAN_BASKET_ELEVATOR = 0x00000186, + SOUND_FLO_STAIRS_LOWERING = 0x00000187, // #rocky #scrape #rumble SOUND_GET_STAR_POWER_WAVE = 0x00000188, - SOUND_LRAW_0189 = 0x00000189, - SOUND_018A = 0x0000018A, - SOUND_018C = 0x0000018C, - SOUND_018D = 0x0000018D, - SOUND_018E = 0x0000018E, - SOUND_0190 = 0x00000190, - SOUND_0191 = 0x00000191, - SOUND_0193 = 0x00000193, - SOUND_LRAW_0194 = 0x00000194, - SOUND_LRAW_FLO_FILL_WATER_POOL = 0x00000197, - SOUND_LRAW_0198 = 0x00000198, - SOUND_LRAW_0199 = 0x00000199, - SOUND_LRAW_019A = 0x0000019A, - SOUND_019B = 0x0000019B, - SOUND_019C = 0x0000019C, - SOUND_019D = 0x0000019D, - SOUND_019E = 0x0000019E, - SOUND_019F = 0x0000019F, - SOUND_01A0 = 0x000001A0, - SOUND_01A1 = 0x000001A1, - SOUND_01A2 = 0x000001A2, - SOUND_01A3 = 0x000001A3, - SOUND_01A4 = 0x000001A4, - SOUND_01A5 = 0x000001A5, - SOUND_01A6 = 0x000001A6, - SOUND_01A7 = 0x000001A7, - SOUND_01A8 = 0x000001A8, - SOUND_01A9 = 0x000001A9, - SOUND_01AA = 0x000001AA, - SOUND_01AB = 0x000001AB, - SOUND_01AC = 0x000001AC, - SOUND_01AD = 0x000001AD, - SOUND_01AE = 0x000001AE, - SOUND_01AF = 0x000001AF, + SOUND_LRAW_JAN_CONSTRUCTION = 0x00000189, + SOUND_JAN_RAPHAEL_POUND = 0x0000018A, // #heavy #impact #thud + SOUND_JAN_ROOT_WOBBLE_1 = 0x0000018C, + SOUND_JAN_ROOT_WOBBLE_2 = 0x0000018D, + SOUND_JAN_ROOT_WOBBLE_3 = 0x0000018E, + SOUND_FLO_PUFF_PUFF_SMOKE_BURST = 0x00000190, // #explode + SOUND_JAN_BOULDER_TREMBLE = 0x00000191, // #rocky #knock #short #impact + SOUND_FLO_BLOW_BUBBLE = 0x00000193, + SOUND_LRAW_BUBBLE_DRIFT = 0x00000194, // #looping + SOUND_LRAW_FLO_FILL_WATER_POOL = 0x00000197, // #looping + SOUND_LRAW_FLO_WATER_FLOW_1 = 0x00000198, // #looping #gentle + SOUND_LRAW_FLO_WATER_FLOW_2 = 0x00000199, // #looping #fountain + SOUND_LRAW_FLO_RELEASE_FOUNTAIN = 0x0000019A, // #looping #fountain + SOUND_FLO_BEANSTALK_START_GROWING = 0x0000019B, + SOUND_FLO_RIDE_BEANSTALK_UP_LOOP = 0x0000019C, // #looping + SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP = 0x0000019D, // #looping + SOUND_FLO_MAGIKOOPA_FLY_AWAY = 0x0000019E, + SOUND_FLO_LAKITU_FLY_AWAY = 0x0000019F, + SOUND_FLO_PUFF_PUFF_EXPLODE = 0x000001A0, // #explode + SOUND_OMO_BOX_GLOW_1 = 0x000001A1, + SOUND_OMO_BOX_GLOW_2 = 0x000001A2, + SOUND_OMO_BOX_GLOW_3 = 0x000001A3, + SOUND_OMO_BOX_GLOW_4 = 0x000001A4, + SOUND_OMO_BOX_CHIME_1 = 0x000001A5, + SOUND_OMO_BOX_CHIME_2 = 0x000001A6, + SOUND_OMO_BOX_CHIME_3 = 0x000001A7, + SOUND_OMO_BOX_CHIME_4 = 0x000001A8, + SOUND_OMO_BOX_DONE = 0x000001A9, + SOUND_OMO_TOYBOX_LID = 0x000001AA, + SOUND_OMO_SECRET_DOOR_OPEN = 0x000001AB, + SOUND_OMO_SECRET_DOOR_CLOSE = 0x000001AC, + SOUND_FLYING_PYROCLAST_1 = 0x000001AD, + SOUND_FLYING_PYROCLAST_2 = 0x000001AE, + SOUND_JAN_CHEST_IMPACT = 0x000001AF, SOUND_LRAW_NOK_WATER = 0x000001B1, SOUND_LRAW_TRD_WATER_EXT = 0x000001B2, SOUND_LRAW_SBK_OASIS_WATER = 0x000001B3, @@ -894,7 +895,7 @@ enum SoundIDs { SOUND_CRYSTAL_BALL_WAVE = 0x00000208, SOUND_MERLON_GATHER = 0x00000209, SOUND_MERLON_STRIKE = 0x0000020A, - SOUND_020B = 0x0000020B, // unused + SOUND_LOWER_PITCH_MAGIC = 0x0000020B, // #unused SOUND_RAVEN_FALL_A = 0x0000020C, SOUND_RAVEN_FALL_B = 0x0000020D, SOUND_RAVEN_FALL_C = 0x0000020E, @@ -912,31 +913,32 @@ enum SoundIDs { SOUND_MENU_ERROR = 0x0000021D, SOUND_LRAW_KPA_CHAIN_DRIVE = 0x00000221, SOUND_KPA_DUMP_LAVA = 0x00000222, - SOUND_0223 = 0x00000223, - SOUND_0225 = 0x00000225, - SOUND_0226 = 0x00000226, - SOUND_0227 = 0x00000227, - SOUND_0228 = 0x00000228, - SOUND_KPA_PULL_CHAIN = 0x00000229, - SOUND_LRAW_KPA_FILL_WATER = 0x0000022A, - SOUND_LRAW_KPA_DRAIN_WATER = 0x0000022B, // sounds like a flush - SOUND_LRAW_022C = 0x0000022C, - SOUND_LRAW_022D = 0x0000022D, - SOUND_FINALE_EXPLOSION_A = 0x0000022E, - SOUND_FINALE_EXPLOSION_B = 0x0000022F, - SOUND_0230 = 0x00000230, - SOUND_0231 = 0x00000231, - SOUND_0232 = 0x00000232, //unused? flute + SOUND_KPA_BOWSER_POWER_UP = 0x00000223, + SOUND_KPA_BOWSER_POWER_DOWN = 0x00000224, // #unused + SOUND_KPA_QUIZ_DOORS_OPEN = 0x00000225, // #stony #scraping + SOUND_KPA_QUIZ_DOORS_CLOSE = 0x00000226, // #stony #scraping + SOUND_KPA_RAISE_STONE_PLATFORM = 0x00000227, // #stony #scraping #rumble + SOUND_KPA_LOWER_STONE_PLATFORM = 0x00000228, // #stony #scraping #rumble + SOUND_KPA_PULL_CHAIN = 0x00000229, // #metallic #rattle + SOUND_LRAW_KPA_FILL_WATER = 0x0000022A, // #looping #flush #flowing #water + SOUND_LRAW_KPA_DRAIN_WATER = 0x0000022B, // #looping #flush #flowing #water + SOUND_LRAW_KPA_ARENA_TURN_ON = 0x0000022C, // #electric #humming #machine + SOUND_LRAW_KPA_ARENA_ACTIVE = 0x0000022D, // #electric #humming #machine + SOUND_KPA_EXPLOSION_A = 0x0000022E, // #explosion + SOUND_KPA_EXPLOSION_B = 0x0000022F, // #explosion + SOUND_KPA_EXPLOSION_CLUSTER = 0x00000230, // #explosion + SOUND_DAMAGE_STARS = 0x00000231, // also used when blocking + SOUND_COLLECT_1UP = 0x00000232, // #unused SOUND_TIMING_BAR_TICK = 0x00000233, SOUND_TIMING_BAR_GO = 0x00000234, SOUND_JUMP_COMBO_1 = 0x00000235, SOUND_JUMP_COMBO_2 = 0x00000236, SOUND_JUMP_COMBO_3 = 0x00000237, SOUND_JUMP_COMBO_4 = 0x00000238, - SOUND_JUMP_COMBO_5 = 0x00000239, // unused - SOUND_JUMP_COMBO_6 = 0x0000023A, // unused - SOUND_JUMP_COMBO_7 = 0x0000023B, // unused, rings a bit longer than the others - SOUND_JUMP_COMBO_8 = 0x0000023C, // unused + SOUND_JUMP_COMBO_5 = 0x00000239, // #unused + SOUND_JUMP_COMBO_6 = 0x0000023A, // #unused + SOUND_JUMP_COMBO_7 = 0x0000023B, // #unused rings a bit longer than the others + SOUND_JUMP_COMBO_8 = 0x0000023C, // #unused SOUND_LRAW_BOWSER_PROPELLER = 0x0000023D, SOUND_BEGIN_WISH = 0x00000241, SOUND_REFRESH = 0x00000242, @@ -952,22 +954,23 @@ enum SoundIDs { SOUND_SHOOTING_STAR_FALL_B = 0x0000025A, SOUND_STAR_BOUNCE_A = 0x0000025C, SOUND_STAR_BOUNCE_B = 0x0000025D, - SOUND_0261 = 0x00000261, - SOUND_0262 = 0x00000262, - SOUND_0263 = 0x00000263, - SOUND_0265 = 0x00000265, - SOUND_0266 = 0x00000266, - SOUND_0267 = 0x00000267, - SOUND_0269 = 0x00000269, - SOUND_026A = 0x0000026A, - SOUND_026B = 0x0000026B, - SOUND_026C = 0x0000026C, - SOUND_LRAW_0271 = 0x00000271, - SOUND_LRAW_0273 = 0x00000273, - SOUND_LRAW_0274 = 0x00000274, - SOUND_LRAW_0275 = 0x00000275, - SOUND_LRAW_0276 = 0x00000276, - SOUND_0281 = 0x00000281, + SOUND_ISK_PLACE_IN_SOCKET = 0x00000261, // #stony #thud + SOUND_EMOTE_IDEA = 0x00000262, + SOUND_EMOTE_QUESTION = 0x00000263, + SOUND_ISK_DOOR_OPEN = 0x00000265, + SOUND_ISK_DOOR_CLOSE = 0x00000266, + SOUND_ISK_DOOR_SLAM = 0x00000267, // #stony #thud #heavy + SOUND_USE_KEY = 0x00000269, // #metallic #rattle + SOUND_LOCK_DROP = 0x0000026A, // #metallic #hollow #thud + SOUND_LARGE_GATE_OPEN = 0x0000026B, // #metallic #blowing + SOUND_LARGE_GATE_CLOSE = 0x0000026C, // #metallic #thud + SOUND_METAL_CRASH = 0x00000270, // #unused #metallic #thud + SOUND_LRAW_TIK_WATER = 0x00000271, // #water + SOUND_LRAW_WATER_FLOWING_1 = 0x00000273, // #water #flowing + SOUND_LRAW_WATER_FLOWING_2 = 0x00000274, // #water #flowing + SOUND_LRAW_WATER_FLOWING_3 = 0x00000275, // #water #flowing + SOUND_LRAW_WATER_FLOWING_4 = 0x00000276, // #water #flowing + SOUND_GOOMBARIO_HEADBONK = 0x00000281, // #descending #falling SOUND_TATTLE_WINDOW_OPEN = 0x00000282, SOUND_0283 = 0x00000283, SOUND_0284 = 0x00000284, @@ -1077,8 +1080,8 @@ enum SoundIDs { SOUND_SHY_GUY_SCREAMS3 = 0x0000030E, SOUND_TOY_TANK_MOVE1 = 0x0000030F, SOUND_TOY_TANK_MOVE2 = 0x00000310, - SOUND_AIM_SHELL_SHOT = 0x00000311, // loops - SOUND_AIM_SPINY_FLIP = 0x00000312, // loops + SOUND_AIM_SHELL_SHOT = 0x00000311, // #looping + SOUND_AIM_SPINY_FLIP = 0x00000312, // #looping SOUND_TUBBA_GULP = 0x00000315, SOUND_FIRE_BAR_0_B = 0x00000316, SOUND_FIRE_BAR_1_B = 0x00000317, @@ -1133,7 +1136,7 @@ enum SoundIDs { SOUND_0356 = 0x00000356, SOUND_0357 = 0x00000357, SOUND_0358 = 0x00000358, - SOUND_EMBER_FLY = 0x00000359, // loops + SOUND_EMBER_FLY = 0x00000359, // #looping SOUND_035B = 0x0000035B, SOUND_CHARGE_LIGHTNING = 0x0000035C, SOUND_035D = 0x0000035D, @@ -1184,10 +1187,10 @@ enum SoundIDs { SOUND_038D = 0x0000038D, SOUND_038E = 0x0000038E, SOUND_0390 = 0x00000390, - SOUND_LRAW_0391 = 0x00000391, + SOUND_LRAW_SPINNING_FLOWER = 0x00000391, SOUND_0392 = 0x00000392, SOUND_MUNCHLESIA_SPIT = 0x00000393, - SOUND_OVEN_TIMER_TICKING = 0x00000394, // loops + SOUND_OVEN_TIMER_TICKING = 0x00000394, // #looping SOUND_GENERAL_WHISTLE = 0x00000395, SOUND_0396 = 0x00000396, SOUND_0397 = 0x00000397, @@ -1200,8 +1203,8 @@ enum SoundIDs { SOUND_LRAW_SAM_STAIRS_RISE = 0x0000039E, SOUND_SAM_STAIRS_FINAL_THUD = 0x0000039F, SOUND_MIM_MUSHROOM_GLOW = 0x000003A0, - SOUND_UNUSED_TAPPING_LOOP = 0x000003A1, // loops - SOUND_SHY_GUY_FLEE_LOOP = 0x000003A2, // loops + SOUND_UNUSED_TAPPING_LOOP = 0x000003A1, // #looping + SOUND_SHY_GUY_FLEE_LOOP = 0x000003A2, // #looping SOUND_LANTERN_GHOST_REVEAL_MORE_1 = 0x000003A3, SOUND_LANTERN_GHOST_REVEAL_MORE_2 = 0x000003A4, SOUND_LANTERN_GHOST_REVEAL_MORE_3 = 0x000003A5, @@ -1212,7 +1215,7 @@ enum SoundIDs { SOUND_LANTERN_GHOST_DARKEN_4 = 0x000003AA, SOUND_PIRANHA_BREATH = 0x000003AB, SOUND_GOOMBA_BROS_STEP = 0x000003AC, - SOUND_LRAW_03AD = 0x000003AD, + SOUND_LRAW_FIGHTING = 0x000003AD, SOUND_03AE = 0x000003AE, SOUND_03AF = 0x000003AF, SOUND_03B0 = 0x000003B0, @@ -1225,7 +1228,7 @@ enum SoundIDs { SOUND_SHY_GUY_STEP_B = 0x000003B7, SOUND_03B9 = 0x000003B9, SOUND_03BB = 0x000003BB, - SOUND_LRAW_03BC = 0x000003BC, + SOUND_LRAW_RUMBLE = 0x000003BC, SOUND_03BD = 0x000003BD, SOUND_03BE = 0x000003BE, SOUND_03C0 = 0x000003C0, @@ -1330,8 +1333,8 @@ enum SoundIDs { SOUND_WHALE_CLOSE_MOUTH = 0x00002037, SOUND_TUBBA_SNORE_INHALE = 0x00002038, SOUND_TUBBA_SNORE_EXHALE = 0x00002039, - SOUND_FINALE_BRIDGE_COLLAPSE_A = 0x0000203A, - SOUND_FINALE_BRIDGE_COLLAPSE_B = 0x0000203B, + SOUND_KPA_BRIDGE_COLLAPSE_A = 0x0000203A, + SOUND_KPA_BRIDGE_COLLAPSE_B = 0x0000203B, SOUND_203C = 0x0000203C, SOUND_203D = 0x0000203D, SOUND_203E = 0x0000203E, @@ -1416,10 +1419,10 @@ enum SoundIDs { SOUND_MUNCHLESIA_SUCTION = 0x0000209B, SOUND_JAN_LOG_LAND = 0x0000209D, SOUND_JAN_LOG_SPLIT = 0x0000209E, - SOUND_209F = 0x0000209F, - SOUND_20A0 = 0x000020A0, - SOUND_20A1 = 0x000020A1, - SOUND_20A2 = 0x000020A2, + SOUND_SEPARATE_BUSHES = 0x0000209F, + SOUND_LARGE_NPC_IMPACT = 0x000020A0, + SOUND_STARSHIP_BOOST = 0x000020A1, + SOUND_IWA_SLIDE_GATE = 0x000020A2, SOUND_CREAKY_WINDOW_OPEN = 0x000020A3, SOUND_CREAKY_WINDOW_CLOSE = 0x000020A4, SOUND_20A5 = 0x000020A5, @@ -1554,18 +1557,18 @@ enum SoundIDs { SOUND_LOOP_TRD_FLOWING_WATER = 0x80000006, SOUND_LOOP_TRD_RAISE_STAIRS = 0x80000007, SOUND_LOOP_CHEERING = 0x80000008, - SOUND_LOOP_09 = 0x80000009, - SOUND_LOOP_0A = 0x8000000A, // unused - SOUND_LOOP_0B = 0x8000000B, - SOUND_LOOP_0C = 0x8000000C, - SOUND_LOOP_0D = 0x8000000D, - SOUND_LOOP_0E = 0x8000000E, + SOUND_LOOP_IWA10_FLOW1 = 0x80000009, + SOUND_LOOP_IWA_UNUSED_FLOW3 = 0x8000000A, // #unused + SOUND_LOOP_IWA00_FLOW3 = 0x8000000B, + SOUND_LOOP_IWA00_FLOW2 = 0x8000000C, + SOUND_LOOP_IWA01_FLOW1 = 0x8000000D, + SOUND_LOOP_IWA01_FLOW2 = 0x8000000E, SOUND_LOOP_OBK_LOWER_CHAIN = 0x8000000F, SOUND_LOOP_MOVE_STATUE = 0x80000010, SOUND_LOOP_SENTINEL_ALARM = 0x80000011, - SOUND_LOOP_QUIZ_TICKING = 0x80000012, // unused - SOUND_LOOP_AUDIENCE_MURMUR = 0x80000013, // unused - SOUND_LOOP_TOYBOX_TRAIN_GEAR = 0x80000014, // unused + SOUND_LOOP_QUIZ_TICKING = 0x80000012, // #unused + SOUND_LOOP_AUDIENCE_MURMUR = 0x80000013, // #unused + SOUND_LOOP_TOYBOX_TRAIN_GEAR = 0x80000014, // #unused SOUND_LOOP_OMO_SLOT_MACHINE = 0x80000015, SOUND_LOOP_OMO_ROTATING_WHEEL = 0x80000016, SOUND_LOOP_JAN_BEACH_WAVES = 0x80000017, @@ -1575,61 +1578,61 @@ enum SoundIDs { SOUND_LOOP_TROMP_ROLL = 0x8000001B, SOUND_LOOP_JAN_SMALL_GEYSER = 0x8000001C, SOUND_LOOP_JAN_LARGE_GEYSER = 0x8000001D, - SOUND_LOOP_1E = 0x8000001E, - SOUND_LOOP_1F = 0x8000001F, // unused, no data - SOUND_LOOP_20 = 0x80000020, // unused, no data - SOUND_LOOP_21 = 0x80000021, - SOUND_LOOP_22 = 0x80000022, - SOUND_LOOP_23 = 0x80000023, - SOUND_LOOP_24 = 0x80000024, + SOUND_LOOP_JAN_CONSTRUCTION = 0x8000001E, + SOUND_LOOP_NOTHING_1F = 0x8000001F, // #unused #nodata + SOUND_LOOP_NOTHING_20 = 0x80000020, // #unused #nodata + SOUND_LOOP_FLO_WATER_FLOW_1 = 0x80000021, + SOUND_LOOP_FLO_WATER_FLOW_2 = 0x80000022, + SOUND_LOOP_BUBBLE_DRIFT = 0x80000023, + SOUND_LOOP_FLO_RELEASE_FOUNTAIN = 0x80000024, SOUND_LOOP_PUFF_PUFF_MACHINE = 0x80000025, - SOUND_LOOP_26 = 0x80000026, // unused - SOUND_LOOP_27 = 0x80000027, - SOUND_LOOP_28 = 0x80000028, - SOUND_LOOP_29 = 0x80000029, - SOUND_LOOP_2A = 0x8000002A, - SOUND_LOOP_2B = 0x8000002B, - SOUND_LOOP_2C = 0x8000002C, - SOUND_LOOP_2D = 0x8000002D, - SOUND_LOOP_2E = 0x8000002E, - SOUND_LOOP_2F = 0x8000002F, - SOUND_LOOP_30 = 0x80000030, - SOUND_LOOP_31 = 0x80000031, - SOUND_LOOP_32 = 0x80000032, - SOUND_LOOP_33 = 0x80000033, - SOUND_LOOP_34 = 0x80000034, - SOUND_LOOP_35 = 0x80000035, - SOUND_LOOP_36 = 0x80000036, - SOUND_LOOP_37 = 0x80000037, - SOUND_LOOP_38 = 0x80000038, - SOUND_LOOP_39 = 0x80000039, - SOUND_LOOP_3A = 0x8000003A, // unused - SOUND_LOOP_3B = 0x8000003B, // unused - SOUND_LOOP_3C = 0x8000003C, // unused - SOUND_LOOP_3D = 0x8000003D, // unused - SOUND_LOOP_3E = 0x8000003E, // unused - SOUND_LOOP_3F = 0x8000003F, // unused - SOUND_LOOP_SAM_STAIRS_RISE = 0x80000040, + SOUND_LOOP_NOTHING_26 = 0x80000026, // #unused #nodata + SOUND_LOOP_TIK01_WATER = 0x80000027, + SOUND_LOOP_TIK02_WATER = 0x80000028, + SOUND_LOOP_TIK02_FLOW2 = 0x80000029, + SOUND_LOOP_TIK02_FLOW3 = 0x8000002A, + SOUND_LOOP_TIK03_WATER = 0x8000002B, + SOUND_LOOP_TIK03_FLOW1 = 0x8000002C, + SOUND_LOOP_TIK05_WATER = 0x8000002D, + SOUND_LOOP_TIK05_FLOW1 = 0x8000002E, + SOUND_LOOP_TIK06_WATER = 0x8000002F, + SOUND_LOOP_TIK06_FLOW2 = 0x80000030, + SOUND_LOOP_TIK06_FLOW3 = 0x80000031, + SOUND_LOOP_TIK06_FLOW4 = 0x80000032, + SOUND_LOOP_TIK08_WATER = 0x80000033, + SOUND_LOOP_TIK08_FLOW1 = 0x80000034, + SOUND_LOOP_TIK09_WATER = 0x80000035, + SOUND_LOOP_TIK09_FLOW2 = 0x80000036, + SOUND_LOOP_TIK09_FLOW4 = 0x80000037, + SOUND_LOOP_TIK09_FLOW3 = 0x80000038, + SOUND_LOOP_TIK10_WATER = 0x80000039, + SOUND_LOOP_TIK_UNUSED1_WATER = 0x8000003A, // #unused + SOUND_LOOP_TIK_UNUSED2_WATER = 0x8000003B, // #unused + SOUND_LOOP_TIK_UNUSED3_WATER = 0x8000003C, // #unused + SOUND_LOOP_TIK_UNUSED3_FLOW4 = 0x8000003D, // #unused + SOUND_LOOP_TIK_UNUSED3_FLOW3 = 0x8000003E, // #unused + SOUND_LOOP_TIK_UNUSED3_FLOW2 = 0x8000003F, // #unused + SOUND_LOOP_SAM_STAIRS_RISE = 0x80000040, SOUND_LOOP_CHARGE_BAR = 0x80000041, SOUND_LOOP_CRYSTAL_BALL_GLOW = 0x80000042, - SOUND_LOOP_43 = 0x80000043, - SOUND_LOOP_44 = 0x80000044, - SOUND_LOOP_45 = 0x80000045, - SOUND_LOOP_46 = 0x80000046, - SOUND_LOOP_47 = 0x80000047, - SOUND_LOOP_48 = 0x80000048, - SOUND_LOOP_49 = 0x80000049, + SOUND_LOOP_TIK18_WATER = 0x80000043, + SOUND_LOOP_TIK19_WATER = 0x80000044, + SOUND_LOOP_TIK19_FLOW3 = 0x80000045, + SOUND_LOOP_TIK19_FLOW4 = 0x80000046, + SOUND_LOOP_TIK20_WATER = 0x80000047, + SOUND_LOOP_TIK23_WATER = 0x80000048, + SOUND_LOOP_TIK24_WATER = 0x80000049, SOUND_LOOP_WINDMILL_EXT = 0x8000004A, SOUND_LOOP_WINDMILL_GEARS = 0x8000004B, SOUND_LOOP_SHY_GUY_CROWD_1 = 0x8000004C, SOUND_LOOP_SHY_GUY_CROWD_2 = 0x8000004D, - SOUND_LOOP_FLIGHT = 0x8000004E, // unused + SOUND_LOOP_FLIGHT = 0x8000004E, // #unused SOUND_LOOP_WHALE_GEYSER = 0x8000004F, SOUND_LOOP_FLO_FILL_WATER_POOL = 0x80000050, SOUND_LOOP_KPA_CHAIN_DRIVE = 0x80000051, SOUND_LOOP_KPA_FILL_WATER = 0x80000052, SOUND_LOOP_KPA_DRAIN_WATER = 0x80000053, - SOUND_LOOP_KPA_FLIP_BRIDGE_PANEL = 0x80000054, // unused + SOUND_LOOP_KPA_FLIP_BRIDGE_PANEL = 0x80000054, // #unused SOUND_LOOP_JR_TROOPA_SWIM = 0x80000055, SOUND_LOOP_KKJ_RUMBLING = 0x80000056, SOUND_LOOP_OSR_RUMBLING = 0x80000057, @@ -1651,11 +1654,11 @@ enum SoundIDs { SOUND_LOOP_STAR_ORB_RISING = 0x80000067, SOUND_LOOP_USE_STAR_BEAM = 0x80000068, SOUND_LOOP_USE_PEACH_BEAM = 0x80000069, - SOUND_LOOP_6A = 0x8000006A, - SOUND_LOOP_6B = 0x8000006B, - SOUND_LOOP_6C = 0x8000006C, - SOUND_LOOP_6D = 0x8000006D, // unused - SOUND_LOOP_6E = 0x8000006E, // unused + SOUND_LOOP_SPINNING_FLOWER = 0x8000006A, // doesn't loop + SOUND_LOOP_RUMBLE = 0x8000006B, + SOUND_LOOP_FIGHTING = 0x8000006C, + SOUND_LOOP_KPA_ARENA_TURN_ON = 0x8000006D, // unused + SOUND_LOOP_KPA_ARENA_ACTIVE = 0x8000006E, // unused // exit doors SOUND_DOOR_OPEN = 0x90000000, SOUND_DOOR_CLOSE = 0x90000001, @@ -4215,7 +4218,6 @@ enum DebugScriptstModes { DEBUG_SCRIPTS_BLOCK_FUNC_DONE = 2, }; - enum DebuffTypes { DEBUFF_TYPE_SLEEP = 0x00001000, DEBUFF_TYPE_STATIC = 0x00002000, diff --git a/src/audio.h b/src/audio.h index d32b02f514b..9f1eea55038 100644 --- a/src/audio.h +++ b/src/audio.h @@ -61,7 +61,6 @@ typedef u8* WaveData; typedef u32 SegData; - typedef enum AuPriority { AU_PRIORITY_FREE = 0, AU_PRIORITY_BGM_PLAYER_MAIN = 1, diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 6efbfccd132..43c10d3d369 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -19,12 +19,12 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_TRD_FLOWING_WATER)] SOUND_LRAW_TRD_FLOWING_WATER, [SOUND_LOOP_IDX(SOUND_LOOP_TRD_RAISE_STAIRS)] SOUND_LRAW_TRD_RAISE_STAIRS, [SOUND_LOOP_IDX(SOUND_LOOP_CHEERING)] SOUND_LRAW_CHEERING, - [SOUND_LOOP_IDX(SOUND_LOOP_09)] SOUND_LRAW_0273, - [SOUND_LOOP_IDX(SOUND_LOOP_0A)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_0B)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_0C)] SOUND_LRAW_0274, - [SOUND_LOOP_IDX(SOUND_LOOP_0D)] SOUND_LRAW_0273, - [SOUND_LOOP_IDX(SOUND_LOOP_0E)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA10_FLOW1)] SOUND_LRAW_WATER_FLOWING_1, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA_UNUSED_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA00_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA00_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA01_FLOW1)] SOUND_LRAW_WATER_FLOWING_1, + [SOUND_LOOP_IDX(SOUND_LOOP_IWA01_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, [SOUND_LOOP_IDX(SOUND_LOOP_OBK_LOWER_CHAIN)] SOUND_LRAW_OBK_LOWER_CHAIN, [SOUND_LOOP_IDX(SOUND_LOOP_MOVE_STATUE)] SOUND_LRAW_MOVE_STATUE, [SOUND_LOOP_IDX(SOUND_LOOP_SENTINEL_ALARM)] SOUND_LRAW_SENTINEL_ALARM, @@ -40,50 +40,50 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_TROMP_ROLL)] SOUND_LRAW_TROMP_ROLL, [SOUND_LOOP_IDX(SOUND_LOOP_JAN_SMALL_GEYSER)] SOUND_LRAW_JAN_SMALL_GEYSER, [SOUND_LOOP_IDX(SOUND_LOOP_JAN_LARGE_GEYSER)] SOUND_LRAW_JAN_LARGE_GEYSER, - [SOUND_LOOP_IDX(SOUND_LOOP_1E)] SOUND_LRAW_0189, - [SOUND_LOOP_IDX(SOUND_LOOP_1F)] SOUND_NONE, - [SOUND_LOOP_IDX(SOUND_LOOP_20)] SOUND_NONE, - [SOUND_LOOP_IDX(SOUND_LOOP_21)] SOUND_LRAW_0198, - [SOUND_LOOP_IDX(SOUND_LOOP_22)] SOUND_LRAW_0199, - [SOUND_LOOP_IDX(SOUND_LOOP_23)] SOUND_LRAW_0194, - [SOUND_LOOP_IDX(SOUND_LOOP_24)] SOUND_LRAW_019A, + [SOUND_LOOP_IDX(SOUND_LOOP_JAN_CONSTRUCTION)] SOUND_LRAW_JAN_CONSTRUCTION, + [SOUND_LOOP_IDX(SOUND_LOOP_NOTHING_1F)] SOUND_NONE, + [SOUND_LOOP_IDX(SOUND_LOOP_NOTHING_20)] SOUND_NONE, + [SOUND_LOOP_IDX(SOUND_LOOP_FLO_WATER_FLOW_1)] SOUND_LRAW_FLO_WATER_FLOW_1, + [SOUND_LOOP_IDX(SOUND_LOOP_FLO_WATER_FLOW_2)] SOUND_LRAW_FLO_WATER_FLOW_2, + [SOUND_LOOP_IDX(SOUND_LOOP_BUBBLE_DRIFT)] SOUND_LRAW_BUBBLE_DRIFT, + [SOUND_LOOP_IDX(SOUND_LOOP_FLO_RELEASE_FOUNTAIN)] SOUND_LRAW_FLO_RELEASE_FOUNTAIN, [SOUND_LOOP_IDX(SOUND_LOOP_PUFF_PUFF_MACHINE)] SOUND_LRAW_PUFF_PUFF_MACHINE, - [SOUND_LOOP_IDX(SOUND_LOOP_26)] SOUND_LRAW_0164, - [SOUND_LOOP_IDX(SOUND_LOOP_27)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_28)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_29)] SOUND_LRAW_0274, - [SOUND_LOOP_IDX(SOUND_LOOP_2A)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_2B)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_2C)] SOUND_LRAW_0273, - [SOUND_LOOP_IDX(SOUND_LOOP_2D)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_2E)] SOUND_LRAW_0273, - [SOUND_LOOP_IDX(SOUND_LOOP_2F)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_30)] SOUND_LRAW_0274, - [SOUND_LOOP_IDX(SOUND_LOOP_31)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_32)] SOUND_LRAW_0276, - [SOUND_LOOP_IDX(SOUND_LOOP_33)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_34)] SOUND_LRAW_0273, - [SOUND_LOOP_IDX(SOUND_LOOP_35)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_36)] SOUND_LRAW_0274, - [SOUND_LOOP_IDX(SOUND_LOOP_37)] SOUND_LRAW_0276, - [SOUND_LOOP_IDX(SOUND_LOOP_38)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_39)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_3A)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_3B)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_3C)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_3D)] SOUND_LRAW_0276, - [SOUND_LOOP_IDX(SOUND_LOOP_3E)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_3F)] SOUND_LRAW_0274, + [SOUND_LOOP_IDX(SOUND_LOOP_NOTHING_26)] SOUND_LRAW_NOTHING_26, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK01_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK02_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK02_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK02_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK03_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK03_FLOW1)] SOUND_LRAW_WATER_FLOWING_1, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK05_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK05_FLOW1)] SOUND_LRAW_WATER_FLOWING_1, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK06_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK06_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK06_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK06_FLOW4)] SOUND_LRAW_WATER_FLOWING_4, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK08_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK08_FLOW1)] SOUND_LRAW_WATER_FLOWING_1, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK09_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK09_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK09_FLOW4)] SOUND_LRAW_WATER_FLOWING_4, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK09_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK10_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED1_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED2_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED3_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED3_FLOW4)] SOUND_LRAW_WATER_FLOWING_4, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED3_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK_UNUSED3_FLOW2)] SOUND_LRAW_WATER_FLOWING_2, [SOUND_LOOP_IDX(SOUND_LOOP_SAM_STAIRS_RISE)] SOUND_LRAW_SAM_STAIRS_RISE, [SOUND_LOOP_IDX(SOUND_LOOP_CHARGE_BAR)] SOUND_LRAW_CHARGE_BAR, [SOUND_LOOP_IDX(SOUND_LOOP_CRYSTAL_BALL_GLOW)] SOUND_LRAW_CRYSTAL_BALL_GLOW, - [SOUND_LOOP_IDX(SOUND_LOOP_43)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_44)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_45)] SOUND_LRAW_0275, - [SOUND_LOOP_IDX(SOUND_LOOP_46)] SOUND_LRAW_0276, - [SOUND_LOOP_IDX(SOUND_LOOP_47)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_48)] SOUND_LRAW_0271, - [SOUND_LOOP_IDX(SOUND_LOOP_49)] SOUND_LRAW_0271, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK18_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK19_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK19_FLOW3)] SOUND_LRAW_WATER_FLOWING_3, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK19_FLOW4)] SOUND_LRAW_WATER_FLOWING_4, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK20_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK23_WATER)] SOUND_LRAW_TIK_WATER, + [SOUND_LOOP_IDX(SOUND_LOOP_TIK24_WATER)] SOUND_LRAW_TIK_WATER, [SOUND_LOOP_IDX(SOUND_LOOP_WINDMILL_EXT)] SOUND_LRAW_WINDMILL_EXT, [SOUND_LOOP_IDX(SOUND_LOOP_WINDMILL_GEARS)] SOUND_LRAW_WINDMILL_GEARS, [SOUND_LOOP_IDX(SOUND_LOOP_SHY_GUY_CROWD_1)] SOUND_LRAW_SHY_GUY_CROWD_1, @@ -116,11 +116,11 @@ s32 LoopingSounds[] = { [SOUND_LOOP_IDX(SOUND_LOOP_STAR_ORB_RISING)] SOUND_LRAW_STAR_ORB_RISING, [SOUND_LOOP_IDX(SOUND_LOOP_USE_STAR_BEAM)] SOUND_LRAW_USE_STAR_BEAM, [SOUND_LOOP_IDX(SOUND_LOOP_USE_PEACH_BEAM)] SOUND_LRAW_USE_PEACH_BEAM, - [SOUND_LOOP_IDX(SOUND_LOOP_6A)] SOUND_LRAW_0391, - [SOUND_LOOP_IDX(SOUND_LOOP_6B)] SOUND_LRAW_03BC, - [SOUND_LOOP_IDX(SOUND_LOOP_6C)] SOUND_LRAW_03AD, - [SOUND_LOOP_IDX(SOUND_LOOP_6D)] SOUND_LRAW_022C, - [SOUND_LOOP_IDX(SOUND_LOOP_6E)] SOUND_LRAW_022D, + [SOUND_LOOP_IDX(SOUND_LOOP_SPINNING_FLOWER)] SOUND_LRAW_SPINNING_FLOWER, + [SOUND_LOOP_IDX(SOUND_LOOP_RUMBLE)] SOUND_LRAW_RUMBLE, + [SOUND_LOOP_IDX(SOUND_LOOP_FIGHTING)] SOUND_LRAW_FIGHTING, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_ARENA_TURN_ON)] SOUND_LRAW_KPA_ARENA_TURN_ON, + [SOUND_LOOP_IDX(SOUND_LOOP_KPA_ARENA_ACTIVE)] SOUND_LRAW_KPA_ARENA_ACTIVE, }; // all sound IDs for alternating sounds @@ -151,8 +151,8 @@ s32 FuzzyHopSounds[] = { SOUND_FUZZY_HOP_A, SOUND_FUZZY_HOP_B, SOUND_FUZZY_HOP_C s32 BulletBillExplodeSounds[] = { SOUND_BULLET_BILL_EXPLODE_A, SOUND_BULLET_BILL_EXPLODE_B }; s32 LuigiStepSounds[] = { SOUND_LUIGI_STEP_A, SOUND_LUIGI_STEP_B }; s32 TrainChugSounds[] = { SOUND_TRAIN_CHUG_A, SOUND_TRAIN_CHUG_B }; -s32 FinaleBridgeCollapseSounds[] = { SOUND_FINALE_BRIDGE_COLLAPSE_A, SOUND_FINALE_BRIDGE_COLLAPSE_B }; -s32 FinaleExplosionSounds[] = { SOUND_FINALE_EXPLOSION_A, SOUND_FINALE_EXPLOSION_B }; +s32 FinaleBridgeCollapseSounds[] = { SOUND_KPA_BRIDGE_COLLAPSE_A, SOUND_KPA_BRIDGE_COLLAPSE_B }; +s32 FinaleExplosionSounds[] = { SOUND_KPA_EXPLOSION_A, SOUND_KPA_EXPLOSION_B }; s32 CardShuffleSounds[] = { SOUND_SHUFFLE_CARD_A, SOUND_SHUFFLE_CARD_B }; s32 StarSpiritAppearSounds[] = { SOUND_STAR_SPIRIT_APPEAR_A, SOUND_STAR_SPIRIT_APPEAR_B }; s32 StarSpiritCastSounds[] = { SOUND_STAR_SPIRIT_CAST_A, SOUND_STAR_SPIRIT_CAST_B }; diff --git a/src/battle/1A5830.c b/src/battle/1A5830.c index 1720315660f..044146b09f8 100644 --- a/src/battle/1A5830.c +++ b/src/battle/1A5830.c @@ -449,7 +449,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { if (blocked) { damage--; damage -= player_team_is_ability_active(target, ABILITY_DAMAGE_DODGE); - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; @@ -462,7 +462,7 @@ HitResult calc_enemy_damage_target(Actor* attacker) { if (target->koStatus == 0 && !(battleStatus->curAttackElement & DAMAGE_TYPE_UNBLOCKABLE)) { if (check_block_input(BUTTON_A)) { damage = 0; - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); show_action_rating(ACTION_RATING_NICE, target, state->goalPos.x, state->goalPos.y, state->goalPos.z); gBattleStatus.flags1 |= BS_FLAGS1_ATK_BLOCKED; break; diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 2c9d0b277a5..ab87331fad3 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -1003,7 +1003,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_026B) + EVT_CALL(PlaySound, SOUND_LARGE_GATE_OPEN) EVT_LABEL(10) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -1013,7 +1013,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_IF_LT(LVarD, 60) EVT_GOTO(10) EVT_END_IF - EVT_CALL(StopSound, SOUND_026B) + EVT_CALL(StopSound, SOUND_LARGE_GATE_OPEN) EVT_WAIT(10) // create the chomp and have him exit the gate EVT_CALL(SummonEnemy, EVT_PTR(N(SummonedChomp)), FALSE) @@ -1100,7 +1100,7 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_GOTO(40) EVT_END_IF EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_026B) + EVT_CALL(PlaySound, SOUND_LARGE_GATE_OPEN) EVT_LABEL(50) EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_GateOpenAmount, LVarD) EVT_CALL(TranslateModel, 31, 0, LVarD, 0) @@ -1110,8 +1110,8 @@ EvtScript N(EVS_Move_SummonChomp) = { EVT_IF_GT(LVarD, 0) EVT_GOTO(50) EVT_END_IF - EVT_CALL(StopSound, SOUND_026B) - EVT_CALL(PlaySound, SOUND_026C) + EVT_CALL(StopSound, SOUND_LARGE_GATE_OPEN) + EVT_CALL(PlaySound, SOUND_LARGE_GATE_CLOSE) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 4, EVT_FLOAT(0.5)) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_HasSummoned, TRUE) EVT_RETURN diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index aab5408c3fd..d192aa21a84 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -270,7 +270,7 @@ EvtScript N(EVS_SetupFearReaction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_SpookReact, AVAL_SpookReact_Ready) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMOTE_QUESTION) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 28993793111..ea992e61e53 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -169,7 +169,7 @@ EvtScript N(EVS_SetupFearReaction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_SpookReact, AVAL_SpookReact_Ready) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMOTE_QUESTION) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index 2439a20fc75..6ac521a0be3 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -148,7 +148,7 @@ EvtScript N(EVS_SetupFearReaction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_SpookReact, AVAL_SpookReact_Ready) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMOTE_QUESTION) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index 28f9b658eb0..865ce43053a 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -147,7 +147,7 @@ EvtScript N(EVS_SetupFearReaction) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_IF_EQ(LVar2, MOVE_SPOOK) EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_SpookReact, AVAL_SpookReact_Ready) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMOTE_QUESTION) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 68d6a1e5cdc..e235fe8dbb1 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -723,7 +723,7 @@ EvtScript N(EVS_Scene_KoloradoToTheRescue) = { EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(8.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -60, 0, 0) EVT_CALL(SpeakToPlayer, NPC_BTL_COMPANION, ANIM_BattleKolorado_Shout, ANIM_BattleKolorado_ShoutStill, 5, MSG_CH5_0106) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RUN_AWAY) EVT_CALL(SetNpcAnimation, NPC_BTL_COMPANION, ANIM_BattleKolorado_Run) EVT_CALL(SetNpcSpeed, NPC_BTL_COMPANION, EVT_FLOAT(6.0)) EVT_CALL(NpcMoveTo, NPC_BTL_COMPANION, -300, 0, 0) @@ -1435,9 +1435,9 @@ EvtScript N(EVS_Death) = { EVT_CALL(PlayModelAnimation, VINE_2, VINE_2_BASE) EVT_WAIT(4) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 119, EVT_FLOAT(0.3)) - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 234) EVT_CALL(HideHealthBar, ACTOR_SELF) @@ -1533,15 +1533,15 @@ EvtScript N(EVS_Death) = { EVT_END_THREAD EVT_WAIT(80) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 165, EVT_FLOAT(1.2)) - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 300) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_EMOTE_QUESTION) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) @@ -1705,10 +1705,10 @@ EvtScript N(EVS_Death) = { EVT_CALL(LoadBattleDmaData, VINE_ANIM_EXTRA_DEATH) EVT_CALL(PlayModelAnimation, VINE_3, VINE_3_BASE) EVT_THREAD - EVT_CALL(PlaySound, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 100, EVT_FLOAT(0.5)) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 8, EVT_FLOAT(0.2)) - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 216) EVT_THREAD diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index a9feaa10c7a..99843a173cf 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -1236,7 +1236,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_NumDefeated, LVar0) EVT_SUB(LVarE, LVar0) EVT_SET(LVarD, LVarE) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_03AD) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LRAW_FIGHTING) EVT_LOOP(LVarD) EVT_IF_GT(LVarE, 1) EVT_SET(LVar0, BS_FLAGS1_40) @@ -1262,7 +1262,7 @@ EvtScript N(EVS_Attack_Swarm) = { EVT_END_IF EVT_WAIT(10) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LRAW_03AD) + EVT_CALL(StopSound, SOUND_LRAW_FIGHTING) EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(20) @@ -1367,9 +1367,9 @@ EvtScript N(EVS_Flee) = { EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_WALK, SOUND_NONE, SOUND_NONE) EVT_WAIT(40) EVT_THREAD - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0173) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RUN_AWAY_BUILDUP) EVT_WAIT(20) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0174) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RUN_AWAY) EVT_END_THREAD EVT_SET(LVar0, PRT_MEMBER_01) EVT_SET(LVar1, ANIM_ShySquadGuy_Anim08) diff --git a/src/battle/common/actor/duplighost/ghost_goombario.inc.c b/src/battle/common/actor/duplighost/ghost_goombario.inc.c index b346899d7bf..77b12ae9ef8 100644 --- a/src/battle/common/actor/duplighost/ghost_goombario.inc.c +++ b/src/battle/common/actor/duplighost/ghost_goombario.inc.c @@ -393,7 +393,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CASE_EQ(PARTNER_RANK_SUPER) EVT_THREAD @@ -408,7 +408,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_DISABLE) EVT_CASE_EQ(PARTNER_RANK_ULTRA) @@ -433,7 +433,7 @@ EvtScript N(EVS_Attack_Headbonk) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_ENABLE) EVT_CALL(SetJumpAnimations, ACTOR_SELF, PRT_MAIN, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(UnkFunc62), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_SELF, ACTOR_BLUR_DISABLE) EVT_END_SWITCH diff --git a/src/battle/common/actor/sky_guy.inc.c b/src/battle/common/actor/sky_guy.inc.c index 1f47946a314..64186221a25 100644 --- a/src/battle/common/actor/sky_guy.inc.c +++ b/src/battle/common/actor/sky_guy.inc.c @@ -373,7 +373,7 @@ EvtScript N(EVS_PopBalloons) = { EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SkyGuy_Anim00) - EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_0263) + EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_EMOTE_QUESTION) EVT_PLAY_EFFECT(EFFECT_EMOTE, EMOTE_QUESTION, 0, LVar0, LVar1, LVar2, 24, 0, 25, 0, 0) EVT_WAIT(25) EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FLYING, ANIM_SkyGuy_Anim06) diff --git a/src/battle/dmg_item.c b/src/battle/dmg_item.c index 97adbf6976e..8f04bf09735 100644 --- a/src/battle/dmg_item.c +++ b/src/battle/dmg_item.c @@ -389,7 +389,7 @@ HitResult calc_item_damage_enemy(void) { hitResult = HIT_RESULT_HIT; fearInflicted = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_SP_EVT_ACTIVE | BS_FLAGS1_10 | BS_FLAGS1_SHOW_PLAYER_DECORATIONS | BS_FLAGS1_ACTORS_VISIBLE; - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); wasStatusInflicted = TRUE; gBattleStatus.flags1 |= BS_FLAGS1_40; } else { @@ -405,7 +405,7 @@ HitResult calc_item_damage_enemy(void) { || ((gBattleStatus.flags1 & (BS_FLAGS1_40 | BS_FLAGS1_200)) && !(gBattleStatus.flags1 & BS_FLAGS1_80)) ) { if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && fearInflicted) { diff --git a/src/battle/dmg_partner.c b/src/battle/dmg_partner.c index 7daf80cf0c2..e77f295fd2a 100644 --- a/src/battle/dmg_partner.c +++ b/src/battle/dmg_partner.c @@ -697,7 +697,7 @@ HitResult calc_partner_damage_enemy(void) { gBattleStatus.flags1 |= BS_FLAGS1_10; gBattleStatus.flags1 |= BS_FLAGS1_SHOW_PLAYER_DECORATIONS; gBattleStatus.flags1 |= BS_FLAGS1_ACTORS_VISIBLE; - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; hitResult = HIT_RESULT_NO_DAMAGE; @@ -742,7 +742,7 @@ HitResult calc_partner_damage_enemy(void) { gBattleStatus.flags1 |= BS_FLAGS1_10; gBattleStatus.flags1 |= BS_FLAGS1_SHOW_PLAYER_DECORATIONS; gBattleStatus.flags1 |= BS_FLAGS1_ACTORS_VISIBLE; - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } else { dispatchEvent = EVENT_IMMUNE; hitResult = HIT_RESULT_NO_DAMAGE; @@ -781,7 +781,7 @@ HitResult calc_partner_damage_enemy(void) { && !(gBattleStatus.flags1 & BS_FLAGS1_80) ) { if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, state->goalPos.x, state->goalPos.y, state->goalPos.z); } if (battleStatus->lastAttackDamage > 0 || (battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS && tempBinary)) { diff --git a/src/battle/dmg_player.c b/src/battle/dmg_player.c index 9fe1a93a4e8..e4c1135689e 100644 --- a/src/battle/dmg_player.c +++ b/src/battle/dmg_player.c @@ -916,7 +916,7 @@ HitResult calc_player_damage_enemy(void) { } if (battleStatus->lastAttackDamage > 0) { - sfx_play_sound(SOUND_0231); + sfx_play_sound(SOUND_DAMAGE_STARS); } if (battleStatus->lastAttackDamage > 0 || ((battleStatus->curAttackElement & DAMAGE_TYPE_STATUS_ALWAYS_HITS) && wasSpecialHit)) { diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index 703161b5f83..baa4c3c128b 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -23,7 +23,7 @@ API_CALLABLE(N(func_802A1280_72A9D0)) { Actor* enemy = get_actor(script->owner1.enemyID); Actor* target; - sfx_play_sound_at_position(SOUND_0231, SOUND_SPACE_DEFAULT, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z); + sfx_play_sound_at_position(SOUND_DAMAGE_STARS, SOUND_SPACE_DEFAULT, enemy->state.goalPos.x, enemy->state.goalPos.y, enemy->state.goalPos.z); target = get_actor(enemy->targetActorID); dispatch_event_actor(target, EVENT_SCARE_AWAY); diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 69c6efaced8..06d6eeb2b01 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -1008,7 +1008,7 @@ EvtScript N(EVS_Attack_Headbonk1) = { EVT_END_THREAD EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CHILD_THREAD EVT_CALL(SetActorScale, ACTOR_PARTNER, EVT_FLOAT(1.1), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -1114,7 +1114,7 @@ EvtScript N(EVS_Attack_Headbonk2) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_RESET) EVT_CHILD_THREAD @@ -1230,7 +1230,7 @@ EvtScript N(EVS_Attack_Headbonk3) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_RESET) EVT_CHILD_THREAD @@ -1371,7 +1371,7 @@ EvtScript N(EVS_Move_Multibonk) = { EVT_CALL(SetGoalToTarget, ACTOR_PARTNER) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_ENABLE) EVT_CALL(SetJumpAnimations, ACTOR_PARTNER, 0, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk, ANIM_BattleGoombario_Headbonk) - EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_0281) + EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_GOOMBARIO_HEADBONK) EVT_CALL(N(JumpOnTarget), LVarA, 3) EVT_CALL(EnableActorBlur, ACTOR_PARTNER, ACTOR_BLUR_RESET) EVT_SUB(LVarD, 1) diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c index acab837e5ef..2b6ee50a3e5 100644 --- a/src/entity/default/Padlock.c +++ b/src/entity/default/Padlock.c @@ -88,7 +88,7 @@ void entity_Padlock_idle(Entity* entity) { entity_Padlock_push_player(entity); if (entity->flags & ENTITY_FLAG_100000) { data->state++; - sfx_play_sound(SOUND_0269); + sfx_play_sound(SOUND_USE_KEY); } break; case 1: @@ -130,7 +130,7 @@ void entity_Padlock_idle(Entity* entity) { data->fallSpeed = 10.0f; data->rotSpeed = 0.2f; data->state++; - sfx_play_sound(SOUND_026A); + sfx_play_sound(SOUND_LOCK_DROP); } break; case 4: @@ -148,7 +148,7 @@ void entity_Padlock_idle(Entity* entity) { entity->rot.x = 90.0f; data->rotSpeed = -20.0f; data->state++; - sfx_play_sound(SOUND_026A); + sfx_play_sound(SOUND_LOCK_DROP); } break; case 6: @@ -161,7 +161,7 @@ void entity_Padlock_idle(Entity* entity) { entity->rot.x = 90.0f; data->timer = 5; data->state++; - sfx_play_sound(SOUND_026A); + sfx_play_sound(SOUND_LOCK_DROP); } break; case 7: diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index 0fa015ec3cb..6b7a266011e 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -139,12 +139,12 @@ void entity_SpinningFlower_init(Entity* entity) { } void func_802BB314_E2DC44(Entity* entity) { - sfx_play_sound_at_position(SOUND_LOOP_6A, SOUND_SPACE_DEFAULT, entity->pos.x, entity->pos.y, entity->pos.z); + sfx_play_sound_at_position(SOUND_LOOP_SPINNING_FLOWER, SOUND_SPACE_DEFAULT, entity->pos.x, entity->pos.y, entity->pos.z); } void func_802BB34C_E2DC7C(void) { - sfx_play_sound(SOUND_LRAW_0391 | SOUND_ID_TRIGGER_CHANGE_SOUND); - snd_stop_tracking_env_sound_pos(SOUND_LRAW_0391, TRUE); + sfx_play_sound(SOUND_LRAW_SPINNING_FLOWER | SOUND_ID_TRIGGER_CHANGE_SOUND); + snd_stop_tracking_env_sound_pos(SOUND_LRAW_SPINNING_FLOWER, TRUE); } void entity_PinkFlowerLight_setupGfx(s32 entityIndex) { diff --git a/src/filemenu/filemenu_common.c b/src/filemenu/filemenu_common.c index 22fd8b3ee32..5553371ca51 100644 --- a/src/filemenu/filemenu_common.c +++ b/src/filemenu/filemenu_common.c @@ -1056,7 +1056,7 @@ void filemenu_init(s32 arg0) { (*panelIt)->fpInit((*panelIt)); } } - update_window_hierarchy(23, 64); + update_window_hierarchy(WINDOW_ID_PAUSE_DECRIPTION, 64); } else { filemenu_currentMenu = 4; filemenu_set_selected(filemenu_menus[4], 0, gCurrentLanguage); @@ -1069,7 +1069,7 @@ void filemenu_init(s32 arg0) { } } } - update_window_hierarchy(23, 64); + update_window_hierarchy(WINDOW_ID_PAUSE_DECRIPTION, 64); } #else menu = filemenu_menus[0]; @@ -1108,7 +1108,7 @@ void filemenu_init(s32 arg0) { (*panelIt)->fpInit((*panelIt)); } } - update_window_hierarchy(23, 64); + update_window_hierarchy(WINDOW_ID_PAUSE_DECRIPTION, 64); #endif } diff --git a/src/i_spy.c b/src/i_spy.c index ee782946fdb..b8c7afbfbe7 100644 --- a/src/i_spy.c +++ b/src/i_spy.c @@ -138,7 +138,7 @@ void ispy_notification_update(void) { case I_SPY_OVERSHOOT: ISpyPtr->scale = 0.57f; ISpyPtr->state++; - sfx_play_sound_at_player(SOUND_017B, SOUND_SPACE_DEFAULT); + sfx_play_sound_at_player(SOUND_ISPY, SOUND_SPACE_DEFAULT); break; case I_SPY_ANIMATE: ISpyPtr->scale = 0.53f; diff --git a/src/pause/pause_main.c b/src/pause/pause_main.c index 35981b504e1..054c988672f 100644 --- a/src/pause/pause_main.c +++ b/src/pause/pause_main.c @@ -664,7 +664,7 @@ void pause_init(void) { sfx_play_sound(SOUND_MENU_SHOW_CHOICE); } - update_window_hierarchy(WINDOW_ID_PAUSE_CURSOR, 0x40); + update_window_hierarchy(WINDOW_ID_PAUSE_CURSOR, 64); } void pause_tutorial_input(s32 *pressed, s32 *held) { diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index 5f9008e88eb..006e193cf37 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -327,7 +327,7 @@ EvtScript N(EVS_TubbaWalking) = { EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcFacePlayer, NPC_Boo_03, 1) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2) @@ -352,10 +352,10 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(SpeakToPlayer, NPC_Boo_03, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00A0) EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_DEFAULT, 450, 200, 160) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.8)) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) @@ -435,8 +435,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(NpcFaceNpc, NPC_Boo_01, NPC_Tubba, 1) EVT_CALL(NpcFaceNpc, NPC_Boo_02, NPC_Tubba, 1) EVT_CALL(SetNpcPos, NPC_Boo_03, 272, 190, 214) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_THREAD diff --git a/src/world/area_arn/arn_07/arn_07_4_entity.c b/src/world/area_arn/arn_07/arn_07_4_entity.c index 40fed7d8cdd..fccfddf8bf7 100644 --- a/src/world/area_arn/arn_07/arn_07_4_entity.c +++ b/src/world/area_arn/arn_07/arn_07_4_entity.c @@ -26,7 +26,7 @@ EvtScript N(EVS_UnlockDoor) = { EVT_CALL(CloseChoicePopup) EVT_SET(GB_StoryProgress, STORY_CH3_UNLOCKED_WINDY_MILL) EVT_CALL(N(GetEntityPosition), MV_Unk_00, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_00) EVT_CALL(N(RemovePadlock)) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index eecd70460d3..705a19f4199 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -266,12 +266,12 @@ EvtScript N(EVS_Scene_BoosApproachManor) = { EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0 / DT)) EVT_CALL(PlayerMoveTo, 184, -44, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_dgb/dgb_01/dgb_01_4_entity.c b/src/world/area_dgb/dgb_01/dgb_01_4_entity.c index 8d3464b451b..b7a66489ee4 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_4_entity.c +++ b/src/world/area_dgb/dgb_01/dgb_01_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB01_UnlockedEastWing, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c index 35f104c6ffb..7b6807011f3 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c +++ b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_NpcIdle_Tubba_Floor3) = { EVT_CALL(SetNpcJumpscale, NPC_Tubba, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Tubba, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Tubba, LVar0, LVar1, LVar2, 30) - EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20A0, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_LARGE_NPC_IMPACT, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySound, SOUND_LOOP_DGB_COLLAPSE) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(4.0)) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(2.0)) diff --git a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c b/src/world/area_dgb/dgb_03/dgb_03_4_entity.c index 6e78dddd055..558f09b3dc9 100644 --- a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c +++ b/src/world/area_dgb/dgb_03/dgb_03_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_UpperDoor) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB03_UnlockedThirdFloor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c index 2c9d17fbb8b..9f17c052b98 100644 --- a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c +++ b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_DGB15_UnlockedUpperFoyer, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_dro/dro_01/npc_shop_owner.c b/src/world/area_dro/dro_01/npc_shop_owner.c index 5b9efde526d..8bde304fe96 100644 --- a/src/world/area_dro/dro_01/npc_shop_owner.c +++ b/src/world/area_dro/dro_01/npc_shop_owner.c @@ -58,7 +58,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CALL(NpcMoveTo, NPC_SELF, 103, 11, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20 * DT) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(NpcMoveTo, NPC_SELF, 554, -12, 20 * DT) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_WAIT(30 * DT) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcIdle_ShopOwner) = { EVT_CASE_LT(STORY_CH2_SHADY_MOUSE_ENTERED_SHOP) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcPos, NPC_SELF, 470, 0, 18) EVT_CALL(NpcMoveTo, NPC_SELF, 287, 9, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, 102, -14, 20 * DT) diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 7d3199b1fb7..ad5ee3ffbd2 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -269,7 +269,7 @@ EvtScript N(EVS_NpcIdle_Mouser_03) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mouser_Purple_Run) EVT_CALL(NpcMoveTo, NPC_SELF, 150, 18, 20) EVT_CALL(EnableNpcBlur, NPC_SELF, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(NpcMoveTo, NPC_SELF, -83, 11, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, -239, 5, 20 * DT) EVT_CALL(NpcMoveTo, NPC_SELF, -371, 5, 20 * DT) diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c index 6206984ebee..a3bd8f4bf7d 100644 --- a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_019C) + EVT_CALL(PlaySound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) @@ -352,7 +352,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o261, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_019D) + EVT_CALL(StopSound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -361,7 +361,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_019B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_FLO_BEANSTALK_START_GROWING, SOUND_SPACE_DEFAULT) EVT_SET(LVarF, 0) EVT_LOOP(100) EVT_ADD(LVarF, 1) diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index a244e283bc2..d9d4e23e9ee 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -171,7 +171,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) @@ -226,7 +226,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) - EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -401,7 +401,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -480,7 +480,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -559,7 +559,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -638,7 +638,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) diff --git a/src/world/area_flo/flo_07/flo_07_1_music.c b/src/world/area_flo/flo_07/flo_07_1_music.c index edf315c69cc..0bf6139960d 100644 --- a/src/world/area_flo/flo_07/flo_07_1_music.c +++ b/src/world/area_flo/flo_07/flo_07_1_music.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH EVT_END_IF - EVT_CALL(PlaySound, SOUND_LOOP_21) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_1) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 5e9813e0f10..9073de80afc 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5 / DT)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_EXEC_GET_TID(N(EVS_ShakeGround), MV_GroundShakingScript) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Strain, ANIM_Posie_Strain, 0, MSG_CH6_0069) EVT_KILL_THREAD(MV_GroundShakingScript) @@ -65,8 +65,8 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -265, 100, 54, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_FLO07_Item_CrystalBerry) EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_RUMBLE) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A) diff --git a/src/world/area_flo/flo_10/flo_10_1_music.c b/src/world/area_flo/flo_10/flo_10_1_music.c index 56146a6b0f2..5289a4af6f2 100644 --- a/src/world/area_flo/flo_10/flo_10_1_music.c +++ b/src/world/area_flo/flo_10/flo_10_1_music.c @@ -13,7 +13,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_SWITCH EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_LOOP_22) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_2) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/flo_10_4_fountain.c index 2ab6e58b839..f8c405074ef 100644 --- a/src/world/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/area_flo/flo_10/flo_10_4_fountain.c @@ -189,7 +189,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(EnableGroup, MODEL_g31, TRUE) EVT_EXEC_WAIT(N(EVS_UnleashFountain)) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_LOOP_24) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_RELEASE_FOUNTAIN) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 3752942d7cd..d5547bd8930 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c index b09e617aa50..4dd05c646fa 100644 --- a/src/world/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/area_flo/flo_14/flo_14_3_bubbles.c @@ -63,7 +63,7 @@ API_CALLABLE(N(UpdateBubbleSoundPos)) { script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_LRAW_0194, SOUND_SPACE_DEFAULT, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_BUBBLE_DRIFT, SOUND_SPACE_DEFAULT, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -85,7 +85,7 @@ Vec3f N(BubbleFlightPath)[] = { EvtScript N(EVS_BubbleFollowPath) = { EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_LOOP_23) + EVT_CALL(PlaySound, SOUND_LOOP_BUBBLE_DRIFT) EVT_CALL(LoadPath, 165, EVT_PTR(N(BubbleFlightPath)), ARRAY_COUNT(N(BubbleFlightPath)), EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -98,7 +98,7 @@ EvtScript N(EVS_BubbleFollowPath) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_LOOP_23) + EVT_CALL(StopSound, SOUND_LOOP_BUBBLE_DRIFT) EVT_RETURN EVT_END }; @@ -159,7 +159,7 @@ EvtScript N(EVS_RideBigBubble) = { }; EvtScript N(EVS_BlowBigBubble) = { - EVT_CALL(PlaySoundAt, SOUND_0193, SOUND_SPACE_DEFAULT, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_FLO_BLOW_BUBBLE, SOUND_SPACE_DEFAULT, 591, 55, 121) EVT_CALL(EnableModel, MODEL_o167, TRUE) EVT_SETF(LVar2, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(0.0)) diff --git a/src/world/area_flo/flo_15/flo_15_5_stairs.c b/src/world/area_flo/flo_15/flo_15_5_stairs.c index 686b446b49d..242bfcf2700 100644 --- a/src/world/area_flo/flo_15/flo_15_5_stairs.c +++ b/src/world/area_flo/flo_15/flo_15_5_stairs.c @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_0187, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_FLO_STAIRS_LOWERING, SOUND_SPACE_DEFAULT) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_flo/flo_18/flo_18_3_machine.c b/src/world/area_flo/flo_18/flo_18_3_machine.c index 39ba2e46e77..4050c7e04e7 100644 --- a/src/world/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/area_flo/flo_18/flo_18_3_machine.c @@ -577,11 +577,11 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 6) EVT_WAIT(2) EVT_ADD(LVar1, 5) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 2, 15) EVT_WAIT(LVar3) EVT_ADD(LVar3, 1) @@ -591,7 +591,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 25) EVT_WAIT(LVar3) EVT_ADD(LVar3, LVar4) @@ -599,10 +599,10 @@ EvtScript N(EVS_DamageMachine) = { EVT_END_LOOP EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_DEFAULT, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_EXPLODE, SOUND_SPACE_DEFAULT, 70, 40, 10) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 70, 40, 10, EVT_FLOAT(3.0), 30) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_DEFAULT, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_EXPLODE, SOUND_SPACE_DEFAULT, 0, 30, 30) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 0, 30, 30, EVT_FLOAT(4.0), 40) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(EVS_BreakSmokestack)) diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index 87cf51d09ce..ac0f06f36b0 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_019E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_FLO_MAGIKOOPA_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_019F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_FLO_LAKITU_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60 * DT, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_019F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_FLO_LAKITU_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80 * DT, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index 841a2ee3355..dee8719908a 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -202,7 +202,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(5) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_019C) + EVT_CALL(StopSound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -228,7 +228,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_019D) + EVT_CALL(PlaySound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) diff --git a/src/world/area_flo/flo_24/flo_24_1_music.c b/src/world/area_flo/flo_24/flo_24_1_music.c index fdd8655ec6b..84a87e816c5 100644 --- a/src/world/area_flo/flo_24/flo_24_1_music.c +++ b/src/world/area_flo/flo_24/flo_24_1_music.c @@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_LOOP_22) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_2) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/area_hos/hos_04/hos_04_7_starship.c b/src/world/area_hos/hos_04/hos_04_7_starship.c index f7ccbb7a465..a61d1a6146f 100644 --- a/src/world/area_hos/hos_04/hos_04_7_starship.c +++ b/src/world/area_hos/hos_04/hos_04_7_starship.c @@ -39,7 +39,7 @@ EvtScript N(EVS_Starship_FlyingAway) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySound, SOUND_0181) + EVT_CALL(PlaySound, SOUND_STARSHIP_ASCEND) EVT_CALL(MakeLerp, 0, 900, 45, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_hos/hos_05/hos_05_8_star_ship.c b/src/world/area_hos/hos_05/hos_05_8_star_ship.c index 937768b9918..1c8d71712c1 100644 --- a/src/world/area_hos/hos_05/hos_05_8_star_ship.c +++ b/src/world/area_hos/hos_05/hos_05_8_star_ship.c @@ -103,7 +103,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_WAIT(25) EVT_CALL(N(SwingCameraPitchUpward)) EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_017D, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_STARSHIP_TAKEOFF_LONG, SOUND_SPACE_DEFAULT) EVT_SET(LVar2, MV_Starship_PosY) EVT_CALL(MakeLerp, 0, 1000, 100, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -159,7 +159,7 @@ EvtScript N(EVS_EnterStarship) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_017F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_STARSHIP_ARRIVE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 750, -85, 90, EASING_QUADRATIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_hos/hos_20/hos_20_2_starship.c b/src/world/area_hos/hos_20/hos_20_2_starship.c index d156cdd0351..4932e6b3509 100644 --- a/src/world/area_hos/hos_20/hos_20_2_starship.c +++ b/src/world/area_hos/hos_20/hos_20_2_starship.c @@ -81,7 +81,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_SET(MV_Starship_Yaw, 0) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_017C) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP) EVT_IF_LT(GB_StoryProgress, STORY_UNUSED_0000005D) EVT_CALL(MakeLerp, -300, 0, 120, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -93,7 +93,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("hos_00"), hos_00_ENTRY_3) EVT_ELSE EVT_THREAD @@ -107,8 +107,8 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(75) - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(PlaySound, SOUND_20A1) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_BOOST) EVT_CALL(MakeLerp, 0, 300, 60, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -128,7 +128,7 @@ EvtScript N(EVS_Starship_Flight1) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("kpa_60"), kpa_60_ENTRY_4) EVT_END_IF EVT_WAIT(100) @@ -149,13 +149,13 @@ EvtScript N(EVS_Starship_Flight2) = { EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.5), EVT_FLOAT(-3.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(PlaySound, SOUND_017C) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP) EVT_SET(MV_Starship_PosX, 0) EVT_SET(MV_Starship_Yaw, 0) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(100) - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(PlaySound, SOUND_20A1) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_BOOST) EVT_CALL(MakeLerp, 0, 300, 60, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -189,7 +189,7 @@ EvtScript N(EVS_Starship_Return) = { EVT_SET(MV_Starship_Yaw, 180) EVT_EXEC(N(EVS_AnimateStarship)) EVT_WAIT(2) - EVT_CALL(PlaySound, SOUND_017C) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP) EVT_THREAD EVT_CALL(MakeLerp, 300, 0, 120, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -201,8 +201,8 @@ EvtScript N(EVS_Starship_Return) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(75) - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(PlaySound, SOUND_20A1) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_BOOST) EVT_CALL(MakeLerp, 0, -300, 60, EASING_CUBIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -222,7 +222,7 @@ EvtScript N(EVS_Starship_Return) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_017C | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_STARSHIP_ENGINE_LOOP | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_CALL(GotoMap, EVT_PTR("hos_05"), hos_05_ENTRY_1) EVT_WAIT(100) EVT_RETURN diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/isk_02_2_lock.c index eb9a881d2b7..c7ca72ea4c0 100644 --- a/src/world/area_isk/isk_02/isk_02_2_lock.c +++ b/src/world/area_isk/isk_02/isk_02_2_lock.c @@ -18,14 +18,14 @@ EvtScript N(EVS_UnlockDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 272, 60, 486) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 272, 60, 486) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK02_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_EntityID_Padlock) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_0265, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_ISK_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_04/isk_04_3_obstructions.c b/src/world/area_isk/isk_04/isk_04_3_obstructions.c index 4950c189b5a..ac9625e2576 100644 --- a/src/world/area_isk/isk_04/isk_04_3_obstructions.c +++ b/src/world/area_isk/isk_04/isk_04_3_obstructions.c @@ -39,14 +39,14 @@ EvtScript N(EVS_UnlockDoorPrompt) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 600, -330, 100) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 600, -330, 100) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK04_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_RuinsLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_0265, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittsw, SOUND_ISK_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/isk_05_3_npc.c index 2b7eafc4425..581a149f26d 100644 --- a/src/world/area_isk/isk_05/isk_05_3_npc.c +++ b/src/world/area_isk/isk_05/isk_05_3_npc.c @@ -165,7 +165,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_DISABLE_AI, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0266, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_ISK_DOOR_CLOSE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) EVT_LABEL(101) EVT_CALL(UpdateLerp) @@ -174,7 +174,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(101) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0267, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_ISK_DOOR_SLAM, SOUND_SPACE_DEFAULT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilittw, COLLIDER_FLAGS_UPPER_MASK) EVT_END_THREAD EVT_CALL(DisablePlayerInput, TRUE) @@ -232,7 +232,7 @@ EvtScript N(EVS_NpcDefeat_StoneChomp_Override) = { EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_SET(GF_ISK05_Defeated_StoneChomp, TRUE) EVT_SET(AF_ISK05_StoneChompDefeated, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0265, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_ISK_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_WAIT(5) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) diff --git a/src/world/area_isk/isk_07/isk_07_5_lock.c b/src/world/area_isk/isk_07/isk_07_5_lock.c index df0ee091ca8..6ed29772857 100644 --- a/src/world/area_isk/isk_07/isk_07_5_lock.c +++ b/src/world/area_isk/isk_07/isk_07_5_lock.c @@ -22,14 +22,14 @@ EvtScript N(EVS_UnlockPrompt_RuinsDoor) = { EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_END_SWITCH - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, -300, -380, 530) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, -300, -380, 530) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK07_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_LockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_0265, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_ISK_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -63,7 +63,7 @@ EvtScript N(EVS_SetupLock) = { EvtScript N(EVS_ShutEntryDoor) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_0266, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_ISK_DOOR_CLOSE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 65, 0, 15, EASING_QUADRATIC_IN) EVT_LABEL(10) EVT_CALL(UpdateLerp) @@ -73,7 +73,7 @@ EvtScript N(EVS_ShutEntryDoor) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_0267, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilitte, SOUND_ISK_DOOR_SLAM, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.3)) EVT_RETURN EVT_END diff --git a/src/world/area_isk/isk_11/isk_11_5_puzzle.c b/src/world/area_isk/isk_11/isk_11_5_puzzle.c index f5c1de286ae..2f6b643d241 100644 --- a/src/world/area_isk/isk_11/isk_11_5_puzzle.c +++ b/src/world/area_isk/isk_11/isk_11_5_puzzle.c @@ -73,7 +73,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket1) EVT_SET(LVar0, GB_ISK11_ItemSocket1) EVT_SET(GB_ISK11_ItemSocket1, 0) @@ -103,7 +103,7 @@ EvtScript N(EVS_ItemPrompt_Socket1) = { EVT_CALL(MakeItemEntity, GB_ISK11_ItemSocket1, -88, -508, 502, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_Socket1_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2087, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_END @@ -124,7 +124,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket2) EVT_SET(LVar0, GB_ISK11_ItemSocket2) EVT_SET(GB_ISK11_ItemSocket2, 0) @@ -155,7 +155,7 @@ EvtScript N(EVS_ItemPrompt_Socket2) = { EVT_SET(MV_Socket2_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2091, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_RETURN EVT_END }; @@ -175,7 +175,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket3) EVT_SET(LVar0, GB_ISK11_ItemSocket3) EVT_SET(GB_ISK11_ItemSocket3, 0) @@ -206,7 +206,7 @@ EvtScript N(EVS_ItemPrompt_Socket3) = { EVT_SET(MV_Socket3_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2090, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_RETURN EVT_END }; @@ -226,7 +226,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket4) EVT_SET(LVar0, GB_ISK11_ItemSocket4) EVT_SET(GB_ISK11_ItemSocket4, 0) @@ -257,7 +257,7 @@ EvtScript N(EVS_ItemPrompt_Socket4) = { EVT_SET(MV_Socket4_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2089, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_RETURN EVT_END }; @@ -277,7 +277,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_CALL(CloseMessage) EVT_IF_EQ(LVar0, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_CALL(AddKeyItem, GB_ISK11_ItemSocket5) EVT_SET(LVar0, GB_ISK11_ItemSocket5) EVT_SET(GB_ISK11_ItemSocket5, 0) @@ -308,7 +308,7 @@ EvtScript N(EVS_ItemPrompt_Socket5) = { EVT_SET(MV_Socket5_ItemEntity, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_0261, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o2088, SOUND_ISK_PLACE_IN_SOCKET, SOUND_SPACE_DEFAULT) EVT_RETURN EVT_END }; diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/isk_11_6_lock.c index e86ede14194..f729eb4502c 100644 --- a/src/world/area_isk/isk_11/isk_11_6_lock.c +++ b/src/world/area_isk/isk_11/isk_11_6_lock.c @@ -18,14 +18,14 @@ EvtScript N(EVS_UnlockPrompt_RuinsKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 355, -460, 430) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 355, -460, 430) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_ISK11_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_LockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) EVT_WAIT(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_0265, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittne, SOUND_ISK_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 65, 65, EASING_LINEAR) EVT_LABEL(10) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_00/iwa_00_1_main.c b/src/world/area_iwa/iwa_00/iwa_00_1_main.c index 0cc3ec00670..698842cd234 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_1_main.c +++ b/src/world/area_iwa/iwa_00/iwa_00_1_main.c @@ -32,8 +32,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_TexPan_Water)) EVT_EXEC(N(EVS_BindSlideTriggers)) EVT_CALL(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_0B, SOUND_SPACE_WITH_DEPTH, 35, -80, -120) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_0C, SOUND_SPACE_WITH_DEPTH, 500, 85, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA00_FLOW3, SOUND_SPACE_WITH_DEPTH, 35, -80, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA00_FLOW2, SOUND_SPACE_WITH_DEPTH, 500, 85, -120) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c index e4265c56bf8..9587c8180c9 100644 --- a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c +++ b/src/world/area_iwa/iwa_00/iwa_00_4_slide.c @@ -25,7 +25,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -42,7 +42,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_01/iwa_01_1_main.c b/src/world/area_iwa/iwa_01/iwa_01_1_main.c index f2ca6dba195..e80893517f1 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_1_main.c +++ b/src/world/area_iwa/iwa_01/iwa_01_1_main.c @@ -59,8 +59,8 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_BindSlideTriggers2)) EVT_EXEC(N(EVS_BindSlideTriggers1)) EVT_CALL(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_0D, SOUND_SPACE_WITH_DEPTH, -570, -180, 425) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_0E, SOUND_SPACE_WITH_DEPTH, 740, -170, 330) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA01_FLOW1, SOUND_SPACE_WITH_DEPTH, -570, -180, 425) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA01_FLOW2, SOUND_SPACE_WITH_DEPTH, 740, -170, 330) EVT_CALL(GetLoadType, LVar1) EVT_IF_EQ(LVar1, 1) EVT_EXEC(EnterSavePoint) diff --git a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c index e15dc22dc54..55c177e1c52 100644 --- a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c +++ b/src/world/area_iwa/iwa_01/iwa_01_5_slide.c @@ -40,7 +40,7 @@ EvtScript N(EVS_UseSlide1) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -57,7 +57,7 @@ EvtScript N(EVS_UseSlide1) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -77,7 +77,7 @@ EvtScript N(EVS_UseSlide2) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -94,7 +94,7 @@ EvtScript N(EVS_UseSlide2) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st2, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c index 952798819a2..5d3bf86d363 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c +++ b/src/world/area_iwa/iwa_03/iwa_03_4_slide.c @@ -25,7 +25,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -80, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -43,7 +43,7 @@ EvtScript N(EVS_UseSlide) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(100) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_20A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_st1, SOUND_IWA_SLIDE_GATE, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -80, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_iwa/iwa_10/iwa_10_1_music.c b/src/world/area_iwa/iwa_10/iwa_10_1_music.c index 13392eb47df..f0d1d32815c 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_1_music.c +++ b/src/world/area_iwa/iwa_10/iwa_10_1_music.c @@ -7,7 +7,7 @@ EvtScript N(EVS_SetupMusic) = { }; EvtScript N(EVS_PushSong) = { - EVT_CALL(StopSound, SOUND_LOOP_09) + EVT_CALL(StopSound, SOUND_LOOP_IWA10_FLOW1) EVT_CALL(PushSong, SONG_NEW_PARTNER, 0) EVT_RETURN EVT_END @@ -17,7 +17,7 @@ EvtScript N(EVS_PopSong) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_WAIT(15) EVT_CALL(PopSong) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_09, SOUND_SPACE_WITH_DEPTH, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA10_FLOW1, SOUND_SPACE_WITH_DEPTH, -560, 0, -233) EVT_RETURN EVT_END }; diff --git a/src/world/area_iwa/iwa_10/iwa_10_2_main.c b/src/world/area_iwa/iwa_10/iwa_10_2_main.c index 705c4fb0e8b..e5755f8ff54 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_2_main.c +++ b/src/world/area_iwa/iwa_10/iwa_10_2_main.c @@ -53,7 +53,7 @@ EvtScript N(EVS_Main) = { EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) EVT_EXEC(N(EVS_SetupFoliage)) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_09, SOUND_SPACE_WITH_DEPTH, -560, 0, -233) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_IWA10_FLOW1, SOUND_SPACE_WITH_DEPTH, -560, 0, -233) EVT_THREAD EVT_SET(LVarF, 0) EVT_LABEL(10) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index be01657a206..e1aeb438366 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_000E, 320, 150) EVT_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0 / DT), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) diff --git a/src/world/area_jan/common/MoveBushTemplates.h b/src/world/area_jan/common/MoveBushTemplates.h index cfadbcfb9a6..e0687f7e251 100644 --- a/src/world/area_jan/common/MoveBushTemplates.h +++ b/src/world/area_jan/common/MoveBushTemplates.h @@ -3,7 +3,7 @@ #define EVT_MOVE_BUSHES(collider, bushModelL, bushmodelR, moveVarL, moveVarR) \ { \ - EVT_CALL(PlaySoundAtCollider, collider, SOUND_209F, 0) \ + EVT_CALL(PlaySoundAtCollider, collider, SOUND_SEPARATE_BUSHES, 0) \ EVT_SET(LVar0, moveVarL) \ EVT_SET(LVar1, moveVarR) \ EVT_SET(LVar6, 0) \ @@ -35,7 +35,7 @@ #define EVT_MOVE_BUSH(collider, bushModel, moveVar) \ { \ - EVT_CALL(PlaySoundAtCollider, collider, SOUND_209F, 0) \ + EVT_CALL(PlaySoundAtCollider, collider, SOUND_SEPARATE_BUSHES, 0) \ EVT_SET(LVar0, MV_CliffTopBush1OffsetR) \ EVT_SET(LVar6, 0) \ EVT_LOOP(60) \ diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 6c96823417e..4caf276b703 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -596,7 +596,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_CH5_000A) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 10) diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index 4420b8be7a1..fd13aed5a72 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -46,9 +46,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_000D, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/jan_02_3_npc.c index 7316ec4d007..52f554156ef 100644 --- a/src/world/area_jan/jan_02/jan_02_3_npc.c +++ b/src/world/area_jan/jan_02/jan_02_3_npc.c @@ -123,7 +123,7 @@ EvtScript N(EVS_NpcInteract_VillageLeader) = { EVT_CASE_LT(STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) EVT_CASE_LT(STORY_CH5_GOT_JADE_RAVEN) EVT_EXEC_WAIT(N(EVS_Scene_GetJadeRaven)) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_VillageLeader_Talk, ANIM_VillageLeader_Idle, 0, MSG_CH5_002D) EVT_CASE_LT(STORY_CH5_ZIP_LINE_READY) EVT_IF_EQ(AF_JAN02_RaphaelComment, FALSE) @@ -158,7 +158,7 @@ EvtScript N(EVS_NpcInit_VillageLeader) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, 0, 15, -50) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_VillageLeader))) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_VillageLeader_Idle) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) EVT_CALL(SetNpcPos, NPC_SELF, 30, 15, -30) diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index 0063b2679a9..ee2ca9d5e6a 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -574,25 +574,25 @@ EvtScript N(EVS_NpcInteract_Raven) = { EVT_CALL(GetSelfNpcID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(NPC_Raven_01) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_008C) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_008D) EVT_END_IF EVT_CASE_EQ(NPC_Raven_03) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_008E) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_008F) EVT_END_IF EVT_CASE_EQ(NPC_Raven_04) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_0090) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_0091) EVT_END_IF EVT_CASE_EQ(NPC_Raven_05) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_0092) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_0093) @@ -605,7 +605,7 @@ EvtScript N(EVS_NpcInteract_Raven) = { EvtScript N(EVS_NpcInit_Raven) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Raven))) EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CASE_RANGE(STORY_CH5_ZIP_LINE_READY, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(GetSelfNpcID, LVar0) EVT_IF_EQ(LVar0, 14) @@ -668,7 +668,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_IdleSad) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_001A) diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c index bb611570c06..ba33ee85779 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -218,7 +218,7 @@ EvtScript N(EVS_NpcInit_Sushie) = { EvtScript N(EVS_NpcInteract_Bubulb) = { EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_IF_EQ(GF_JAN04_Met_Bubulb, FALSE) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Yellow_PopUp) @@ -248,7 +248,7 @@ EvtScript N(EVS_NpcInteract_Bubulb) = { EvtScript N(EVS_NpcInit_Bubulb) = { EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bubulb))) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_IF_EQ(GF_JAN04_Met_Bubulb, FALSE) EVT_CALL(SetNpcCollisionSize, NPC_SELF, 25, 25) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Yellow_BuriedIdle) diff --git a/src/world/area_jan/jan_04/jan_04_8_treasure.c b/src/world/area_jan/jan_04/jan_04_8_treasure.c index f4ee6e22305..9bf1c3a0275 100644 --- a/src/world/area_jan/jan_04/jan_04_8_treasure.c +++ b/src/world/area_jan/jan_04/jan_04_8_treasure.c @@ -124,7 +124,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_01AF, SOUND_SPACE_DEFAULT, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_JAN_CHEST_IMPACT, SOUND_SPACE_DEFAULT, LVar1, LVar2, LVar3) EVT_THREAD EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -15, 0, 0, 10, 10) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, 0, 0, 0, 0, 0) @@ -140,7 +140,7 @@ EvtScript N(EVS_Scene_TreasureChest) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAt, SOUND_01AF, SOUND_SPACE_DEFAULT, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_JAN_CHEST_IMPACT, SOUND_SPACE_DEFAULT, LVar1, LVar2, LVar3) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) EVT_WAIT(60) diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index 179a7bf084e..909f3eb4f65 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -30,9 +30,9 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(GF_JAN07_YoshiCriedForHelp, FALSE) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B4, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -183, 50, -11) @@ -75,7 +75,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_WAIT(15) EVT_SET(AF_JAN_02, TRUE) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_WAIT(30) @@ -181,11 +181,11 @@ EvtScript N(EVS_NpcIdle_PutridPiranha) = { EVT_CALL(InterpNpcYaw, NPC_PutridPiranha_01, 270, 0) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PutridPiranha_02, EMOTE_EXCLAMATION, 0, 38, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(3) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) - EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PutridPiranha_01, EMOTE_EXCLAMATION, 0, 35, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(35) EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) diff --git a/src/world/area_jan/jan_08/jan_08_3_bushes.c b/src/world/area_jan/jan_08/jan_08_3_bushes.c index c9ec6194456..dcb9f78ab71 100644 --- a/src/world/area_jan/jan_08/jan_08_3_bushes.c +++ b/src/world/area_jan/jan_08/jan_08_3_bushes.c @@ -56,7 +56,7 @@ EvtScript N(EVS_Inspect_FlipBush) = { EVT_CALL(PlayerMoveTo, -340, LVar5, 20) EVT_CALL(PlayerFaceNpc, NPC_YoshiKid, FALSE) EVT_WAIT(10) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o88, SOUND_209F, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o88, SOUND_SEPARATE_BUSHES, 0) EVT_SET(LVar3, 0) EVT_LOOP(10) EVT_ADD(LVar3, 9) diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index ba3e7889bb3..e90dbd25918 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -254,7 +254,7 @@ EvtScript N(EVS_ManageGeyserSounds) = { }; EvtScript N(EVS_BoulderTremble) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o33, SOUND_0191, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o33, SOUND_JAN_BOULDER_TREMBLE, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) EVT_RETURN EVT_END @@ -340,7 +340,7 @@ EvtScript N(EVS_ManagePuzzle) = { EVT_WAIT(8) EVT_END_LOOP EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(GetModelCenter, MODEL_o33) EVT_CALL(FacePlayerTowardPoint, LVar0, LVar2, 4) diff --git a/src/world/area_jan/jan_15/jan_15_1_main.c b/src/world/area_jan/jan_15/jan_15_1_main.c index 2155c590c3f..63908d3a403 100644 --- a/src/world/area_jan/jan_15/jan_15_1_main.c +++ b/src/world/area_jan/jan_15/jan_15_1_main.c @@ -4,7 +4,7 @@ EvtScript N(EVS_ExitWalk_jan_16) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(UseExitHeading, 60, jan_15_ENTRY_1) EVT_EXEC(ExitWalk) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) EVT_CALL(GotoMap, EVT_PTR("jan_16"), jan_16_ENTRY_3) EVT_ELSE EVT_CALL(GotoMap, EVT_PTR("jan_16"), jan_16_ENTRY_0) diff --git a/src/world/area_jan/jan_16/jan_16_2_main.c b/src/world/area_jan/jan_16/jan_16_2_main.c index a7fbd925e19..669c8828f0d 100644 --- a/src/world/area_jan/jan_16/jan_16_2_main.c +++ b/src/world/area_jan/jan_16/jan_16_2_main.c @@ -14,7 +14,7 @@ EvtScript N(EVS_BindExitTriggers) = { }; EvtScript N(EVS_SpawnButterflies) = { - EVT_IF_NE(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_NE(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -310, 10, 0) EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -210, 10, 240) EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, 330, 10, 260) diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c index c9094d7957d..0baf0f578ab 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -23,7 +23,7 @@ NpcSettings N(NpcSettings_Raven) = { EvtScript N(D_802412D4_B812D4) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) EVT_CALL(EnableGroup, MODEL_g38, FALSE) EVT_CALL(EnableGroup, MODEL_g54, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -45,7 +45,7 @@ EvtScript N(D_802412D4_B812D4) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30 * DT) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_SET(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_SET(GB_StoryProgress, STORY_CH5_REACHED_RAPHAELS_TREE) EVT_END_IF EVT_CALL(EnableGroup, MODEL_g38, TRUE) EVT_CALL(EnableGroup, MODEL_g54, TRUE) @@ -64,9 +64,9 @@ EvtScript N(EVS_NpcInteract_Raven) = { EvtScript N(EVS_NpcInit_Raven) = { EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_GOTO(20) - EVT_CASE_RANGE(STORY_CH5_RAFAEL_LEFT_NEST, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_RANGE(STORY_CH5_RAPHAEL_LEFT_NEST, STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Raven))) EVT_CALL(GetSelfNpcID, LVar0) EVT_IF_EQ(LVar0, 1) @@ -76,7 +76,7 @@ EvtScript N(EVS_NpcInit_Raven) = { EVT_CALL(SetNpcPos, NPC_Raven_04, -390, 0, -40) EVT_CALL(SetNpcPos, NPC_Raven_05, -411, 93, -16) EVT_END_IF - EVT_CASE_GT(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_GT(STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_LABEL(20) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o113, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(RemoveNpc, NPC_SELF) @@ -114,7 +114,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_SELF, 2) EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 30) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_018A, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JAN_RAPHAEL_POUND, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 50, EVT_FLOAT(1.0)) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -156,11 +156,11 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_LOOP(6) EVT_SWITCH(LVar0) EVT_CASE_RANGE(1, 4) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018C, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_JAN_ROOT_WOBBLE_1, 0) EVT_CASE_EQ(5) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018D, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_JAN_ROOT_WOBBLE_2, 0) EVT_CASE_EQ(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_018E, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_JAN_ROOT_WOBBLE_3, 0) EVT_END_SWITCH EVT_ADD(LVar0, 1) EVT_WAIT(20) @@ -198,21 +198,21 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { #else EVT_CALL(ResetCam, CAM_DEFAULT, 5) #endif - EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_SET(GB_StoryProgress, STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END }; EvtScript N(EVS_NpcInit_RaphaelRaven) = { - EVT_IF_EQ(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, 85, 0, 410) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) EVT_RETURN EVT_ELSE EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) - EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(TranslateGroup, MODEL_g40, 0, 100, 0) EVT_END_IF diff --git a/src/world/area_jan/jan_22/jan_22_1_music.c b/src/world/area_jan/jan_22/jan_22_1_music.c index ff511e3b1c9..1fc0f1dedd7 100644 --- a/src/world/area_jan/jan_22/jan_22_1_music.c +++ b/src/world/area_jan/jan_22/jan_22_1_music.c @@ -15,7 +15,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_THREAD EVT_ELSE EVT_SWITCH(GB_StoryProgress) - EVT_CASE_RANGE(STORY_CH5_RAFAEL_MOVED_ROOT, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CASE_RANGE(STORY_CH5_RAPHAEL_MOVED_ROOT, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_IF_NE(LVar0, jan_22_ENTRY_1) EVT_CALL(SetMusicTrack, 0, SONG_RAPHAEL_RAVEN, 0, 8) EVT_SET(AF_JAN_03, FALSE) diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/jan_22_2_main.c index b0a5c2aaee7..e62163afd17 100644 --- a/src/world/area_jan/jan_22/jan_22_2_main.c +++ b/src/world/area_jan/jan_22/jan_22_2_main.c @@ -88,12 +88,12 @@ EvtScript N(D_8024202C_B861AC) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g39, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g86, COLLIDER_FLAGS_UPPER_MASK) EVT_END_IF - EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o149, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC_WAIT(N(EVS_SeparateBushesImmediately)) EVT_END_IF EVT_SWITCH(GB_StoryProgress) - EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_EQ(STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_THREAD EVT_EXEC(N(EVS_Scene_RaphaelComingThrough)) EVT_WAIT(200) @@ -116,7 +116,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o304, COLLIDER_FLAGS_UPPER_MASK) EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_LT(STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_CASE_EQ(STORY_CH5_BEGAN_PEACH_MISSION) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index 52b6ff1e274..3519a9ec735 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_UseBasketElevator) = { EVT_END_IF EVT_EXEC_GET_TID(N(EVS_TetherCamToBasketPlayer), LVar7) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_JAN_BASKET_ELEVATOR, 0) EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -109,7 +109,7 @@ EvtScript N(EVS_UseBasketElevator) = { EVT_WAIT(5) EVT_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_JAN_BASKET_ELEVATOR, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -234,7 +234,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EvtScript N(EVS_NpcIdle_RaphaelRaven) = { EVT_LABEL(0) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF @@ -245,9 +245,9 @@ EvtScript N(EVS_NpcIdle_RaphaelRaven) = { EvtScript N(EVS_NpcInit_RaphaelRaven) = { EVT_SWITCH(GB_StoryProgress) - EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_EQ(STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_RaphaelRaven))) - EVT_CASE_EQ(STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CASE_EQ(STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_CALL(SetNpcPos, NPC_SELF, 125, 0, -40) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) @@ -281,7 +281,7 @@ EvtScript N(EVS_Raven_HopAndWalkAway) = { }; EvtScript N(EVS_BuildingEffects) = { - EVT_CALL(PlaySoundAt, SOUND_LOOP_1E, SOUND_SPACE_DEFAULT, 270, 130, 0) + EVT_CALL(PlaySoundAt, SOUND_LOOP_JAN_CONSTRUCTION, SOUND_SPACE_DEFAULT, 270, 130, 0) EVT_LOOP(0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(30 * DT) @@ -302,7 +302,7 @@ EvtScript N(EVS_BuildingEffects) = { EvtScript N(EVS_ManageRavens) = { EVT_LABEL(0) - EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF @@ -407,7 +407,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_GOTO(11) EVT_END_IF EVT_WAIT(40 * DT) - EVT_CALL(StopSound, SOUND_LOOP_1E) + EVT_CALL(StopSound, SOUND_LOOP_JAN_CONSTRUCTION) EVT_KILL_THREAD(LVarA) EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_FINISH_WORK) EVT_CASE_EQ(RAVEN_SCENE_FINISH_WORK) @@ -445,7 +445,7 @@ EvtScript N(EVS_ManageRavens) = { EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 20 * DT) EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CD) EVT_THREAD - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_JAN_BASKET_ELEVATOR, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -571,9 +571,9 @@ EvtScript N(EVS_ManageRavens) = { EvtScript N(EVS_NpcInit_Raven) = { EVT_SWITCH(GB_StoryProgress) - EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CASE_EQ(STORY_CH5_RAPHAEL_MOVED_ROOT) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_ManageRavens))) - EVT_CASE_EQ(STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CASE_EQ(STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_ManageRavens))) EVT_EXEC(N(EVS_GatherRavensNearRaphael)) EVT_CASE_RANGE(STORY_CH5_ZIP_LINE_READY, STORY_CH5_OPENED_ESCAPE_ROUTE) @@ -669,7 +669,7 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_CALL(NpcMoveTo, NPC_Raven_05, -150, -10, 0) EVT_CALL(NpcMoveTo, NPC_Raven_05, 77, -10, 0) EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) - EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_SET(GB_StoryProgress, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -703,9 +703,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00BC, 320, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(DisablePlayerInput, FALSE) @@ -809,9 +809,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_Before) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C5, 0, 60) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(DisablePlayerInput, FALSE) @@ -869,7 +869,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SetSelfVar, 0, 21) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_JAN_BASKET_ELEVATOR, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) EVT_LOOP(0) @@ -890,7 +890,7 @@ EvtScript N(EVS_NpcIdle_Kolorado_After) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_WAIT(40 * DT) - EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_0186, 0) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_JAN_BASKET_ELEVATOR, 0) EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -1017,7 +1017,7 @@ EvtScript N(EVS_NpcInit_Kolorado_WaitingToExplore) = { EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado_Before))) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_Before))) - EVT_CASE_RANGE(STORY_CH5_RAFAEL_MOVED_ROOT, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CASE_RANGE(STORY_CH5_RAPHAEL_MOVED_ROOT, STORY_CH5_RAPHAEL_WAITING_FOR_MARIO) EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_After))) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_CASE_DEFAULT diff --git a/src/world/area_jan/jan_22/jan_22_6_bushes.c b/src/world/area_jan/jan_22/jan_22_6_bushes.c index 7a0a31afed8..ac33860e7f6 100644 --- a/src/world/area_jan/jan_22/jan_22_6_bushes.c +++ b/src/world/area_jan/jan_22/jan_22_6_bushes.c @@ -8,7 +8,7 @@ #include "../common/MoveBush.inc.c" EvtScript N(EVS_MoveBushes_Separate) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o149, SOUND_209F, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o149, SOUND_SEPARATE_BUSHES, 0) EVT_SET(LVar0, MV_BushOffsetL) EVT_SET(LVar1, MV_BushOffsetR) EVT_SET(LVar6, 0) diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index 9342a370879..5ae910392c3 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -538,7 +538,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(15 * DT) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0 * DT)) - EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_SET(GB_StoryProgress, STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -553,7 +553,7 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_After) = { EvtScript N(EVS_NpcInit_RaphaelRaven) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) EVT_SWITCH(GB_StoryProgress) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven_Before))) EVT_CASE_GE(STORY_CH5_ZIP_LINE_READY) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven_After))) diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c index 2617c71c8ac..3c90338bc7d 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c +++ b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c @@ -49,7 +49,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_WAIT(10 * DT) EVT_CALL(PlayerMoveTo, 590, 0, 10 * DT) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_THREAD @@ -57,7 +57,7 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Walk) EVT_CALL(NpcMoveTo, NPC_Peach, 640, 0, 10 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach1_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Peach, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Peach, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach2_LookAround) diff --git a/src/world/area_kkj/kkj_10/kkj_10_2_entity.c b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c index 2e0ab5e2d7f..2d0fe7f9fd0 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_2_entity.c +++ b/src/world/area_kkj/kkj_10/kkj_10_2_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 0, 10, 490) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 0, 10, 490) EVT_SET(LVar0, MV_PadlockEntityIdx) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c index e03683abef8..890c466da6e 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -11,7 +11,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c index 048ee8d0631..02d6d3d44df 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -30,7 +30,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(N(SetPeachFlag8)) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c index d135f904858..feecb6de093 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c +++ b/src/world/area_kkj/kkj_11/kkj_11_2_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_ItemPrompt_Lock) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 0, 10, 490) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 0, 10, 490) EVT_SET(LVar0, MV_PadlockEntityIdx) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c index b42cfa110ae..6f2998dfa3f 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -12,7 +12,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c index 416e7eae0b8..bf6bf88d6e1 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -29,7 +29,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index f8376c4c1d1..a8a64b6b647 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -117,7 +117,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c index 75f16b71b09..eb3dc63aaee 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c @@ -51,7 +51,7 @@ EvtScript N(EVS_MoveToBattlePositions) = { EVT_WAIT(20) EVT_CALL(SetNpcJumpscale, NPC_Bowser_Body, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_Bowser_Body, 675, 0, 0, 10) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_20A0, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_LARGE_NPC_IMPACT, SOUND_SPACE_DEFAULT) EVT_END_THREAD EVT_THREAD EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index 8196fa86b67..ccdc051ac03 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -332,7 +332,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_WAIT(5) EVT_CALL(SetNpcJumpscale, NPC_Bowser_Body, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_Bowser_Body, 810, 0, 0, 5) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_20A0, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_Body, SOUND_LARGE_NPC_IMPACT, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_PostJump) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20 * DT, EVT_FLOAT(2.0)) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_Idle) diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c index 616210debc2..91aa64c49c8 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c +++ b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_WAIT(30 * DT) EVT_CALL(N(ClearPeachDepressed)) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(InterpPlayerYaw, 270, 3) @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_WAIT(10 * DT) EVT_CALL(PlaySoundAt, SOUND_KKJ_WINDOW_TAP, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpPlayerYaw, 135, 5) @@ -349,7 +349,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c index cc4964153a9..0af07517e08 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c +++ b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Scene_Chapter1) = { EVT_CALL(SpeakToPlayer, NPC_PLAYER, ANIM_Peach3_InformalTalk, ANIM_Peach1_Idle, 5, MSG_Peach_0035) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0036) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index f00a9ea5c40..7b9048389f4 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -147,9 +147,9 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(FadeOutMusic, 0, 2000) EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0007, 300, 20) EVT_WAIT(5 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_THREAD @@ -332,13 +332,13 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_EXEC_WAIT(N(EVS_FocusCam_KoopaBros)) EVT_WAIT(10 * DT) EVT_CALL(FadeOutMusic, 0, 500) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaBros_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Talk, ANIM_KoopaBros_Red_Idle, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) @@ -371,12 +371,12 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_END_THREAD EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_KoopaBros_02, MSG_Peach_CH1_KoopaBros_0015) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0173, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_RUN_AWAY_BUILDUP, SOUND_SPACE_DEFAULT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_02, 90, 0) EVT_CALL(EnableNpcBlur, NPC_KoopaBros_02, TRUE) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Run) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 200, -60, 10 * DT) EVT_END_THREAD EVT_THREAD diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c index 82256ad4c3b..bf367234a44 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c +++ b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c @@ -174,7 +174,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_THREAD EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_AlmostCaught)) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Gasp) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) @@ -214,9 +214,9 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SpeakToNpc, NPC_Bowser, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, NPC_Bowser, MSG_Peach_0088) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Delighted) EVT_WAIT(1) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c index f1b8e171422..1560c56773b 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -13,7 +13,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c index ae7fbe8aeb1..60b3458a659 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -71,7 +71,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c index 4f2454df607..de3279ad2c7 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c +++ b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c @@ -162,7 +162,7 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_CALL(SetMusicTrack, 0, SONG_PEACH_SNEAKING, 0, 4) EVT_END_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach2_Startle) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c index 4e69d4aa86f..7b296c13778 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -47,7 +47,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(N(SetPeachFlag8)) EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index 794dc0012bd..a3aedd363e2 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 5) EVT_WAIT(10 * DT) EVT_CALL(NpcMoveTo, NPC_Kammy, 280, -50, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index 68b2734e8cd..a7d26932f7c 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -30,7 +30,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) - EVT_CALL(StopSound, SOUND_LRAW_022C) + EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_TURN_ON) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_RETURN EVT_END @@ -38,7 +38,7 @@ EvtScript N(EVS_NpcIdle_Bowser) = { EvtScript N(EVS_NpcDefeat_Bowser) = { #define NAME_SUFFIX - EVT_CALL(PlaySound, SOUND_LRAW_022D) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_EXEC(N(EVS_Scene_PeachBreaksFree)) EVT_RETURN EVT_END @@ -70,7 +70,7 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { EVT_CALL(GetNpcPos, NPC_Peach_01, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_20000) - EVT_CALL(StopSound, SOUND_LRAW_022D) + EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_CALL(StartBossBattle, SONG_BOWSER_BATTLE) EVT_CALL(EnablePartnerAI) EVT_RETURN diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index 47f1a37be11..7577cb8fee8 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -60,7 +60,7 @@ EvtScript N(EVS_BowserActivatesSwitch) = { EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Land) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_RearUpLaugh) - EVT_CALL(PlaySound, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE) EVT_LOOP(0) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 1, EVT_FLOAT(2.0)) EVT_WAIT(1) @@ -68,12 +68,12 @@ EvtScript N(EVS_BowserActivatesSwitch) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_Bowser_01, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Bowser_01, 300, 0, 0, 20) EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_FLOOR_SWITCH_ACTIVATE, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_20A0, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_LARGE_NPC_IMPACT, SOUND_SPACE_DEFAULT) EVT_SET(AF_KKJ_1A, TRUE) EVT_RETURN EVT_END @@ -411,7 +411,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { EVT_CALL(SetNpcDecoration, NPC_Bowser_01, 0, NPC_DECORATION_BOWSER_AURA) EVT_END_THREAD EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_0223, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Bowser_01, SOUND_KPA_BOWSER_POWER_UP, SOUND_SPACE_DEFAULT) EVT_SETF(LVar0, EVT_FLOAT(1.0)) EVT_LOOP(50) EVT_ADDF(LVar0, EVT_FLOAT(0.01)) @@ -481,7 +481,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_IF_EQ(GF_KKJ25_Defeated_Kammy, FALSE) EVT_THREAD EVT_WAIT(50) - EVT_CALL(PlaySound, SOUND_LRAW_022C) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_ARENA_TURN_ON) EVT_END_THREAD EVT_CALL(MakeLerp, 0, 50, 120, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -498,7 +498,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_END_LOOP EVT_ELSE EVT_IF_EQ(GF_KKJ25_Defeated_Bowser, FALSE) - EVT_CALL(PlaySound, SOUND_LRAW_022D) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_END_IF EVT_SET(LVar0, 5) EVT_END_IF @@ -611,7 +611,7 @@ EvtScript N(EVS_ManageArenaEffects) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LRAW_022D) + EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_RETURN EVT_END }; diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index c56b597a293..7a521fd689e 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -93,7 +93,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(InterpNpcYaw, NPC_Peach_01, 90, 0) EVT_CALL(SpeakToPlayer, NPC_Twink_01, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_CH8_009D) EVT_WAIT(10) - EVT_CALL(StopSound, SOUND_LRAW_022D) + EVT_CALL(StopSound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_CALL(SetMusicTrack, 0, SONG_PEACH_WISHES, 0, 8) EVT_CALL(InterpNpcYaw, NPC_Peach_01, 270, 0) EVT_WAIT(10) diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index 4c2682d0390..563e7ee72ff 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -312,7 +312,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 14, 150, 60, 0, 1, 330) EVT_WAIT(310 * DT) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00AA, 160, 40) - EVT_CALL(PlaySound, SOUND_LRAW_022D) + EVT_CALL(PlaySound, SOUND_LRAW_KPA_ARENA_ACTIVE) EVT_CALL(RemoveNpc, NPC_StarRod) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_CALL(GetCurrentPartnerID, LVar0) @@ -370,11 +370,11 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach2_RaiseArms, ANIM_Peach1_Idle, 0, MSG_CH8_00AC) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_SET(MV_DestructState, DESTRUCT_STATE_1) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Peach_02, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 0) @@ -471,8 +471,8 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(SpeakToNpc, NPC_Bowser_03, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 512, NPC_Kammy_05, MSG_CH8_00B0) EVT_SET(MV_ArenaState, ARENA_STATE_BROKEN) EVT_WAIT(20) - EVT_CALL(StopSound, SOUND_LRAW_03BC) - EVT_CALL(PlaySoundAt, SOUND_0230, SOUND_SPACE_DEFAULT, 500, 0, 100) + EVT_CALL(StopSound, SOUND_LRAW_RUMBLE) + EVT_CALL(PlaySoundAt, SOUND_KPA_EXPLOSION_CLUSTER, SOUND_SPACE_DEFAULT, 500, 0, 100) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 500, 0, 100, EVT_FLOAT(8.0), 90) EVT_SET(MV_DestructState, DESTRUCT_STATE_7) EVT_CALL(SetNpcAnimation, NPC_Bowser_03, ANIM_WorldBowser_Shock) diff --git a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c index 0f3e5d09f82..3c57cb73267 100644 --- a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c +++ b/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c @@ -918,7 +918,7 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach1_Idle) EVT_END_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_QUESTION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 5) @@ -997,13 +997,13 @@ EvtScript N(EVS_ManageQuizGame) = { EVT_CALL(SpeakToPlayer, NPC_HammerBros, ANIM_HammerBros_Anim0B, ANIM_HammerBros_Anim03, 5, MSG_Peach_00F6) EVT_CALL(PlaySound, SOUND_AUDIENCE_CHEER) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_LookAround) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(13 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(13 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 45, 13, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Peach2_ForwardIdle) diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index 8cdfade667a..83b7b4848ea 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -600,7 +600,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 6dfc9b668c5..4236df47a64 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -403,7 +403,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_PARTNER, -295, -30, 0) EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0269, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_USE_KEY, SOUND_SPACE_DEFAULT) EVT_WAIT(15 * DT) EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_GOOMBA_GATE_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) @@ -1609,7 +1609,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20 * DT) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_WAIT(20 * DT) @@ -1622,7 +1622,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(20 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 60, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(55 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) @@ -2088,10 +2088,10 @@ EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Outro_000F) EVT_WAIT(10) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(InterpNpcYaw, NPC_Goombario, 90, 0) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index e6cfded05d2..9572bbb3a28 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -64,7 +64,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcAux, NPC_Goompa, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c index 3b243b1dbc6..85aba9c2af3 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -34,11 +34,11 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_THREAD EVT_WAIT(18 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0175, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_PAPER_GLIDE_1, SOUND_SPACE_DEFAULT) EVT_WAIT(30 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0176, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_PAPER_GLIDE_2, SOUND_SPACE_DEFAULT) EVT_WAIT(28 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0175, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_PAPER_GLIDE_1, SOUND_SPACE_DEFAULT) EVT_END_THREAD EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index d9fbbccff51..9c0850977e3 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -110,7 +110,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(80) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 5, MSG_CH0_00DB) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_THREAD @@ -125,7 +125,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(15) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_FLYING, FALSE) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) @@ -175,7 +175,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_StillBack) EVT_WAIT(30) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_END_THREAD EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(110) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DE) @@ -410,7 +410,7 @@ EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(GF_KMR20_CaughtLuigiReadingLetter, TRUE) EVT_WAIT(20) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index e090d6da70c..97a5643f0bb 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -222,9 +222,9 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_WAIT(35) EVT_CALL(PlaySoundAt, SOUNC_CHECK_MAILBOX, SOUND_SPACE_DEFAULT, 430, 0, -185) EVT_WAIT(25) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_0021) diff --git a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c index 4817aa3940d..66d9fdf316f 100644 --- a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c +++ b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_CALL(N(EnableCameraFollowPlayerY)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0227, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -36,7 +36,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0228, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_LOWER_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -50, 20, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -52,7 +52,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_0227, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -66,7 +66,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_0228, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_KPA_LOWER_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -99, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c index 59abcc8df3e..d2bc6cea99a 100644 --- a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c +++ b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_CALL(N(EnableCameraFollowPlayerY)) EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0227, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -36,7 +36,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_0228, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_KPA_LOWER_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -52,7 +52,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_THREAD EVT_SET_GROUP(EVT_GROUP_EF) EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_0227, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_KPA_RAISE_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(EnableGroup, MODEL_move2, TRUE) EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) EVT_LOOP(0) @@ -67,7 +67,7 @@ EvtScript N(EVS_ActivateSwitch) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, FALSE) EVT_WAIT(80) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_0228, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_KPA_LOWER_STONE_PLATFORM, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c index 7773cb32599..2b558efdd18 100644 --- a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c +++ b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_LockedDoor) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySound, SOUND_0269) + EVT_CALL(PlaySound, SOUND_USE_KEY) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA113_UnlockedDoor, TRUE) EVT_SET(LVar0, MV_PadlockEntityID) diff --git a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c index a00b6280603..ac3101a5f01 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c +++ b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c @@ -64,7 +64,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA134_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c index d4a9fb77831..a2165b3b605 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c +++ b/src/world/area_kpa/kpa_14/kpa_14_3_entity.c @@ -43,7 +43,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA14_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index 5b33def77a2..db7fa141af8 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -158,9 +158,9 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_0262, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c index d95bc4f5aa3..0af1220b2cd 100644 --- a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c +++ b/src/world/area_kpa/kpa_52/kpa_52_2_entity.c @@ -24,7 +24,7 @@ EvtScript N(EVS_UnlockPrompt_Door) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA52_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index 9543d687dc2..644668e6b76 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -46,7 +46,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Flee) = { EVT_END_IF EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 5) diff --git a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c index d5fe8aa5c1d..5e81d2f0e6f 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c +++ b/src/world/area_kpa/kpa_60/kpa_60_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c index f78b7265a00..b320ecb0d82 100644 --- a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c +++ b/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c @@ -37,7 +37,7 @@ EvtScript N(EVS_Scene_Arrival) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, -70, 0) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(PlaySound, SOUND_0182) + EVT_CALL(PlaySound, SOUND_STARSHIP_FLY_AWAY) EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Arrival)), ARRAY_COUNT(N(FlightPath_Arrival)), EASING_LINEAR) EVT_LABEL(90) EVT_CALL(GetNextPathPos) @@ -88,7 +88,7 @@ EvtScript N(EVS_Scene_Departure) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_0183) + EVT_CALL(PlaySound, SOUND_STARSHIP_FLY_TOWARD) EVT_CALL(LoadPath, 45, EVT_PTR(N(FlightPath_Departure)), ARRAY_COUNT(N(FlightPath_Departure)), EASING_LINEAR) EVT_LABEL(90) EVT_CALL(GetNextPathPos) diff --git a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c index 32b65f3eb87..e384f96bead 100644 --- a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c +++ b/src/world/area_kpa/kpa_62/kpa_62_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_FrontDoor) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA62_UnlockedFrontDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadLockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c index e2a62359343..de011b0471b 100644 --- a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c +++ b/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c @@ -146,7 +146,7 @@ EvtScript N(EVS_Starship_Depart) = { EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_STARSHIP_THEME, 1, 8) EVT_THREAD - EVT_CALL(PlaySoundAtPlayer, SOUND_017E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_STARSHIP_TAKEOFF_SHORT, SOUND_SPACE_DEFAULT) EVT_SET(LVar2, MV_Starship_PosY) EVT_CALL(MakeLerp, 0, -110, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) @@ -184,7 +184,7 @@ EvtScript N(EVS_Starship_Arrive) = { EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) EVT_EXEC_GET_TID(N(EVS_UpdatePassengers), LVar9) - EVT_CALL(PlaySoundAtPlayer, SOUND_017F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_STARSHIP_ARRIVE, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_CALL(MakeLerp, -100, 0, 60, EASING_QUADRATIC_OUT) EVT_LOOP(0) diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c index 563f2b27dd6..c52ecb90e92 100644 --- a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c +++ b/src/world/area_kpa/kpa_82/kpa_82_3_npc.c @@ -177,7 +177,7 @@ EvtScript N(EVS_SetCam_BeforeBattle) = { EvtScript N(EVS_SetDoorRots) = { EVT_CALL(MakeLerp, 0, 60, 30 * DT, EASING_LINEAR) - EVT_CALL(PlaySound, SOUND_0225) + EVT_CALL(PlaySound, SOUND_KPA_QUIZ_DOORS_OPEN) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) @@ -197,7 +197,7 @@ EvtScript N(EVS_SetDoorRots) = { EvtScript N(EVS_CloseDoors) = { EVT_CALL(MakeLerp, 60, 0, 30 * DT, EASING_LINEAR) - EVT_CALL(PlaySound, SOUND_0226) + EVT_CALL(PlaySound, SOUND_KPA_QUIZ_DOORS_CLOSE) EVT_LABEL(0) EVT_CALL(UpdateLerp) EVT_CALL(TranslateModel, MODEL_o100, 0, LVar0, 0) diff --git a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c index 8c168fa1930..e48b1d996e9 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c +++ b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_PrisonCell) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA91_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c index cdd9e38c863..ed29ec73cbd 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c +++ b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c @@ -23,7 +23,7 @@ EvtScript N(EVS_UnlockPrompt_PrisonCell) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GF_KPA95_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar1, 0) diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index dee48a24f2f..2aeb32b3a13 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_WAIT(5) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 3) EVT_WAIT(5) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25 * DT) EVT_CALL(SetSelfVar, 0, 2) diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/area_kzn/kzn_19/kzn_19_1_music.c index 3874a44476b..3ac45c73494 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/area_kzn/kzn_19/kzn_19_1_music.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_END_IF //@bug extra endif EVT_CASE_GE(STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index 82c984ea4f4..cafbe9120d9 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) EVT_SET(AF_KZN_BossRoomFloorBroken, TRUE) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN_BossRoomFloorBroken, TRUE) diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/area_kzn/kzn_20/kzn_20_1_music.c index 155ae5216eb..3ab10abfac2 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 240b2d7fc8c..5035db12d1a 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(15) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) diff --git a/src/world/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/area_kzn/kzn_22/kzn_22_1_music.c index d8b1799aee8..4a82776367e 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/area_kzn/kzn_22/kzn_22_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index 48dbcd0ad4c..343d753d5b1 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -145,10 +145,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_01AD, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_FLYING_PYROCLAST_1, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_01AE, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_FLYING_PYROCLAST_2, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, FALSE) EVT_END_IF EVT_RETURN diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 4e5a116260f..f24bd06faee 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -696,7 +696,7 @@ EvtScript N(EVS_Scene_KoopaBrosUnmasked) = { EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Run) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_THREAD EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 700, 0, 0) diff --git a/src/world/area_mac/mac_01/npc/read_fortune.inc.c b/src/world/area_mac/mac_01/npc/read_fortune.inc.c index cb3c9dbb810..5362ba5b955 100644 --- a/src/world/area_mac/mac_01/npc/read_fortune.inc.c +++ b/src/world/area_mac/mac_01/npc/read_fortune.inc.c @@ -413,7 +413,7 @@ EvtScript N(EVS_Merlon_GiveHint) = { EVT_SET(LVar0, MSG_MerlonHint_002D) EVT_CASE_LT(STORY_CH5_MOVED_RAVEN_STATUE) EVT_SET(LVar0, MSG_MerlonHint_002E) - EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CASE_LT(STORY_CH5_RAPHAEL_LEFT_NEST) EVT_SET(LVar0, MSG_MerlonHint_002F) EVT_CASE_LT(STORY_CH5_ENTERED_MT_LAVA_LAVA) EVT_SET(LVar0, MSG_MerlonHint_0030) diff --git a/src/world/area_mac/mac_02/mac_02_5_entity.c b/src/world/area_mac/mac_02/mac_02_5_entity.c index 652581cfb86..dcbcd3c9c65 100644 --- a/src/world/area_mac/mac_02/mac_02_5_entity.c +++ b/src/world/area_mac/mac_02/mac_02_5_entity.c @@ -19,7 +19,7 @@ EvtScript N(EVS_ChooseItem_OddKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, -470, 30, -155) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, -470, 30, -155) EVT_SET(LVar0, MV_BlueHouseLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index 33b57de3b76..34a919b9ff9 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) @@ -89,7 +89,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) @@ -104,7 +104,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(InterpPlayerYaw, 270, 0) diff --git a/src/world/area_mac/mac_04/mac_04.h b/src/world/area_mac/mac_04/mac_04.h index a33f6013783..eacd9a29366 100644 --- a/src/world/area_mac/mac_04/mac_04.h +++ b/src/world/area_mac/mac_04/mac_04.h @@ -61,8 +61,8 @@ extern EvtScript N(EVS_MakeHiddenRoom); extern EvtScript N(EVS_SetupFoliage); extern EvtScript N(EVS_MakeEntities); -extern EvtScript N(EVS_80248B08); -extern EvtScript N(D_80248798_84B368); +extern EvtScript N(EVS_OnEnterShop); +extern EvtScript N(EVS_HiddenRoom_WaitForOuttaSight); extern EvtScript N(EVS_ExitToybox); extern EvtScript N(EVS_Toybox_SetupTrainPrompt); extern EvtScript N(D_8024697C_84954C); diff --git a/src/world/area_mac/mac_04/mac_04_3_rooms.c b/src/world/area_mac/mac_04/mac_04_3_rooms.c index 4c9e1090909..626b897180c 100644 --- a/src/world/area_mac/mac_04/mac_04_3_rooms.c +++ b/src/world/area_mac/mac_04/mac_04_3_rooms.c @@ -35,7 +35,7 @@ EvtScript N(EVS_RoomListener_Shop) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(ROOM_UPDATE_ENTER_BEGIN) EVT_CALL(EnableGroup, MODEL_mise_in, TRUE) - EVT_EXEC(N(EVS_80248B08)) + EVT_EXEC(N(EVS_OnEnterShop)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_CALL(EnableGroup, MODEL_mise_in, FALSE) EVT_END_SWITCH @@ -134,7 +134,7 @@ EvtScript N(EVS_RoomListener_Warehouse) = { EVT_CALL(EnableGroup, MODEL_heiho_in, TRUE) EVT_SET(MF_MusicMixTrigger, TRUE) EVT_CASE_EQ(ROOM_UPDATE_ENTER_DONE) - EVT_EXEC(N(D_80248798_84B368)) + EVT_EXEC(N(EVS_HiddenRoom_WaitForOuttaSight)) EVT_CASE_EQ(ROOM_UPDATE_EXIT_END) EVT_CALL(EnableGroup, MODEL_heiho_in, FALSE) EVT_CALL(EnableGroup, MODEL_hi_soto, TRUE) diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index 47bc62f9162..49bb1756023 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -68,7 +68,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(RemoveKeyItemAt, LVar1) - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -94,7 +94,7 @@ EvtScript N(EVS_ItemPrompt_ToyTrain) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) EVT_CALL(CloseChoicePopup) EVT_SET(GB_StoryProgress, STORY_CH4_RETURNED_TOY_TRAIN) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/mac_04_8_entity.c index b50ced84a50..99450da85e4 100644 --- a/src/world/area_mac/mac_04/mac_04_8_entity.c +++ b/src/world/area_mac/mac_04/mac_04_8_entity.c @@ -119,7 +119,7 @@ EvtScript N(EVS_EnterToybox) = { EVT_WAIT(1) EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 0, -90, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -174,7 +174,7 @@ EvtScript N(EVS_ExitToybox) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_01AA, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_omo_ent, SOUND_OMO_TOYBOX_LID, SOUND_SPACE_DEFAULT) EVT_END_THREAD EVT_EXEC_GET_TID(N(EVS_FocusCameraOnPlayer), LVarA) EVT_CALL(PlaySoundAtPlayer, SOUND_TRANSPORTER_OUT, SOUND_SPACE_DEFAULT) @@ -240,7 +240,7 @@ EvtScript N(EVS_ItemPrompt_StoreroomKey) = { EVT_CALL(CloseChoicePopup) EVT_RETURN EVT_END_IF - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, 155, 48, -480) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, 155, 48, -480) EVT_SET(LVar0, MV_StoreroomLockEntityID) EVT_CALL(N(RemovePadlock)) EVT_WAIT(5) diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index c8b2e7fe14c..82f20fb7db7 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -9,7 +9,7 @@ API_CALLABLE(N(IsPartnerBow)) { return ApiStatus_DONE2; } -EvtScript N(D_802480E0_84ACB0) = { +EvtScript N(EVS_ShyGuy_PlayFootstepSounds) = { EVT_LOOP(0) EVT_CALL(PlaySoundAtNpc, LVar0, SOUND_SEQ_SHY_GUY_STEP, SOUND_SPACE_DEFAULT) EVT_WAIT(2) @@ -18,7 +18,7 @@ EvtScript N(D_802480E0_84ACB0) = { EVT_END }; -EvtScript N(D_80248128_84ACF8) = { +EvtScript N(EVS_SuspiciousGuy_OpenDoor) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hu, SOUND_BASIC_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(20) @@ -32,7 +32,7 @@ EvtScript N(D_80248128_84ACF8) = { EVT_END }; -EvtScript N(D_802481E0_84ADB0) = { +EvtScript N(EVS_SuspiciousGuy_CloseDoor) = { EVT_SET(LVar0, 90) EVT_LOOP(20) EVT_ADD(LVar0, -3) @@ -46,8 +46,8 @@ EvtScript N(D_802481E0_84ADB0) = { EVT_END }; -EvtScript N(D_80248298_84AE68) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_01AB, SOUND_SPACE_DEFAULT) +EvtScript N(EVS_OpenSecretDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_OMO_SECRET_DOOR_OPEN, SOUND_SPACE_DEFAULT) EVT_SET(LVar0, 0) EVT_LOOP(36) EVT_ADD(LVar0, 10) @@ -58,13 +58,13 @@ EvtScript N(D_80248298_84AE68) = { EVT_SET(LVar0, 0) EVT_CALL(RotateModel, MODEL_hkai1, LVar0, 0, 1, 0) EVT_CALL(RotateModel, MODEL_hkai2, LVar0, 0, 1, 0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_01AC, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_hk, SOUND_OMO_SECRET_DOOR_CLOSE, SOUND_SPACE_DEFAULT) EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) EVT_RETURN EVT_END }; -EvtScript N(D_802483B8_84AF88) = { +EvtScript N(EVS_SuspiciousGuy_RevealSecretRoom) = { EVT_WAIT(20 * DT) EVT_CALL(SetNpcFlagBits, NPC_ShyGuy_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 5, MSG_MAC_Housing_00B3) @@ -89,7 +89,7 @@ EvtScript N(D_802483B8_84AF88) = { EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim09) EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim0A) - EVT_EXEC(N(D_80248298_84AE68)) + EVT_EXEC(N(EVS_OpenSecretDoor)) EVT_CALL(SetNpcJumpscale, NPC_ShyGuy_01, EVT_FLOAT(0.5)) EVT_CALL(NpcJump0, NPC_ShyGuy_01, -440, 20, -75, 20 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) @@ -101,9 +101,9 @@ EvtScript N(D_802483B8_84AF88) = { EVT_END }; -EvtScript N(D_80248624_84B1F4) = { +EvtScript N(EVS_SuspiciousGuy_RunAway) = { EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, SOUND_SPACE_DEFAULT) - EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) @@ -114,17 +114,17 @@ EvtScript N(D_80248624_84B1F4) = { EVT_WAIT(4 * DT) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim04) EVT_WAIT(4 * DT) - EVT_EXEC_WAIT(N(D_80248128_84ACF8)) - EVT_SET(LVar0, 14) - EVT_EXEC_GET_TID(N(D_802480E0_84ACB0), LVarA) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_OpenDoor)) + EVT_SET(LVar0, NPC_ShyGuy_01) + EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayFootstepSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -501, 223, 15 * DT) EVT_KILL_THREAD(LVarA) - EVT_EXEC_WAIT(N(D_802481E0_84ADB0)) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_CloseDoor)) EVT_RETURN EVT_END }; -EvtScript N(D_80248798_84B368) = { +EvtScript N(EVS_HiddenRoom_WaitForOuttaSight) = { EVT_SET_GROUP(EVT_GROUP_EF) EVT_IF_NE(GB_StoryProgress, STORY_CH4_MET_WITH_TWINK) EVT_RETURN @@ -137,9 +137,10 @@ EvtScript N(D_80248798_84B368) = { EVT_WAIT(1) EVT_END_LOOP EVT_SET(LVar7, 0) + // wait for player to use bow within 100 <= z <= 200 EVT_LOOP(0) EVT_CALL(N(IsPartnerBow)) - EVT_IF_NE(LVar0, 0) + EVT_IF_TRUE(LVar0) EVT_SET(LVar7, 1) EVT_BREAK_LOOP EVT_END_IF @@ -148,25 +149,26 @@ EvtScript N(D_80248798_84B368) = { EVT_BREAK_LOOP EVT_END_IF EVT_IF_GT(LVar2, 200) + // automatically satisfied while exiting the front door EVT_RETURN EVT_END_IF EVT_WAIT(1) EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) - EVT_EXEC_WAIT(N(D_80248128_84ACF8)) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_OpenDoor)) EVT_CALL(SetNpcPos, NPC_ShyGuy_01, -501, 20, 223) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim02) EVT_CALL(NpcMoveTo, NPC_ShyGuy_01, -506, 168, 15) EVT_CALL(SetNpcAnimation, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim00) - EVT_EXEC_WAIT(N(D_802481E0_84ADB0)) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_CloseDoor)) EVT_IF_EQ(LVar7, 1) - EVT_EXEC_WAIT(N(D_802483B8_84AF88)) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_RevealSecretRoom)) EVT_ELSE - EVT_EXEC_WAIT(N(D_80248624_84B1F4)) + EVT_EXEC_WAIT(N(EVS_SuspiciousGuy_RunAway)) EVT_CALL(N(GetFloorCollider), LVar0) EVT_THREAD EVT_WAIT(10 * DT) - EVT_EXEC(N(D_80248798_84B368)) + EVT_EXEC(N(EVS_HiddenRoom_WaitForOuttaSight)) EVT_END_THREAD EVT_END_IF EVT_CALL(SetNpcPos, NPC_ShyGuy_01, NPC_DISPOSE_LOCATION) @@ -175,7 +177,7 @@ EvtScript N(D_80248798_84B368) = { EVT_END }; -EvtScript N(D_80248A14_84B5E4) = { +EvtScript N(EVS_ShyGuy_StealStoreroomKey) = { EVT_CALL(GetNpcPos, NPC_ShyGuy_02, LVar2, LVar3, LVar4) EVT_ADD(LVar3, 20) EVT_CALL(MakeItemEntity, ITEM_VIS_GROUP(ITEM_STOREROOM_KEY, VIS_GROUP_1), LVar2, LVar3, LVar4, ITEM_SPAWN_MODE_DECORATION, 0) @@ -192,7 +194,7 @@ EvtScript N(D_80248A14_84B5E4) = { EVT_END }; -EvtScript N(EVS_80248B08) = { +EvtScript N(EVS_OnEnterShop) = { EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) EVT_RETURN EVT_END_IF @@ -236,9 +238,9 @@ EvtScript N(EVS_80248B08) = { EVT_END_LOOP EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit_mu, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_DEFAULT) EVT_END_THREAD - EVT_EXEC(N(D_80248A14_84B5E4)) - EVT_SET(LVar0, 15) - EVT_EXEC_GET_TID(N(D_802480E0_84ACB0), LVarA) + EVT_EXEC(N(EVS_ShyGuy_StealStoreroomKey)) + EVT_SET(LVar0, NPC_ShyGuy_02) + EVT_EXEC_GET_TID(N(EVS_ShyGuy_PlayFootstepSounds), LVarA) EVT_CALL(NpcMoveTo, NPC_ShyGuy_02, 254, -66, 30) EVT_KILL_THREAD(LVarA) EVT_CALL(SetNpcPos, NPC_ShyGuy_02, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 6df0b7daa8b..e7f3afefde3 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -1246,9 +1246,9 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(20) - EVT_CALL(PlaySoundAtPlayer, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Port_00B4, 160, 40) diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index ee267fe17db..c167e4ef5cd 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -771,31 +771,31 @@ API_CALLABLE(N(RunMinigame)) { if (data->found < NUM_PANELS) { data->timeLeft--; if (data->timeLeft == 750) { - sfx_play_sound(SOUND_01A5); + sfx_play_sound(SOUND_OMO_BOX_CHIME_1); } else if (data->timeLeft == 600) { - sfx_play_sound(SOUND_01A5); + sfx_play_sound(SOUND_OMO_BOX_CHIME_1); } else if (data->timeLeft == 450) { - sfx_play_sound(SOUND_01A5); + sfx_play_sound(SOUND_OMO_BOX_CHIME_1); } else if (data->timeLeft == 300) { - sfx_play_sound(SOUND_01A6); + sfx_play_sound(SOUND_OMO_BOX_CHIME_2); } else if (data->timeLeft == 270) { - sfx_play_sound(SOUND_01A6); + sfx_play_sound(SOUND_OMO_BOX_CHIME_2); } else if (data->timeLeft == 240) { - sfx_play_sound(SOUND_01A6); + sfx_play_sound(SOUND_OMO_BOX_CHIME_2); } else if (data->timeLeft == 210) { - sfx_play_sound(SOUND_01A6); + sfx_play_sound(SOUND_OMO_BOX_CHIME_2); } else if (data->timeLeft == 180) { - sfx_play_sound(SOUND_01A6); + sfx_play_sound(SOUND_OMO_BOX_CHIME_2); } else if (data->timeLeft == 150) { - sfx_play_sound(SOUND_01A7); + sfx_play_sound(SOUND_OMO_BOX_CHIME_3); } else if (data->timeLeft == 120) { - sfx_play_sound(SOUND_01A7); + sfx_play_sound(SOUND_OMO_BOX_CHIME_3); } else if (data->timeLeft == 90) { - sfx_play_sound(SOUND_01A7); + sfx_play_sound(SOUND_OMO_BOX_CHIME_3); } else if (data->timeLeft == 60) { - sfx_play_sound(SOUND_01A7); + sfx_play_sound(SOUND_OMO_BOX_CHIME_3); } else if (data->timeLeft == 30) { - sfx_play_sound(SOUND_01A7); + sfx_play_sound(SOUND_OMO_BOX_CHIME_3); } } if ((data->timeLeft > 0) && (data->found == NUM_PANELS)) { diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index 309e2ab87ff..36362f7ce4a 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -270,7 +270,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { EVT_CALL(GetNpcPos, NPC_Koover, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_ADD(LVar1, 35) - EVT_CALL(PlaySoundAtNpc, NPC_Koover, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Koover, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Koover, EMOTE_EXCLAMATION, 0, 20, EMOTER_POS, LVar0, LVar1, LVar2, 0) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_Koopa_Run) diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index ab12c3060fc..15661c0e967 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -954,7 +954,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_WAIT(20 * DT) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00C9) EVT_WAIT(10 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 50, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/omo_04_6_scenes.c index 0fa3004c4c5..3080d5b3956 100644 --- a/src/world/area_omo/omo_04/omo_04_6_scenes.c +++ b/src/world/area_omo/omo_04/omo_04_6_scenes.c @@ -236,7 +236,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_END_THREAD EVT_WAIT(90 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/omo_07_6_scenes.c index c3c4a96d6ca..4c570c375c9 100644 --- a/src/world/area_omo/omo_07/omo_07_6_scenes.c +++ b/src/world/area_omo/omo_07/omo_07_6_scenes.c @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF diff --git a/src/world/area_omo/omo_08/omo_08_3_boxes.c b/src/world/area_omo/omo_08/omo_08_3_boxes.c index 5d3ec31a278..92b93fd8b87 100644 --- a/src/world/area_omo/omo_08/omo_08_3_boxes.c +++ b/src/world/area_omo/omo_08/omo_08_3_boxes.c @@ -208,16 +208,16 @@ EvtScript N(EVS_BoxResult_GiveCoins) = { EVT_WAIT(LVar0) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_OMO_BOX_CHIME_2, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_OMO_BOX_CHIME_1, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_OMO_BOX_CHIME_3, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_OMO_BOX_CHIME_4, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -230,7 +230,7 @@ EvtScript N(EVS_BoxResult_GiveCoins) = { EVT_EXEC(N(EVS_RedLightOff)) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySound, SOUND_01A9) + EVT_CALL(PlaySound, SOUND_OMO_BOX_DONE) EVT_EXEC(N(EVS_GreenLightOn)) EVT_EXEC(N(EVS_YellowLightOn)) EVT_EXEC(N(EVS_RedLightOn)) @@ -315,16 +315,16 @@ EvtScript N(EVS_BoxResult_RepairTrack) = { EVT_WAIT(3) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_OMO_BOX_CHIME_2, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_OMO_BOX_CHIME_1, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_OMO_BOX_CHIME_3, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(3) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_OMO_BOX_CHIME_4, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(3) EVT_END_LOOP @@ -516,16 +516,16 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_WAIT(LVar0) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A6, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_OMO_BOX_CHIME_2, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_BlueLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A5, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_OMO_BOX_CHIME_1, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_RedLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A7, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_OMO_BOX_CHIME_3, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_YellowLightOn)) EVT_WAIT(LVar0) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A8, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_OMO_BOX_CHIME_4, SOUND_SPACE_DEFAULT) EVT_EXEC(N(EVS_GreenLightOn)) EVT_WAIT(LVar0) EVT_SUB(LVar0, 1) @@ -538,7 +538,7 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EVT_EXEC(N(EVS_RedLightOff)) EVT_EXEC(N(EVS_BlueLightOff)) EVT_WAIT(LVar0) - EVT_CALL(PlaySound, SOUND_01A9) + EVT_CALL(PlaySound, SOUND_OMO_BOX_DONE) EVT_EXEC(N(EVS_GreenLightOn)) EVT_EXEC(N(EVS_YellowLightOn)) EVT_EXEC(N(EVS_RedLightOn)) @@ -635,13 +635,13 @@ EvtScript N(EVS_BoxResult_ReleaseShyGuys) = { EvtScript N(EVS_HitBox) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(EVT_PTR(N(GreenBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_01A2, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o907, SOUND_OMO_BOX_GLOW_2, SOUND_SPACE_DEFAULT) EVT_CASE_EQ(EVT_PTR(N(YellowBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_01A1, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o911, SOUND_OMO_BOX_GLOW_1, SOUND_SPACE_DEFAULT) EVT_CASE_EQ(EVT_PTR(N(RedBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_01A3, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o915, SOUND_OMO_BOX_GLOW_3, SOUND_SPACE_DEFAULT) EVT_CASE_EQ(EVT_PTR(N(BlueBoxInfo))) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_01A4, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o918, SOUND_OMO_BOX_GLOW_4, SOUND_SPACE_DEFAULT) EVT_END_SWITCH EVT_USE_BUF(LVar0) EVT_BUF_READ1(LVar1) diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/omo_09_8_scenes.c index b1e15fe4d9a..270b6ed493f 100644 --- a/src/world/area_omo/omo_09/omo_09_8_scenes.c +++ b/src/world/area_omo/omo_09/omo_09_8_scenes.c @@ -107,7 +107,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_CALL(SetNpcVar, NPC_Kammy, 0, 0) EVT_WAIT(5 * DT) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) - EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5 * DT) EVT_END_IF diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c index fcf43e096ef..2120b66059c 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -306,7 +306,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(func_802D2C14, 0) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059) diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/omo_13_4_npc.c index 30075c21c0d..a1eed070afd 100644 --- a/src/world/area_omo/omo_13/omo_13_4_npc.c +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcInteract_AntiGuy) = { EVT_END_IF EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004A) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) diff --git a/src/world/area_osr/osr_03/osr_03_4_starship.c b/src/world/area_osr/osr_03/osr_03_4_starship.c index acb192a8247..be700bdb757 100644 --- a/src/world/area_osr/osr_03/osr_03_4_starship.c +++ b/src/world/area_osr/osr_03/osr_03_4_starship.c @@ -52,7 +52,7 @@ EvtScript N(EVS_Scene_Starship) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD - EVT_CALL(PlaySound, SOUND_0180) + EVT_CALL(PlaySound, SOUND_STARSHIP_NEAR_FLYBY) EVT_CALL(MakeLerp, 50, 10, 10, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_pra/pra_02/pra_02_4_entity.c b/src/world/area_pra/pra_02/pra_02_4_entity.c index d4f9a9cc6b1..0aa9cd6f810 100644 --- a/src/world/area_pra/pra_02/pra_02_4_entity.c +++ b/src/world/area_pra/pra_02/pra_02_4_entity.c @@ -183,9 +183,9 @@ EvtScript N(EVS_ItemPrompt_RedPadlock) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_16_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne, 1, 0) EVT_CALL(N(GetEntityPosition), MV_NearRedPadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarRedPadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_NearRedPadlock) EVT_SET(MV_NearRedPadlock, -1) EVT_CALL(N(RemovePadlock)) @@ -220,9 +220,9 @@ EvtScript N(EVS_ItemPrompt_BluePadlock) = { EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittse2, 1, 0) EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_pra_13_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittne2, 1, 0) EVT_CALL(N(GetEntityPosition), MV_NearBluePadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_FarBluePadlock, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_NearBluePadlock) EVT_SET(MV_NearBluePadlock, -1) EVT_CALL(N(RemovePadlock)) diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index 5369d9ea308..ccae33a2e87 100644 --- a/src/world/area_pra/pra_19/pra_19_3_npc.c +++ b/src/world/area_pra/pra_19/pra_19_3_npc.c @@ -628,7 +628,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_WAIT(60) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(35) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) diff --git a/src/world/area_pra/pra_34/pra_34_2_main.c b/src/world/area_pra/pra_34/pra_34_2_main.c index 3acc3a18616..cad6076cc95 100644 --- a/src/world/area_pra/pra_34/pra_34_2_main.c +++ b/src/world/area_pra/pra_34/pra_34_2_main.c @@ -126,9 +126,9 @@ EvtScript N(EVS_UnlockPrompt_Doors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_PRA34_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_FarPadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(N(GetEntityPosition), MV_NearPadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_FarPadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_SET(LVar0, MV_NearPadlockEntityID) diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/sam_01_5_scenes.c index 05061cee066..9d9b9cf5ece 100644 --- a/src/world/area_sam/sam_01/sam_01_5_scenes.c +++ b/src/world/area_sam/sam_01/sam_01_5_scenes.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 0, 0) EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -185, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MayorPenguinWife, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30 * DT) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk) diff --git a/src/world/area_sam/sam_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/sam_08_5_scenes.c index 093bc8b620d..dbdf21a2b32 100644 --- a/src/world/area_sam/sam_08/sam_08_5_scenes.c +++ b/src/world/area_sam/sam_08/sam_08_5_scenes.c @@ -9,7 +9,7 @@ API_CALLABLE(N(AdjustFightingSoundsPos)) { s32 z = evt_get_variable(script, *args++); // @bug need to use real sound id, not environmental sound id - sfx_adjust_env_sound_pos(SOUND_LOOP_6C, SOUND_SPACE_DEFAULT, x, y, z); + sfx_adjust_env_sound_pos(SOUND_LOOP_FIGHTING, SOUND_SPACE_DEFAULT, x, y, z); return ApiStatus_DONE2; } @@ -25,7 +25,7 @@ API_CALLABLE(N(StartFightingRumble)) { } EvtScript N(EVS_TwoKoopesFightingFX) = { - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_LOOP_6C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_LOOP_FIGHTING, SOUND_SPACE_DEFAULT) EVT_LOOP(0) EVT_CALL(N(StartFightingRumble), 80, 10) EVT_CALL(GetNpcPos, NPC_Kooper_01A, LVar0, LVar1, LVar2) @@ -93,19 +93,19 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(InterpNpcYaw, NPC_Kooper_01A, 270, 0) EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 90, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtPlayer, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtPlayer, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Idle, ANIM_WorldKooper_Idle, 5, MSG_CH7_011F) EVT_THREAD @@ -377,7 +377,7 @@ EvtScript N(EVS_Scene_HitTrueKooper) = { EVT_CALL(N(PlayBigSmokePuff), LVar0, LVar1, LVar2) EVT_WAIT(6 * DT) EVT_END_LOOP - EVT_CALL(StopSound, SOUND_LOOP_6C) + EVT_CALL(StopSound, SOUND_LOOP_FIGHTING) EVT_KILL_THREAD(MV_KoopersFightingScript) EVT_CALL(RandInt, 100, LVar0) EVT_IF_GT(LVar0, 50) diff --git a/src/world/area_sam/sam_11/sam_11_3_rooms.c b/src/world/area_sam/sam_11/sam_11_3_rooms.c index 6109d70d9f8..ca97eccc977 100644 --- a/src/world/area_sam/sam_11/sam_11_3_rooms.c +++ b/src/world/area_sam/sam_11/sam_11_3_rooms.c @@ -134,7 +134,7 @@ EvtScript N(EVS_UnlockPrompt_LeftHouse) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_SAM11_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_PadlockEntityID) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/tik_01_2_main.c index f85355598dd..018dfade11f 100644 --- a/src/world/area_tik/tik_01/tik_01_2_main.c +++ b/src/world/area_tik/tik_01/tik_01_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_27) + EVT_CALL(PlaySound, SOUND_LOOP_TIK01_WATER) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) diff --git a/src/world/area_tik/tik_02/tik_02_2_main.c b/src/world/area_tik/tik_02/tik_02_2_main.c index 1b781286134..352797d2239 100644 --- a/src/world/area_tik/tik_02/tik_02_2_main.c +++ b/src/world/area_tik/tik_02/tik_02_2_main.c @@ -17,9 +17,9 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_28) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_29, SOUND_SPACE_WITH_DEPTH, -230, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_2A, SOUND_SPACE_WITH_DEPTH, 20, -180, 120) + EVT_CALL(PlaySound, SOUND_LOOP_TIK02_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK02_FLOW2, SOUND_SPACE_WITH_DEPTH, -230, -180, 120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK02_FLOW3, SOUND_SPACE_WITH_DEPTH, 20, -180, 120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/tik_03_2_main.c index 9d9f0a3f72b..33b889a54af 100644 --- a/src/world/area_tik/tik_03/tik_03_2_main.c +++ b/src/world/area_tik/tik_03/tik_03_2_main.c @@ -81,8 +81,8 @@ EvtScript N(EVS_Main) = { EVT_RETURN EVT_END_IF EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_2B) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_2C, SOUND_SPACE_WITH_DEPTH, -10, -20, 120) + EVT_CALL(PlaySound, SOUND_LOOP_TIK03_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK03_FLOW1, SOUND_SPACE_WITH_DEPTH, -10, -20, 120) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_RETURN diff --git a/src/world/area_tik/tik_05/tik_05_2_main.c b/src/world/area_tik/tik_05/tik_05_2_main.c index 64c44a1d187..6f2876f82f6 100644 --- a/src/world/area_tik/tik_05/tik_05_2_main.c +++ b/src/world/area_tik/tik_05/tik_05_2_main.c @@ -17,8 +17,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_2D) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_2E, SOUND_SPACE_WITH_DEPTH, -85, -20, 120) + EVT_CALL(PlaySound, SOUND_LOOP_TIK05_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK05_FLOW1, SOUND_SPACE_WITH_DEPTH, -85, -20, 120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_06/tik_06_2_main.c b/src/world/area_tik/tik_06/tik_06_2_main.c index 1db13ac1f8b..9e9fb051ab5 100644 --- a/src/world/area_tik/tik_06/tik_06_2_main.c +++ b/src/world/area_tik/tik_06/tik_06_2_main.c @@ -67,10 +67,10 @@ EvtScript N(EVS_Main) = { EVT_SET(GF_MAP_ToadTownTunnels, TRUE) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_2F) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_30, SOUND_SPACE_WITH_DEPTH, -85, -180, 120) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_31, SOUND_SPACE_WITH_DEPTH, -25, -140, -130) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_32, SOUND_SPACE_WITH_DEPTH, -35, -180, 130) + EVT_CALL(PlaySound, SOUND_LOOP_TIK06_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK06_FLOW2, SOUND_SPACE_WITH_DEPTH, -85, -180, 120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK06_FLOW3, SOUND_SPACE_WITH_DEPTH, -25, -140, -130) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK06_FLOW4, SOUND_SPACE_WITH_DEPTH, -35, -180, 130) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index 138867398d3..85924bfe4ba 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -32,8 +32,8 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_33) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_34, SOUND_SPACE_WITH_DEPTH, -30, -30, -85) + EVT_CALL(PlaySound, SOUND_LOOP_TIK08_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK08_FLOW1, SOUND_SPACE_WITH_DEPTH, -30, -30, -85) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) EVT_CALL(EnableTexPanning, MODEL_o92, TRUE) diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c index f1c4699f4b6..ac0f4a3a62e 100644 --- a/src/world/area_tik/tik_09/tik_09_2_main.c +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -9,7 +9,7 @@ EvtScript N(EVS_CloseGates) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySound, SOUND_CHIME_BEGIN_AMBUSH) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_026B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_LARGE_GATE_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 60, 0, 25, EASING_COS_IN_OUT) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -20,7 +20,7 @@ EvtScript N(EVS_CloseGates) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_026C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_LARGE_GATE_CLOSE, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o58, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) @@ -67,10 +67,10 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_35) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_36, SOUND_SPACE_WITH_DEPTH, -190, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_37, SOUND_SPACE_WITH_DEPTH, 50, -20, -120) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_38, SOUND_SPACE_WITH_DEPTH, 290, -20, -120) + EVT_CALL(PlaySound, SOUND_LOOP_TIK09_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK09_FLOW2, SOUND_SPACE_WITH_DEPTH, -190, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK09_FLOW4, SOUND_SPACE_WITH_DEPTH, 50, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK09_FLOW3, SOUND_SPACE_WITH_DEPTH, 290, -20, -120) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_CALL(EnableTexPanning, MODEL_o84, TRUE) diff --git a/src/world/area_tik/tik_10/tik_10_2_main.c b/src/world/area_tik/tik_10/tik_10_2_main.c index bd599fb9280..f06f3518fb7 100644 --- a/src/world/area_tik/tik_10/tik_10_2_main.c +++ b/src/world/area_tik/tik_10/tik_10_2_main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_39) + EVT_CALL(PlaySound, SOUND_LOOP_TIK10_WATER) EVT_EXEC(N(EVS_SetupDrips)) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD diff --git a/src/world/area_tik/tik_18/tik_18_2_main.c b/src/world/area_tik/tik_18/tik_18_2_main.c index 5020ed4befe..765ba723afc 100644 --- a/src/world/area_tik/tik_18/tik_18_2_main.c +++ b/src/world/area_tik/tik_18/tik_18_2_main.c @@ -22,7 +22,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o45, COLLIDER_FLAGS_UPPER_MASK) EVT_EXEC(N(EVS_SetupDrips)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_43) + EVT_CALL(PlaySound, SOUND_LOOP_TIK18_WATER) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/tik_19_2_main.c index a376a135a18..08ab449d5fc 100644 --- a/src/world/area_tik/tik_19/tik_19_2_main.c +++ b/src/world/area_tik/tik_19/tik_19_2_main.c @@ -26,9 +26,9 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_44) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_45, SOUND_SPACE_WITH_DEPTH, 0, -20, 30) - EVT_CALL(PlaySoundAtF, SOUND_LOOP_46, SOUND_SPACE_WITH_DEPTH, 270, -20, 30) + EVT_CALL(PlaySound, SOUND_LOOP_TIK19_WATER) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK19_FLOW3, SOUND_SPACE_WITH_DEPTH, 0, -20, 30) + EVT_CALL(PlaySoundAtF, SOUND_LOOP_TIK19_FLOW4, SOUND_SPACE_WITH_DEPTH, 270, -20, 30) EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_1) diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c index 42cdbda41d9..e00e074d5f1 100644 --- a/src/world/area_tik/tik_20/tik_20_2_main.c +++ b/src/world/area_tik/tik_20/tik_20_2_main.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) EVT_END_THREAD EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_47) + EVT_CALL(PlaySound, SOUND_LOOP_TIK20_WATER) EVT_EXEC(N(EVS_SetupDrips)) EVT_THREAD TEX_PAN_PARAMS_ID(TEX_PANNER_0) diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c index 1afca160321..e06c2a77730 100644 --- a/src/world/area_tik/tik_23/tik_23_2_main.c +++ b/src/world/area_tik/tik_23/tik_23_2_main.c @@ -71,7 +71,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_48) + EVT_CALL(PlaySound, SOUND_LOOP_TIK23_WATER) EVT_EXEC_WAIT(N(EVS_SetupDrips)) EVT_CALL(SetTexPanner, MODEL_nagare1, 0) EVT_CALL(SetTexPanner, MODEL_o97, 0) diff --git a/src/world/area_tik/tik_24/tik_24_2_main.c b/src/world/area_tik/tik_24/tik_24_2_main.c index 4b387d49832..ab2db6ab339 100644 --- a/src/world/area_tik/tik_24/tik_24_2_main.c +++ b/src/world/area_tik/tik_24/tik_24_2_main.c @@ -47,7 +47,7 @@ EvtScript N(EVS_Main) = { EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(PlaySound, SOUND_LOOP_49) + EVT_CALL(PlaySound, SOUND_LOOP_TIK24_WATER) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) EVT_WAIT(1) diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 1e23d13218b..6e2b461e5fc 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Talk, ANIM_KoopaBros_Black_Idle, 0, MSG_CH1_00D2) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Walk) EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0173, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_RUN_AWAY_BUILDUP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Run) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -71,7 +71,7 @@ EvtScript N(EVS_NpcIdle_KoopaBros) = { EVT_WAIT(8 * DT) EVT_WAIT(12 * DT) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_SELF, -496, 101, 0) EVT_END_THREAD diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index 9a5f5235ec5..ab01ce1798d 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -125,13 +125,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(20 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(120 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) @@ -162,7 +162,7 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) diff --git a/src/world/area_trd/trd_01/trd_01_2_entity.c b/src/world/area_trd/trd_01/trd_01_2_entity.c index fb4a5f8952b..43fd9d53562 100644 --- a/src/world/area_trd/trd_01/trd_01_2_entity.c +++ b/src/world/area_trd/trd_01/trd_01_2_entity.c @@ -46,7 +46,7 @@ EvtScript N(EVS_UnlockDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD01_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Padlock_EntityIndex) EVT_CALL(N(RemovePadlock)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_trd/trd_02/trd_02_2_entity.c b/src/world/area_trd/trd_02/trd_02_2_entity.c index d1cc0f244a4..4e3cbd79d65 100644 --- a/src/world/area_trd/trd_02/trd_02_2_entity.c +++ b/src/world/area_trd/trd_02/trd_02_2_entity.c @@ -25,7 +25,7 @@ EvtScript N(D_80242890_9A3870) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD02_UnlockedDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Padlock_EntityIndex) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c index 4ccba4bb93d..b073ffba6da 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_WAIT(25 * DT) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) EVT_THREAD - EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_026B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_LARGE_GATE_OPEN, SOUND_SPACE_DEFAULT) EVT_CALL(MakeLerp, 100, 0, 40 * DT, EASING_QUADRATIC_IN) EVT_LABEL(0) EVT_CALL(UpdateLerp) @@ -60,7 +60,7 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_026C, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_LARGE_GATE_CLOSE, SOUND_SPACE_DEFAULT) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(10 * DT) EVT_END_THREAD @@ -98,13 +98,13 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Talk, ANIM_KoopaBros_Green_Idle, 0, MSG_CH1_00D4) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Walk) EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_0173, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_RUN_AWAY_BUILDUP, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8 * DT) EVT_WAIT(8 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_0174, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_RUN_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros, -300, 70, 0) EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index dac6411be0e..f8577fbbba8 100644 --- a/src/world/area_trd/trd_04/trd_04_2_entity.c +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -51,7 +51,7 @@ EvtScript N(EVS_UnlockUpperLeftDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD04_UnlockedUpperDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Unk_00, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_00) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) @@ -79,7 +79,7 @@ EvtScript N(EVS_UnlockLowerRightDoors) = { EVT_CALL(CloseChoicePopup) EVT_SET(GF_TRD04_UnlockedLowerDoor, TRUE) EVT_CALL(N(GetEntityPosition), MV_Unk_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0269, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_USE_KEY, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_SET(LVar0, MV_Unk_01) EVT_CALL(N(RemovePadlock)) EVT_RESUME_GROUP(EVT_GROUP_01) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index 7bd5b53f2a7..0dd18eed83c 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -148,7 +148,7 @@ Vec3f N(UnusedPath)[] = { EvtScript N(EVS_PlayerFalling) = { EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0175) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_1) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 0, 150, 45, EASING_COS_IN_OUT) @@ -179,7 +179,7 @@ EvtScript N(EVS_PlayerFalling) = { EVT_SETF(LVar6, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0175) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_1) EVT_END_THREAD EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) EVT_LABEL(1) @@ -207,7 +207,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0176) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_2) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 0, -135, 45, EASING_COS_IN_OUT) @@ -236,7 +236,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0176) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_2) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_PARTNER, LVar4, LVar5, LVar6) EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index d6a2a1d72c5..8132f4e6a1e 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -144,7 +144,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_WAIT(10 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, EMOTER_POS, LVar0, LVar1, LVar2, 40) EVT_WAIT(25 * DT) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) @@ -156,13 +156,13 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(3.0)) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5 * DT) EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Talk, ANIM_KoopaBros_Yellow_Idle, 0, MSG_CH1_00D6) - EVT_CALL(PlaySound, SOUND_0173) + EVT_CALL(PlaySound, SOUND_RUN_AWAY_BUILDUP) EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Run) EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.8)) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8 * DT) EVT_WAIT(8 * DT) - EVT_CALL(PlaySound, SOUND_0174) + EVT_CALL(PlaySound, SOUND_RUN_AWAY) EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0 / DT)) EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -400, -10, 0) EVT_EXEC(N(EVS_EndKoopaBrosTheme)) diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 0a0ba6aea20..10b9b99529c 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -170,7 +170,7 @@ EvtScript N(EVS_PlayerFalling) = { EVT_CALL(SetPlayerPos, 0, 130, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0175) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_1) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 180, 210, 25, EASING_QUADRATIC_IN) @@ -207,7 +207,7 @@ EvtScript N(EVS_PartnerFalling) = { EVT_CALL(SetNpcPos, NPC_PARTNER, 0, LVar0, 0) EVT_THREAD EVT_WAIT(5) - EVT_CALL(PlaySound, SOUND_0176) + EVT_CALL(PlaySound, SOUND_PAPER_GLIDE_2) EVT_END_THREAD EVT_THREAD EVT_CALL(MakeLerp, 180, 150, 25, EASING_QUADRATIC_IN) diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index d1ac029a17d..9e4d3736460 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_WAIT(15 * DT) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(25 * DT) - EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40 * DT) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c index 6206984ebee..a3bd8f4bf7d 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c @@ -252,7 +252,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_019C) + EVT_CALL(PlaySound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) @@ -352,7 +352,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o261, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o351, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_019D) + EVT_CALL(StopSound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -361,7 +361,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { }; EvtScript N(EVS_Scene_BeanstalkGrowing) = { - EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_019B, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o261, SOUND_FLO_BEANSTALK_START_GROWING, SOUND_SPACE_DEFAULT) EVT_SET(LVarF, 0) EVT_LOOP(100) EVT_ADD(LVarF, 1) diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index 82db6987b0e..cc29bf9ef83 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_BURROW_SURFACE, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10) - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0263, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_QUESTION, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) @@ -228,7 +228,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) - EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) @@ -405,7 +405,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -484,7 +484,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -563,7 +563,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) @@ -642,7 +642,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_ELSE EVT_SET(LVar1, 10) EVT_END_IF - EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_PARTNER, 1) diff --git a/src/world/dead/area_flo/flo_07/flo_07_1_music.c b/src/world/dead/area_flo/flo_07/flo_07_1_music.c index edf315c69cc..0bf6139960d 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_1_music.c +++ b/src/world/dead/area_flo/flo_07/flo_07_1_music.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_CALL(SetMusicTrack, 0, SONG_FLOWER_FIELDS_SUNNY, 0, 8) EVT_END_SWITCH EVT_END_IF - EVT_CALL(PlaySound, SOUND_LOOP_21) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_1) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index 638486caf70..1eb92c982c7 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_EXEC_GET_TID(N(EVS_ShakeGround), MV_GroundShakingScript) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Strain, ANIM_Posie_Strain, 0, MSG_CH6_0069) EVT_KILL_THREAD(MV_GroundShakingScript) @@ -65,8 +65,8 @@ EvtScript N(EVS_MakeCrystalBerry) = { EVT_CALL(MakeItemEntity, ITEM_CRYSTAL_BERRY, -265, 100, 54, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_FLO07_Item_CrystalBerry) EVT_SET(GF_FLO07_CrystalBerryFellOnLeftSide, TRUE) EVT_END_IF - EVT_CALL(PlaySound, SOUND_LRAW_03BC | SOUND_ID_TRIGGER_CHANGE_SOUND) - EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_03BC) + EVT_CALL(PlaySound, SOUND_LRAW_RUMBLE | SOUND_ID_TRIGGER_CHANGE_SOUND) + EVT_CALL(StopTrackingSoundPos, SOUND_LRAW_RUMBLE) EVT_SET(AF_FLO_MadeCrystalBerry, TRUE) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Posie, ANIM_Posie_Talk, ANIM_Posie_Idle, 0, MSG_CH6_006A) diff --git a/src/world/dead/area_flo/flo_10/flo_10_1_music.c b/src/world/dead/area_flo/flo_10/flo_10_1_music.c index 56146a6b0f2..5289a4af6f2 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_1_music.c +++ b/src/world/dead/area_flo/flo_10/flo_10_1_music.c @@ -13,7 +13,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_SWITCH EVT_END_IF EVT_IF_GE(GB_StoryProgress, STORY_CH6_FILLED_SPRING_WITH_WATER) - EVT_CALL(PlaySound, SOUND_LOOP_22) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_WATER_FLOW_2) EVT_END_IF EVT_RETURN EVT_END diff --git a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c index efcf4723082..62def281bb2 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c @@ -189,7 +189,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(EnableGroup, MODEL_g31, TRUE) EVT_EXEC_WAIT(N(EVS_UnleashFountain)) EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_LOOP_24) + EVT_CALL(PlaySound, SOUND_LOOP_FLO_RELEASE_FOUNTAIN) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index eb498e6d718..b79b0ab7a60 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_TalkPlead, ANIM_Lily_IdlePlead, 5, MSG_CH6_0079) EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c index 62ffc4b1530..cc9e138e326 100644 --- a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c +++ b/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c @@ -63,7 +63,7 @@ API_CALLABLE(N(UpdateBubbleSoundPos)) { script->functionTemp[0] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_LRAW_0194, SOUND_SPACE_DEFAULT, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + sfx_adjust_env_sound_pos(SOUND_LRAW_BUBBLE_DRIFT, SOUND_SPACE_DEFAULT, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); return ApiStatus_DONE2; } @@ -85,7 +85,7 @@ Vec3f N(BubbleFlightPath)[] = { EvtScript N(EVS_BubbleFollowPath) = { EVT_WAIT(20) - EVT_CALL(PlaySound, SOUND_LOOP_23) + EVT_CALL(PlaySound, SOUND_LOOP_BUBBLE_DRIFT) EVT_CALL(LoadPath, 165, EVT_PTR(N(BubbleFlightPath)), ARRAY_COUNT(N(BubbleFlightPath)), EASING_COS_IN_OUT) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -98,7 +98,7 @@ EvtScript N(EVS_BubbleFollowPath) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(StopSound, SOUND_LOOP_23) + EVT_CALL(StopSound, SOUND_LOOP_BUBBLE_DRIFT) EVT_RETURN EVT_END }; @@ -159,7 +159,7 @@ EvtScript N(EVS_RideBigBubble) = { }; EvtScript N(EVS_BlowBigBubble) = { - EVT_CALL(PlaySoundAt, SOUND_0193, SOUND_SPACE_DEFAULT, 591, 55, 121) + EVT_CALL(PlaySoundAt, SOUND_FLO_BLOW_BUBBLE, SOUND_SPACE_DEFAULT, 591, 55, 121) EVT_CALL(EnableModel, MODEL_o167, TRUE) EVT_SETF(LVar2, EVT_FLOAT(1.0)) EVT_SETF(LVar4, EVT_FLOAT(0.0)) diff --git a/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c b/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c index 686b446b49d..242bfcf2700 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c +++ b/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c @@ -44,7 +44,7 @@ EvtScript N(EVS_MonitorFallingStairs) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(6) - EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_0187, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o175, SOUND_FLO_STAIRS_LOWERING, SOUND_SPACE_DEFAULT) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c index 3c1c1c2ba70..6b124427e26 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c +++ b/src/world/dead/area_flo/flo_18/flo_18_3_machine.c @@ -580,11 +580,11 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 6) EVT_WAIT(2) EVT_ADD(LVar1, 5) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 2, 15) EVT_WAIT(LVar3) EVT_ADD(LVar3, 1) @@ -594,7 +594,7 @@ EvtScript N(EVS_DamageMachine) = { EVT_USE_BUF(EVT_PTR(N(SmokeBurstPositions))) EVT_LOOP(ARRAY_COUNT(N(SmokeBurstPositions))) EVT_BUF_READ3(LVar0, LVar1, LVar2) - EVT_CALL(PlaySoundAt, SOUND_0190, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_SMOKE_BURST, SOUND_SPACE_DEFAULT, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 25) EVT_WAIT(LVar3) EVT_ADD(LVar3, LVar4) @@ -602,10 +602,10 @@ EvtScript N(EVS_DamageMachine) = { EVT_END_LOOP EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_DEFAULT, 70, 40, 10) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_EXPLODE, SOUND_SPACE_DEFAULT, 70, 40, 10) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 70, 40, 10, EVT_FLOAT(3.0), 30) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) - EVT_CALL(PlaySoundAt, SOUND_01A0, SOUND_SPACE_DEFAULT, 0, 30, 30) + EVT_CALL(PlaySoundAt, SOUND_FLO_PUFF_PUFF_EXPLODE, SOUND_SPACE_DEFAULT, 0, 30, 30) EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 0, 30, 30, EVT_FLOAT(4.0), 40) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(2.0)) EVT_EXEC_WAIT(N(EVS_BreakSmokestack)) diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index 4a7b8b8562e..500822b0399 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EvtScript N(EVS_GangRetreat) = { EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_019E, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_FlyingMagikoopa, SOUND_FLO_MAGIKOOPA_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_FlyingMagikoopa, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_FlyingMagikoopa, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Magikoopa)), ARRAY_COUNT(N(RetreatPath_Magikoopa)), EASING_LINEAR) @@ -104,7 +104,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_THREAD EVT_WAIT(15) EVT_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_019F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_01, SOUND_FLO_LAKITU_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_01, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_01, 270, 0) EVT_CALL(LoadPath, 60, EVT_PTR(N(RetreatPath_Lakitu_01)), ARRAY_COUNT(N(RetreatPath_Lakitu_01)), EASING_LINEAR) @@ -130,7 +130,7 @@ EvtScript N(EVS_GangRetreat) = { EVT_END_IF EVT_END_LOOP EVT_END_THREAD - EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_019F, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_Lakitu_03, SOUND_FLO_LAKITU_FLY_AWAY, SOUND_SPACE_DEFAULT) EVT_CALL(SetNpcFlagBits, NPC_Lakitu_03, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(InterpNpcYaw, NPC_Lakitu_03, 270, 0) EVT_CALL(LoadPath, 80, EVT_PTR(N(RetreatPath_Lakitu_03)), ARRAY_COUNT(N(RetreatPath_Lakitu_03)), EASING_LINEAR) diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index 9a7b35d2628..1f38af879db 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -204,7 +204,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(5) EVT_SET(AF_FLO_RidingBeanstalk, FALSE) - EVT_CALL(StopSound, SOUND_019C) + EVT_CALL(StopSound, SOUND_FLO_RIDE_BEANSTALK_UP_LOOP) EVT_EXEC_WAIT(N(EVS_SetupMusic)) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(DisablePlayerInput, FALSE) @@ -230,7 +230,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlayerMoveTo, LVar9, LVarB, 8) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.0)) EVT_CALL(NpcJump0, NPC_PARTNER, LVarC, LVarD, LVarE, 5) - EVT_CALL(PlaySound, SOUND_019D) + EVT_CALL(PlaySound, SOUND_FLO_RIDE_BEANSTALK_DOWN_LOOP) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c index 3874a44476b..3ac45c73494 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c @@ -11,7 +11,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_END_IF EVT_END_IF //@bug extra endif EVT_CASE_GE(STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_SWITCH EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_1) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index 066fd4d3798..60ccd3df2a2 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -479,7 +479,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) EVT_SET(AF_KZN_BossRoomFloorBroken, TRUE) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN_BossRoomFloorBroken, TRUE) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c index 155ae5216eb..3ab10abfac2 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_IF EVT_IF_LT(GB_StoryProgress, STORY_CH5_OPENED_ESCAPE_ROUTE) EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 0, 8) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 240b2d7fc8c..5035db12d1a 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_END_IF EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -447,7 +447,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_WAIT(15) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) - EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_0262, SOUND_SPACE_DEFAULT) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_EMOTE_IDEA, SOUND_SPACE_DEFAULT) EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c index d8b1799aee8..4a82776367e 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c @@ -2,7 +2,7 @@ EvtScript N(EVS_SetupMusic) = { EVT_IF_GE(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) - EVT_CALL(PlaySound, SOUND_LOOP_6B) + EVT_CALL(PlaySound, SOUND_LOOP_RUMBLE) EVT_END_IF EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_LAVA_4) diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index 48dbcd0ad4c..343d753d5b1 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -145,10 +145,10 @@ EvtScript N(EVS_PlayPyroclastSounds) = { EVT_BUF_READ1(LVar1) EVT_END_LOOP EVT_IF_EQ(AF_KZN23_UseAlternateSound, FALSE) - EVT_CALL(PlaySoundAt, SOUND_01AD, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_FLYING_PYROCLAST_1, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, TRUE) EVT_ELSE - EVT_CALL(PlaySoundAt, SOUND_01AE, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) + EVT_CALL(PlaySoundAt, SOUND_FLYING_PYROCLAST_2, SOUND_SPACE_DEFAULT, LVar1, 2800, 0) EVT_SET(AF_KZN23_UseAlternateSound, FALSE) EVT_END_IF EVT_RETURN