diff options
Diffstat (limited to 'arm9/asm')
33 files changed, 69 insertions, 69 deletions
diff --git a/arm9/asm/unk_0200BB14.s b/arm9/asm/unk_0200BB14.s index b8a6eab5..840d91d1 100644 --- a/arm9/asm/unk_0200BB14.s +++ b/arm9/asm/unk_0200BB14.s @@ -342,7 +342,7 @@ _0200BD68: str r0, [sp, #0x18] ldr r0, [r5, #0x0] ldr r1, [r6, #0x0] - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [sp, #0x18] ldr r2, [r5, #0x0] str r0, [sp, #0x1c] @@ -408,7 +408,7 @@ _0200BDF6: ldr r1, [sp, #0x10] ldr r0, [r5, #0x0] ldr r1, [r1, #0x18] - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [r4, #0x14] add r6, r0, #0x0 str r1, [sp, #0x0] diff --git a/arm9/asm/unk_0201B1A8.s b/arm9/asm/unk_0201B1A8.s index 359f9bfe..115edca0 100644 --- a/arm9/asm/unk_0201B1A8.s +++ b/arm9/asm/unk_0201B1A8.s @@ -21,7 +21,7 @@ FUN_0201B1A8: ; 0x0201B1A8 push {r3-r5, lr} add r5, r3, #0x0 add r4, r2, #0x0 - bl FUN_020161A4 + bl AllocAndReadFile str r0, [r5, #0x0] bl NNS_G3dGetTex cmp r0, #0x0 diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s index 03e1404e..e465b1ec 100644 --- a/arm9/asm/unk_0201F06C.s +++ b/arm9/asm/unk_0201F06C.s @@ -265,7 +265,7 @@ _0201F1C8: ldr r0, [r0, #0x0] ldr r1, [r5, #0x4] mov r2, #0x4 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator ldr r0, [r5, #0x0] ldr r1, [r5, #0x4] bl FUN_0201C360 @@ -1821,7 +1821,7 @@ _0201FD0C: str r0, [r4, r1] ldr r0, [r5, #0x8] ldr r1, _0201FD54 ; =UNK_02105BBC - bl FUN_020161A4 + bl AllocAndReadFile mov r1, #0x46 lsl r1, r1, #0x2 str r0, [r4, r1] diff --git a/arm9/asm/unk_02020C44.s b/arm9/asm/unk_02020C44.s index 235543ee..4550b5cb 100644 --- a/arm9/asm/unk_02020C44.s +++ b/arm9/asm/unk_02020C44.s @@ -146,7 +146,7 @@ _02020D38: _02020D48: ldr r0, [sp, #0x0] add r1, r6, #0x0 - bl FUN_020161A4 + bl AllocAndReadFile str r0, [r4, #0x4] cmp r0, #0x0 bne _02020D5A diff --git a/arm9/asm/unk_02033B68.s b/arm9/asm/unk_02033B68.s index 9e204377..57ae58f9 100644 --- a/arm9/asm/unk_02033B68.s +++ b/arm9/asm/unk_02033B68.s @@ -326,7 +326,7 @@ FUN_02033D3C: ; 0x02033D3C beq _02033D92 ldr r0, _02033D98 ; =UNK_02105D88 add r1, sp, #0x4 - bl FUN_020161F8 + bl OpenAndReadWholeFile mov r1, #0x96 ldr r0, [sp, #0x4] lsl r1, r1, #0x2 @@ -374,11 +374,11 @@ FUN_02033D9C: ; 0x02033D9C add r1, sp, #0x4 beq _02033DC2 ldr r0, _02033E5C ; =UNK_02105D98 - bl FUN_020161F8 + bl OpenAndReadWholeFile b _02033DC8 _02033DC2: ldr r0, _02033E60 ; =UNK_02105DA8 - bl FUN_020161F8 + bl OpenAndReadWholeFile _02033DC8: mov r1, #0x96 ldr r0, [sp, #0x4] diff --git a/arm9/asm/unk_02033F50.s b/arm9/asm/unk_02033F50.s index ed33e084..eb65ebfd 100644 --- a/arm9/asm/unk_02033F50.s +++ b/arm9/asm/unk_02033F50.s @@ -110,7 +110,7 @@ _02033FA4: str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, _02034160 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] diff --git a/arm9/asm/unk_02034188.s b/arm9/asm/unk_02034188.s index 08265835..a91f1c2c 100644 --- a/arm9/asm/unk_02034188.s +++ b/arm9/asm/unk_02034188.s @@ -58,7 +58,7 @@ FUN_02034188: ; 0x02034188 str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, _02034370 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index c9df4ca4..0a9414a9 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -3649,7 +3649,7 @@ FUN_02036E08: ; 0x02036E08 mov r0, #0x3 mov r1, #0x49 lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r0, [r4, #0xc] bl SavArray_PlayerParty_get ldrb r1, [r5, #0x0] @@ -3773,7 +3773,7 @@ FUN_02036F1C: ; 0x02036F1C ldr r0, [r4, r0] bl FUN_0206C92C mov r0, #0x49 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _02036F9C ; =0x00000475 mov r1, #0x0 bl FUN_02005350 diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index 26a50555..efd22ed4 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -187,16 +187,16 @@ FUN_02037400: ; 0x02037400 mov r0, #0x3 mov r1, #0xb lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r1, #0x20 mov r0, #0x3 lsl r2, r1, #0x9 - bl FUN_0201681C + bl CreateHeap mov r2, #0x3 mov r0, #0x0 mov r1, #0x5b lsl r2, r2, #0x8 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0x0 mov r1, #0xb8 mov r2, #0xb @@ -282,11 +282,11 @@ FUN_020374B0: ; 0x020374B0 add r0, r5, #0x0 bl OverlayManager_FreeData mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xb - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x20 - bl FUN_020168D0 + bl DestroyHeap pop {r3-r5, pc} thumb_func_start FUN_02037504 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 9c2132bf..f564a2ab 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -1633,7 +1633,7 @@ _020382F6: mov r0, #0x3 mov r1, #0x1a lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r0, [r5, #0xc] bl Sav2_PlayerData_GetOptionsAddr str r0, [sp, #0x24] @@ -1691,7 +1691,7 @@ _02038386: ldr r0, [r4, #0x60] bl FUN_0206C92C mov r0, #0x1a - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x7 str r0, [r4, #0x0] b _020383C8 diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s index 929f1efa..ac3011bd 100644 --- a/arm9/asm/unk_020484A8.s +++ b/arm9/asm/unk_020484A8.s @@ -110,7 +110,7 @@ _02048556: mov r1, #0x4 mov r0, #0x3 lsl r2, r1, #0xf - bl FUN_0201681C + bl CreateHeap add r0, r6, #0x0 add r1, r5, #0x0 bl FUN_02048764 @@ -240,7 +240,7 @@ _02048666: add r0, r5, #0x0 bl FreeToHeap mov r0, #0x4 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x0 bl OS_ResetSystem add sp, #0xc diff --git a/arm9/asm/unk_0204FBA8.s b/arm9/asm/unk_0204FBA8.s index f1101a82..e53fd195 100644 --- a/arm9/asm/unk_0204FBA8.s +++ b/arm9/asm/unk_0204FBA8.s @@ -154,7 +154,7 @@ FUN_0204FC5C: ; 0x0204FC5C mov r0, #0x3 mov r1, #0x21 lsl r2, r2, #0xa - bl FUN_0201681C + bl CreateHeap ldr r0, _0204FC9C ; =UNK_021C5A6C ldr r0, [r0, #0x0] ldr r0, [r0, #0x18] @@ -2279,7 +2279,7 @@ _02050D66: bl MOD18_0223E1A4 bl FUN_02031860 mov r0, #0x21 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _02050D84 ; =UNK_021C5A6C mov r1, #0x0 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_020520AC.s b/arm9/asm/unk_020520AC.s index 8ff9a9a1..c53ca1c7 100644 --- a/arm9/asm/unk_020520AC.s +++ b/arm9/asm/unk_020520AC.s @@ -137,7 +137,7 @@ _020520C0: mov r0, #0x3 mov r1, #0x1f lsl r2, r2, #0x6 - bl FUN_02016828 + bl CreateHeapAtEnd add r0, r4, #0x0 bl FUN_02052110 add r5, r0, #0x0 @@ -625,7 +625,7 @@ FUN_020524A0: ; 0x020524A0 add r0, r4, #0x0 bl FreeToHeap mov r0, #0x1f - bl FUN_020168D0 + bl DestroyHeap _020524B8: pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_02052EE8.s b/arm9/asm/unk_02052EE8.s index 0c163fd8..7014adcd 100644 --- a/arm9/asm/unk_02052EE8.s +++ b/arm9/asm/unk_02052EE8.s @@ -50,7 +50,7 @@ FUN_02052EE8: ; 0x02052EE8 ldr r0, [r0, #0x38] str r0, [r4, #0x8] mov r0, #0xb - bl FUN_02016828 + bl CreateHeapAtEnd mov r0, #0x59 bl FUN_02053618 ldr r1, _02052F6C ; =0x000004DC @@ -113,7 +113,7 @@ FUN_02052FA4: ; 0x02052FA4 ldr r0, [r4, r0] bl FUN_0205362C mov r0, #0x59 - bl FUN_020168D0 + bl DestroyHeap add r0, r4, #0x0 bl FreeToHeap pop {r4, pc} diff --git a/arm9/asm/unk_02053750.s b/arm9/asm/unk_02053750.s index 38f594ef..cf28dafb 100644 --- a/arm9/asm/unk_02053750.s +++ b/arm9/asm/unk_02053750.s @@ -974,7 +974,7 @@ _02053E24: bl FUN_02009DAC ldr r1, _02053E88 ; =UNK_02105F80 mov r0, #0x4 - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [r5, #0x10] add r4, r0, #0x0 str r1, [sp, #0x0] @@ -1012,7 +1012,7 @@ FUN_02053E8C: ; 0x02053E8C add r4, r0, #0x0 mov r0, #0x4 add r1, r6, #0x0 - bl FUN_020161A4 + bl AllocAndReadFile add r6, r0, #0x0 add r1, r4, #0x0 mov r2, #0x4 diff --git a/arm9/asm/unk_020625EC.s b/arm9/asm/unk_020625EC.s index fc235004..09de8a47 100644 --- a/arm9/asm/unk_020625EC.s +++ b/arm9/asm/unk_020625EC.s @@ -61,7 +61,7 @@ FUN_020625EC: ; 0x020625EC mov r1, #0x50 lsl r2, r0, #0xd ldr r6, [r5, #0xc] - bl FUN_0201681C + bl CreateHeap mov r1, #0x2d mov r0, #0x50 lsl r1, r1, #0x4 @@ -194,7 +194,7 @@ _020626FE: lsl r2, r2, #0x4 bl MI_CpuFill8 add r0, r5, #0x0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xc add sp, #0x8 pop {r3-r7, pc} diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index df203337..c7b09260 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -43,7 +43,7 @@ FUN_020653EC: ; 0x020653EC mov r0, #0x3 mov r1, #0x2b lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap mov r1, #0x6e mov r0, #0x2b lsl r1, r1, #0x2 @@ -111,7 +111,7 @@ FUN_02065474: ; 0x02065474 add r0, r4, #0x0 bl FreeToHeap ldr r0, [r4, #0x0] - bl FUN_020168D0 + bl DestroyHeap pop {r4, pc} .balign 4 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index 295f1006..8f7699de 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -738,7 +738,7 @@ _0206CCCE: mov r3, #0x4 bl FUN_02007E68 ldr r0, [r4, #0x5c] - bl FUN_02016AF8 + bl GF_ExpHeap_FndGetTotalFreeSize mov r1, #0x2 lsl r1, r1, #0xe cmp r0, r1 diff --git a/arm9/asm/unk_0206F1F0.s b/arm9/asm/unk_0206F1F0.s index cdb5db18..8493d5db 100644 --- a/arm9/asm/unk_0206F1F0.s +++ b/arm9/asm/unk_0206F1F0.s @@ -203,7 +203,7 @@ _0206F34A: ldr r2, _0206F388 ; =0x00040100 mov r0, #0x3 mov r1, #0x36 - bl FUN_0201681C + bl CreateHeap bl FUN_02088878 mov r0, #0x36 bl MOD07_02211E60 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 17adb2d2..5e04c49a 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -143,12 +143,12 @@ FUN_0206F3FC: ; 0x0206F3FC strh r1, [r3, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0x2 mov r0, #0x3 mov r1, #0xc lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0x0 bl FUN_0206FE74 add r4, r0, #0x0 @@ -1022,7 +1022,7 @@ _0206FB30: ldr r0, [sp, #0x0] bl OverlayManager_FreeData mov r0, #0xc - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_020772F0.s b/arm9/asm/unk_020772F0.s index 87e9cab0..15173c11 100644 --- a/arm9/asm/unk_020772F0.s +++ b/arm9/asm/unk_020772F0.s @@ -730,7 +730,7 @@ _020772FE: mov r0, #0x3 mov r1, #0x12 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r1, #0x5d add r0, r6, #0x0 lsl r1, r1, #0x4 @@ -777,7 +777,7 @@ _020772FE: str r0, [r4, r1] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl FUN_02077B24 mov r0, #0x16 lsl r0, r0, #0x4 @@ -1583,7 +1583,7 @@ _02077A0C: add r1, r0, #0x0 bl Main_SetVBlankIntrCB mov r0, #0x12 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _02077A80 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index 3134a96c..4dee97dd 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -87,12 +87,12 @@ FUN_02079C7C: ; 0x02079C7C strh r2, [r0, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0x1 mov r0, #0x3 mov r1, #0x13 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _02079DAC ; =0x0000069C add r0, r4, #0x0 mov r2, #0x13 @@ -339,7 +339,7 @@ FUN_02079ECC: ; 0x02079ECC add r0, r4, #0x0 bl OverlayManager_FreeData mov r0, #0x13 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02080C38.s b/arm9/asm/unk_02080C38.s index 3e0d058c..d1dff0e3 100644 --- a/arm9/asm/unk_02080C38.s +++ b/arm9/asm/unk_02080C38.s @@ -807,7 +807,7 @@ FUN_02081214: ; 0x02081214 mov r0, #0xb mov r1, #0x14 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap bl FUN_020811D8 add r4, r0, #0x0 bl GetLCRNGSeed @@ -1191,7 +1191,7 @@ _020814FE: add r0, r7, #0x0 bl FUN_0208120C mov r0, #0x14 - bl FUN_020168D0 + bl DestroyHeap pop {r3-r7, pc} .balign 4 diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index c19e1a5d..d4e2215b 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -418,7 +418,7 @@ FUN_020857F8: ; 0x020857F8 mov r0, #0x3 mov r1, #0x28 lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap add r0, r4, #0x0 mov r1, #0x1c mov r2, #0x28 @@ -629,6 +629,6 @@ FUN_020859A0: ; 0x020859A0 add r0, r5, #0x0 bl OverlayManager_FreeData ldr r0, [r4, #0x0] - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r3-r5, pc} diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index a2f90e0a..aa13c4f2 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -184,7 +184,7 @@ FUN_020859C0: ; 0x020859C0 mov r0, #0x3 mov r1, #0x35 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r0, #0x35 bl MOD62_02230F3C bl MOD62_0222F7E0 @@ -570,7 +570,7 @@ FUN_02085C08: ; 0x02085C08 bl OverlayManager_FreeData bl FUN_0201CD04 mov r0, #0x35 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _02085D68 ; =SDK_OVERLAY_MODULE_08_ID bl UnloadOverlayByID mov r0, #0x1 diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 3a4017d7..b2d21149 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -23,7 +23,7 @@ FUN_02086084: ; 0x02086084 mov r0, #0x3 mov r1, #0x47 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0x0 mov r1, #0x80 mov r2, #0x47 @@ -219,7 +219,7 @@ FUN_020861DC: ; 0x020861DC add r0, r5, #0x0 bl OverlayManager_FreeData mov r0, #0x47 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02087D00.s b/arm9/asm/unk_02087D00.s index 65d4db3d..dfdb08c6 100644 --- a/arm9/asm/unk_02087D00.s +++ b/arm9/asm/unk_02087D00.s @@ -206,7 +206,7 @@ FUN_02087E40: ; 0x02087E40 mov r0, #0x3 mov r1, #0x2c lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap add r0, r4, #0x0 mov r1, #0x18 mov r2, #0x2c @@ -294,7 +294,7 @@ FUN_02087EE8: ; 0x02087EE8 add r0, r5, #0x0 bl OverlayManager_FreeData ldr r0, [r4, #0x0] - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r3-r5, pc} .balign 4 diff --git a/arm9/asm/unk_02088858.s b/arm9/asm/unk_02088858.s index 5f71517a..f7539bca 100644 --- a/arm9/asm/unk_02088858.s +++ b/arm9/asm/unk_02088858.s @@ -89,14 +89,14 @@ FUN_020888DC: ; 0x020888DC mov r0, #0x3 mov r1, #0x31 lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap add r0, r4, #0x0 bl OverlayManager_GetField18 ldr r0, [r0, #0x8] mov r1, #0x31 bl FUN_02088898 mov r0, #0x31 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x0 bl OS_ResetSystem mov r0, #0x1 diff --git a/arm9/asm/unk_0208898C.s b/arm9/asm/unk_0208898C.s index 6fef7584..68885a65 100644 --- a/arm9/asm/unk_0208898C.s +++ b/arm9/asm/unk_0208898C.s @@ -33,7 +33,7 @@ FUN_020889B0: ; 0x020889B0 mov r0, #0x3 mov r1, #0x37 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r4, #0x0 mov r1, #0x24 mov r2, #0x37 @@ -145,7 +145,7 @@ FUN_02088A78: ; 0x02088A78 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r6, #0x0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x1 pop {r4-r6, pc} .balign 4 diff --git a/arm9/asm/unk_02089498.s b/arm9/asm/unk_02089498.s index 3facd182..56b9ee9e 100644 --- a/arm9/asm/unk_02089498.s +++ b/arm9/asm/unk_02089498.s @@ -42,7 +42,7 @@ FUN_02089498: ; 0x02089498 mov r0, #0x3 mov r1, #0x58 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0x0 mov r1, #0x38 mov r2, #0x58 @@ -119,7 +119,7 @@ _020894FC: str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0x0 bl FUN_0208961C add r0, r4, #0x0 @@ -197,7 +197,7 @@ FUN_020895F0: ; 0x020895F0 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r4, #0x0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x0 bl OS_ResetSystem mov r0, #0x1 diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 9c06a4ab..a1b0c04b 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -38,7 +38,7 @@ FUN_02089960: ; 0x02089960 mov r0, #0x3 mov r1, #0x58 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0x0 mov r1, #0x3c mov r2, #0x58 @@ -101,7 +101,7 @@ _020899B8: str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r6, #0x0 bl FUN_02089A6C add r0, r6, #0x0 @@ -141,7 +141,7 @@ FUN_02089A40: ; 0x02089A40 add r0, r5, #0x0 bl OverlayManager_FreeData add r0, r4, #0x0 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID ldr r1, _02089A68 ; =MOD83_0223A360 bl RegisterMainOverlay diff --git a/arm9/asm/unk_02089D90.s b/arm9/asm/unk_02089D90.s index e7b88272..1fd86f68 100644 --- a/arm9/asm/unk_02089D90.s +++ b/arm9/asm/unk_02089D90.s @@ -57,7 +57,7 @@ FUN_02089D90: ; 0x02089D90 str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, _02089EFC ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] diff --git a/arm9/asm/unk_02089F24.s b/arm9/asm/unk_02089F24.s index b5c93a8a..14ed66e2 100644 --- a/arm9/asm/unk_02089F24.s +++ b/arm9/asm/unk_02089F24.s @@ -61,7 +61,7 @@ FUN_02089F24: ; 0x02089F24 str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, _0208A090 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] @@ -230,7 +230,7 @@ _0208A0C8: str r0, [r2, #0x0] mov r0, #0x4 mov r1, #0x8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, _0208A230 ; =gMain + 0x60 mov r1, #0x0 strb r1, [r0, #0x5] |