Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cry fixes, type null

Browse Source
This commit is contained in:
amiosi 2021-02-03 14:10:39 -05:00
parent b84f952f32
commit 762dcb8a7c
9 changed files with 307 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/graphics.h
View File

@ -809,7 +809,7 @@ extern const u32 gMonFrontPic_Golisopod[];
extern const u32 gMonFrontPic_Sandygast[];
extern const u32 gMonFrontPic_Palossand[];
extern const u32 gMonFrontPic_Pyukumuku[];
extern const u32 gMonFrontPic_Type_null[];
extern const u32 gMonFrontPic_TypeNull[];
extern const u32 gMonFrontPic_Silvally[];
extern const u32 gMonFrontPic_Minior[];
extern const u32 gMonFrontPic_Komala[];
@ -1949,7 +1949,7 @@ extern const u32 gMonBackPic_Golisopod[];
extern const u32 gMonBackPic_Sandygast[];
extern const u32 gMonBackPic_Palossand[];
extern const u32 gMonBackPic_Pyukumuku[];
extern const u32 gMonBackPic_Type_null[];
extern const u32 gMonBackPic_TypeNull[];
extern const u32 gMonBackPic_Silvally[];
extern const u32 gMonBackPic_Minior[];
extern const u32 gMonBackPic_Komala[];
@ -3087,7 +3087,7 @@ extern const u32 gMonPalette_Golisopod[];
extern const u32 gMonPalette_Sandygast[];
extern const u32 gMonPalette_Palossand[];
extern const u32 gMonPalette_Pyukumuku[];
extern const u32 gMonPalette_Type_null[];
extern const u32 gMonPalette_TypeNull[];
extern const u32 gMonPalette_Silvally[];
extern const u32 gMonPalette_Minior[];
extern const u32 gMonPalette_Komala[];
@ -4252,7 +4252,7 @@ extern const u32 gMonShinyPalette_Golisopod[];
extern const u32 gMonShinyPalette_Sandygast[];
extern const u32 gMonShinyPalette_Palossand[];
extern const u32 gMonShinyPalette_Pyukumuku[];
extern const u32 gMonShinyPalette_Type_null[];
extern const u32 gMonShinyPalette_TypeNull[];
extern const u32 gMonShinyPalette_Silvally[];
extern const u32 gMonShinyPalette_Minior[];
extern const u32 gMonShinyPalette_Komala[];
@ -5409,7 +5409,7 @@ extern const u8 gMonIcon_Golisopod[];
extern const u8 gMonIcon_Sandygast[];
extern const u8 gMonIcon_Palossand[];
extern const u8 gMonIcon_Pyukumuku[];
extern const u8 gMonIcon_Type_null[];
extern const u8 gMonIcon_TypeNull[];
extern const u8 gMonIcon_Silvally[];
extern const u8 gMonIcon_Minior[];
extern const u8 gMonIcon_Komala[];

392
sound/cry_tables.inc
View File

@ -29,10 +29,10 @@ gCryTable:: @ 869DCF4
cry Cry_Raichu @ 869DE20
cry Cry_Sandshrew @ 869DE2C
cry Cry_Sandslash @ 869DE38
cry Cry_Nidoran_F @ 869DE44
cry Cry_NidoranF @ 869DE44
cry Cry_Nidorina @ 869DE50
cry Cry_Nidoqueen @ 869DE5C
cry Cry_Nidoran_M @ 869DE68
cry Cry_NidoranM @ 869DE68
cry Cry_Nidorino @ 869DE74
cry Cry_Nidoking @ 869DE80
cry Cry_Clefairy @ 869DE8C
@ -122,7 +122,7 @@ gCryTable:: @ 869DCF4
cry Cry_Seaking @ 869E27C
cry Cry_Staryu @ 869E288
cry Cry_Starmie @ 869E294
cry Cry_Mr_Mime @ 869E2A0
cry Cry_MrMime @ 869E2A0
cry Cry_Scyther @ 869E2AC
cry Cry_Jynx @ 869E2B8
cry Cry_Electabuzz @ 869E2C4
@ -439,7 +439,7 @@ gCryTable:: @ 869DCF4
cry Cry_Bronzor
cry Cry_Bronzong
cry Cry_Bonsly
cry Cry_Mime_Jr
cry Cry_MimeJr
cry Cry_Happiny
cry Cry_Chatot
cry Cry_Spiritomb
@ -474,7 +474,7 @@ gCryTable:: @ 869DCF4
cry Cry_Glaceon
cry Cry_Gliscor
cry Cry_Mamoswine
cry Cry_Porygon_Z
cry Cry_PorygonZ
cry Cry_Gallade
cry Cry_Probopass
cry Cry_Dusknoir
@ -772,7 +772,7 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Sandygast
cry_uncomp Cry_Palossand
cry_uncomp Cry_Pyukumuku
cry_uncomp Cry_Type_null
cry_uncomp Cry_TypeNull
cry_uncomp Cry_Silvally
cry_uncomp Cry_Minior
cry_uncomp Cry_Komala
@ -782,13 +782,13 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Bruxish
cry_uncomp Cry_Drampa
cry_uncomp Cry_Dhelmise
cry_uncomp Cry_Jangmo_o
cry_uncomp Cry_Hakamo_o
cry_uncomp Cry_Kommo_o
cry_uncomp Cry_Tapu_Koko
cry_uncomp Cry_Tapu_Lele
cry_uncomp Cry_Tapu_Bulu
cry_uncomp Cry_Tapu_Fini
cry_uncomp Cry_Jangmoo
cry_uncomp Cry_Hakamoo
cry_uncomp Cry_Kommoo
cry_uncomp Cry_TapuKoko
cry_uncomp Cry_TapuLele
cry_uncomp Cry_TapuBulu
cry_uncomp Cry_TapuFini
cry_uncomp Cry_Cosmog
cry_uncomp Cry_Cosmoem
cry_uncomp Cry_Solgaleo
@ -866,7 +866,7 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Perrserker
cry_uncomp Cry_Cursola
cry_uncomp Cry_Sirfetchd
cry_uncomp Cry_Mr_Rime
cry_uncomp Cry_MrRime
cry_uncomp Cry_Runerigus
cry_uncomp Cry_Milcery
cry_uncomp Cry_Alcremie
@ -900,57 +900,57 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Spectrier
cry_uncomp Cry_Calyrex
@ Megas
cry_uncomp Cry_Venusaur_Mega
cry_uncomp Cry_Charizard_Mega_X
cry_uncomp Cry_Charizard_Mega_Y
cry_uncomp Cry_Blastoise_Mega
cry_uncomp Cry_Beedrill_Mega
cry_uncomp Cry_Pidgeot_Mega
cry_uncomp Cry_Alakazam_Mega
cry_uncomp Cry_Slowbro_Mega
cry_uncomp Cry_Gengar_Mega
cry_uncomp Cry_Kangaskhan_Mega
cry_uncomp Cry_Pinsir_Mega
cry_uncomp Cry_Gyarados_Mega
cry_uncomp Cry_Aerodactyl_Mega
cry_uncomp Cry_Mewtwo_Mega_X
cry_uncomp Cry_Mewtwo_Mega_Y
cry_uncomp Cry_Ampharos_Mega
cry_uncomp Cry_Steelix_Mega
cry_uncomp Cry_Scizor_Mega
cry_uncomp Cry_Heracross_Mega
cry_uncomp Cry_Houndoom_Mega
cry_uncomp Cry_Tyranitar_Mega
cry_uncomp Cry_Sceptile_Mega
cry_uncomp Cry_Blaziken_Mega
cry_uncomp Cry_Swampert_Mega
cry_uncomp Cry_Gardevoir_Mega
cry_uncomp Cry_Sableye_Mega
cry_uncomp Cry_Mawile_Mega
cry_uncomp Cry_Aggron_Mega
cry_uncomp Cry_Medicham_Mega
cry_uncomp Cry_Manectric_Mega
cry_uncomp Cry_Sharpedo_Mega
cry_uncomp Cry_Camerupt_Mega
cry_uncomp Cry_Altaria_Mega
cry_uncomp Cry_Banette_Mega
cry_uncomp Cry_Absol_Mega
cry_uncomp Cry_Glalie_Mega
cry_uncomp Cry_Salamence_Mega
cry_uncomp Cry_Metagross_Mega
cry_uncomp Cry_Latias_Mega
cry_uncomp Cry_Latios_Mega
cry_uncomp Cry_Lopunny_Mega
cry_uncomp Cry_Garchomp_Mega
cry_uncomp Cry_Lucario_Mega
cry_uncomp Cry_Abomasnow_Mega
cry_uncomp Cry_Gallade_Mega
cry_uncomp Cry_Audino_Mega
cry_uncomp Cry_Diancie_Mega
cry_uncomp Cry_VenusaurMega
cry_uncomp Cry_CharizardMegaX
cry_uncomp Cry_CharizardMegaY
cry_uncomp Cry_BlastoiseMega
cry_uncomp Cry_BeedrillMega
cry_uncomp Cry_PidgeotMega
cry_uncomp Cry_AlakazamMega
cry_uncomp Cry_SlowbroMega
cry_uncomp Cry_GengarMega
cry_uncomp Cry_KangaskhanMega
cry_uncomp Cry_PinsirMega
cry_uncomp Cry_GyaradosMega
cry_uncomp Cry_AerodactylMega
cry_uncomp Cry_MewtwoMegaX
cry_uncomp Cry_MewtwoMegaY
cry_uncomp Cry_AmpharosMega
cry_uncomp Cry_SteelixMega
cry_uncomp Cry_ScizorMega
cry_uncomp Cry_HeracrossMega
cry_uncomp Cry_HoundoomMega
cry_uncomp Cry_TyranitarMega
cry_uncomp Cry_SceptileMega
cry_uncomp Cry_BlazikenMega
cry_uncomp Cry_SwampertMega
cry_uncomp Cry_GardevoirMega
cry_uncomp Cry_SableyeMega
cry_uncomp Cry_MawileMega
cry_uncomp Cry_AggronMega
cry_uncomp Cry_MedichamMega
cry_uncomp Cry_ManectricMega
cry_uncomp Cry_SharpedoMega
cry_uncomp Cry_CameruptMega
cry_uncomp Cry_AltariaMega
cry_uncomp Cry_BanetteMega
cry_uncomp Cry_AbsolMega
cry_uncomp Cry_GlalieMega
cry_uncomp Cry_SalamenceMega
cry_uncomp Cry_MetagrossMega
cry_uncomp Cry_LatiasMega
cry_uncomp Cry_LatiosMega
cry_uncomp Cry_LopunnyMega
cry_uncomp Cry_GarchompMega
cry_uncomp Cry_LucarioMega
cry_uncomp Cry_AbomasnowMega
cry_uncomp Cry_GalladeMega
cry_uncomp Cry_AudinoMega
cry_uncomp Cry_DiancieMega
@ Special Mega + Primals
cry_uncomp Cry_Rayquaza_Mega
cry_uncomp Cry_Kyogre_Primal
cry_uncomp Cry_Groudon_Primal
cry_uncomp Cry_RayquazaMega
cry_uncomp Cry_KyogrePrimal
cry_uncomp Cry_GroudonPrimal
@ Alolan Forms
cry Cry_Rattata
cry Cry_Raticate
@ -974,11 +974,11 @@ gCryTable:: @ 869DCF4
cry Cry_Meowth
cry Cry_Ponyta
cry Cry_Rapidash
cry_uncomp Cry_Slowpoke_Galarian
cry_uncomp Cry_SlowpokeGalarian
cry Cry_Slowbro
cry Cry_Farfetchd
cry Cry_Weezing
cry Cry_Mr_Mime
cry Cry_MrMime
cry Cry_Articuno
cry Cry_Zapdos
cry Cry_Moltres
@ -1066,7 +1066,7 @@ gCryTable:: @ 869DCF4
@ Giratina
cry Cry_Giratina
@ Shaymin
cry Cry_Shaymin_Sky
cry Cry_ShayminSky
@ Arceus
cry Cry_Arceus
cry Cry_Arceus
@ -1099,12 +1099,12 @@ gCryTable:: @ 869DCF4
cry Cry_Sawsbuck
cry Cry_Sawsbuck
@ Therian Forms
cry Cry_Tornadus_Therian
cry Cry_Thundurus_Therian
cry Cry_Landorus_Therian
cry Cry_TornadusTherian
cry Cry_ThundurusTherian
cry Cry_LandorusTherian
@ Kyurem
cry Cry_Kyurem_White
cry Cry_Kyurem_Black
cry Cry_KyuremWhite
cry Cry_KyuremBlack
@ Keldeo
cry Cry_Keldeo
@ Meloetta
@ -1147,7 +1147,7 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Floette
cry_uncomp Cry_Floette
cry_uncomp Cry_Floette
cry_uncomp Cry_Floette_Eternal_Flower
cry_uncomp Cry_FloetteEternalFlower
@ Florges
cry_uncomp Cry_Florges
cry_uncomp Cry_Florges
@ -1170,31 +1170,31 @@ gCryTable:: @ 869DCF4
@ Pumpkaboo
cry_uncomp Cry_Pumpkaboo
cry_uncomp Cry_Pumpkaboo
cry_uncomp Cry_Pumpkaboo_Super
cry_uncomp Cry_PumpkabooSuper
@ Gourgeist
cry_uncomp Cry_Gourgeist
cry_uncomp Cry_Gourgeist
cry_uncomp Cry_Gourgeist_Super
cry_uncomp Cry_GourgeistSuper
@ Xerneas
cry_uncomp Cry_Xerneas
@ Zygarde
cry_uncomp Cry_Zygarde_10
cry_uncomp Cry_Zygarde_10
cry_uncomp Cry_Zygarde10
cry_uncomp Cry_Zygarde10
cry_uncomp Cry_Zygarde
cry_uncomp Cry_Zygarde_Complete
cry_uncomp Cry_ZygardeComplete
@ Hoopa
cry_uncomp Cry_Hoopa_Unbound
cry_uncomp Cry_HoopaUnbound
@ Oricorio
cry_uncomp Cry_Oricorio_Pom_Pom
cry_uncomp Cry_Oricorio_Pau
cry_uncomp Cry_Oricorio_Sensu
cry_uncomp Cry_OricorioPomPom
cry_uncomp Cry_OricorioPau
cry_uncomp Cry_OricorioSensu
@ Rockruff
cry_uncomp Cry_Rockruff
@ Lycanroc
cry_uncomp Cry_Lycanroc_Midnight
cry_uncomp Cry_Lycanroc_Dusk
cry_uncomp Cry_LycanrocMidnight
cry_uncomp Cry_LycanrocDusk
@ Wishiwashi
cry_uncomp Cry_Wishiwashi_School
cry_uncomp Cry_WishiwashiSchool
@ Silvally
cry_uncomp Cry_Silvally
cry_uncomp Cry_Silvally
@ -1230,16 +1230,16 @@ gCryTable:: @ 869DCF4
@ Mimikyu
cry_uncomp Cry_Mimikyu
@ Necrozma
cry_uncomp Cry_Necrozma_Dusk_Mane
cry_uncomp Cry_Necrozma_Dawn_Wings
cry_uncomp Cry_Necrozma_Ultra
cry_uncomp Cry_NecrozmaDuskMane
cry_uncomp Cry_NecrozmaDawnWings
cry_uncomp Cry_NecrozmaUltra
@ Magearna
cry_uncomp Cry_Magearna
@ Cramorant
cry_uncomp Cry_Cramorant
cry_uncomp Cry_Cramorant
@ Toxtricity
cry_uncomp Cry_Toxtricity_Low_Key
cry_uncomp Cry_ToxtricityLowKey
@ Sinistea
cry_uncomp Cry_Sinistea
@ Polteageist
@ -1254,24 +1254,24 @@ gCryTable:: @ 869DCF4
cry_uncomp Cry_Alcremie
cry_uncomp Cry_Alcremie
@ Eiscue
cry_uncomp Cry_Eiscue_Noice_Face
cry_uncomp Cry_EiscueNoiceFace
@ Indeedee
cry_uncomp Cry_Indeedee_Female
cry_uncomp Cry_IndeedeeFemale
@ Morpeko
cry_uncomp Cry_Morpeko_Hangry
cry_uncomp Cry_MorpekoHangry
@ Zacian
cry_uncomp Cry_Zacian_Crowned_Sword
cry_uncomp Cry_ZacianCrownedSword
@ Zamazenta
cry_uncomp Cry_Zamazenta_Crowned_Shield
cry_uncomp Cry_ZamazentaCrownedShield
@ Eternatus
cry_uncomp Cry_Eternatus_Eternamax
cry_uncomp Cry_EternatusEternamax
@ Urshifu
cry_uncomp Cry_Urshifu_Rapid_Strike_Style
cry_uncomp Cry_UrshifuRapidStrikeStyle
@ Zarude
cry_uncomp Cry_Zarude
@ Calyrex
cry_uncomp Cry_Calyrex_Ice_Rider
cry_uncomp Cry_Calyrex_Shadow_Rider
cry_uncomp Cry_CalyrexIceRider
cry_uncomp Cry_CalyrexShadowRider
.align 2
gCryTable2:: @ 869EF24
@ -1303,10 +1303,10 @@ gCryTable2:: @ 869EF24
cry2 Cry_Raichu @ 869F050
cry2 Cry_Sandshrew @ 869F05C
cry2 Cry_Sandslash @ 869F068
cry2 Cry_Nidoran_F @ 869F074
cry2 Cry_NidoranF @ 869F074
cry2 Cry_Nidorina @ 869F080
cry2 Cry_Nidoqueen @ 869F08C
cry2 Cry_Nidoran_M @ 869F098
cry2 Cry_NidoranM @ 869F098
cry2 Cry_Nidorino @ 869F0A4
cry2 Cry_Nidoking @ 869F0B0
cry2 Cry_Clefairy @ 869F0BC
@ -1396,7 +1396,7 @@ gCryTable2:: @ 869EF24
cry2 Cry_Seaking @ 869F4AC
cry2 Cry_Staryu @ 869F4B8
cry2 Cry_Starmie @ 869F4C4
cry2 Cry_Mr_Mime @ 869F4D0
cry2 Cry_MrMime @ 869F4D0
cry2 Cry_Scyther @ 869F4DC
cry2 Cry_Jynx @ 869F4E8
cry2 Cry_Electabuzz @ 869F4F4
@ -1713,7 +1713,7 @@ gCryTable2:: @ 869EF24
cry2 Cry_Bronzor
cry2 Cry_Bronzong
cry2 Cry_Bonsly
cry2 Cry_Mime_Jr
cry2 Cry_MimeJr
cry2 Cry_Happiny
cry2 Cry_Chatot
cry2 Cry_Spiritomb
@ -1748,7 +1748,7 @@ gCryTable2:: @ 869EF24
cry2 Cry_Glaceon
cry2 Cry_Gliscor
cry2 Cry_Mamoswine
cry2 Cry_Porygon_Z
cry2 Cry_PorygonZ
cry2 Cry_Gallade
cry2 Cry_Probopass
cry2 Cry_Dusknoir
@ -2046,7 +2046,7 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Sandygast
cry2_uncomp Cry_Palossand
cry2_uncomp Cry_Pyukumuku
cry2_uncomp Cry_Type_null
cry2_uncomp Cry_TypeNull
cry2_uncomp Cry_Silvally
cry2_uncomp Cry_Minior
cry2_uncomp Cry_Komala
@ -2056,13 +2056,13 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Bruxish
cry2_uncomp Cry_Drampa
cry2_uncomp Cry_Dhelmise
cry2_uncomp Cry_Jangmo_o
cry2_uncomp Cry_Hakamo_o
cry2_uncomp Cry_Kommo_o
cry2_uncomp Cry_Tapu_Koko
cry2_uncomp Cry_Tapu_Lele
cry2_uncomp Cry_Tapu_Bulu
cry2_uncomp Cry_Tapu_Fini
cry2_uncomp Cry_Jangmoo
cry2_uncomp Cry_Hakamoo
cry2_uncomp Cry_Kommoo
cry2_uncomp Cry_TapuKoko
cry2_uncomp Cry_TapuLele
cry2_uncomp Cry_TapuBulu
cry2_uncomp Cry_TapuFini
cry2_uncomp Cry_Cosmog
cry2_uncomp Cry_Cosmoem
cry2_uncomp Cry_Solgaleo
@ -2140,7 +2140,7 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Perrserker
cry2_uncomp Cry_Cursola
cry2_uncomp Cry_Sirfetchd
cry2_uncomp Cry_Mr_Rime
cry2_uncomp Cry_MrRime
cry2_uncomp Cry_Runerigus
cry2_uncomp Cry_Milcery
cry2_uncomp Cry_Alcremie
@ -2174,57 +2174,57 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Spectrier
cry2_uncomp Cry_Calyrex
@ Megas
cry2_uncomp Cry_Venusaur_Mega
cry2_uncomp Cry_Charizard_Mega_X
cry2_uncomp Cry_Charizard_Mega_Y
cry2_uncomp Cry_Blastoise_Mega
cry2_uncomp Cry_Beedrill_Mega
cry2_uncomp Cry_Pidgeot_Mega
cry2_uncomp Cry_Alakazam_Mega
cry2_uncomp Cry_Slowbro_Mega
cry2_uncomp Cry_Gengar_Mega
cry2_uncomp Cry_Kangaskhan_Mega
cry2_uncomp Cry_Pinsir_Mega
cry2_uncomp Cry_Gyarados_Mega
cry2_uncomp Cry_Aerodactyl_Mega
cry2_uncomp Cry_Mewtwo_Mega_X
cry2_uncomp Cry_Mewtwo_Mega_Y
cry2_uncomp Cry_Ampharos_Mega
cry2_uncomp Cry_Steelix_Mega
cry2_uncomp Cry_Scizor_Mega
cry2_uncomp Cry_Heracross_Mega
cry2_uncomp Cry_Houndoom_Mega
cry2_uncomp Cry_Tyranitar_Mega
cry2_uncomp Cry_Sceptile_Mega
cry2_uncomp Cry_Blaziken_Mega
cry2_uncomp Cry_Swampert_Mega
cry2_uncomp Cry_Gardevoir_Mega
cry2_uncomp Cry_Sableye_Mega
cry2_uncomp Cry_Mawile_Mega
cry2_uncomp Cry_Aggron_Mega
cry2_uncomp Cry_Medicham_Mega
cry2_uncomp Cry_Manectric_Mega
cry2_uncomp Cry_Sharpedo_Mega
cry2_uncomp Cry_Camerupt_Mega
cry2_uncomp Cry_Altaria_Mega
cry2_uncomp Cry_Banette_Mega
cry2_uncomp Cry_Absol_Mega
cry2_uncomp Cry_Glalie_Mega
cry2_uncomp Cry_Salamence_Mega
cry2_uncomp Cry_Metagross_Mega
cry2_uncomp Cry_Latias_Mega
cry2_uncomp Cry_Latios_Mega
cry2_uncomp Cry_Lopunny_Mega
cry2_uncomp Cry_Garchomp_Mega
cry2_uncomp Cry_Lucario_Mega
cry2_uncomp Cry_Abomasnow_Mega
cry2_uncomp Cry_Gallade_Mega
cry2_uncomp Cry_Audino_Mega
cry2_uncomp Cry_Diancie_Mega
cry2_uncomp Cry_VenusaurMega
cry2_uncomp Cry_CharizardMegaX
cry2_uncomp Cry_CharizardMegaY
cry2_uncomp Cry_BlastoiseMega
cry2_uncomp Cry_BeedrillMega
cry2_uncomp Cry_PidgeotMega
cry2_uncomp Cry_AlakazamMega
cry2_uncomp Cry_SlowbroMega
cry2_uncomp Cry_GengarMega
cry2_uncomp Cry_KangaskhanMega
cry2_uncomp Cry_PinsirMega
cry2_uncomp Cry_GyaradosMega
cry2_uncomp Cry_AerodactylMega
cry2_uncomp Cry_MewtwoMegaX
cry2_uncomp Cry_MewtwoMegaY
cry2_uncomp Cry_AmpharosMega
cry2_uncomp Cry_SteelixMega
cry2_uncomp Cry_ScizorMega
cry2_uncomp Cry_HeracrossMega
cry2_uncomp Cry_HoundoomMega
cry2_uncomp Cry_TyranitarMega
cry2_uncomp Cry_SceptileMega
cry2_uncomp Cry_BlazikenMega
cry2_uncomp Cry_SwampertMega
cry2_uncomp Cry_GardevoirMega
cry2_uncomp Cry_SableyeMega
cry2_uncomp Cry_MawileMega
cry2_uncomp Cry_AggronMega
cry2_uncomp Cry_MedichamMega
cry2_uncomp Cry_ManectricMega
cry2_uncomp Cry_SharpedoMega
cry2_uncomp Cry_CameruptMega
cry2_uncomp Cry_AltariaMega
cry2_uncomp Cry_BanetteMega
cry2_uncomp Cry_AbsolMega
cry2_uncomp Cry_GlalieMega
cry2_uncomp Cry_SalamenceMega
cry2_uncomp Cry_MetagrossMega
cry2_uncomp Cry_LatiasMega
cry2_uncomp Cry_LatiosMega
cry2_uncomp Cry_LopunnyMega
cry2_uncomp Cry_GarchompMega
cry2_uncomp Cry_LucarioMega
cry2_uncomp Cry_AbomasnowMega
cry2_uncomp Cry_GalladeMega
cry2_uncomp Cry_AudinoMega
cry2_uncomp Cry_DiancieMega
@ Special Mega + Primals
cry2_uncomp Cry_Rayquaza_Mega
cry2_uncomp Cry_Kyogre_Primal
cry2_uncomp Cry_Groudon_Primal
cry2_uncomp Cry_RayquazaMega
cry2_uncomp Cry_KyogrePrimal
cry2_uncomp Cry_GroudonPrimal
@ Alolan Forms
cry2 Cry_Rattata
cry2 Cry_Raticate
@ -2248,11 +2248,11 @@ gCryTable2:: @ 869EF24
cry2 Cry_Meowth
cry2 Cry_Ponyta
cry2 Cry_Rapidash
cry2_uncomp Cry_Slowpoke_Galarian
cry2_uncomp Cry_SlowpokeGalarian
cry2 Cry_Slowbro
cry2 Cry_Farfetchd
cry2 Cry_Weezing
cry2 Cry_Mr_Mime
cry2 Cry_MrMime
cry2 Cry_Articuno
cry2 Cry_Zapdos
cry2 Cry_Moltres
@ -2340,7 +2340,7 @@ gCryTable2:: @ 869EF24
@ Giratina
cry2 Cry_Giratina
@ Shaymin
cry2 Cry_Shaymin_Sky
cry2 Cry_ShayminSky
@ Arceus
cry2 Cry_Arceus
cry2 Cry_Arceus
@ -2373,12 +2373,12 @@ gCryTable2:: @ 869EF24
cry2 Cry_Sawsbuck
cry2 Cry_Sawsbuck
@ Therian Forms
cry2 Cry_Tornadus_Therian
cry2 Cry_Thundurus_Therian
cry2 Cry_Landorus_Therian
cry2 Cry_TornadusTherian
cry2 Cry_ThundurusTherian
cry2 Cry_LandorusTherian
@ Kyurem
cry2 Cry_Kyurem_White
cry2 Cry_Kyurem_Black
cry2 Cry_KyuremWhite
cry2 Cry_KyuremBlack
@ Keldeo
cry2 Cry_Keldeo
@ Meloetta
@ -2421,7 +2421,7 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Floette
cry2_uncomp Cry_Floette
cry2_uncomp Cry_Floette
cry2_uncomp Cry_Floette_Eternal_Flower
cry2_uncomp Cry_FloetteEternalFlower
@ Florges
cry2_uncomp Cry_Florges
cry2_uncomp Cry_Florges
@ -2444,31 +2444,31 @@ gCryTable2:: @ 869EF24
@ Pumpkaboo
cry2_uncomp Cry_Pumpkaboo
cry2_uncomp Cry_Pumpkaboo
cry2_uncomp Cry_Pumpkaboo_Super
cry2_uncomp Cry_PumpkabooSuper
@ Gourgeist
cry2_uncomp Cry_Gourgeist
cry2_uncomp Cry_Gourgeist
cry2_uncomp Cry_Gourgeist_Super
cry2_uncomp Cry_GourgeistSuper
@ Xerneas
cry2_uncomp Cry_Xerneas
@ Zygarde
cry2_uncomp Cry_Zygarde_10
cry2_uncomp Cry_Zygarde_10
cry2_uncomp Cry_Zygarde10
cry2_uncomp Cry_Zygarde10
cry2_uncomp Cry_Zygarde
cry2_uncomp Cry_Zygarde_Complete
cry2_uncomp Cry_ZygardeComplete
@ Hoopa
cry2_uncomp Cry_Hoopa_Unbound
cry2_uncomp Cry_HoopaUnbound
@ Oricorio
cry2_uncomp Cry_Oricorio_Pom_Pom
cry2_uncomp Cry_Oricorio_Pau
cry2_uncomp Cry_Oricorio_Sensu
cry2_uncomp Cry_OricorioPomPom
cry2_uncomp Cry_OricorioPau
cry2_uncomp Cry_OricorioSensu
@ Rockruff
cry2_uncomp Cry_Rockruff
@ Lycanroc
cry2_uncomp Cry_Lycanroc_Midnight
cry2_uncomp Cry_Lycanroc_Dusk
cry2_uncomp Cry_LycanrocMidnight
cry2_uncomp Cry_LycanrocDusk
@ Wishiwashi
cry2_uncomp Cry_Wishiwashi_School
cry2_uncomp Cry_WishiwashiSchool
@ Silvally
cry2_uncomp Cry_Silvally
cry2_uncomp Cry_Silvally
@ -2504,16 +2504,16 @@ gCryTable2:: @ 869EF24
@ Mimikyu
cry2_uncomp Cry_Mimikyu
@ Necrozma
cry2_uncomp Cry_Necrozma_Dusk_Mane
cry2_uncomp Cry_Necrozma_Dawn_Wings
cry2_uncomp Cry_Necrozma_Ultra
cry2_uncomp Cry_NecrozmaDuskMane
cry2_uncomp Cry_NecrozmaDawnWings
cry2_uncomp Cry_NecrozmaUltra
@ Magearna
cry2_uncomp Cry_Magearna
@ Cramorant
cry2_uncomp Cry_Cramorant
cry2_uncomp Cry_Cramorant
@ Toxtricity
cry2_uncomp Cry_Toxtricity_Low_Key
cry2_uncomp Cry_ToxtricityLowKey
@ Sinistea
cry2_uncomp Cry_Sinistea
@ Polteageist
@ -2528,21 +2528,21 @@ gCryTable2:: @ 869EF24
cry2_uncomp Cry_Alcremie
cry2_uncomp Cry_Alcremie
@ Eiscue
cry2_uncomp Cry_Eiscue_Noice_Face
cry2_uncomp Cry_EiscueNoiceFace
@ Indeedee
cry2_uncomp Cry_Indeedee_Female
cry2_uncomp Cry_IndeedeeFemale
@ Morpeko
cry2_uncomp Cry_Morpeko_Hangry
cry2_uncomp Cry_MorpekoHangry
@ Zacian
cry2_uncomp Cry_Zacian_Crowned_Sword
cry2_uncomp Cry_ZacianCrownedSword
@ Zamazenta
cry2_uncomp Cry_Zamazenta_Crowned_Shield
cry2_uncomp Cry_ZamazentaCrownedShield
@ Eternatus
cry2_uncomp Cry_Eternatus_Eternamax
cry2_uncomp Cry_EternatusEternamax
@ Urshifu
cry2_uncomp Cry_Urshifu_Rapid_Strike_Style
cry2_uncomp Cry_UrshifuRapidStrikeStyle
@ Zarude
cry2_uncomp Cry_Zarude
@ Calyrex
cry2_uncomp Cry_Calyrex_Ice_Rider
cry2_uncomp Cry_Calyrex_Shadow_Rider
cry2_uncomp Cry_CalyrexIceRider
cry2_uncomp Cry_CalyrexShadowRider

192
sound/direct_sound_data.inc
View File

@ -499,7 +499,7 @@ Cry_Sandslash::
.incbin "sound/direct_sound_samples/cries/sandslash.bin"
.align 2
Cry_Nidoran_F::
Cry_NidoranF::
.incbin "sound/direct_sound_samples/cries/nidoran_f.bin"
.align 2
@ -511,7 +511,7 @@ Cry_Nidoqueen::
.incbin "sound/direct_sound_samples/cries/nidoqueen.bin"
.align 2
Cry_Nidoran_M::
Cry_NidoranM::
.incbin "sound/direct_sound_samples/cries/nidoran_m.bin"
.align 2
@ -871,7 +871,7 @@ Cry_Starmie::
.incbin "sound/direct_sound_samples/cries/starmie.bin"
.align 2
Cry_Mr_Mime::
Cry_MrMime::
.incbin "sound/direct_sound_samples/cries/mr_mime.bin"
.align 2
@ -2139,7 +2139,7 @@ Cry_Bonsly::
.incbin "sound/direct_sound_samples/cries/bonsly.bin"
.align 2
Cry_Mime_Jr::
Cry_MimeJr::
.incbin "sound/direct_sound_samples/cries/mime_jr.bin"
.align 2
@ -2279,7 +2279,7 @@ Cry_Mamoswine::
.incbin "sound/direct_sound_samples/cries/mamoswine.bin"
.align 2
Cry_Porygon_Z::
Cry_PorygonZ::
.incbin "sound/direct_sound_samples/cries/porygon_z.bin"
.align 2
@ -3471,7 +3471,7 @@ Cry_Pyukumuku::
.incbin "sound/direct_sound_samples/cries/uncomp_pyukumuku.bin"
.align 2
Cry_Type_null::
Cry_TypeNull::
.incbin "sound/direct_sound_samples/cries/uncomp_type_null.bin"
.align 2
@ -3511,31 +3511,31 @@ Cry_Dhelmise::
.incbin "sound/direct_sound_samples/cries/uncomp_dhelmise.bin"
.align 2
Cry_Jangmo_o::
Cry_Jangmoo::
.incbin "sound/direct_sound_samples/cries/uncomp_jangmo_o.bin"
.align 2
Cry_Hakamo_o::
Cry_Hakamoo::
.incbin "sound/direct_sound_samples/cries/uncomp_hakamo_o.bin"
.align 2
Cry_Kommo_o::
Cry_Kommoo::
.incbin "sound/direct_sound_samples/cries/uncomp_kommo_o.bin"
.align 2
Cry_Tapu_Koko::
Cry_TapuKoko::
.incbin "sound/direct_sound_samples/cries/uncomp_tapu_koko.bin"
.align 2
Cry_Tapu_Lele::
Cry_TapuLele::
.incbin "sound/direct_sound_samples/cries/uncomp_tapu_lele.bin"
.align 2
Cry_Tapu_Bulu::
Cry_TapuBulu::
.incbin "sound/direct_sound_samples/cries/uncomp_tapu_bulu.bin"
.align 2
Cry_Tapu_Fini::
Cry_TapuFini::
.incbin "sound/direct_sound_samples/cries/uncomp_tapu_fini.bin"
.align 2
@ -3847,7 +3847,7 @@ Cry_Sirfetchd::
.incbin "sound/direct_sound_samples/cries/uncomp_sirfetchd.bin"
.align 2
Cry_Mr_Rime::
Cry_MrRime::
.incbin "sound/direct_sound_samples/cries/uncomp_mr_rime.bin"
.align 2
@ -3979,331 +3979,331 @@ Cry_Calyrex::
.incbin "sound/direct_sound_samples/cries/uncomp_calyrex.bin"
.align 2
Cry_Venusaur_Mega::
Cry_VenusaurMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_venusaur.bin"
.align 2
Cry_Charizard_Mega_X::
Cry_CharizardMegaX::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_x.bin"
.align 2
Cry_Charizard_Mega_Y::
Cry_CharizardMegaY::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_y.bin"
.align 2
Cry_Blastoise_Mega::
Cry_BlastoiseMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_blastoise.bin"
.align 2
Cry_Beedrill_Mega::
Cry_BeedrillMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_beedrill.bin"
.align 2
Cry_Pidgeot_Mega::
Cry_PidgeotMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_pidgeot.bin"
.align 2
Cry_Alakazam_Mega::
Cry_AlakazamMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_alakazam.bin"
.align 2
Cry_Slowbro_Mega::
Cry_SlowbroMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_slowbro.bin"
.align 2
Cry_Gengar_Mega::
Cry_GengarMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_gengar.bin"
.align 2
Cry_Kangaskhan_Mega::
CryKangaskhanMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.bin"
.align 2
Cry_Pinsir_Mega::
CryPinsirMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_pinsir.bin"
.align 2
Cry_Gyarados_Mega::
CryGyaradosMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_gyarados.bin"
.align 2
Cry_Aerodactyl_Mega::
CryAerodactylMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.bin"
.align 2
Cry_Mewtwo_Mega_X::
CryMewtwoMegaX::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.bin"
.align 2
Cry_Mewtwo_Mega_Y::
Cry_MewtwoMegaY::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_y.bin"
.align 2
Cry_Ampharos_Mega::
Cry_AmpharosMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_ampharos.bin"
.align 2
Cry_Steelix_Mega::
Cry_SteelixMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_steelix.bin"
.align 2
Cry_Scizor_Mega::
Cry_ScizorMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_scizor.bin"
.align 2
Cry_Heracross_Mega::
Cry_HeracrossMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_heracross.bin"
.align 2
Cry_Houndoom_Mega::
Cry_HoundoomMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_houndoom.bin"
.align 2
Cry_Tyranitar_Mega::
Cry_TyranitarMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_tyranitar.bin"
.align 2
Cry_Sceptile_Mega::
Cry_SceptileMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_sceptile.bin"
.align 2
Cry_Blaziken_Mega::
Cry_BlazikenMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_blaziken.bin"
.align 2
Cry_Swampert_Mega::
Cry_SwampertMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_swampert.bin"
.align 2
Cry_Gardevoir_Mega::
Cry_GardevoirMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_gardevoir.bin"
.align 2
Cry_Sableye_Mega::
Cry_SableyeMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_sableye.bin"
.align 2
Cry_Mawile_Mega::
Cry_MawileMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_mawile.bin"
.align 2
Cry_Aggron_Mega::
Cry_AggronMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_aggron.bin"
.align 2
Cry_Medicham_Mega::
Cry_MedichamMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_medicham.bin"
.align 2
Cry_Manectric_Mega::
Cry_ManectricMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_manectric.bin"
.align 2
Cry_Sharpedo_Mega::
Cry_SharpedoMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_sharpedo.bin"
.align 2
Cry_Camerupt_Mega::
Cry_CameruptMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_camerupt.bin"
.align 2
Cry_Altaria_Mega::
Cry_AltariaMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_altaria.bin"
.align 2
Cry_Banette_Mega::
Cry_BanetteMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_banette.bin"
.align 2
Cry_Absol_Mega::
Cry_AbsolMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_absol.bin"
.align 2
Cry_Glalie_Mega::
Cry_GlalieMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_glalie.bin"
.align 2
Cry_Salamence_Mega::
Cry_SalamenceMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_salamence.bin"
.align 2
Cry_Metagross_Mega::
Cry_MetagrossMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_metagross.bin"
.align 2
Cry_Latias_Mega::
Cry_LatiasMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_latias.bin"
.align 2
Cry_Latios_Mega::
Cry_LatiosMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_latios.bin"
.align 2
Cry_Lopunny_Mega::
Cry_LopunnyMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_lopunny.bin"
.align 2
Cry_Garchomp_Mega::
Cry_GarchompMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_garchomp.bin"
.align 2
Cry_Lucario_Mega::
Cry_LucarioMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_lucario.bin"
.align 2
Cry_Abomasnow_Mega::
Cry_AbomasnowMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_abomasnow.bin"
.align 2
Cry_Gallade_Mega::
Cry_GalladeMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_gallade.bin"
.align 2
Cry_Audino_Mega::
Cry_AudinoMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_audino.bin"
.align 2
Cry_Diancie_Mega::
Cry_DiancieMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_diancie.bin"
.align 2
Cry_Rayquaza_Mega::
Cry_RayquazaMega::
.incbin "sound/direct_sound_samples/cries/uncomp_mega_rayquaza.bin"
.align 2
Cry_Kyogre_Primal::
Cry_KyogrePrimal::
.incbin "sound/direct_sound_samples/cries/uncomp_primal_kyogre.bin"
.align 2
Cry_Groudon_Primal::
Cry_GroudonPrimal::
.incbin "sound/direct_sound_samples/cries/uncomp_primal_groudon.bin"
.align 2
Cry_Slowpoke_Galarian::
Cry_SlowpokeGalarian::
.incbin "sound/direct_sound_samples/cries/uncomp_slowpoke_galarian.bin"
.align 2
Cry_Shaymin_Sky::
Cry_ShayminSky::
.incbin "sound/direct_sound_samples/cries/shaymin_sky.bin"
.align 2
Cry_Tornadus_Therian::
Cry_TornadusTherian::
.incbin "sound/direct_sound_samples/cries/tornadus_therian.bin"
.align 2
Cry_Thundurus_Therian::
Cry_ThundurusTherian::
.incbin "sound/direct_sound_samples/cries/thundurus_therian.bin"
.align 2
Cry_Landorus_Therian::
Cry_LandorusTherian::
.incbin "sound/direct_sound_samples/cries/landorus_therian.bin"
.align 2
Cry_Kyurem_White::
Cry_KyuremWhite::
.incbin "sound/direct_sound_samples/cries/kyurem_white.bin"
.align 2
Cry_Kyurem_Black::
Cry_KyuremBlack::
.incbin "sound/direct_sound_samples/cries/kyurem_black.bin"
.align 2
Cry_Floette_Eternal_Flower::
Cry_FloetteEternalFlower::
.incbin "sound/direct_sound_samples/cries/uncomp_floette_eternal_flower.bin"
.align 2
Cry_Pumpkaboo_Super::
Cry_PumpkabooSuper::
.incbin "sound/direct_sound_samples/cries/uncomp_pumpkaboo_super.bin"
.align 2
Cry_Gourgeist_Super::
Cry_GourgeistSuper::
.incbin "sound/direct_sound_samples/cries/uncomp_gourgeist_super.bin"
.align 2
Cry_Zygarde_10::
Cry_Zygarde10::
.incbin "sound/direct_sound_samples/cries/uncomp_zygarde_10.bin"
.align 2
Cry_Zygarde_Complete::
Cry_ZygardeComplete::
.incbin "sound/direct_sound_samples/cries/uncomp_zygarde_complete.bin"
.align 2
Cry_Hoopa_Unbound::
Cry_HoopaUnbound::
.incbin "sound/direct_sound_samples/cries/uncomp_hoopa_unbound.bin"
.align 2
Cry_Oricorio_Pom_Pom::
Cry_OricorioPomPom::
.incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.bin"
.align 2
Cry_Oricorio_Pau::
Cry_OricorioPau::
.incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pau.bin"
.align 2
Cry_Oricorio_Sensu::
Cry_OricorioSensu::
.incbin "sound/direct_sound_samples/cries/uncomp_oricorio_sensu.bin"
.align 2
Cry_Lycanroc_Midnight::
Cry_LycanrocMidnight::
.incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_midnight.bin"
.align 2
Cry_Lycanroc_Dusk::
Cry_LycanrocDusk::
.incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_dusk.bin"
.align 2
Cry_Wishiwashi_School::
Cry_WishiwashiSchool::
.incbin "sound/direct_sound_samples/cries/uncomp_wishiwashi_school.bin"
.align 2
Cry_Necrozma_Dusk_Mane::
Cry_NecrozmaDuskMane::
.incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dusk_mane.bin"
.align 2
Cry_Necrozma_Dawn_Wings::
Cry_NecrozmaDawnWings::
.incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dawn_wings.bin"
.align 2
Cry_Necrozma_Ultra::
Cry_NecrozmaUltra::
.incbin "sound/direct_sound_samples/cries/uncomp_necrozma_ultra.bin"
.align 2
Cry_Toxtricity_Low_Key::
Cry_ToxtricityLowKey::
.incbin "sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.bin"
.align 2
Cry_Eiscue_Noice_Face::
Cry_Eiscue_NoiceFace::
.incbin "sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.bin"
.align 2
Cry_Indeedee_Female::
Cry_IndeedeeFemale::
.incbin "sound/direct_sound_samples/cries/uncomp_indeedee_female.bin"
.align 2
Cry_Morpeko_Hangry::
Cry_MorpekoHangry::
.incbin "sound/direct_sound_samples/cries/uncomp_morpeko_hangry.bin"
.align 2
Cry_Zacian_Crowned_Sword::
Cry_ZacianCrownedSword::
.incbin "sound/direct_sound_samples/cries/uncomp_zacian_crowned_sword.bin"
.align 2
Cry_Zamazenta_Crowned_Shield::
Cry_ZamazentaCrownedShield::
.incbin "sound/direct_sound_samples/cries/uncomp_zamazenta_crowned_shield.bin"
.align 2
Cry_Eternatus_Eternamax::
Cry_EternatusEternamax::
.incbin "sound/direct_sound_samples/cries/uncomp_eternatus_eternamax.bin"
.align 2
Cry_Urshifu_Rapid_Strike_Style::
Cry_UrshifuRapidStrikeStyle::
.incbin "sound/direct_sound_samples/cries/uncomp_urshifu_rapid_strike_style.bin"
.align 2
Cry_Calyrex_Ice_Rider::
Cry_CalyrexIceRider::
.incbin "sound/direct_sound_samples/cries/uncomp_calyrex_ice_rider.bin"
.align 2
Cry_Calyrex_Shadow_Rider::
Cry_CalyrexShadowRider::
.incbin "sound/direct_sound_samples/cries/uncomp_calyrex_shadow_rider.bin"
.align 2

10
src/data/graphics/pokemon.h
View File

@ -772,7 +772,7 @@ const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/fron
const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz");
const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz");
const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/front.4bpp.lz");
const u32 gMonFrontPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz");
const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz");
const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz");
const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz");
const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz");
@ -1912,7 +1912,7 @@ const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back.
const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz");
const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz");
const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz");
const u32 gMonBackPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz");
const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz");
const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz");
const u32 gMonBackPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz");
const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz");
@ -3050,7 +3050,7 @@ const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/norma
const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/normal.gbapal.lz");
const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz");
const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz");
const u32 gMonPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz");
const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz");
const u32 gMonPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz");
const u32 gMonPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz");
const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz");
@ -4215,7 +4215,7 @@ const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/
const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz");
const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz");
const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz");
const u32 gMonShinyPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz");
const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz");
const u32 gMonShinyPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz");
const u32 gMonShinyPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz");
const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz");
@ -5372,7 +5372,7 @@ const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp"
const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp");
const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp");
const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp");
const u8 gMonIcon_Type_null[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp");
const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp");
const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp");
const u8 gMonIcon_Minior[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp");
const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp");

2
src/data/pokemon_graphics/back_pic_table.h
View File

@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(SANDYGAST, gMonBackPic_Sandygast),
SPECIES_SPRITE(PALOSSAND, gMonBackPic_Palossand),
SPECIES_SPRITE(PYUKUMUKU, gMonBackPic_Pyukumuku),
SPECIES_SPRITE(TYPE_NULL, gMonBackPic_Type_null),
SPECIES_SPRITE(TYPE_NULL, gMonBackPic_TypeNull),
SPECIES_SPRITE(SILVALLY, gMonBackPic_Silvally),
SPECIES_SPRITE(MINIOR, gMonBackPic_Minior),
SPECIES_SPRITE(KOMALA, gMonBackPic_Komala),

2
src/data/pokemon_graphics/front_pic_table.h
View File

@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(SANDYGAST, gMonFrontPic_Sandygast),
SPECIES_SPRITE(PALOSSAND, gMonFrontPic_Palossand),
SPECIES_SPRITE(PYUKUMUKU, gMonFrontPic_Pyukumuku),
SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_Type_null),
SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_TypeNull),
SPECIES_SPRITE(SILVALLY, gMonFrontPic_Silvally),
SPECIES_SPRITE(MINIOR, gMonFrontPic_Minior),
SPECIES_SPRITE(KOMALA, gMonFrontPic_Komala),

2
src/data/pokemon_graphics/palette_table.h
View File

@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(SANDYGAST, gMonPalette_Sandygast),
SPECIES_PAL(PALOSSAND, gMonPalette_Palossand),
SPECIES_PAL(PYUKUMUKU, gMonPalette_Pyukumuku),
SPECIES_PAL(TYPE_NULL, gMonPalette_Type_null),
SPECIES_PAL(TYPE_NULL, gMonPalette_TypeNull),
SPECIES_PAL(SILVALLY, gMonPalette_Silvally),
SPECIES_PAL(MINIOR, gMonPalette_Minior),
SPECIES_PAL(KOMALA, gMonPalette_Komala),

2
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(SANDYGAST, gMonShinyPalette_Sandygast),
SPECIES_SHINY_PAL(PALOSSAND, gMonShinyPalette_Palossand),
SPECIES_SHINY_PAL(PYUKUMUKU, gMonShinyPalette_Pyukumuku),
SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_Type_null),
SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_TypeNull),
SPECIES_SHINY_PAL(SILVALLY, gMonShinyPalette_Silvally),
SPECIES_SHINY_PAL(MINIOR, gMonShinyPalette_Minior),
SPECIES_SHINY_PAL(KOMALA, gMonShinyPalette_Komala),

2
src/pokemon_icon.c
View File

@ -797,7 +797,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_SANDYGAST] = gMonIcon_Sandygast,
[SPECIES_PALOSSAND] = gMonIcon_Palossand,
[SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku,
[SPECIES_TYPE_NULL] = gMonIcon_Type_null,
[SPECIES_TYPE_NULL] = gMonIcon_TypeNull,
[SPECIES_SILVALLY] = gMonIcon_Silvally,
[SPECIES_MINIOR] = gMonIcon_Minior,
[SPECIES_KOMALA] = gMonIcon_Komala,