diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-15 22:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 22:20:16 -0400 |
| commit | dda361afb7e2abafc15a498968580be6d1a83cfe (patch) | |
| tree | 46e7d19c2aec0e65ab446c7916e5d8aeb38bfe48 /asm/fldeff_flash.s | |
| parent | c8213423cefc83310bc62ca8bcc17d7b6b42e442 (diff) | |
| parent | 0a779312c8a5911620ef43eaefbecdbac9fa7b33 (diff) | |
Merge pull request #326 from ProjectRevoTPP/master
move player_pc data to C file and restructure/label the file
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 |