diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
| commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
| tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /asm/script_pokemon_util_80A0058.s | |
| parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
| parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) | |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/script_pokemon_util_80A0058.s')
| -rw-r--r-- | asm/script_pokemon_util_80A0058.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 81b3b7efe..6f451b90a 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -385,7 +385,7 @@ sub_80A0334: @ 80A0334 ldr r0, _080A034C @ =sub_80A0350 str r0, [r1, 0x8] movs r0, 0 - bl sub_81274A8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 @@ -427,7 +427,7 @@ ChooseBattleTowerPlayerParty: @ 80A0380 ldr r0, _080A0398 @ =sub_80A039C str r0, [r1, 0x8] movs r0, 0x1 - bl sub_81274A8 + bl InitChooseHalfPartyForBattle pop {r0} bx r0 .align 2, 0 |