diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
| commit | 46e006b94cf7a2e59652a083cdd01f0d5dc9a26f (patch) | |
| tree | d2d5315a6c8512aeda5ca5d435c3ef2a7d80688b /asm/battle_setup.s | |
| parent | 0ba52688584d8a35ec9c617b035c9dea71e2689f (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (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 128aa459f..a0585784f 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -579,7 +579,7 @@ _0807FAF4: .4byte gBattleTypeFlags thumb_func_start sub_807FAF8 sub_807FAF8: @ 807FAF8 push {lr} - bl sub_804C230 + bl LoadPlayerParty bl sub_807FB40 pop {r0} bx r0 @@ -594,7 +594,7 @@ sub_807FB08: @ 807FB08 ldr r1, _0807FB38 @ =gMain ldr r0, _0807FB3C @ =sub_807FAF8 str r0, [r1, 0x8] - bl copy_player_party_to_sav1 + bl SavePlayerParty bl sub_8159F40 bl GetWildBattleTransition lsls r0, 24 |