Review comments and documentation

5 files changed, 16 insertions, 16 deletions

diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 87f01b7fb..fe6aac664 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2832,7 +2832,7 @@ _080E6F68:
 	ldrb r1, [r0]
 	movs r0, 0x64
 	muls r0, r1
-	ldr r1, _080E6FB4 @ =gEnemyParty + 0x1f4
+	ldr r1, _080E6FB4 @ =gEnemyParty + 500 @ &gEnemyParty[5]
 	adds r0, r1
 	movs r1, 0x2C
 	muls r1, r4
@@ -2855,7 +2855,7 @@ _080E6FA4: .4byte gSaveBlock2Ptr
 _080E6FA8: .4byte gSaveBlock1Ptr
 _080E6FAC: .4byte 0x00002cac
 _080E6FB0: .4byte 0x0000056d
-_080E6FB4: .4byte gEnemyParty + 0x1f4
+_080E6FB4: .4byte gEnemyParty + 500 @ &gEnemyParty[5]
 	thumb_func_end sub_80E6EE0
 
 	thumb_func_start SaveBattleTowerProgress
diff --git a/asm/cable_club.s b/asm/cable_club.s
index 9b4c173c9..d19bb3a35 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -2211,7 +2211,7 @@ _080818C4:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080818D8
-	ldr r0, _080818E4 @ =sub_804C718
+	ldr r0, _080818E4 @ =CB2_ReturnFromLinkTrade
 	bl SetMainCallback2
 	adds r0, r5, 0
 	bl DestroyTask
@@ -2221,7 +2221,7 @@ _080818D8:
 	bx r0
 	.align 2, 0
 _080818E0: .4byte gReceivedRemoteLinkPlayers
-_080818E4: .4byte sub_804C718
+_080818E4: .4byte CB2_ReturnFromLinkTrade
 	thumb_func_end sub_8081850
 
 	thumb_func_start sub_80818E8
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 710ee2b67..dac85320e 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -738,7 +738,7 @@ _080CE3D8: .4byte nullsub_76
 _080CE3DC: .4byte sub_80D00D8
 _080CE3E0: .4byte gMain
 _080CE3E4:
-	bl sub_80544FC
+	bl LoadTradeAnimGfx
 	b _080CE4EC
 _080CE3EA:
 	movs r0, 0x20
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index 4decd66ff..63a894247 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -2939,7 +2939,7 @@ sub_8117100: @ 8117100
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl sub_804C718
+	bl CB2_ReturnFromLinkTrade
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 91e19ebf2..43a7a6e31 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -3033,7 +3033,7 @@ _081201C0:
 	lsrs r6, r0, 29
 	cmp r6, 0x3
 	bne _081201F0
-	ldr r0, _081201EC @ =gPlayerParty + 0x12C
+	ldr r0, _081201EC @ =gPlayerParty + 300 @ &gPlayerParty[3]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -3042,12 +3042,12 @@ _081201C0:
 	b _08120290
 	.align 2, 0
 _081201E8: .4byte gUnknown_203B09C
-_081201EC: .4byte gPlayerParty + 0x12C
+_081201EC: .4byte gPlayerParty + 300 @ &gPlayerParty[3]
 _081201F0:
-	ldr r0, _081201F4 @ =gPlayerParty + 0xC8
+	ldr r0, _081201F4 @ =gPlayerParty + 200 @ &gPlayerParty[2]
 	b _0812020C
 	.align 2, 0
-_081201F4: .4byte gPlayerParty + 0xC8
+_081201F4: .4byte gPlayerParty + 200 @ &gPlayerParty[2]
 _081201F8:
 	cmp r0, 0x1
 	bne _08120290
@@ -3058,7 +3058,7 @@ _081201F8:
 	lsrs r5, r0, 29
 	cmp r5, 0x5
 	bne _08120224
-	ldr r0, _08120220 @ =gPlayerParty + 0x1F4
+	ldr r0, _08120220 @ =gPlayerParty + 500 @ &gPlayerParty[5]
 _0812020C:
 	movs r1, 0xB
 	bl GetMonData
@@ -3068,9 +3068,9 @@ _0812020C:
 	b _08120290
 	.align 2, 0
 _0812021C: .4byte gUnknown_203B09C
-_08120220: .4byte gPlayerParty + 0x1F4
+_08120220: .4byte gPlayerParty + 500 @ &gPlayerParty[5]
 _08120224:
-	ldr r0, _08120234 @ =gPlayerParty + 0x190
+	ldr r0, _08120234 @ =gPlayerParty + 400 @ &gPlayerParty[4]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -3078,7 +3078,7 @@ _08120224:
 	movs r0, 0x4
 	b _0812028E
 	.align 2, 0
-_08120234: .4byte gPlayerParty + 0x190
+_08120234: .4byte gPlayerParty + 400 @ &gPlayerParty[4]
 _08120238:
 	ldrb r1, [r4]
 	subs r0, r1, 0x2
@@ -18129,7 +18129,7 @@ _08127A80: .4byte sub_811FB28
 sub_8127A84: @ 8127A84
 	push {r4,lr}
 	adds r4, r0, 0
-	ldr r0, _08127AA4 @ =gPlayerParty + 0x64
+	ldr r0, _08127AA4 @ =gPlayerParty + 100 @ &gPlayerParty[1]
 	movs r1, 0xB
 	bl GetMonData
 	cmp r0, 0
@@ -18143,7 +18143,7 @@ _08127AA0:
 	movs r0, 0x7
 	b _08127ABA
 	.align 2, 0
-_08127AA4: .4byte gPlayerParty + 0x64
+_08127AA4: .4byte gPlayerParty + 100 @ &gPlayerParty[1]
 _08127AA8:
 	ldr r0, _08127AB4 @ =gUnknown_203B0A0
 	ldrb r0, [r0, 0xB]