diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 15:54:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 15:54:40 -0500 |
| commit | b14fe9dce369b1a78c5f4f653b4c7e2e2d67d98d (patch) | |
| tree | ff1f6209a92bc3a92c102bb4a18ca8a7fa907af7 /data/scripts | |
| parent | ef935f6f4a59a2b37c4ff870ade96853621210ae (diff) | |
| parent | 57be596ce43bed86594412d598d3058c4a3d1d2d (diff) | |
Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cave_of_origin.inc | 2 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 4 | ||||
| -rw-r--r-- | data/scripts/kecleon.inc | 2 | ||||
| -rw-r--r-- | data/scripts/lilycove_lady.inc | 12 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index abffd07ff..6773c0662 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -2,7 +2,7 @@ CaveOfOrigin_EventScript_LegendaryCry:: lockall waitse - playmoncry SPECIES_KYOGRE, 2 @ SPECIES_GROUDON in Ruby + playmoncry SPECIES_KYOGRE, CRY_MODE_ENCOUNTER @ SPECIES_GROUDON in Ruby waitmoncry setvar VAR_TEMP_5, 1 releaseall diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index f5c023147..8d529d5e1 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -114,7 +114,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneAliveMon specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox Route117_PokemonDayCare_Text_WellRaiseYourMon, MSGBOX_DEFAULT waitmoncry special StoreSelectedPokemonInDaycare @@ -220,7 +220,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: playse SE_SHOP msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT waitse - playmoncry VAR_RESULT, 0 + playmoncry VAR_RESULT, CRY_MODE_NORMAL msgbox Route117_PokemonDayCare_Text_TookBackMon, MSGBOX_DEFAULT waitmoncry specialvar VAR_RESULT, GetDaycareState diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc index 414217499..82eca777d 100644 --- a/data/scripts/kecleon.inc +++ b/data/scripts/kecleon.inc @@ -70,7 +70,7 @@ EventScript_BattleKecleon:: applymovement VAR_LAST_TALKED, Movement_KecleonAppears waitmovement 0 waitse - playmoncry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, CRY_MODE_ENCOUNTER delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index 137af8752..576fa28ad 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -454,7 +454,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: waitmovement 0 delay 60 waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL delay 120 waitmoncry compare VAR_0x8004, 1 @@ -552,7 +552,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: lock faceplayer waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT waitmoncry release @@ -562,7 +562,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: lock faceplayer waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT waitmoncry release @@ -572,7 +572,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: lock faceplayer waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT waitmoncry release @@ -582,7 +582,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: lock faceplayer waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT waitmoncry release @@ -592,7 +592,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: lock faceplayer waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT waitmoncry release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 571b61e62..e2e985a7a 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -385,7 +385,7 @@ PlayersHouse_1F_EventScript_Vigoroth1:: lock faceplayer waitse - playmoncry SPECIES_VIGOROTH, 0 + playmoncry SPECIES_VIGOROTH, CRY_MODE_NORMAL msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT waitmoncry release @@ -395,7 +395,7 @@ PlayersHouse_1F_EventScript_Vigoroth2:: lock faceplayer waitse - playmoncry SPECIES_VIGOROTH, 0 + playmoncry SPECIES_VIGOROTH, CRY_MODE_NORMAL msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT waitmoncry release |