diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
| commit | ed90bf2430290853bd9376d53c70055fa07634be (patch) | |
| tree | 39f67b5cbd0c0ef9e1a4763a052fd07924349940 /asm/overworld.s | |
| parent | bbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff) | |
| parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) | |
Merge branch 'master' into pokedex_2
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 |