summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-30 18:11:20 -0700
committerYamaArashi <shadow962@live.com>2016-10-30 18:11:20 -0700
commit3e311cb329269df4816583b840dbb7fed145a9ce (patch)
tree29668800011a4ef94b67ba4a1f393362f637796d
parentdb212ba685f6d07924b2023ba417336a18300d08 (diff)
name dive-related task
-rw-r--r--asm/rom_80859BC.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 8d199442c..0366bf499 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -2994,7 +2994,7 @@ _080870AA:
thumb_func_start FldEff_UseDive
FldEff_UseDive: @ 80870B0
push {r4,lr}
- ldr r4, _080870E0 @ =sub_80870EC
+ ldr r4, _080870E0 @ =Task_Dive
adds r0, r4, 0
movs r1, 0xFF
bl CreateTask
@@ -3016,13 +3016,13 @@ FldEff_UseDive: @ 80870B0
pop {r1}
bx r1
.align 2, 0
-_080870E0: .4byte sub_80870EC
+_080870E0: .4byte Task_Dive
_080870E4: .4byte gTasks
_080870E8: .4byte gUnknown_0202FF84
thumb_func_end FldEff_UseDive
- thumb_func_start sub_80870EC
-sub_80870EC: @ 80870EC
+ thumb_func_start Task_Dive
+Task_Dive: @ 80870EC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -3049,7 +3049,7 @@ _080870FE:
.align 2, 0
_0808711C: .4byte gUnknown_0839F330
_08087120: .4byte gTasks
- thumb_func_end sub_80870EC
+ thumb_func_end Task_Dive
thumb_func_start sub_8087124
sub_8087124: @ 8087124
@@ -3110,7 +3110,7 @@ dive_3_unknown: @ 8087160
ldrb r1, [r0, 0x1E]
mov r0, sp
bl dive_warp
- ldr r0, _080871B4 @ =sub_80870EC
+ ldr r0, _080871B4 @ =Task_Dive
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@@ -3125,7 +3125,7 @@ _080871A4:
.align 2, 0
_080871AC: .4byte gMapObjects
_080871B0: .4byte gPlayerAvatar
-_080871B4: .4byte sub_80870EC
+_080871B4: .4byte Task_Dive
thumb_func_end dive_3_unknown
thumb_func_start sub_80871B8