diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-30 19:39:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 19:39:07 -0400 |
| commit | 1a34a06758175b4d39ee0a81c3441ac958d005fd (patch) | |
| tree | 6d45cd2c009eabf36e6a34550607bfa80cad5ed9 /asm/overworld.s | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
| parent | d4ace1162fd85d0531da5bf2296102bf1f503073 (diff) | |
Merge pull request #84 from jiangzhengwenjz/battle_transition
battle_transition
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 39fbe770a..56c253477 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3398,13 +3398,13 @@ sub_8056578: @ 8056578 bx r0 thumb_func_end sub_8056578 - thumb_func_start sub_80565A8 -sub_80565A8: @ 80565A8 + thumb_func_start CB2_OverworldBasic +CB2_OverworldBasic: @ 80565A8 push {lr} bl sub_8056578 pop {r0} bx r0 - thumb_func_end sub_80565A8 + thumb_func_end CB2_OverworldBasic thumb_func_start sub_80565B4 sub_80565B4: @ 80565B4 |