start fldeffect cut
This commit is contained in:
@@ -467,7 +467,7 @@ _080F9F54:
|
||||
thumb_func_start sub_80F9F5C
|
||||
sub_80F9F5C: @ 80F9F5C
|
||||
push {lr}
|
||||
ldr r0, =gUnknown_0203AB40
|
||||
ldr r0, =gPlayerFacingPosition
|
||||
ldr r1, =gMapHeader
|
||||
ldr r1, [r1, 0x4]
|
||||
bl sub_80E9608
|
||||
@@ -572,7 +572,7 @@ sub_80FA004: @ 80FA004
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x2
|
||||
bne _080FA0AE
|
||||
ldr r4, =gUnknown_0203AB40
|
||||
ldr r4, =gPlayerFacingPosition
|
||||
adds r1, r4, 0x2
|
||||
adds r0, r4, 0
|
||||
bl GetXYCoordsOneStepInFrontOfPlayer
|
||||
@@ -590,10 +590,10 @@ sub_80FA004: @ 80FA004
|
||||
cmp r0, 0x1
|
||||
bne _080FA070
|
||||
bl sub_80F9F5C
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =sub_80FA0DC
|
||||
b _080FA0C0
|
||||
.pool
|
||||
@@ -605,10 +605,10 @@ _080FA070:
|
||||
cmp r0, 0x1
|
||||
bne _080FA0A0
|
||||
bl sub_80F9F5C
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =sub_80FA1E8
|
||||
b _080FA0C0
|
||||
.pool
|
||||
@@ -624,10 +624,10 @@ _080FA0AE:
|
||||
b _080FA0C4
|
||||
_080FA0B2:
|
||||
bl sub_80F9F5C
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =sub_80FA34C
|
||||
_080FA0C0:
|
||||
str r0, [r1]
|
||||
@@ -824,7 +824,7 @@ sub_80FA234: @ 80FA234
|
||||
thumb_func_start sub_80FA248
|
||||
sub_80FA248: @ 80FA248
|
||||
push {r4,lr}
|
||||
ldr r1, =gUnknown_0203AB40
|
||||
ldr r1, =gPlayerFacingPosition
|
||||
movs r2, 0
|
||||
ldrsh r0, [r1, r2]
|
||||
movs r2, 0x2
|
||||
|
||||
1294
asm/fldeff_cut.s
1294
asm/fldeff_cut.s
File diff suppressed because it is too large
Load Diff
@@ -10199,10 +10199,10 @@ _081B5714:
|
||||
movs r0, 0x5
|
||||
bl PlaySE
|
||||
_081B571A:
|
||||
ldr r0, =gUnknown_03005DB0
|
||||
ldr r0, =gFieldCallback2
|
||||
movs r1, 0
|
||||
str r1, [r0]
|
||||
ldr r0, =gUnknown_0203CEEC
|
||||
ldr r0, =gPostMenuFieldCallback
|
||||
str r1, [r0]
|
||||
adds r0, r4, 0
|
||||
bl sub_81B1C1C
|
||||
@@ -10213,8 +10213,8 @@ _081B572A:
|
||||
.pool
|
||||
thumb_func_end sub_81B56D8
|
||||
|
||||
thumb_func_start FieldCallback_Teleport
|
||||
FieldCallback_Teleport: @ 81B5738
|
||||
thumb_func_start FieldCallback_PrepareFadeInFromMenu
|
||||
FieldCallback_PrepareFadeInFromMenu: @ 81B5738
|
||||
push {lr}
|
||||
bl pal_fill_black
|
||||
ldr r0, =task_launch_hm_phase_2
|
||||
@@ -10224,7 +10224,7 @@ FieldCallback_Teleport: @ 81B5738
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end FieldCallback_Teleport
|
||||
thumb_func_end FieldCallback_PrepareFadeInFromMenu
|
||||
|
||||
thumb_func_start task_launch_hm_phase_2
|
||||
task_launch_hm_phase_2: @ 81B5750
|
||||
@@ -10241,7 +10241,7 @@ task_launch_hm_phase_2: @ 81B5750
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
str r0, [r1]
|
||||
ldr r0, =gUnknown_0203CEEC
|
||||
ldr r0, =gPostMenuFieldCallback
|
||||
ldr r0, [r0]
|
||||
bl _call_via_r0
|
||||
adds r0, r4, 0
|
||||
@@ -10345,10 +10345,10 @@ sub_81B5820: @ 81B5820
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _081B585C
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =hm_surf_run_dp02scr
|
||||
str r0, [r1]
|
||||
movs r0, 0x1
|
||||
@@ -10463,10 +10463,10 @@ hm_prepare_waterfall: @ 81B58F0
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
bne _081B594C
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =hm2_waterfall
|
||||
str r0, [r1]
|
||||
movs r0, 0x1
|
||||
@@ -10510,10 +10510,10 @@ sub_81B5974: @ 81B5974
|
||||
b _081B599E
|
||||
.pool
|
||||
_081B5990:
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r0, =FieldCallback_Teleport
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =FieldCallback_PrepareFadeInFromMenu
|
||||
str r0, [r1]
|
||||
ldr r1, =gUnknown_0203CEEC
|
||||
ldr r1, =gPostMenuFieldCallback
|
||||
ldr r0, =sub_81B5958
|
||||
str r0, [r1]
|
||||
movs r0, 0x1
|
||||
@@ -17276,7 +17276,7 @@ sub_81B9354: @ 81B9354
|
||||
sub sp, 0xC
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, =gUnknown_03005DB0
|
||||
ldr r2, =gFieldCallback2
|
||||
ldr r1, =hm_add_c3_without_phase_2
|
||||
str r1, [r2]
|
||||
movs r1, 0
|
||||
@@ -17308,7 +17308,7 @@ sub_81B9390: @ 81B9390
|
||||
movs r0, 0xFF
|
||||
strh r0, [r4]
|
||||
_081B93A6:
|
||||
ldr r0, =gUnknown_03005DB0
|
||||
ldr r0, =gFieldCallback2
|
||||
ldr r1, =hm_add_c3_without_phase_2
|
||||
str r1, [r0]
|
||||
ldr r0, =CB2_ReturnToField
|
||||
@@ -17417,7 +17417,7 @@ _081B9486:
|
||||
ldr r1, =gSpecialVar_0x8004
|
||||
ldrb r0, [r2]
|
||||
strh r0, [r1]
|
||||
ldr r1, =gUnknown_03005DB0
|
||||
ldr r1, =gFieldCallback2
|
||||
ldr r0, =hm_add_c3_without_phase_2
|
||||
str r0, [r1]
|
||||
ldr r0, =CB2_ReturnToField
|
||||
@@ -17553,7 +17553,7 @@ _081B95A4:
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
_081B95BA:
|
||||
ldr r0, =gUnknown_03005DB0
|
||||
ldr r0, =gFieldCallback2
|
||||
ldr r1, =hm_add_c3_without_phase_2
|
||||
str r1, [r0]
|
||||
ldr r0, =CB2_ReturnToField
|
||||
|
||||
@@ -2070,7 +2070,7 @@ sub_81C4F44: @ 81C4F44
|
||||
cmp r0, 0
|
||||
bne _081C4F6E
|
||||
bl overworld_free_bg_tilemaps
|
||||
ldr r0, =gUnknown_03005DB0
|
||||
ldr r0, =gFieldCallback2
|
||||
ldr r1, =hm_add_c3_without_phase_2
|
||||
str r1, [r0]
|
||||
ldr r1, =CB2_ReturnToField
|
||||
|
||||
Reference in New Issue
Block a user