diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-30 19:40:00 -0400 |
| commit | fba22dbd24a797a45345dbc7e0ff8fb520ecba19 (patch) | |
| tree | 961ec5145112e039542f50a79032a06481cf12a0 /asm/overworld.s | |
| parent | 9b3b3244f7dad9c0a1d6335a8786da1fdfedd870 (diff) | |
| parent | 1a34a06758175b4d39ee0a81c3441ac958d005fd (diff) | |
Merge branch 'master' into slot_machine
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 |