diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /asm/menu_helpers.s | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/menu_helpers.s')
| -rw-r--r-- | asm/menu_helpers.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index f01fc8569..acc3065ea 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -587,8 +587,8 @@ _08122208: bx r1 thumb_func_end sub_81221EC - thumb_func_start atk2D_jumpifarraynotequal -atk2D_jumpifarraynotequal: @ 812220C + thumb_func_start sub_812220C +sub_812220C: @ 812220C push {r4-r6,lr} adds r6, r2, 0 ldr r2, [sp, 0x10] @@ -633,7 +633,7 @@ _08122254: pop {r4-r6} pop {r0} bx r0 - thumb_func_end atk2D_jumpifarraynotequal + thumb_func_end sub_812220C thumb_func_start sub_812225C sub_812225C: @ 812225C |