diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:40:22 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:40:22 -0500 |
| commit | dcd35c895cb1c5680f92360cb084e6924ed3b76f (patch) | |
| tree | e3b12bfd9f67e1237832602f03fe5bfd7380ab0b /data/battle_scripts_2.s | |
| parent | eff6795887cc27f2c5139df9a6da70f4f02338b4 (diff) | |
| parent | c79d259508d47a8b5bde5b9060b8fe8c6989bd44 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 26f28726d..2c5c391ad 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,8 +1,8 @@ #include "constants/battle_constants.h" #include "constants/items.h" #include "constants/songs.h" - .include "asm/macros.inc" - .include "asm/macros/battle_script.inc" + .include "include/macros.inc" + .include "include/macros/battle_script.inc" .include "constants/constants.inc" .include "constants/battle_script_constants.inc" @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse 17 + playse SE_NIGERU setbyte gBattleOutcome, BATTLE_RAN finishturn |