diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
| commit | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (patch) | |
| tree | a0b00c058bd7234b9140b4636b08016278f1b049 /asm/overworld.s | |
| parent | 2d04eb22abd3f60902ee1f9bc87bd510518709e3 (diff) | |
| parent | 87958f2f87b9f7f6e5548d9cb2ac53c3339b78d5 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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 5f58e6d14..5de62b896 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 |