Synced sound.c

Sunnhild · Jul 29, 2022 · dfe6c68 · dfe6c68
1 parent 78e3780
commit dfe6c68
Show file tree

Hide file tree

Showing 64 changed files with 643 additions and 599 deletions.
diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc
@@ -145,7 +145,7 @@
 	.byte 0xff, 0, 0xff, 0
 	.endm
 
-	.macro cry2 sample:req
+	.macro cry_reverse sample:req
 	.byte 0x30, 60, 0, 0
 	.4byte \sample
 	.byte 0xff, 0, 0xff, 0

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
@@ -1,6 +1,7 @@
 #include "constants/battle.h"
 #include "constants/battle_anim.h"
 #include "constants/songs.h"
+#include "constants/sound.h"
 #include "constants/moves.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/battle_anim_script.inc"
@@ -5068,7 +5069,7 @@ Move_ROAR::
 	monbg ANIM_ATTACKER
 	monbgprio_28 0
 	setalpha 8, 8
-	createvisualtask SoundTask_PlayDoubleCry, 2, 0, 2
+	createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_ROAR
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1
 	call RoarEffect
 	delay 20
@@ -5093,7 +5094,7 @@ RoarEffect::
 
 Move_GROWL::
 	loadspritegfx ANIM_TAG_NOISE_LINE
-	createvisualtask SoundTask_PlayDoubleCry, 2, 0, 255
+	createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_GROWL
 	call RoarEffect
 	delay 10
 	createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 9, 1

diff --git a/data/event_scripts.s b/data/event_scripts.s
@@ -10,6 +10,7 @@
 #include "constants/pokemon.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
+#include "constants/sound.h"
 #include "constants/species.h"
 #include "constants/vars.h"
 #include "constants/battle.h"

diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -80,7 +80,7 @@ BirthIsland_Exterior_EventScript_Deoxys::
 	applymovement LOCALID_DEOXYS, Movement_DeoxysApproach
 	waitmovement 0
 	waitse
-	playmoncry SPECIES_DEOXYS, 2
+	playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setvar VAR_LAST_TALKED, LOCALID_DEOXYS

diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
@@ -45,7 +45,7 @@ CeladonCity_EventScript_Poliwrath::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_POLIWRATH, 0
+	playmoncry SPECIES_POLIWRATH, CRY_MODE_NORMAL
 	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry

diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -32,7 +32,7 @@ CeladonCity_Condominiums_1F_EventScript_Meowth::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_MEOWTH, 0
+	playmoncry SPECIES_MEOWTH, CRY_MODE_NORMAL
 	msgbox CeladonCity_Condominiums_1F_Text_Meowth
 	waitmoncry
 	release
@@ -42,7 +42,7 @@ CeladonCity_Condominiums_1F_EventScript_Clefairy::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_CLEFAIRY, 0
+	playmoncry SPECIES_CLEFAIRY, CRY_MODE_NORMAL
 	msgbox CeladonCity_Condominiums_1F_Text_Clefairy
 	waitmoncry
 	release
@@ -52,7 +52,7 @@ CeladonCity_Condominiums_1F_EventScript_Nidoran::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_NIDORAN_F, 0
+	playmoncry SPECIES_NIDORAN_F, CRY_MODE_NORMAL
 	msgbox CeladonCity_Condominiums_1F_Text_Nidoran
 	waitmoncry
 	release

diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc
@@ -28,7 +28,7 @@ CeruleanCave_B1F_EventScript_Mewtwo::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_MEWTWO, 2
+	playmoncry SPECIES_MEWTWO, CRY_MODE_ENCOUNTER
 	message CeruleanCave_B1F_Text_Mew
 	waitmessage
 	waitmoncry

diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
@@ -62,7 +62,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene::
 	message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
 	waitmessage
 	waitse
-	playmoncry SPECIES_LAPRAS, 2
+	playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER
 	waitbuttonpress
 	waitmoncry
 	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat

diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc
@@ -36,7 +36,7 @@ FourIsland_PokemonDayCare_GiveMonToRaise::
 	goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty
 	specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies
 	waitse
-	playmoncry VAR_0x8005, 0
+	playmoncry VAR_0x8005, CRY_MODE_NORMAL
 	msgbox DayCare_Text_WellRaiseYourMon
 	waitmoncry
 	special StoreSelectedPokemonInDaycare
@@ -137,7 +137,7 @@ FourIsland_PokemonDayCare_RetrieveMon::
 	playse SE_RS_SHOP
 	msgbox DayCare_Text_HeresYourMon
 	waitse
-	playmoncry VAR_RESULT, 0
+	playmoncry VAR_RESULT, CRY_MODE_NORMAL
 	textcolor 3
 	msgbox DayCare_Text_TookBackMon
 	call EventScript_RestorePrevTextColor

diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc
@@ -18,7 +18,7 @@ LavenderTown_House1_EventScript_Cubone::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_CUBONE, 0
+	playmoncry SPECIES_CUBONE, CRY_MODE_NORMAL
 	msgbox LavenderTown_House1_Text_Cubone
 	waitmoncry
 	release

diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc
@@ -54,7 +54,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_NIDORINO, 0
+	playmoncry SPECIES_NIDORINO, CRY_MODE_NORMAL
 	msgbox LavenderTown_VolunteerPokemonHouse_Text_Nidorino
 	waitmoncry
 	release
@@ -64,7 +64,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PSYDUCK, 0
+	playmoncry SPECIES_PSYDUCK, CRY_MODE_NORMAL
 	msgbox LavenderTown_VolunteerPokemonHouse_Text_Psyduck
 	waitmoncry
 	release

diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc
@@ -29,7 +29,7 @@ MtEmber_Summit_EventScript_Moltres::
 	faceplayer
 	setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE
 	waitse
-	playmoncry SPECIES_MOLTRES, 2
+	playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER
 	message Text_Gyaoo
 	waitmessage
 	waitmoncry

diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
@@ -53,7 +53,7 @@ NavelRock_Base_EventScript_Lugia::
 	delay 30
 	delay 50
 	waitse
-	playmoncry SPECIES_LUGIA, 2
+	playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER
 	waitmoncry
 	delay 20
 	setvar VAR_0x8004, SPECIES_LUGIA

diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
@@ -49,7 +49,7 @@ NavelRock_Summit_EventScript_HoOh::
 	setweather 0
 	doweather
 	waitse
-	playmoncry SPECIES_HO_OH, 2
+	playmoncry SPECIES_HO_OH, CRY_MODE_ENCOUNTER
 	delay 30
 	waitmoncry
 	delay 60

diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc
@@ -26,7 +26,7 @@ PewterCity_House1_EventScript_Nidoran::
 PewterCity_House1_EventScript_DoNidoranCry::
 	textcolor 3
 	waitse
-	playmoncry SPECIES_NIDORAN_M, 0
+	playmoncry SPECIES_NIDORAN_M, CRY_MODE_NORMAL
 	msgbox PewterCity_House1_Text_Nidoran
 	waitmoncry
 	call EventScript_RestorePrevTextColor

diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
@@ -21,7 +21,7 @@ PokemonTower_6F_EventScript_DefeatedMarowakGhost::
 	message PokemonTower_6F_Text_GhostWasCubonesMother
 	waitmessage
 	waitse
-	playmoncry SPECIES_MAROWAK, 0
+	playmoncry SPECIES_MAROWAK, CRY_MODE_NORMAL
 	waitbuttonpress
 	waitmoncry
 	msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed

diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc
@@ -40,7 +40,7 @@ PowerPlant_EventScript_Zapdos::
 	faceplayer
 	setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ZAPDOS, 2
+	playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER
 	message Text_Gyaoo
 	waitmessage
 	waitmoncry
@@ -78,7 +78,7 @@ PowerPlant_EventScript_Electrode1::
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE
@@ -107,7 +107,7 @@ PowerPlant_EventScript_Electrode2::
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ELECTRODE, 2
+	playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_SYS_SPECIAL_WILD_BATTLE

diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc
@@ -22,7 +22,7 @@ Route12_EventScript_Snorlax::
 	call EventScript_AwakenSnorlax
 	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
 	waitse
-	playmoncry SPECIES_SNORLAX, 2
+	playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_HIDE_ROUTE_12_SNORLAX

diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc
@@ -41,7 +41,7 @@ Route16_EventScript_Snorlax::
 	call EventScript_AwakenSnorlax
 	setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE
 	waitse
-	playmoncry SPECIES_SNORLAX, 2
+	playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER
 	delay 40
 	waitmoncry
 	setflag FLAG_HIDE_ROUTE_16_SNORLAX

diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc
@@ -29,7 +29,7 @@ Route16_House_EventScript_Fearow::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_FEAROW, 0
+	playmoncry SPECIES_FEAROW, CRY_MODE_NORMAL
 	msgbox Route16_House_Text_Fearow
 	waitmoncry
 	release

diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc
@@ -13,7 +13,7 @@ SSAnne_1F_Room3_EventScript_Wigglytuff::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_WIGGLYTUFF, 0
+	playmoncry SPECIES_WIGGLYTUFF, CRY_MODE_NORMAL
 	msgbox SSAnne_1F_Room3_Text_Wigglytuff
 	waitmoncry
 	release

diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc
@@ -9,7 +9,7 @@ SSAnne_B1F_Room5_EventScript_Machoke::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_MACHOKE, 0
+	playmoncry SPECIES_MACHOKE, CRY_MODE_NORMAL
 	msgbox SSAnne_B1F_Room5_Text_Machoke
 	waitmoncry
 	release

diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
@@ -76,7 +76,7 @@ SaffronCity_EventScript_Pidgeot::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIDGEOT, 0
+	playmoncry SPECIES_PIDGEOT, CRY_MODE_NORMAL
 	msgbox SaffronCity_Text_Pidgeot
 	waitmoncry
 	release

diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
@@ -13,7 +13,7 @@ SaffronCity_CopycatsHouse_1F_EventScript_Chansey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_CHANSEY, 0
+	playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL
 	msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
 	waitmoncry
 	release

diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
@@ -5,7 +5,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doduo::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_DODUO, 0
+	playmoncry SPECIES_DODUO, CRY_MODE_NORMAL
 	msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo
 	waitmoncry
 	release

diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc
@@ -13,7 +13,7 @@ SaffronCity_House_EventScript_Pidgey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIDGEY, 0
+	playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
 	msgbox SaffronCity_House_Text_Pidgey
 	waitmoncry
 	release

diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc
@@ -164,7 +164,7 @@ SeafoamIslands_B4F_EventScript_Articuno::
 	faceplayer
 	setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE
 	waitse
-	playmoncry SPECIES_ARTICUNO, 2
+	playmoncry SPECIES_ARTICUNO, CRY_MODE_ENCOUNTER
 	message Text_Gyaoo
 	waitmessage
 	waitmoncry

diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
@@ -76,7 +76,7 @@ SevenIsland_SevaultCanyon_House_EventScript_Chansey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_CHANSEY, 0
+	playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL
 	msgbox SevenIsland_SevaultCanyon_House_Text_Chansey
 	waitmoncry
 	release

diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
@@ -404,7 +404,7 @@ ThreeIsland_EventScript_Doduo::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_DODUO, 0
+	playmoncry SPECIES_DODUO, CRY_MODE_NORMAL
 	msgbox ThreeIsland_Text_Doduo
 	waitmoncry
 	release

diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc
@@ -21,7 +21,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle::
 	msgbox ThreeIsland_BerryForest_Text_HereItComesAgain
 	goto_if_questlog EventScript_ReleaseEnd
 	waitse
-	playmoncry SPECIES_HYPNO, 2
+	playmoncry SPECIES_HYPNO, CRY_MODE_ENCOUNTER
 	waitmoncry
 	setwildbattle SPECIES_HYPNO, 30, ITEM_NONE
 	dowildbattle

diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc
@@ -249,7 +249,7 @@ VermilionCity_EventScript_Machop::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_MACHOP, 0
+	playmoncry SPECIES_MACHOP, CRY_MODE_NORMAL
 	msgbox VermilionCity_Text_Machop
 	waitmoncry
 	msgbox VermilionCity_Text_MachopStompingLandFlat

diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc
@@ -13,7 +13,7 @@ VermilionCity_House3_EventScript_Pidgey::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIDGEY, 0
+	playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL
 	msgbox VermilionCity_House3_Text_Pidgey
 	waitmoncry
 	release

diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc
@@ -99,7 +99,7 @@ VermilionCity_PokemonFanClub_EventScript_Pikachu::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_PIKACHU, 0
+	playmoncry SPECIES_PIKACHU, CRY_MODE_NORMAL
 	msgbox VermilionCity_PokemonFanClub_Text_Pikachu
 	waitmoncry
 	release
@@ -109,7 +109,7 @@ VermilionCity_PokemonFanClub_EventScript_Seel::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SEEL, 0
+	playmoncry SPECIES_SEEL, CRY_MODE_NORMAL
 	msgbox VermilionCity_PokemonFanClub_Text_Seel
 	waitmoncry
 	release

diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc
@@ -13,7 +13,7 @@ ViridianCity_House1_EventScript_Speary::
 	lock
 	faceplayer
 	waitse
-	playmoncry SPECIES_SPEAROW, 0
+	playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL
 	msgbox ViridianCity_House1_Text_Speary
 	waitmoncry
 	release