diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /asm/battle_controller_wally.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/battle_controller_wally.s')
| -rw-r--r-- | asm/battle_controller_wally.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index ddb97f927..98d3e7c68 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3674,7 +3674,7 @@ dp01t_12_1_battle_menu: @ 816A470 adds r0, r1 ldr r1, =sub_816A430 str r1, [r0] - ldr r0, =gUnknown_085CCA3A + ldr r0, =gText_BattleMenu movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -3692,7 +3692,7 @@ _0816A48A: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, =gUnknown_085CCA15 + ldr r0, =gText_WhatWillWallyDo bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x1 |