summaryrefslogtreecommitdiff
path: root/asm/jirachi_wish.s
diff options
context:
space:
mode:
authorCheng Hann Gan <chenghanngan.us@gmail.com>2021-11-20 10:47:46 -0600
committerGitHub <noreply@github.com>2021-11-20 08:47:46 -0800
commit938a88551f6ddefb7f696b738696c8ce2d8e0e36 (patch)
tree35a8d3954aa03fb00d061d7603d28af0111bb516 /asm/jirachi_wish.s
parent13552719886449c45aa0a06caccb7d7491382d9c (diff)
Labeled more symbols (#77)
* Labeled more symbols * Fixed comment typo * Renamed some functions
Diffstat (limited to 'asm/jirachi_wish.s')
-rw-r--r--asm/jirachi_wish.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/jirachi_wish.s b/asm/jirachi_wish.s
index 85a8d1c..4d113bb 100644
--- a/asm/jirachi_wish.s
+++ b/asm/jirachi_wish.s
@@ -157,7 +157,7 @@ _0808B6D2:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -241,7 +241,7 @@ _0808B77E:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -321,7 +321,7 @@ _0808B87C:
bl UnlockFriendArea
movs r0, 0xD4
bl PlaySoundEffect
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
ldr r0, _0808BA3C
movs r2, 0
@@ -391,7 +391,7 @@ _0808B8F4:
movs r2, 0
ldrsh r0, [r7, r2]
asrs r1, 16
- bl sub_8049590
+ bl GetMapEntity
ldrh r1, [r0]
movs r0, 0x3
ands r0, r1
@@ -442,7 +442,7 @@ _0808B98E:
movs r0, 0xA
movs r1, 0x46
bl sub_803E708
- bl sub_8083600
+ bl GetLeaderEntity
adds r1, r0, 0
adds r1, 0x4
adds r0, r6, 0x4