Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS (rh-hideout#4210)

johannakullmann · Feb 18, 2024 · 3d2e0d2 · 3d2e0d2
1 parent 45cee81
commit 3d2e0d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/include/constants/cries.h b/include/constants/cries.h
@@ -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,

diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc
@@ -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
@@ -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

diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
@@ -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