diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-15 00:04:06 +0800 |
| commit | 96fa1a23edaf12082034b4ef79244e6ce3dd3128 (patch) | |
| tree | 969c8a73b9f5b3ecdb0f7fc13d551f73d4d70e63 /asm/overworld.s | |
| parent | 277726fd5e8c6da021206deeecb163f40073ff3c (diff) | |
| parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) | |
Merge branch 'master' into pokemon
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 dec8f6715..934fd29f3 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3799,8 +3799,8 @@ _080568F4: .4byte gFieldCallback _080568F8: .4byte FieldCallback_ReturnToEventScript2 thumb_func_end CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_start sub_80568FC -sub_80568FC: @ 80568FC + thumb_func_start CB2_Overworld +CB2_Overworld: @ 80568FC push {lr} bl sub_80569BC ldr r1, _08056910 @ =gFieldCallback @@ -3812,7 +3812,7 @@ sub_80568FC: @ 80568FC .align 2, 0 _08056910: .4byte gFieldCallback _08056914: .4byte sub_807DF7C - thumb_func_end sub_80568FC + thumb_func_end CB2_Overworld thumb_func_start sub_8056918 sub_8056918: @ 8056918 |