diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_records.s | 4 | ||||
| -rw-r--r-- | asm/cable_club.s | 8 | ||||
| -rw-r--r-- | asm/rom4.s | 8 | ||||
| -rw-r--r-- | asm/rom_8065394.s | 4 | ||||
| -rw-r--r-- | asm/trainer_card.s | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/asm/battle_records.s b/asm/battle_records.s index 86f6f4ff0..10eaa45ae 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -460,7 +460,7 @@ sub_8110290: @ 8110290 ldr r3, _081102DC @ =gUnknown_02024D26 ldrb r3, [r3] ldr r6, _081102E0 @ =gLinkPlayers - ldr r5, _081102E4 @ =gUnknown_02029818 + ldr r5, _081102E4 @ =gLinkPlayerMapObjects lsls r4, 2 adds r4, r5 ldrb r5, [r4, 0x1] @@ -480,7 +480,7 @@ _081102D4: .4byte gSaveBlock1 + 0x30B8 _081102D8: .4byte gUnknown_0202FFF0 _081102DC: .4byte gUnknown_02024D26 _081102E0: .4byte gLinkPlayers -_081102E4: .4byte gUnknown_02029818 +_081102E4: .4byte gLinkPlayerMapObjects thumb_func_end sub_8110290 thumb_func_start PrintLinkBattleWinsLossesDraws diff --git a/asm/cable_club.s b/asm/cable_club.s index ebf64fe82..b7b7bb82d 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -710,7 +710,7 @@ _08083248: .4byte gScriptResult _0808324C: .4byte sub_80833C4 _08083250: bl GetLinkPlayerCount_2 - ldr r4, _08083278 @ =gUnknown_03004864 + ldr r4, _08083278 @ =gFieldLinkPlayerCount strb r0, [r4] bl GetMultiplayerId ldr r1, _0808327C @ =gUnknown_03004860 @@ -727,7 +727,7 @@ _08083270: pop {r0} bx r0 .align 2, 0 -_08083278: .4byte gUnknown_03004864 +_08083278: .4byte gFieldLinkPlayerCount _0808327C: .4byte gUnknown_03004860 _08083280: .4byte gBlockSendBuffer _08083284: .4byte sub_8083314 @@ -763,7 +763,7 @@ _080832C0: .4byte gTasks _080832C4: .4byte sub_80833C4 _080832C8: bl GetLinkPlayerCount_2 - ldr r4, _08083300 @ =gUnknown_03004864 + ldr r4, _08083300 @ =gFieldLinkPlayerCount strb r0, [r4] bl GetMultiplayerId ldr r1, _08083304 @ =gUnknown_03004860 @@ -786,7 +786,7 @@ _080832F8: pop {r0} bx r0 .align 2, 0 -_08083300: .4byte gUnknown_03004864 +_08083300: .4byte gFieldLinkPlayerCount _08083304: .4byte gUnknown_03004860 _08083308: .4byte gBlockSendBuffer _0808330C: .4byte gTasks diff --git a/asm/rom4.s b/asm/rom4.s index caf9fd336..6509a591d 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -12480,7 +12480,7 @@ _0805B630: .4byte gSaveBlock1 + 0xC20 RemoveFieldObjectsOutsideView: @ 805B634 push {r4-r6,lr} movs r3, 0 - ldr r6, _0805B688 @ =gUnknown_02029818 + ldr r6, _0805B688 @ =gLinkPlayerMapObjects _0805B63A: movs r2, 0 movs r4, 0 @@ -12524,7 +12524,7 @@ _0805B67A: pop {r0} bx r0 .align 2, 0 -_0805B688: .4byte gUnknown_02029818 +_0805B688: .4byte gLinkPlayerMapObjects _0805B68C: .4byte gMapObjects _0805B690: .4byte 0x00010001 thumb_func_end RemoveFieldObjectsOutsideView @@ -12656,7 +12656,7 @@ sub_805B75C: @ 805B75C lsrs r2, 16 mov r10, r2 movs r7, 0 - ldr r2, _0805B900 @ =gUnknown_02029818 + ldr r2, _0805B900 @ =gLinkPlayerMapObjects _0805B77E: lsls r0, r7, 2 adds r1, r0, r2 @@ -12845,7 +12845,7 @@ _0805B8EE: pop {r0} bx r0 .align 2, 0 -_0805B900: .4byte gUnknown_02029818 +_0805B900: .4byte gLinkPlayerMapObjects _0805B904: .4byte gMapObjects _0805B908: .4byte 0xffff0000 _0805B90C: .4byte 0x0000ffff diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index d3a9c1f02..37e33d029 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -558,7 +558,7 @@ _08068314: .4byte gUnknown_0821664C _08068318: .4byte gMapObjects _0806831C: movs r4, 0 - ldr r1, _08068354 @ =gUnknown_02029818 + ldr r1, _08068354 @ =gLinkPlayerMapObjects _08068320: ldrb r0, [r1] cmp r0, 0x1 @@ -588,7 +588,7 @@ _0806834E: pop {r1} bx r1 .align 2, 0 -_08068354: .4byte gUnknown_02029818 +_08068354: .4byte gLinkPlayerMapObjects _08068358: .4byte gSelectedMapObject _0806835C: .4byte gUnknown_0202E8DE _08068360: .4byte gUnknown_0202E8E0 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index 4e1035d1a..927cb17c2 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -35,7 +35,7 @@ sub_8093130: @ 8093130 bl SetMainCallback2 ldr r2, _08093168 @ =0x02000000 ldr r3, _0809316C @ =gLinkPlayers - ldr r0, _08093170 @ =gUnknown_02029818 + ldr r0, _08093170 @ =gLinkPlayerMapObjects lsls r4, 2 adds r4, r0 ldrb r1, [r4, 0x1] @@ -53,7 +53,7 @@ sub_8093130: @ 8093130 _08093164: .4byte sub_8093174 _08093168: .4byte 0x02000000 _0809316C: .4byte gLinkPlayers -_08093170: .4byte gUnknown_02029818 +_08093170: .4byte gLinkPlayerMapObjects thumb_func_end sub_8093130 thumb_func_start sub_8093174 |