diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
| commit | ad3a97e178b93c38b1d43f8120449b042ac23a0e (patch) | |
| tree | 1c0e790d275ae85cc82360406fd2e655ae262d1f /asm/pokenav.s | |
| parent | a3b5af17eabb255e983e61c6306e30f27de82524 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
berry blender merge conflicts
Diffstat (limited to 'asm/pokenav.s')
| -rwxr-xr-x | asm/pokenav.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index d6a3cc80c..d806a334b 100755 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -25722,7 +25722,7 @@ sub_81D3AD8: @ 81D3AD8 adds r5, r0, 0 adds r4, r1, 0 movs r0, 0x1E - bl sub_81535DC + bl TryCopySpecialSaveSection cmp r0, 0x1 bne _081D3B04 ldr r2, =0x00000ee8 |