finish trainer card matching and data
This commit is contained in:
+4
-4
@@ -781,7 +781,7 @@ _08080D54:
|
||||
ldrb r0, [r4]
|
||||
bl sub_800A900
|
||||
ldr r0, _08080D84 @ =gBlockSendBuffer
|
||||
bl sub_80898E8
|
||||
bl TrainerCard_GenerateCardForLinkPlayer
|
||||
ldr r0, _08080D88 @ =sub_8080E6C
|
||||
_08080D72:
|
||||
str r0, [r5]
|
||||
@@ -884,7 +884,7 @@ _08080E20:
|
||||
ldrb r0, [r4]
|
||||
bl sub_800A900
|
||||
ldr r0, _08080E60 @ =gBlockSendBuffer
|
||||
bl sub_80898E8
|
||||
bl TrainerCard_GenerateCardForLinkPlayer
|
||||
ldr r1, _08080E64 @ =gTasks
|
||||
lsls r0, r5, 2
|
||||
adds r0, r5
|
||||
@@ -2388,7 +2388,7 @@ sp02A_crash_sound: @ 8081A1C
|
||||
ldr r0, _08081A2C @ =gSpecialVar_0x8006
|
||||
ldrb r0, [r0]
|
||||
ldr r1, _08081A30 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
bl InitLinkPartnerTrainerCard
|
||||
bl ShowTrainerCardInLink
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -2412,7 +2412,7 @@ sub_8081A34: @ 8081A34
|
||||
adds r1, r2
|
||||
bl StringCopy
|
||||
adds r0, r4, 0
|
||||
bl sub_808B1BC
|
||||
bl GetTrainerCardStars
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
|
||||
+2
-2
@@ -3252,7 +3252,7 @@ _08117384:
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r1, _081173BC @ =CB2_ReturnToField
|
||||
bl InitLinkPartnerTrainerCard
|
||||
bl ShowTrainerCardInLink
|
||||
_081173A2:
|
||||
bl RunTasks
|
||||
bl RunTextPrinters
|
||||
@@ -3489,7 +3489,7 @@ sub_8117594: @ 8117594
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
adds r5, r1, 0
|
||||
bl sub_80898E8
|
||||
bl TrainerCard_GenerateCardForLinkPlayer
|
||||
cmp r5, 0
|
||||
beq _081175AE
|
||||
bl sub_81440E8
|
||||
|
||||
-5113
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user