diff --git a/.DS_Store b/.DS_Store index 3625297c9..4bec39fca 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata index 0b4b7660f..505a2912b 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb index d473ffc28..2533869c2 100644 --- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb +++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb @@ -226,6 +226,7 @@ module GameData def self.play_cry_from_species(species, form = 0, volume = 90, pitch = 100) dex_num = getDexNumberForSpecies(species) + return if !dex_num return play_triple_fusion_cry(species, volume, pitch) if dex_num > Settings::ZAPMOLCUNO_NB if dex_num > NB_POKEMON body_number = getBodyID(dex_num) diff --git a/Data/System.rxdata b/Data/System.rxdata index 038b6a23b..de771bff1 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Graphics/.DS_Store b/Graphics/.DS_Store index 1b3d95778..e79780e24 100644 Binary files a/Graphics/.DS_Store and b/Graphics/.DS_Store differ diff --git a/Graphics/Characters/.DS_Store b/Graphics/Characters/.DS_Store index 4683af018..2eab30122 100644 Binary files a/Graphics/Characters/.DS_Store and b/Graphics/Characters/.DS_Store differ diff --git a/Graphics/Characters/080+103.png b/Graphics/Characters/slowbro-electrode.png similarity index 100% rename from Graphics/Characters/080+103.png rename to Graphics/Characters/slowbro-electrode.png