diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 19:21:51 +0100 |
| commit | b0657350a43f3f91cd5e3ab8f910ab5ab78bb61c (patch) | |
| tree | 9568b4252f963e3210410880dad3b53dd3b5ab7d /asm/battle_setup.s | |
| parent | ad3a97e178b93c38b1d43f8120449b042ac23a0e (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
berry blender fix merge conflicts
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 621749734..f77e7a5d0 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -82,8 +82,8 @@ task_add_01_battle_start: @ 80B065C .pool thumb_func_end task_add_01_battle_start - thumb_func_start sub_80B0698 -sub_80B0698: @ 80B0698 + thumb_func_start BattleSetup_StartWildBattle +BattleSetup_StartWildBattle: @ 80B0698 push {lr} bl GetSafariZoneFlag cmp r0, 0 @@ -95,15 +95,15 @@ _080B06A8: _080B06AC: pop {r0} bx r0 - thumb_func_end sub_80B0698 + thumb_func_end BattleSetup_StartWildBattle - thumb_func_start sub_80B06B0 -sub_80B06B0: @ 80B06B0 + thumb_func_start BattleSetup_StartBattlePikeWildBattle +BattleSetup_StartBattlePikeWildBattle: @ 80B06B0 push {lr} bl sub_80B07B4 pop {r0} bx r0 - thumb_func_end sub_80B06B0 + thumb_func_end BattleSetup_StartBattlePikeWildBattle thumb_func_start sub_80B06BC sub_80B06BC: @ 80B06BC @@ -147,8 +147,8 @@ _080B06F2: .pool thumb_func_end sub_80B06BC - thumb_func_start sub_80B072C -sub_80B072C: @ 80B072C + thumb_func_start BattleSetup_StartRoamerBattle +BattleSetup_StartRoamerBattle: @ 80B072C push {lr} bl ScriptContext2_Enable bl player_bitmagic @@ -174,7 +174,7 @@ sub_80B072C: @ 80B072C pop {r0} bx r0 .pool - thumb_func_end sub_80B072C + thumb_func_end BattleSetup_StartRoamerBattle thumb_func_start sub_80B077C sub_80B077C: @ 80B077C |