diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /asm/fldeff_flash.s | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
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 c14e9057d..dcd485d9f 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -18,7 +18,7 @@ SetUpFieldMove_Flash: @ 810CBB4 lsls r0, 24 cmp r0, 0 bne _0810CBF4 - ldr r1, _0810CBE4 @ =gUnknown_0300485C + ldr r1, _0810CBE4 @ =gFieldCallback ldr r0, _0810CBE8 @ =sub_808AB90 str r0, [r1] ldr r1, _0810CBEC @ =gUnknown_03005CE4 @@ -29,7 +29,7 @@ SetUpFieldMove_Flash: @ 810CBB4 .align 2, 0 _0810CBDC: .4byte gMapHeader _0810CBE0: .4byte 0x00000828 -_0810CBE4: .4byte gUnknown_0300485C +_0810CBE4: .4byte gFieldCallback _0810CBE8: .4byte sub_808AB90 _0810CBEC: .4byte gUnknown_03005CE4 _0810CBF0: .4byte sub_810CBFC |