diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-24 17:22:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 17:22:11 -0400 |
| commit | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (patch) | |
| tree | b8b08638a6d8ae195dbdc4b17d1e91a6d301b073 /asm/script_pokemon_util_80A0058.s | |
| parent | 6e36c229200e083ca005cbc448e99210d111f3b2 (diff) | |
| parent | 4fae71a4b0723fac867cbeb439feb3fc71664f0e (diff) | |
Merge pull request #132 from PikalaxALT/field_specials
Field specials
Diffstat (limited to 'asm/script_pokemon_util_80A0058.s')
| -rw-r--r-- | asm/script_pokemon_util_80A0058.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s index 6b4cdd1a8..525293081 100644 --- a/asm/script_pokemon_util_80A0058.s +++ b/asm/script_pokemon_util_80A0058.s @@ -420,8 +420,8 @@ _080A0378: .4byte gSpecialVar_Result _080A037C: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_80A0350 - thumb_func_start sub_80A0380 -sub_80A0380: @ 80A0380 + thumb_func_start ChooseBattleTowerPlayerParty +ChooseBattleTowerPlayerParty: @ 80A0380 push {lr} ldr r1, _080A0394 @ =gMain ldr r0, _080A0398 @ =sub_80A039C @@ -433,7 +433,7 @@ sub_80A0380: @ 80A0380 .align 2, 0 _080A0394: .4byte gMain _080A0398: .4byte sub_80A039C - thumb_func_end sub_80A0380 + thumb_func_end ChooseBattleTowerPlayerParty thumb_func_start sub_80A039C sub_80A039C: @ 80A039C @@ -450,7 +450,7 @@ sub_80A039C: @ 80A039C _080A03B0: .4byte gUnknown_203B0D4 _080A03B4: .4byte gSpecialVar_Result _080A03B8: - bl sub_80A03D8 + bl ReducePlayerPartyToThree ldr r1, _080A03D0 @ =gSpecialVar_Result movs r0, 0x1 strh r0, [r1] @@ -465,8 +465,8 @@ _080A03D0: .4byte gSpecialVar_Result _080A03D4: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic thumb_func_end sub_80A039C - thumb_func_start sub_80A03D8 -sub_80A03D8: @ 80A03D8 + thumb_func_start ReducePlayerPartyToThree +ReducePlayerPartyToThree: @ 80A03D8 push {r4-r7,lr} mov r7, r8 push {r7} @@ -530,6 +530,6 @@ _080A042C: _080A0454: .4byte gPlayerParty _080A0458: .4byte gUnknown_203B0D4 _080A045C: .4byte 0x05000096 - thumb_func_end sub_80A03D8 + thumb_func_end ReducePlayerPartyToThree .align 2, 0 @ Don't pad with nop. |