diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 11:15:00 +0100 |
| commit | 43f23b8a78a0111c88d671942a012d8d4b28596c (patch) | |
| tree | 743beb78116eb7f6558e8a6c906873e584cbf8b2 /asm/overworld.s | |
| parent | 3a3772c74ff76a258ffa4b6515fa07d5c96a2979 (diff) | |
| parent | f209cbd7a0519b49fcf3f1b7a3fca27d6dcaacd8 (diff) | |
Merge branch 'master' into dump_pointers
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 f86097ce9..6749cb8fd 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -2212,8 +2212,8 @@ call_ResetMapMusic: @ 8085778 bx r0 thumb_func_end call_ResetMapMusic - thumb_func_start sub_8085784 -sub_8085784: @ 8085784 + thumb_func_start Overworld_PlaySpecialMapMusic +Overworld_PlaySpecialMapMusic: @ 8085784 push {r4,lr} bl sav1_map_get_music lsls r0, 16 @@ -2261,7 +2261,7 @@ _080857E8: pop {r0} bx r0 .pool - thumb_func_end sub_8085784 + thumb_func_end Overworld_PlaySpecialMapMusic thumb_func_start Overworld_SetSavedMusic Overworld_SetSavedMusic: @ 80857F4 |