diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-12 20:18:48 -0400 |
| commit | 6c52f7ce04ea37ae6a1854521f0e312d39e86ecb (patch) | |
| tree | b7369c07f40081796b51fc52ca5f26faaa8b8723 /asm/battle_records.s | |
| parent | e143072f961cfffc5e8e2cc5b2a6059c27124808 (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/battle_records.s')
| -rw-r--r-- | asm/battle_records.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_records.s b/asm/battle_records.s index dc7ecb94f..bd847561c 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -980,7 +980,7 @@ sub_80CD98C: @ 80CD98C ldrh r2, [r2, 0xE] ldr r3, _080CD9EC @ =gUnknown_2023E8A ldrb r3, [r3] - ldr r5, _080CD9F0 @ =gUnknown_202273C + ldr r5, _080CD9F0 @ =gLinkPlayers lsls r4, r6, 3 subs r4, r6 lsls r4, 2 @@ -999,7 +999,7 @@ _080CD9E0: .4byte gSaveBlock2Ptr _080CD9E4: .4byte 0x00000a98 _080CD9E8: .4byte gUnknown_2039654 _080CD9EC: .4byte gUnknown_2023E8A -_080CD9F0: .4byte gUnknown_202273C +_080CD9F0: .4byte gLinkPlayers thumb_func_end sub_80CD98C thumb_func_start sub_80CD9F4 |