Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed silent Klefki cry #4392

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Fixed silent Klefki cry #4392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f6865
Fixed Klefki's cry not being hearable
AsparagusEduardo Apr 14, 2024
6a79a08
Added warning to family toggle file
AsparagusEduardo Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/config/species_enabled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#ifndef GUARD_CONFIG_SPECIES_ENABLED_H
#define GUARD_CONFIG_SPECIES_ENABLED_H

// WARNING: For some reason, using 1/0 instead of TRUE/FALSE causes cry IDs to be shifted.
// Please use TRUE/FALSE when using the family toggles.

// Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file.
// Generations of Pokémon are defined by the first member introduced,
// so Pikachu depends on the Gen 1 setting despite Pichu being the lowest member of the evolution tree.
Expand Down
4 changes: 2 additions & 2 deletions sound/cry_tables.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,7 @@ gCryTable::
cry Cry_Goodra
.endif @ P_FAMILY_GOOMY
.if P_FAMILY_KLEFKI == TRUE
cry Cry_Klefki
cry_uncomp Cry_Klefki @ Cannot be heard unless we use cry_uncomp here.
.endif @ P_FAMILY_KLEFKI
.if P_FAMILY_PHANTUMP == TRUE
cry Cry_Phantump
Expand Down Expand Up @@ -4133,7 +4133,7 @@ gCryTable_Reverse::
cry_reverse Cry_Goodra
.endif @ P_FAMILY_GOOMY
.if P_FAMILY_KLEFKI == TRUE
cry_reverse Cry_Klefki
cry_reverse_uncomp Cry_Klefki @ Cannot be heard unless we use cry_reverse_uncomp here.
.endif @ P_FAMILY_KLEFKI
.if P_FAMILY_PHANTUMP == TRUE
cry_reverse Cry_Phantump
Expand Down
Loading