diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-18 12:55:48 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-18 12:55:48 -0500 |
commit | 75a32c9dc54e32dd8c87af98dd0d3def658f7b02 (patch) | |
tree | e14c28dfd6de59cef7771ccb9d6ef239f8093023 /asm/fldeff_cut.s | |
parent | cfb0e233eebd172ce9131f4e4b940b18db6eb1d0 (diff) | |
parent | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (diff) |
Merge branch 'link' of github.com:pikalaxalt/pokeemerald into link
Diffstat (limited to 'asm/fldeff_cut.s')
-rwxr-xr-x | asm/fldeff_cut.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 71137b705..20380e478 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -20,7 +20,7 @@ sub_80D3718: @ 80D3718 cmp r0, 0x1 bne _080D3754 ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 + ldr r0, =FieldCallback_Teleport str r0, [r1] ldr r1, =gUnknown_0203CEEC ldr r0, =sub_80D3A9C @@ -322,7 +322,7 @@ _080D395A: bne _080D39F8 _080D39BC: ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 + ldr r0, =FieldCallback_Teleport str r0, [r1] ldr r1, =gUnknown_0203CEEC ldr r0, =hm2_ruin_valley @@ -360,7 +360,7 @@ _080D3A18: bne _080D3A2A _080D3A1E: ldr r1, =gUnknown_03005DB0 - ldr r0, =hm_add_c3_launch_phase_2 + ldr r0, =FieldCallback_Teleport str r0, [r1] ldr r1, =gUnknown_0203CEEC ldr r0, =hm2_ruin_valley |