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/overworld.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
Diffstat (limited to 'asm/overworld.s')
| -rw-r--r-- | asm/overworld.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/overworld.s b/asm/overworld.s index 5e6315b9f..3c6f52f4e 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -4834,7 +4834,7 @@ sub_80571A8: @ 80571A8 ldrb r0, [r0] cmp r6, r0 bcs _08057212 - ldr r7, _0805722C @ =gUnknown_202273C + ldr r7, _0805722C @ =gLinkPlayers _080571D8: lsls r5, r6, 24 lsrs r5, 24 @@ -4874,7 +4874,7 @@ _08057212: .align 2, 0 _08057224: .4byte gUnknown_300502C _08057228: .4byte gUnknown_3005030 -_0805722C: .4byte gUnknown_202273C +_0805722C: .4byte gLinkPlayers thumb_func_end sub_80571A8 thumb_func_start sub_8057230 @@ -4885,7 +4885,7 @@ sub_8057230: @ 8057230 ldrb r0, [r0] cmp r4, r0 bcs _0805725E - ldr r5, _08057268 @ =gUnknown_202273C + ldr r5, _08057268 @ =gLinkPlayers _0805723E: lsls r0, r4, 24 lsrs r0, 24 @@ -4908,7 +4908,7 @@ _0805725E: bx r0 .align 2, 0 _08057264: .4byte gUnknown_3005030 -_08057268: .4byte gUnknown_202273C +_08057268: .4byte gLinkPlayers thumb_func_end sub_8057230 thumb_func_start sub_805726C |