diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-09-30 03:00:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 03:00:10 -0500 |
| commit | 741c99cded03ceb2d924b52b5c44d68bc5901b17 (patch) | |
| tree | 722c09a5712e65b460268a300b0799eeef6374fc /asm/battle_controller_linkopponent.s | |
| parent | f09a6a653c2691865314a309266d4d6d82152fdc (diff) | |
| parent | 4dad58648fe65b7df90da45972518222853b2e98 (diff) | |
Merge pull request #45 from DizzyEggg/decomp_battle4
Decompile Battle 4
Diffstat (limited to 'asm/battle_controller_linkopponent.s')
| -rw-r--r-- | asm/battle_controller_linkopponent.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index d28823a8b..5a762a174 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -5045,7 +5045,7 @@ sub_8066FF4: @ 8066FF4 bl BufferStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0 - bl battle_show_message_maybe + bl sub_814F9EC ldr r1, =gBattleBankFunc ldrb r0, [r5] lsls r0, 2 @@ -5565,7 +5565,7 @@ sub_806743C: @ 806743C ldrb r0, [r0] cmp r0, 0 beq _08067478 - bl sub_805EA60 + bl BattleMusicStop ldrb r1, [r5] lsls r1, 9 adds r0, r4, 0x1 |