diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:31:03 +0100 |
| commit | 1b7246395d0d7e47834f3b9c4f9f016a906a9953 (patch) | |
| tree | e775f8d4d5e30bbfb7ef3b5ca9dcf62171d919bb /asm/rom4.s | |
| parent | ba00a1c688f84edcab44bd183d6dea4e2e7ba0be (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
merge conflicts, review changes, daycare
Diffstat (limited to 'asm/rom4.s')
| -rw-r--r-- | asm/rom4.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/rom4.s b/asm/rom4.s index 3b6f87d84..3f59c2807 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -841,7 +841,7 @@ sub_8084CCC: @ 8084CCC sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r4, r0, 0 cmp r4, 0 beq _08084CFA @@ -885,7 +885,7 @@ Overworld_SetHealLocationWarp: @ 8084D1C sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r5, r0, 0 cmp r5, 0 beq _08084D50 @@ -1187,7 +1187,7 @@ sub_8084F6C: @ 8084F6C sub sp, 0x8 lsls r0, 24 lsrs r0, 24 - bl sub_8122CBC + bl GetHealLocationPointer adds r5, r0, 0 cmp r5, 0 beq _08084FA0 |