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/item.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/item.s')
| -rw-r--r-- | asm/item.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/item.s b/asm/item.s index 97582e190..89177c5d4 100644 --- a/asm/item.s +++ b/asm/item.s @@ -676,8 +676,8 @@ _080D6D04: .pool thumb_func_end sub_80D6CE4 - thumb_func_start sub_80D6D1C -sub_80D6D1C: @ 80D6D1C + thumb_func_start CheckPCHasItem +CheckPCHasItem: @ 80D6D1C push {r4-r6,lr} lsls r0, 16 lsrs r6, r0, 16 @@ -717,10 +717,10 @@ _080D6D68: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_80D6D1C + thumb_func_end CheckPCHasItem - thumb_func_start sub_80D6D70 -sub_80D6D70: @ 80D6D70 + thumb_func_start AddPCItem +AddPCItem: @ 80D6D70 push {r4-r7,lr} mov r7, r8 push {r7} @@ -819,7 +819,7 @@ _080D6E3A: pop {r1} bx r1 .pool - thumb_func_end sub_80D6D70 + thumb_func_end AddPCItem thumb_func_start sub_80D6E48 sub_80D6E48: @ 80D6E48 |