diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-02 07:28:09 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-02 07:28:09 +0800 |
| commit | 742a7ee1beab323e30d60c599697a2a831c4f4de (patch) | |
| tree | 0398c32de72a880fae0223d017fa3ab814e9c472 /asm/battle_controller_player.s | |
| parent | c2964e818143757ca5586b1a811669a1c287e870 (diff) | |
ported reshow_battle_screen from pokeem
Diffstat (limited to 'asm/battle_controller_player.s')
| -rw-r--r-- | asm/battle_controller_player.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 51845f47a..385b0d44e 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -4884,23 +4884,23 @@ ActionSelectionDestroyCursorAt: @ 8030A98 thumb_func_start sub_8030ADC sub_8030ADC: @ 8030ADC push {lr} - ldr r0, _08030AE8 @ =sub_8077764 + ldr r0, _08030AE8 @ =ReshowBattleScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08030AE8: .4byte sub_8077764 +_08030AE8: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_8030ADC thumb_func_start sub_8030AEC sub_8030AEC: @ 8030AEC push {lr} - ldr r0, _08030AF8 @ =sub_8077764 + ldr r0, _08030AF8 @ =ReshowBattleScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_08030AF8: .4byte sub_8077764 +_08030AF8: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_8030AEC thumb_func_start CompleteOnFinishedStatusAnimation @@ -7457,7 +7457,7 @@ sub_8031FF4: @ 8031FF4 lsls r4, 24 lsrs r4, 24 adds r0, r6, 0 - bl sub_807685C + bl GetBattlerSpriteSubpriority adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -7803,7 +7803,7 @@ _08032342: ldr r5, _08032404 @ =gActiveBattler ldrb r1, [r5] adds r0, r4, 0 - bl sub_8034750 + bl DecompressTrainerBackPalette ldrb r0, [r5] bl GetBattlerPosition adds r1, r0, 0 @@ -7825,7 +7825,7 @@ _08032342: adds r4, r0 asrs r4, 16 ldrb r0, [r5] - bl sub_807685C + bl GetBattlerSpriteSubpriority adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -7980,7 +7980,7 @@ _080324BE: ldr r5, _0803256C @ =gActiveBattler ldrb r1, [r5] adds r0, r4, 0 - bl sub_8034750 + bl DecompressTrainerBackPalette ldrb r0, [r5] bl GetBattlerPosition adds r1, r0, 0 |