mirror of
https://github.com/zeldaret/tmc
synced 2026-08-07 10:16:23 -04:00
Renaming according to review
This commit is contained in:
@@ -791,7 +791,7 @@ sub_0803EAD0: @ 0x0803EAD0
|
||||
movs r4, #0x32
|
||||
ldrsh r2, [r2, r4]
|
||||
subs r2, #4
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0803EAE8: .4byte gUnk_020000B0
|
||||
|
||||
+4
-4
@@ -39,7 +39,7 @@ _0803EBE4:
|
||||
ldrh r2, [r0]
|
||||
adds r0, r4, #0
|
||||
movs r3, #2
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
bne _0803EC14
|
||||
movs r0, #4
|
||||
@@ -141,7 +141,7 @@ sub_0803EC94: @ 0x0803EC94
|
||||
ldrh r2, [r6]
|
||||
adds r0, r4, #0
|
||||
movs r3, #1
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0803ECD8
|
||||
ldrh r0, [r5]
|
||||
@@ -465,7 +465,7 @@ sub_0803EF04: @ 0x0803EF04
|
||||
movs r4, #0x32
|
||||
ldrsh r2, [r2, r4]
|
||||
subs r2, #4
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0803EF1C: .4byte gUnk_020000B0
|
||||
@@ -531,7 +531,7 @@ sub_0803EF74: @ 0x0803EF74
|
||||
ldrsh r2, [r4, r0]
|
||||
adds r0, r5, #0
|
||||
movs r3, #0x50
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0803EFA8
|
||||
adds r0, r4, #0
|
||||
|
||||
+5
-5
@@ -449,7 +449,7 @@ _08049398:
|
||||
asrs r3, r3, #0x10
|
||||
adds r3, #0x10
|
||||
adds r0, r4, #0
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _080493E0
|
||||
movs r0, #2
|
||||
@@ -661,7 +661,7 @@ sub_08049538: @ 0x08049538
|
||||
adds r2, #0x80
|
||||
adds r0, r4, #0
|
||||
movs r3, #0x70
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
adds r1, r0, #0
|
||||
cmp r1, #0
|
||||
bne _0804956E
|
||||
@@ -754,7 +754,7 @@ sub_080495F8: @ 0x080495F8
|
||||
adds r2, #0x80
|
||||
adds r0, r4, #0
|
||||
movs r3, #0x28
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0804963C
|
||||
movs r0, #2
|
||||
@@ -1195,7 +1195,7 @@ sub_08049944: @ 0x08049944
|
||||
movs r3, #0x32
|
||||
ldrsh r2, [r5, r3]
|
||||
movs r3, #0x20
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0804998C
|
||||
ldr r2, _08049994 @ =gPlayerState
|
||||
@@ -1292,7 +1292,7 @@ sub_080499F0: @ 0x080499F0
|
||||
ldrsh r2, [r4, r3]
|
||||
adds r0, r5, #0
|
||||
movs r3, #0x24
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _08049A7E
|
||||
ldrb r1, [r6]
|
||||
|
||||
+3
-3
@@ -671,7 +671,7 @@ _0803976A:
|
||||
ldrsh r2, [r0, r3]
|
||||
adds r0, r4, #0
|
||||
movs r3, #0x24
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _08039818
|
||||
movs r0, #5
|
||||
@@ -713,7 +713,7 @@ _080397DC:
|
||||
ldrsh r2, [r0, r3]
|
||||
adds r0, r4, #0
|
||||
movs r3, #0x48
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _08039818
|
||||
movs r0, #8
|
||||
@@ -844,7 +844,7 @@ sub_080398C0: @ 0x080398C0
|
||||
ldrsh r2, [r0, r3]
|
||||
adds r0, r4, #0
|
||||
movs r3, #0x58
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _08039908
|
||||
ldr r1, _08039904 @ =gPlayerEntity
|
||||
|
||||
@@ -789,7 +789,7 @@ sub_0802FA88: @ 0x0802FA88
|
||||
adds r6, #0x7a
|
||||
ldrh r2, [r6]
|
||||
movs r3, #2
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0802FAF6
|
||||
adds r1, r4, #0
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
adds r2, r2, r0
|
||||
adds r0, r6, #0
|
||||
movs r3, #8
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _080AA3D0
|
||||
movs r0, #1
|
||||
|
||||
@@ -555,7 +555,7 @@ _0808663A:
|
||||
adds r0, r7, #0
|
||||
adds r1, r4, #0
|
||||
movs r3, #2
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _080866B8
|
||||
movs r0, #1
|
||||
|
||||
@@ -297,7 +297,7 @@ _0808BD34:
|
||||
subs r2, #6
|
||||
adds r0, r5, #0
|
||||
movs r3, #0x1c
|
||||
bl isEntityWithinDistance
|
||||
bl EntityWithinDistance
|
||||
cmp r0, #0
|
||||
beq _0808BDAE
|
||||
adds r0, r5, #0
|
||||
|
||||
Reference in New Issue
Block a user