diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 11:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:56:24 -0500 |
| commit | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (patch) | |
| tree | d45390654cd3f80ffccd4af95760133ef77366bd /asm/event_data.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
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 |