diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:41:21 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 08:41:21 -0400 |
commit | a13a7535cd78a113d23a8cccddced3d5f13ad479 (patch) | |
tree | 0a7e672c5a7acc6261ca714538198d80c13fff47 /arm9/asm | |
parent | dd47776b7c311afdbfbb123485ecf2bf695a3c04 (diff) |
Decompile igt
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/player_data.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02015E30.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02028980.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_02029E48.s | 76 | ||||
-rw-r--r-- | arm9/asm/unk_02064E90.s | 4 |
5 files changed, 6 insertions, 82 deletions
diff --git a/arm9/asm/player_data.s b/arm9/asm/player_data.s index edcf1391..f434845a 100644 --- a/arm9/asm/player_data.s +++ b/arm9/asm/player_data.s @@ -25,7 +25,7 @@ Sav2_PlayerData_init: ; 0x020238C8 bl InitCoins add r4, #0x26 add r0, r4, #0x0 - bl FUN_02029E48 + bl InitIGT pop {r4, pc} thumb_func_start Sav2_GetPlayerDataPtr diff --git a/arm9/asm/unk_02015E30.s b/arm9/asm/unk_02015E30.s index 7a147859..9ca09399 100644 --- a/arm9/asm/unk_02015E30.s +++ b/arm9/asm/unk_02015E30.s @@ -62,7 +62,7 @@ FUN_02015E60: ; 0x02015E60 bhs _02015E9A ldr r0, [r1, #0x4] sub r1, r4, r3 - bl FUN_02029E54 + bl AddIGTSeconds ldr r0, _02015E9C ; =UNK_021C4898 str r4, [r0, #0x8] str r5, [r0, #0xc] diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index 260e868f..d307ef03 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -1248,7 +1248,7 @@ FUN_0202918C: ; 0x0202918C orr r0, r1 strb r0, [r4, #0x1] ldr r0, [sp, #0x0] - bl FUN_02029EC0 + bl GetIGTMinutes mov r1, #0xa bl _s32_div_f lsl r0, r0, #0x18 @@ -1317,7 +1317,7 @@ FUN_0202920C: ; 0x0202920C orr r0, r1 strb r0, [r4, #0x1] ldr r0, [sp, #0x0] - bl FUN_02029EC0 + bl GetIGTMinutes mov r1, #0xa bl _s32_div_f lsl r0, r0, #0x18 diff --git a/arm9/asm/unk_02029E48.s b/arm9/asm/unk_02029E48.s deleted file mode 100644 index c54c2176..00000000 --- a/arm9/asm/unk_02029E48.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - thumb_func_start FUN_02029E48 -FUN_02029E48: ; 0x02029E48 - mov r1, #0x0 - strh r1, [r0, #0x0] - strb r1, [r0, #0x2] - strb r1, [r0, #0x3] - bx lr - .balign 4 - - thumb_func_start FUN_02029E54 -FUN_02029E54: ; 0x02029E54 - push {r3-r7, lr} - add r5, r0, #0x0 - ldrh r6, [r5, #0x0] - ldr r0, _02029EB8 ; =0x000003E7 - cmp r6, r0 - bne _02029E6C - ldrb r0, [r5, #0x2] - cmp r0, #0x3b - bne _02029E6C - ldrb r0, [r5, #0x3] - cmp r0, #0x3b - beq _02029EB4 -_02029E6C: - ldrb r0, [r5, #0x3] - ldrb r4, [r5, #0x2] - add r7, r0, r1 - cmp r7, #0x3b - bls _02029EAE - add r0, r7, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r4, r4, r0 - add r0, r7, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r7, r1, #0x0 - cmp r4, #0x3b - bls _02029EAE - add r0, r4, #0x0 - mov r1, #0x3c - bl _u32_div_f - add r6, r6, r0 - add r0, r4, #0x0 - mov r1, #0x3c - bl _u32_div_f - ldr r0, _02029EB8 ; =0x000003E7 - add r4, r1, #0x0 - cmp r6, r0 - blo _02029EAE - mov r4, #0x3b - add r6, r0, #0x0 - add r7, r4, #0x0 -_02029EAE: - strh r6, [r5, #0x0] - strb r4, [r5, #0x2] - strb r7, [r5, #0x3] -_02029EB4: - pop {r3-r7, pc} - nop -_02029EB8: .word 0x000003E7 - - thumb_func_start FUN_02029EBC -FUN_02029EBC: ; 0x02029EBC - ldrh r0, [r0, #0x0] - bx lr - - thumb_func_start FUN_02029EC0 -FUN_02029EC0: ; 0x02029EC0 - ldrb r0, [r0, #0x2] - bx lr diff --git a/arm9/asm/unk_02064E90.s b/arm9/asm/unk_02064E90.s index ef39e346..5fb820cc 100644 --- a/arm9/asm/unk_02064E90.s +++ b/arm9/asm/unk_02064E90.s @@ -385,10 +385,10 @@ FUN_020651BC: ; 0x020651BC add r5, r2, #0x0 add r6, r3, #0x0 ldr r7, [sp, #0x20] - bl FUN_02029EBC + bl GetIGTHours strh r0, [r4, #0x2a] ldr r0, [sp, #0x4] - bl FUN_02029EC0 + bl GetIGTMinutes add r1, r4, #0x0 add r1, #0x2e strb r0, [r1, #0x0] |