diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-17 23:25:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-17 23:25:11 -0500 |
| commit | 2f1285e4393deef290790e04cbb8d50b9fd007f5 (patch) | |
| tree | fa9008354f56ecb3ff48c266dc0474a1c621f6c9 /asm/field_screen_effect.s | |
| parent | ebd3a1371757839c260256e2d8101fc6448b2915 (diff) | |
| parent | da93247ea805fa5ade9fe2316dee827553d09e43 (diff) | |
Merge pull request #174 from garakmon/object_event
Dissassemble Event Object Data
Diffstat (limited to 'asm/field_screen_effect.s')
| -rw-r--r-- | asm/field_screen_effect.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 8d07f3779..f6e1c2f05 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -942,10 +942,10 @@ _0807F542: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 - ldr r1, _0807F580 @ =gMapObjects + ldr r1, _0807F580 @ =gObjectEvents adds r0, r1 movs r1, 0x2 - bl FieldObjectTurn + bl ObjectEventTurn ldr r1, _0807F584 @ =gTasks lsls r0, r6, 2 adds r0, r6 @@ -958,7 +958,7 @@ _0807F542: .align 2, 0 _0807F578: .4byte gUnknown_841B5B6 _0807F57C: .4byte gPlayerAvatar -_0807F580: .4byte gMapObjects +_0807F580: .4byte gObjectEvents _0807F584: .4byte gTasks _0807F588: lsls r4, r6, 2 |