diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/event_data.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/event_data.s')
| -rw-r--r-- | asm/event_data.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/event_data.s b/asm/event_data.s index e2758639f..1875449fa 100644 --- a/asm/event_data.s +++ b/asm/event_data.s @@ -829,9 +829,9 @@ sub_806E6FC: @ 806E6FC strh r0, [r1] ldr r1, _0806E790 @ =gUnknown_20370D2 strh r0, [r1] - ldr r1, _0806E794 @ =gUnknown_20370D6 + ldr r1, _0806E794 @ =gSpecialVar_MonBoxId strh r0, [r1] - ldr r1, _0806E798 @ =gUnknown_20370D8 + ldr r1, _0806E798 @ =gSpecialVar_MonBoxPos strh r0, [r1] ldr r1, _0806E79C @ =gUnknown_20370DA strh r0, [r1] @@ -857,8 +857,8 @@ _0806E784: .4byte gUnknown_20370D4 _0806E788: .4byte gUnknown_20370D0 _0806E78C: .4byte gUnknown_203AD30 _0806E790: .4byte gUnknown_20370D2 -_0806E794: .4byte gUnknown_20370D6 -_0806E798: .4byte gUnknown_20370D8 +_0806E794: .4byte gSpecialVar_MonBoxId +_0806E798: .4byte gSpecialVar_MonBoxPos _0806E79C: .4byte gUnknown_20370DA _0806E7A0: .4byte gUnknown_20370DC _0806E7A4: .4byte gUnknown_20370DE |