ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RHH/master' into RHH/upcoming

Browse Source
This commit is contained in:
Eduardo Quezada 2023-08-24 21:31:58 -04:00
commit 1f72e6ac07
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml vendored
View File

@ -23,8 +23,9 @@ body:
label: Version label: Version
description: What version of pokeemerald-expansion are you using as a base? description: What version of pokeemerald-expansion are you using as a base?
options: options:
- 1.5.2 (Default) - 1.5.3 (Default)
- upcoming (Edge) - upcoming (Edge)
- 1.5.2
- 1.5.1 - 1.5.1
- 1.5.0 - 1.5.0
- 1.4.3 - 1.4.3

3
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml vendored
View File

@ -23,8 +23,9 @@ body:
label: Version label: Version
description: What version of pokeemerald-expansion are you using as a base? description: What version of pokeemerald-expansion are you using as a base?
options: options:
- 1.5.2 (Default) - 1.5.3 (Default)
- upcoming (Edge) - upcoming (Edge)
- 1.5.2
- 1.5.1 - 1.5.1
- 1.5.0 - 1.5.0
- 1.4.3 - 1.4.3

3
.github/ISSUE_TEMPLATE/04_other_errors.yaml vendored
View File

@ -23,8 +23,9 @@ body:
label: Version label: Version
description: What version of pokeemerald-expansion are you using as a base? description: What version of pokeemerald-expansion are you using as a base?
options: options:
- 1.5.2 (Default) - 1.5.3 (Default)
- upcoming (Edge) - upcoming (Edge)
- 1.5.2
- 1.5.1 - 1.5.1
- 1.5.0 - 1.5.0
- 1.4.3 - 1.4.3

7
sound/cry_tables.inc
View File

@ -2080,6 +2080,8 @@ gCryTable::
@ Calyrex @ Calyrex
cry Cry_CalyrexIceRider cry Cry_CalyrexIceRider
cry Cry_CalyrexShadowRider cry Cry_CalyrexShadowRider
@ Basculegion
cry Cry_Basculegion
.else .else
@ Cramorant @ Cramorant
cry Cry_Unown cry Cry_Unown
@ -2118,6 +2120,8 @@ gCryTable::
@ Calyrex @ Calyrex
cry Cry_Unown cry Cry_Unown
cry Cry_Unown cry Cry_Unown
@ Basculegion
cry Cry_Unown
.endif .endif
.align 2 .align 2
@ -4163,6 +4167,8 @@ gCryTable_Reverse::
@ Calyrex @ Calyrex
cry_reverse Cry_CalyrexIceRider cry_reverse Cry_CalyrexIceRider
cry_reverse Cry_CalyrexShadowRider cry_reverse Cry_CalyrexShadowRider
@ Basculegion
cry_reverse Cry_Basculegion
.else .else
cry_reverse Cry_Unown cry_reverse Cry_Unown
cry_reverse Cry_Unown cry_reverse Cry_Unown
@ -4187,4 +4193,5 @@ gCryTable_Reverse::
cry_reverse Cry_Unown cry_reverse Cry_Unown
cry_reverse Cry_Unown cry_reverse Cry_Unown
cry_reverse Cry_Unown cry_reverse Cry_Unown
cry_reverse Cry_Unown
.endif .endif