diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
| commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
| tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /asm/battle_controller_safari.s | |
| parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
| parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) | |
merge with master and fix conflicts
Diffstat (limited to 'asm/battle_controller_safari.s')
| -rw-r--r-- | asm/battle_controller_safari.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 13111e08d..2db6fa613 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -860,7 +860,7 @@ sub_8159A94: @ 8159A94 adds r0, r1 ldr r1, =sub_8159A54 str r1, [r0] - ldr r0, =gUnknown_085CCA54 + ldr r0, =gText_SafariZoneMenu movs r1, 0x2 bl battle_show_message_maybe movs r4, 0 @@ -878,7 +878,7 @@ _08159AAE: ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - ldr r0, =gUnknown_085CCA04 + ldr r0, =gText_WhatWillPkmnDo2 bl StrCpyDecodeToDisplayedStringBattle ldr r0, =gDisplayedStringBattle movs r1, 0x1 |