diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
| commit | 6c52f7ce04ea37ae6a1854521f0e312d39e86ecb (patch) | |
| tree | b7369c07f40081796b51fc52ca5f26faaa8b8723 /asm/battle_setup.s | |
| parent | e143072f961cfffc5e8e2cc5b2a6059c27124808 (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 27ac6b473..d9c84dcc4 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -260,7 +260,7 @@ sub_807F810: @ 807F810 ldr r0, _0807F860 @ =gEnemyParty ldr r2, _0807F864 @ =gUnknown_841D148 movs r1, 0x2 - bl sub_804037C + bl SetMonData movs r0, 0x7 bl IncrementGameStat movs r0, 0x8 @@ -396,7 +396,7 @@ _0807F960: ldr r0, _0807F990 @ =gEnemyParty ldr r2, _0807F994 @ =gUnknown_841D148 movs r1, 0x2 - bl sub_804037C + bl SetMonData movs r0, 0x7 bl IncrementGameStat movs r0, 0x8 |