diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-23 22:00:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 22:00:47 -0400 |
| commit | 5b7c34096cff301c4d74bb2e67a7164b66bcc5dd (patch) | |
| tree | 6124fc5f2881ec5d698509101b407a36fdb934cd /asm/menu.s | |
| parent | e0a5896de36da0bb83c3983df8b2f47d019a8896 (diff) | |
| parent | 756f2c3a71c8f7e832a9e70a542210f549f4c61b (diff) | |
Merge pull request #74 from jiangzhengwenjz/misc
menu_helpers
Diffstat (limited to 'asm/menu.s')
| -rw-r--r-- | asm/menu.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/menu.s b/asm/menu.s index 2229f41d8..c8e823fc1 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_810EDC4 -sub_810EDC4: @ 810EDC4 + thumb_func_start DrawDialogFrameWithCustomTileAndPalette +DrawDialogFrameWithCustomTileAndPalette: @ 810EDC4 push {r4,r5,lr} adds r4, r1, 0 lsls r0, 24 @@ -38,7 +38,7 @@ _0810EDFA: _0810EE00: .4byte gUnknown_203ADF0 _0810EE04: .4byte gUnknown_203ADF2 _0810EE08: .4byte sub_810EE5C - thumb_func_end sub_810EDC4 + thumb_func_end DrawDialogFrameWithCustomTileAndPalette thumb_func_start sub_810EE0C sub_810EE0C: @ 810EE0C |