diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /data | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_ai_scripts.s | 1 | ||||
| -rw-r--r-- | data/battle_anim_scripts.s | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index cfbef4ec2..34b7aeaad 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -14,6 +14,7 @@ @ To make adding these improvements easier they are commented and tagged with "Improvement in Emerald" @ Emerald also adds a few entirely new AI commands (mostly to expand Double Battle AI), which are not included + .align 2 gBattleAI_ScriptsTable:: @ 81D9BF4 .4byte AI_CheckBadMove .4byte AI_CheckViability diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c267575a3..05f298340 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -44,6 +44,7 @@ gMovesWithQuietBGM:: @ 81C68EC .2byte MOVE_GRASS_WHISTLE .2byte 0xFFFF + .align 2 gBattleAnims_Moves:: .4byte Move_NONE .4byte Move_POUND |