diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
| commit | aa6e1a91fc89d01ad65eb532d6832767c936807a (patch) | |
| tree | 77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /asm/field_screen_effect.s | |
| parent | 46e957bacd9ba5538262c89bb87e1915167bb201 (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'asm/field_screen_effect.s')
| -rw-r--r-- | asm/field_screen_effect.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 2a6ee5c65..a1a51b908 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -942,7 +942,7 @@ _0807F542: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807F580 @ =gUnknown_2036E38 + ldr r1, _0807F580 @ =gMapObjects adds r0, r1 movs r1, 0x2 bl FieldObjectTurn @@ -958,7 +958,7 @@ _0807F542: .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 _0807F57C: .4byte gUnknown_2037078 -_0807F580: .4byte gUnknown_2036E38 +_0807F580: .4byte gMapObjects _0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 |