From ce60e767323a3182ce1afca1422030e6f02aaf33 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Aug 2020 20:16:03 -0400 Subject: Name remaining player_data routines --- arm9/asm/scrcmd.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/asm/scrcmd.s') diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 1cd62a91..716c0f15 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -7876,7 +7876,7 @@ FUN_0203D834: ; 0x0203D834 lsl r1, r1, #0x18 add r0, r4, #0x0 lsr r1, r1, #0x18 - bl FUN_02023A2C + bl PlayerProfile_SetAvatar mov r0, #0x0 pop {r3-r5, pc} .balign 4 @@ -10039,7 +10039,7 @@ FUN_0203E968: ; 0x0203E968 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] bl Sav2_PlayerData_GetProfileAddr - bl FUN_02023A90 + bl PlayerProfile_SetNatDexFlag b _0203E9C8 _0203E9AE: cmp r4, #0x2 -- cgit v1.2.3 From 5d7b65886813e92ddd538cf8da6a43038a7cda0a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Aug 2020 21:27:25 -0400 Subject: Split pokedex and daycare --- arm9/asm/scrcmd.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arm9/asm/scrcmd.s') diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 716c0f15..1cf7300d 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -10034,7 +10034,7 @@ FUN_0203E968: ; 0x0203E968 ldr r0, [r0, #0x0] ldr r0, [r0, #0xc] bl FUN_02024DA0 - bl FUN_02024C84 + bl Pokedex_SetNatDexFlag add r5, #0x80 ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] @@ -10048,7 +10048,7 @@ _0203E9AE: ldr r0, [r5, #0x0] ldr r0, [r0, #0xc] bl FUN_02024DA0 - bl FUN_02024CA4 + bl Pokedex_GetNatDexFlag strh r0, [r6, #0x0] b _0203E9C8 _0203E9C4: -- cgit v1.2.3 From 326934766a59d838c7313d2b9445ae548b1f7907 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Aug 2020 16:16:56 -0400 Subject: use_item_on_mon.c; itemdata to json --- arm9/asm/scrcmd.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'arm9/asm/scrcmd.s') diff --git a/arm9/asm/scrcmd.s b/arm9/asm/scrcmd.s index 1cf7300d..3f324f9f 100644 --- a/arm9/asm/scrcmd.s +++ b/arm9/asm/scrcmd.s @@ -5263,13 +5263,13 @@ FUN_0203C300: ; 0x0203C300 .balign 4 _0203C328: .word FUN_0203BB90 - thumb_func_start FUN_0203C32C -FUN_0203C32C: ; 0x0203C32C + thumb_func_start ScrCmd_halloffame +ScrCmd_halloffame: ; 0x0203C32C push {r3, lr} add r0, #0x80 ldr r0, [r0, #0x0] ldr r0, [r0, #0x10] - bl FUN_02048694 + bl Special_EnterHallOfFame mov r0, #0x1 pop {r3, pc} @@ -7910,8 +7910,8 @@ FUN_0203D874: ; 0x0203D874 pop {r3-r5, pc} .balign 4 - thumb_func_start FUN_0203D8A0 -FUN_0203D8A0: ; 0x0203D8A0 + thumb_func_start ScrCmd_getplayergender +ScrCmd_getplayergender: ; 0x0203D8A0 push {r3-r5, lr} add r5, r0, #0x0 add r0, #0x80 @@ -7932,14 +7932,14 @@ FUN_0203D8A0: ; 0x0203D8A0 mov r0, #0x0 pop {r3-r5, pc} - thumb_func_start FUN_0203D8D0 -FUN_0203D8D0: ; 0x0203D8D0 + thumb_func_start ScrCmd_healparty +ScrCmd_healparty: ; 0x0203D8D0 push {r3, lr} ldr r0, [r0, #0x74] bl FUN_02046528 ldr r0, [r0, #0xc] bl SavArray_PlayerParty_get - bl FUN_02085140 + bl HealParty mov r0, #0x0 pop {r3, pc} .balign 4 -- cgit v1.2.3