diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/decoration_inventory.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/decoration_inventory.s')
| -rw-r--r-- | asm/decoration_inventory.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s index 52d490c20..7a909f585 100644 --- a/asm/decoration_inventory.s +++ b/asm/decoration_inventory.s @@ -156,8 +156,8 @@ _08161910: bx r1 thumb_func_end sub_81618D0 - thumb_func_start sub_8161918 -sub_8161918: @ 8161918 + thumb_func_start CheckHasDecoration +CheckHasDecoration: @ 8161918 push {r4,lr} lsls r0, 24 lsrs r3, r0, 24 @@ -193,7 +193,7 @@ _08161958: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8161918 + thumb_func_end CheckHasDecoration thumb_func_start DecorationAdd DecorationAdd: @ 8161960 |