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

Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS #4210

Merged
merged 1 commit into from
Feb 18, 2024
Merged

Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions include/constants/cries.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,9 +626,9 @@ enum {
#if P_FAMILY_TEDDIURSA
CRY_TEDDIURSA,
CRY_URSARING,
#if P_GEN_9_CROSS_EVOS
#if P_GEN_8_CROSS_EVOS
CRY_URSALUNA,
#endif //P_GEN_9_CROSS_EVOS
#endif //P_GEN_8_CROSS_EVOS
#endif //P_FAMILY_TEDDIURSA
#if P_FAMILY_SLUGMA
CRY_SLUGMA,
Expand Down
8 changes: 4 additions & 4 deletions sound/cry_tables.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,9 +623,9 @@ gCryTable::
.if P_FAMILY_TEDDIURSA == TRUE
cry Cry_Teddiursa
cry Cry_Ursaring
.if P_GEN_9_CROSS_EVOS == TRUE
.if P_GEN_8_CROSS_EVOS == TRUE
cry Cry_Ursaluna
.endif @ P_GEN_9_CROSS_EVOS
.endif @ P_GEN_8_CROSS_EVOS
.endif @ P_FAMILY_TEDDIURSA
.if P_FAMILY_SLUGMA == TRUE
cry Cry_Slugma
Expand Down Expand Up @@ -3027,9 +3027,9 @@ gCryTable_Reverse::
.if P_FAMILY_TEDDIURSA == TRUE
cry_reverse Cry_Teddiursa
cry_reverse Cry_Ursaring
.if P_GEN_9_CROSS_EVOS == TRUE
.if P_GEN_8_CROSS_EVOS == TRUE
cry_reverse Cry_Ursaluna
.endif @ P_GEN_9_CROSS_EVOS
.endif @ P_GEN_8_CROSS_EVOS
.endif @ P_FAMILY_TEDDIURSA
.if P_FAMILY_SLUGMA == TRUE
cry_reverse Cry_Slugma
Expand Down
4 changes: 2 additions & 2 deletions sound/direct_sound_data.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,11 +1844,11 @@ Cry_Teddiursa::
Cry_Ursaring::
.incbin "sound/direct_sound_samples/cries/ursaring.bin"

.if P_GEN_9_CROSS_EVOS == TRUE
.if P_GEN_8_CROSS_EVOS == TRUE
.align 2
Cry_Ursaluna::
.incbin "sound/direct_sound_samples/cries/ursaluna.bin"
.endif @ P_GEN_9_CROSS_EVOS
.endif @ P_GEN_8_CROSS_EVOS
.endif @ P_FAMILY_TEDDIURSA

.if P_FAMILY_SLUGMA == TRUE
Expand Down
Loading