through sub_80E909C

This commit is contained in:
PikalaxALT
2017-10-24 21:27:46 -04:00
parent 6558af388b
commit 0b0926f127
4 changed files with 50 additions and 110 deletions
-110
View File
@@ -5,116 +5,6 @@
.text
thumb_func_start sub_80E8FD0
sub_80E8FD0: @ 80E8FD0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r2, r0, r1
movs r1, 0x8
ldrsh r0, [r2, r1]
cmp r0, 0
beq _080E8FF4
cmp r0, 0x1
beq _080E900C
b _080E904A
.pool
_080E8FF4:
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _080E904A
movs r0, 0x1
strh r0, [r2, 0x8]
b _080E904A
.pool
_080E900C:
ldr r0, =0x00004054
bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
lsls r1, r0, 2
adds r1, r0
lsls r1, 5
adds r2, r1
ldr r0, =0x00001aac
adds r2, r0
ldrb r0, [r2]
cmp r0, 0xFE
bhi _080E9030
adds r0, 0x1
strb r0, [r2]
_080E9030:
bl sub_80E8F9C
bl warp_in
ldr r0, =gFieldCallback
ldr r1, =sub_80AF168
str r1, [r0]
ldr r0, =c2_load_new_map
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
_080E904A:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80E8FD0
thumb_func_start sub_80E9068
sub_80E9068: @ 80E9068
push {lr}
ldr r0, =sub_80E8FD0
movs r1, 0
bl CreateTask
movs r0, 0x1
movs r1, 0
bl fade_screen
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
movs r1, 0x4
ldrsb r1, [r0, r1]
movs r2, 0x5
ldrsb r2, [r0, r2]
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
pop {r0}
bx r0
.pool
thumb_func_end sub_80E9068
thumb_func_start sub_80E909C
sub_80E909C: @ 80E909C
push {lr}
ldr r0, =gMapHeader
ldrb r0, [r0, 0x17]
cmp r0, 0x9
bne _080E90C0
ldr r0, =0x00004097
bl VarGet
lsls r0, 16
cmp r0, 0
bne _080E90C0
movs r0, 0
b _080E90C2
.pool
_080E90C0:
movs r0, 0x1
_080E90C2:
pop {r1}
bx r1
thumb_func_end sub_80E909C
thumb_func_start sub_80E90C8
sub_80E90C8: @ 80E90C8
push {r4,lr}