diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-04 01:54:51 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-04 01:54:51 +0800 |
| commit | 67542ec22d57256b9613e9aeabb28440c66bfeb2 (patch) | |
| tree | a235a96472d7ac3b018a32162ab68450a983aea4 /asm/menu_indicators.s | |
| parent | 94091f15894ff2a0a9b2e838aba84ebdc211703c (diff) | |
| parent | 5bcafd74ec9978e260dc8dc53e57a89964a8c5cc (diff) | |
fix for merge
Diffstat (limited to 'asm/menu_indicators.s')
| -rw-r--r-- | asm/menu_indicators.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s index 5ae7a46c4..28e783731 100644 --- a/asm/menu_indicators.s +++ b/asm/menu_indicators.s @@ -294,8 +294,8 @@ _08133B38: .4byte 0x0000ffff _08133B3C: .4byte gSprites thumb_func_end AddScrollIndicatorArrowPair - thumb_func_start AddScrollIndicatorArrowPairParametrized -AddScrollIndicatorArrowPairParametrized: @ 8133B40 + thumb_func_start AddScrollIndicatorArrowPairParameterized +AddScrollIndicatorArrowPairParameterized: @ 8133B40 push {r4,lr} adds r4, r1, 0 subs r0, 0x2 @@ -345,7 +345,7 @@ _08133B76: bx r1 .align 2, 0 _08133BA0: .4byte gUnknown_203B130 - thumb_func_end AddScrollIndicatorArrowPairParametrized + thumb_func_end AddScrollIndicatorArrowPairParameterized thumb_func_start sub_8133BA4 sub_8133BA4: @ 8133BA4 |