diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
| commit | 05aba58d5d5783cb3942349b0a1cc7a19a871d8d (patch) | |
| tree | 8d7e4308d231420bdceb40a565af2fe10b4f58f6 /asm/fldeff_flash.s | |
| parent | bc1a957674e84daf181c508afd2b623304de121d (diff) | |
| parent | d1630d481a0ff611fda2d70a100eed5046982cec (diff) | |
fix battle transition conflicts
Diffstat (limited to 'asm/fldeff_flash.s')
| -rw-r--r-- | asm/fldeff_flash.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 9cc3a59a5..d52ee34fc 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -18,7 +18,7 @@ SetUpFieldMove_Flash: @ 81370FC lsrs r0, 24 strh r0, [r4] 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_8179918 @@ -35,7 +35,7 @@ _08137134: cmp r0, 0 bne _08137170 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_flash |