Skip to content

Commit

Permalink
sounds progress
Browse files Browse the repository at this point in the history
  • Loading branch information
HailSanta authored and HailSanta committed Oct 13, 2023
1 parent cc73484 commit eebd709
Show file tree
Hide file tree
Showing 200 changed files with 760 additions and 757 deletions.
18 changes: 9 additions & 9 deletions include/common_structs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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 */
Expand Down
358 changes: 180 additions & 178 deletions include/enums.h
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/audio.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ typedef u8* WaveData;

typedef u32 SegData;


typedef enum AuPriority {
AU_PRIORITY_FREE = 0,
AU_PRIORITY_BGM_PLAYER_MAIN = 1,
Expand Down
106 changes: 53 additions & 53 deletions src/audio/sfx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 };
Expand Down
4 changes: 2 additions & 2 deletions src/battle/1A5830.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/battle/area/isk_part_2/actor/tutankoopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/battle/area/kmr_part_3/actor/final_jr_troopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/battle/area/kmr_part_3/actor/mage_jr_troopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/battle/area/kmr_part_3/actor/para_jr_troopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions src/battle/area/kzn2/actor/lava_piranha.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/battle/area/omo2_1/actor/shy_squad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading

0 comments on commit eebd709

Please sign in to comment.