through SetContinueGameWarpToDynamicWarp
This commit is contained in:
PikalaxALT
+7
-645
@@ -5,644 +5,6 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start update_camera_pos_from_warpid
|
||||
update_camera_pos_from_warpid: @ 80552FC
|
||||
push {r4,r5,lr}
|
||||
ldr r0, _0805532C @ =gSaveBlock1Ptr
|
||||
ldr r2, [r0]
|
||||
movs r1, 0x6
|
||||
ldrsb r1, [r2, r1]
|
||||
adds r4, r0, 0
|
||||
cmp r1, 0
|
||||
blt _08055334
|
||||
ldr r3, _08055330 @ =gMapHeader
|
||||
ldr r0, [r3, 0x4]
|
||||
ldrb r5, [r0, 0x1]
|
||||
cmp r1, r5
|
||||
bge _08055334
|
||||
ldr r0, [r0, 0x8]
|
||||
lsls r1, 3
|
||||
adds r0, r1, r0
|
||||
ldrh r0, [r0]
|
||||
strh r0, [r2]
|
||||
ldr r0, [r3, 0x4]
|
||||
ldr r0, [r0, 0x8]
|
||||
adds r1, r0
|
||||
ldrh r0, [r1, 0x2]
|
||||
strh r0, [r2, 0x2]
|
||||
b _0805536C
|
||||
.align 2, 0
|
||||
_0805532C: .4byte gSaveBlock1Ptr
|
||||
_08055330: .4byte gMapHeader
|
||||
_08055334:
|
||||
ldr r1, [r4]
|
||||
ldrh r3, [r1, 0x8]
|
||||
movs r2, 0x8
|
||||
ldrsh r0, [r1, r2]
|
||||
cmp r0, 0
|
||||
blt _08055350
|
||||
ldrh r2, [r1, 0xA]
|
||||
movs r5, 0xA
|
||||
ldrsh r0, [r1, r5]
|
||||
cmp r0, 0
|
||||
blt _08055350
|
||||
strh r3, [r1]
|
||||
strh r2, [r1, 0x2]
|
||||
b _0805536C
|
||||
_08055350:
|
||||
ldr r3, [r4]
|
||||
ldr r2, _08055374 @ =gMapHeader
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0]
|
||||
lsrs r1, r0, 31
|
||||
adds r0, r1
|
||||
asrs r0, 1
|
||||
strh r0, [r3]
|
||||
ldr r0, [r2]
|
||||
ldr r0, [r0, 0x4]
|
||||
lsrs r1, r0, 31
|
||||
adds r0, r1
|
||||
asrs r0, 1
|
||||
strh r0, [r3, 0x2]
|
||||
_0805536C:
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055374: .4byte gMapHeader
|
||||
thumb_func_end update_camera_pos_from_warpid
|
||||
|
||||
thumb_func_start WarpIntoMap
|
||||
WarpIntoMap: @ 8055378
|
||||
push {lr}
|
||||
bl ApplyCurrentWarp
|
||||
bl LoadCurrentMapData
|
||||
bl update_camera_pos_from_warpid
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end WarpIntoMap
|
||||
|
||||
thumb_func_start SetWarpDestination
|
||||
SetWarpDestination: @ 805538C
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, _080553C4 @ =sWarpDestination
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
lsls r6, 24
|
||||
asrs r6, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
str r3, [sp]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080553C4: .4byte sWarpDestination
|
||||
thumb_func_end SetWarpDestination
|
||||
|
||||
thumb_func_start SetWarpDestinationToMapWarp
|
||||
SetWarpDestinationToMapWarp: @ 80553C8
|
||||
push {lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
asrs r0, 24
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
lsls r2, 24
|
||||
asrs r2, 24
|
||||
movs r3, 0x1
|
||||
negs r3, r3
|
||||
str r3, [sp]
|
||||
bl SetWarpDestination
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end SetWarpDestinationToMapWarp
|
||||
|
||||
thumb_func_start SetDynamicWarp
|
||||
SetDynamicWarp: @ 80553E8
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
ldr r0, _08055418 @ =gSaveBlock1Ptr
|
||||
ldr r5, [r0]
|
||||
adds r0, r5, 0
|
||||
adds r0, 0x14
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
lsls r2, 24
|
||||
asrs r2, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
movs r4, 0
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp]
|
||||
movs r4, 0x2
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp, 0x4]
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055418: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SetDynamicWarp
|
||||
|
||||
thumb_func_start SetDynamicWarpWithCoords
|
||||
SetDynamicWarpWithCoords: @ 805541C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
ldr r4, [sp, 0x14]
|
||||
ldr r5, [sp, 0x18]
|
||||
ldr r0, _08055450 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0x14
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
lsls r2, 24
|
||||
asrs r2, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
str r5, [sp, 0x4]
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055450: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SetDynamicWarpWithCoords
|
||||
|
||||
thumb_func_start SetWarpDestinationToDynamicWarp
|
||||
SetWarpDestinationToDynamicWarp: @ 8055454
|
||||
ldr r2, _08055464 @ =sWarpDestination
|
||||
ldr r0, _08055468 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x18]
|
||||
ldr r0, [r0, 0x14]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08055464: .4byte sWarpDestination
|
||||
_08055468: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SetWarpDestinationToDynamicWarp
|
||||
|
||||
thumb_func_start sub_805546C
|
||||
sub_805546C: @ 805546C
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl GetHealLocationPointer
|
||||
adds r4, r0, 0
|
||||
cmp r4, 0
|
||||
beq _0805549A
|
||||
movs r0, 0
|
||||
ldrsb r0, [r4, r0]
|
||||
movs r1, 0x1
|
||||
ldrsb r1, [r4, r1]
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
movs r3, 0x2
|
||||
ldrsb r3, [r4, r3]
|
||||
ldrb r4, [r4, 0x4]
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl SetWarpDestination
|
||||
_0805549A:
|
||||
add sp, 0x4
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_805546C
|
||||
|
||||
thumb_func_start copy_saved_warp3_bank_and_enter_x_to_warp1
|
||||
copy_saved_warp3_bank_and_enter_x_to_warp1: @ 80554A4
|
||||
ldr r2, _080554B4 @ =sWarpDestination
|
||||
ldr r0, _080554B8 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x20]
|
||||
ldr r0, [r0, 0x1C]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080554B4: .4byte sWarpDestination
|
||||
_080554B8: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
|
||||
|
||||
thumb_func_start Overworld_SetWhiteoutRespawnPoint
|
||||
Overworld_SetWhiteoutRespawnPoint: @ 80554BC
|
||||
push {lr}
|
||||
ldr r0, _080554C8 @ =sWarpDestination
|
||||
bl SetWhiteoutRespawnWarpAndHealerNpc
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080554C8: .4byte sWarpDestination
|
||||
thumb_func_end Overworld_SetWhiteoutRespawnPoint
|
||||
|
||||
thumb_func_start SetLastHealLocationWarp
|
||||
SetLastHealLocationWarp: @ 80554CC
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl GetHealLocationPointer
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _08055500
|
||||
ldr r0, _08055508 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0x1C
|
||||
movs r1, 0
|
||||
ldrsb r1, [r5, r1]
|
||||
movs r2, 0x1
|
||||
ldrsb r2, [r5, r2]
|
||||
movs r3, 0x1
|
||||
negs r3, r3
|
||||
movs r4, 0x2
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp]
|
||||
movs r4, 0x4
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp, 0x4]
|
||||
bl SetWarpData
|
||||
_08055500:
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055508: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SetLastHealLocationWarp
|
||||
|
||||
thumb_func_start UpdateEscapeWarp
|
||||
UpdateEscapeWarp: @ 805550C
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 16
|
||||
lsrs r6, r0, 16
|
||||
lsls r1, 16
|
||||
lsrs r7, r1, 16
|
||||
bl GetCurrentMapType
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
lsrs r4, 24
|
||||
ldr r1, _08055598 @ =sWarpDestination
|
||||
movs r0, 0
|
||||
ldrsb r0, [r1, r0]
|
||||
ldrb r1, [r1, 0x1]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
bl get_map_light_level_by_bank_and_number
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
adds r0, r4, 0
|
||||
bl IsMapTypeOutdoors
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08055590
|
||||
adds r0, r5, 0
|
||||
bl IsMapTypeOutdoors
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
beq _08055590
|
||||
ldr r5, _0805559C @ =gSaveBlock1Ptr
|
||||
ldr r0, [r5]
|
||||
ldrh r0, [r0, 0x4]
|
||||
cmp r0, 0x1
|
||||
beq _08055590
|
||||
bl GetPlayerFacingDirection
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x1
|
||||
eors r0, r1
|
||||
negs r4, r0
|
||||
orrs r4, r0
|
||||
ldr r1, [r5]
|
||||
movs r0, 0x4
|
||||
ldrsb r0, [r1, r0]
|
||||
ldrb r1, [r1, 0x5]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
subs r3, r6, 0x7
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
lsrs r4, 31
|
||||
subs r4, 0x7
|
||||
adds r4, r7, r4
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl SetEscapeWarp
|
||||
_08055590:
|
||||
add sp, 0x4
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055598: .4byte sWarpDestination
|
||||
_0805559C: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end UpdateEscapeWarp
|
||||
|
||||
thumb_func_start SetEscapeWarp
|
||||
SetEscapeWarp: @ 80555A0
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, _080555DC @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0x24
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
lsls r6, 24
|
||||
asrs r6, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
str r3, [sp]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080555DC: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end SetEscapeWarp
|
||||
|
||||
thumb_func_start sub_80555E0
|
||||
sub_80555E0: @ 80555E0
|
||||
ldr r2, _080555F0 @ =sWarpDestination
|
||||
ldr r0, _080555F4 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x28]
|
||||
ldr r0, [r0, 0x24]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080555F0: .4byte sWarpDestination
|
||||
_080555F4: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_80555E0
|
||||
|
||||
thumb_func_start SetFixedDiveWarp
|
||||
SetFixedDiveWarp: @ 80555F8
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, _08055630 @ =gFixedDiveWarp
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
lsls r6, 24
|
||||
asrs r6, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
str r3, [sp]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055630: .4byte gFixedDiveWarp
|
||||
thumb_func_end SetFixedDiveWarp
|
||||
|
||||
thumb_func_start warp1_set_to_warp2
|
||||
warp1_set_to_warp2: @ 8055634
|
||||
ldr r2, _08055644 @ =sWarpDestination
|
||||
ldr r0, _08055648 @ =gFixedDiveWarp
|
||||
ldr r1, [r0, 0x4]
|
||||
ldr r0, [r0]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08055644: .4byte sWarpDestination
|
||||
_08055648: .4byte gFixedDiveWarp
|
||||
thumb_func_end warp1_set_to_warp2
|
||||
|
||||
thumb_func_start SetFixedHoleWarp
|
||||
SetFixedHoleWarp: @ 805564C
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, _08055684 @ =gFixedHoleWarp
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
lsls r6, 24
|
||||
asrs r6, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
str r3, [sp]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055684: .4byte gFixedHoleWarp
|
||||
thumb_func_end SetFixedHoleWarp
|
||||
|
||||
thumb_func_start SetWarpDestinationToFixedHoleWarp
|
||||
SetWarpDestinationToFixedHoleWarp: @ 8055688
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 16
|
||||
lsrs r5, r0, 16
|
||||
lsls r1, 16
|
||||
lsrs r6, r1, 16
|
||||
ldr r4, _080556B0 @ =gFixedHoleWarp
|
||||
adds r0, r4, 0
|
||||
bl IsDummyWarp
|
||||
cmp r0, 0x1
|
||||
bne _080556BC
|
||||
ldr r2, _080556B4 @ =sWarpDestination
|
||||
ldr r0, _080556B8 @ =gLastUsedWarp
|
||||
ldr r1, [r0, 0x4]
|
||||
ldr r0, [r0]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
b _080556D6
|
||||
.align 2, 0
|
||||
_080556B0: .4byte gFixedHoleWarp
|
||||
_080556B4: .4byte sWarpDestination
|
||||
_080556B8: .4byte gLastUsedWarp
|
||||
_080556BC:
|
||||
movs r0, 0
|
||||
ldrsb r0, [r4, r0]
|
||||
movs r1, 0x1
|
||||
ldrsb r1, [r4, r1]
|
||||
movs r2, 0x1
|
||||
negs r2, r2
|
||||
lsls r3, r5, 24
|
||||
asrs r3, 24
|
||||
lsls r4, r6, 24
|
||||
asrs r4, 24
|
||||
str r4, [sp]
|
||||
bl SetWarpDestination
|
||||
_080556D6:
|
||||
add sp, 0x4
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end SetWarpDestinationToFixedHoleWarp
|
||||
|
||||
thumb_func_start warp1_set_to_sav1w
|
||||
warp1_set_to_sav1w: @ 80556E0
|
||||
ldr r2, _080556F0 @ =sWarpDestination
|
||||
ldr r0, _080556F4 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
ldr r1, [r0, 0x10]
|
||||
ldr r0, [r0, 0xC]
|
||||
str r0, [r2]
|
||||
str r1, [r2, 0x4]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_080556F0: .4byte sWarpDestination
|
||||
_080556F4: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end warp1_set_to_sav1w
|
||||
|
||||
thumb_func_start sub_80556F8
|
||||
sub_80556F8: @ 80556F8
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x8
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
adds r6, r2, 0
|
||||
ldr r1, [sp, 0x18]
|
||||
ldr r0, _08055734 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0xC
|
||||
lsls r4, 24
|
||||
asrs r4, 24
|
||||
lsls r5, 24
|
||||
asrs r5, 24
|
||||
lsls r6, 24
|
||||
asrs r6, 24
|
||||
lsls r3, 24
|
||||
asrs r3, 24
|
||||
str r3, [sp]
|
||||
lsls r1, 24
|
||||
asrs r1, 24
|
||||
str r1, [sp, 0x4]
|
||||
adds r1, r4, 0
|
||||
adds r2, r5, 0
|
||||
adds r3, r6, 0
|
||||
bl SetWarpData
|
||||
add sp, 0x8
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055734: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_80556F8
|
||||
|
||||
thumb_func_start sub_8055738
|
||||
sub_8055738: @ 8055738
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x8
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl GetHealLocationPointer
|
||||
adds r5, r0, 0
|
||||
cmp r5, 0
|
||||
beq _0805576C
|
||||
ldr r0, _08055774 @ =gSaveBlock1Ptr
|
||||
ldr r0, [r0]
|
||||
adds r0, 0xC
|
||||
movs r1, 0
|
||||
ldrsb r1, [r5, r1]
|
||||
movs r2, 0x1
|
||||
ldrsb r2, [r5, r2]
|
||||
movs r3, 0x1
|
||||
negs r3, r3
|
||||
movs r4, 0x2
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp]
|
||||
movs r4, 0x4
|
||||
ldrsb r4, [r5, r4]
|
||||
str r4, [sp, 0x4]
|
||||
bl SetWarpData
|
||||
_0805576C:
|
||||
add sp, 0x8
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08055774: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_8055738
|
||||
|
||||
thumb_func_start sub_8055778
|
||||
sub_8055778: @ 8055778
|
||||
ldr r0, _08055788 @ =gSaveBlock1Ptr
|
||||
ldr r2, [r0]
|
||||
ldr r0, [r2, 0x14]
|
||||
ldr r1, [r2, 0x18]
|
||||
str r0, [r2, 0xC]
|
||||
str r1, [r2, 0x10]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
_08055788: .4byte gSaveBlock1Ptr
|
||||
thumb_func_end sub_8055778
|
||||
|
||||
thumb_func_start GetMapConnection
|
||||
GetMapConnection: @ 805578C
|
||||
push {r4,lr}
|
||||
@@ -719,7 +81,7 @@ _080557FC:
|
||||
.align 2, 0
|
||||
_08055810: .4byte gFixedDiveWarp
|
||||
_08055814:
|
||||
bl warp1_set_to_warp2
|
||||
bl SetWarpDestinationToDiveWarp
|
||||
_08055818:
|
||||
movs r0, 0x1
|
||||
_0805581A:
|
||||
@@ -1933,8 +1295,8 @@ _08056152:
|
||||
bx r1
|
||||
thumb_func_end sub_8056124
|
||||
|
||||
thumb_func_start get_map_light_level_by_bank_and_number
|
||||
get_map_light_level_by_bank_and_number: @ 8056158
|
||||
thumb_func_start GetMapTypeByGroupAndId
|
||||
GetMapTypeByGroupAndId: @ 8056158
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
asrs r0, 8
|
||||
@@ -1946,7 +1308,7 @@ get_map_light_level_by_bank_and_number: @ 8056158
|
||||
ldrb r0, [r0, 0x17]
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end get_map_light_level_by_bank_and_number
|
||||
thumb_func_end GetMapTypeByGroupAndId
|
||||
|
||||
thumb_func_start get_map_light_level_from_warp
|
||||
get_map_light_level_from_warp: @ 8056170
|
||||
@@ -1956,7 +1318,7 @@ get_map_light_level_from_warp: @ 8056170
|
||||
movs r1, 0x1
|
||||
ldrsb r1, [r0, r1]
|
||||
adds r0, r2, 0
|
||||
bl get_map_light_level_by_bank_and_number
|
||||
bl GetMapTypeByGroupAndId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
@@ -2936,7 +2298,7 @@ CB2_ContinueSavedGame: @ 8056938
|
||||
cmp r0, 0x1
|
||||
bne _0805699C
|
||||
bl sav2_x9_clear_bit1
|
||||
bl warp1_set_to_sav1w
|
||||
bl SetWarpDestinationToContinueGameWarp
|
||||
bl WarpIntoMap
|
||||
ldr r0, _08056998 @ =CB2_LoadMap
|
||||
bl SetMainCallback2
|
||||
@@ -4217,7 +3579,7 @@ sub_8057430: @ 8057430
|
||||
cmp r0, 0x1
|
||||
bne _08057490
|
||||
bl sav2_x9_clear_bit1
|
||||
bl warp1_set_to_sav1w
|
||||
bl SetWarpDestinationToContinueGameWarp
|
||||
bl WarpIntoMap
|
||||
ldr r0, _0805748C @ =CB2_LoadMap
|
||||
bl SetMainCallback2
|
||||
|
||||
Reference in New Issue
Block a user