diff options
Diffstat (limited to 'arm9/modules')
56 files changed, 259 insertions, 259 deletions
diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s index 49201028..259f9f52 100644 --- a/arm9/modules/04/asm/arm_04.s +++ b/arm9/modules/04/asm/arm_04.s @@ -161,7 +161,7 @@ _021D8F40: ldr r0, _021D91BC ; =UNK04_02210468 mov r2, #0 ldr r1, [r0] - ldr r0, _021D91C4 ; =UNK_021D74A8 + ldr r0, _021D91C4 ; =errno str r2, [sp] str r2, [r0] add r0, r1, #0x1000 @@ -169,7 +169,7 @@ _021D8F40: ldr r1, _021D91C8 ; =UNK04_0220BF3C bl MOD04_021DA388 bl atol - ldr r1, _021D91C4 ; =UNK_021D74A8 + ldr r1, _021D91C4 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021D8F9C @@ -220,7 +220,7 @@ _021D9014: add r1, sp, #0 add r0, r2, r0 mov r2, #0xa - bl strtold2 + bl strtol ldr r2, _021D91BC ; =UNK04_02210468 ldr r1, _021D91D4 ; =0x0000100C ldr r5, [r2] @@ -324,7 +324,7 @@ _021D91B0: .align 2, 0 _021D91BC: .word UNK04_02210468 _021D91C0: .word UNK04_0220BF34 -_021D91C4: .word UNK_021D74A8 +_021D91C4: .word errno _021D91C8: .word UNK04_0220BF3C _021D91CC: .word 0x00004E85 _021D91D0: .word 0x000059D8 @@ -3164,7 +3164,7 @@ _021DB970: bl MOD04_021DA388 bl atol mov sl, r0 - ldr r0, _021DC690 ; =UNK_021D74A8 + ldr r0, _021DC690 ; =errno ldr r0, [r0] cmp r0, #0x22 bne _021DB9A0 @@ -3653,7 +3653,7 @@ _021DC080: bl MOD04_021DA388 bl atol mov sl, r0 - ldr r0, _021DC690 ; =UNK_021D74A8 + ldr r0, _021DC690 ; =errno ldr r0, [r0] cmp r0, #0x22 bne _021DC0BC @@ -3705,7 +3705,7 @@ _021DC118: _021DC14C: add r0, sp, #0x64 bl atol - ldr r1, _021DC690 ; =UNK_021D74A8 + ldr r1, _021DC690 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021DC17C @@ -3873,7 +3873,7 @@ _021DC3B4: strb r2, [r1, r0] mov r0, r1 bl atol - ldr r1, _021DC690 ; =UNK_021D74A8 + ldr r1, _021DC690 ; =errno ldr r1, [r1] cmp r1, #0x22 bne _021DC3F0 @@ -4067,7 +4067,7 @@ _021DC680: .word UNK04_0220C36C _021DC684: .word OSi_ThreadInfo _021DC688: .word 0x00001B34 _021DC68C: .word UNK04_0220C418 -_021DC690: .word UNK_021D74A8 +_021DC690: .word errno _021DC694: .word 0x0000012E _021DC698: .word UNK04_0221048C _021DC69C: .word UNK04_0220BEB4 @@ -4408,7 +4408,7 @@ MOD04_021DCA84: ; 0x021DCA84 mov r1, r6 bl strcpy mov r2, #0 - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno add r0, sp, #0x28 strb r2, [sp, #0x23] strb r2, [sp, #0x27] @@ -4418,7 +4418,7 @@ MOD04_021DCA84: ; 0x021DCA84 strb r2, [sp, #0x35] str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp] ldr r1, [r1] cmp r1, #0x22 @@ -4445,12 +4445,12 @@ _021DCBC4: ldr r0, [sp, #4] cmp r0, #0xc bhi _021DCCA8 - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno mov r2, #0 add r0, sp, #0x21 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #8] ldr r0, [r1] cmp r0, #0x22 @@ -4459,7 +4459,7 @@ _021DCBC4: add r0, sp, #0x2d str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x10] ldr r0, [r1] cmp r0, #0x22 @@ -4468,7 +4468,7 @@ _021DCBC4: add r0, sp, #0x30 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x14] ldr r0, [r1] cmp r0, #0x22 @@ -4477,7 +4477,7 @@ _021DCBC4: add r0, sp, #0x33 str r2, [r1] bl atol - ldr r1, _021DCCB8 ; =UNK_021D74A8 + ldr r1, _021DCCB8 ; =errno str r0, [sp, #0x18] ldr r0, [r1] cmp r0, #0x22 @@ -4505,7 +4505,7 @@ _021DCCA8: ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _021DCCB4: .word UNK04_0220C580 -_021DCCB8: .word UNK_021D74A8 +_021DCCB8: .word errno _021DCCBC: .word UNK04_0220C550 _021DCCC0: .word UNK04_022104FC _021DCCC4: .word UNK04_022104F8 @@ -4550,7 +4550,7 @@ _021DCD20: ldmia sp!, {r4, pc} _021DCD4C: bl atol - ldr r1, _021DCEE4 ; =UNK_021D74A8 + ldr r1, _021DCEE4 ; =errno mov r2, r0 ldr r0, [r1] cmp r0, #0x22 @@ -4588,7 +4588,7 @@ _021DCDA0: _021DCDD4: add r0, sp, #0 bl atol - ldr r1, _021DCEE4 ; =UNK_021D74A8 + ldr r1, _021DCEE4 ; =errno mov r2, r0 ldr r0, [r1] cmp r0, #0x22 @@ -4659,7 +4659,7 @@ _021DCED4: .word UNK04_02210504 _021DCED8: .word 0xFFFF9DF3 _021DCEDC: .word UNK04_0220C5A0 _021DCEE0: .word UNK04_0220C5A8 -_021DCEE4: .word UNK_021D74A8 +_021DCEE4: .word errno _021DCEE8: .word 0xFFFF9E58 _021DCEEC: .word UNK04_0220C5B4 _021DCEF0: .word 0xFFFFA240 @@ -27563,7 +27563,7 @@ MOD04_021F01C4: ; 0x021F01C4 mov r2, r0 cmp r3, #0 beq _021F01FC - ldr r1, _021F0204 ; =UNK_0210420C + ldr r1, _021F0204 ; =__lower_mapC _021F01D8: cmp r3, #0 blt _021F01EC @@ -27579,7 +27579,7 @@ _021F01FC: mov r0, r2 bx lr .align 2, 0 -_021F0204: .word UNK_0210420C +_021F0204: .word __lower_mapC arm_func_end MOD04_021F01C4 arm_func_start MOD04_021F0208 @@ -33471,7 +33471,7 @@ _021F5418: blt _021F5434 cmp r1, #0x80 bge _021F5434 - ldr r0, _021F5844 ; =UNK_0210428C + ldr r0, _021F5844 ; =__upper_mapC ldrb r1, [r0, r1] _021F5434: mov r0, r1, lsl #0x18 @@ -33758,7 +33758,7 @@ _021F5834: .word UNK04_0220E2B8 _021F5838: .word UNK04_0220E2C4 _021F583C: .word UNK04_0220E2D0 _021F5840: .word UNK04_0220E2E8 -_021F5844: .word UNK_0210428C +_021F5844: .word __upper_mapC _021F5848: .word UNK04_0220E2F8 _021F584C: .word UNK04_0220E2FC _021F5850: .word UNK04_0220E300 @@ -45849,7 +45849,7 @@ _021FFDB8: add r3, r4, #1 cmp r0, #0 beq _021FFE10 - ldr r1, _021FFEA8 ; =UNK_0210430C + ldr r1, _021FFEA8 ; =__msl_digit mov r2, #0 _021FFDD0: cmp r0, #0 @@ -45915,7 +45915,7 @@ _021FFE84: .align 2, 0 _021FFEA0: .word UNK04_0220EFD8 _021FFEA4: .word UNK04_0220EFF8 -_021FFEA8: .word UNK_0210430C +_021FFEA8: .word __msl_digit _021FFEAC: .word 0x0000FFFF arm_func_end MOD04_021FFD28 @@ -49986,7 +49986,7 @@ MOD04_022034F4: ; 0x022034F4 mov ip, #0 cmp lr, #0 beq _02203538 - ldr r3, _0220354C ; =UNK_0210420C + ldr r3, _0220354C ; =__lower_mapC ldr r2, _02203550 ; =0x9CCF9319 _02203514: cmp lr, #0 @@ -50006,7 +50006,7 @@ _02203538: add sp, sp, #4 ldmfd sp!, {pc} .align 2, 0 -_0220354C: .word UNK_0210420C +_0220354C: .word __lower_mapC _02203550: .word 0x9CCF9319 arm_func_end MOD04_022034F4 @@ -50366,7 +50366,7 @@ _022039A8: mov r1, #0 b _022039C0 _022039B0: - ldr r1, _022039DC ; =UNK_0210430C + ldr r1, _022039DC ; =__msl_digit mov r2, r2, lsl #1 ldrh r1, [r1, r2] and r1, r1, #8 @@ -50381,7 +50381,7 @@ _022039D0: ldmia sp!, {r4, r5, r6, pc} .align 2, 0 _022039D8: .word UNK04_0220F7E0 -_022039DC: .word UNK_0210430C +_022039DC: .word __msl_digit arm_func_end MOD04_0220394C arm_func_start MOD04_022039E0 @@ -53297,7 +53297,7 @@ MOD04_02206124: ; 0x02206124 mov ip, #0 cmp lr, #0 beq _02206168 - ldr r3, _0220617C ; =UNK_0210420C + ldr r3, _0220617C ; =__lower_mapC ldr r2, _02206180 ; =0x9CCF9319 _02206144: cmp lr, #0 @@ -53317,7 +53317,7 @@ _02206168: add sp, sp, #4 ldmfd sp!, {pc} .align 2, 0 -_0220617C: .word UNK_0210420C +_0220617C: .word __lower_mapC _02206180: .word 0x9CCF9319 arm_func_end MOD04_02206124 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 730bfc00..4ca1ac2e 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -69,7 +69,7 @@ _021D7564: mov r0, #3 ldr r2, [r2, #4] mov r1, #4 - bl FUN_0201681C + bl CreateHeap ldr r0, [r4, #4] cmp r0, #0 beq _021D757A @@ -361,7 +361,7 @@ _021D7806: mov r0, #0 str r0, [r4, #4] mov r0, #4 - bl FUN_020168D0 + bl DestroyHeap ldr r0, [r4, #0x70] ldr r0, [r0] lsl r0, r0, #8 diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s index ec304548..419b92fd 100644 --- a/arm9/modules/05/asm/mod05_021D9320.s +++ b/arm9/modules/05/asm/mod05_021D9320.s @@ -53,7 +53,7 @@ _021D9374: str r0, [sp, #0x20] ldr r1, [r6] add r0, r4, #0 - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [sp, #0x20] str r0, [sp, #0x24] add r2, r4, #0 @@ -161,7 +161,7 @@ _021D944A: ldr r1, [sp, #0x10] add r0, r4, #0 ldr r1, [r1, #0x18] - bl FUN_020161A4 + bl AllocAndReadFile mov r3, #0x4e lsl r3, r3, #2 ldr r1, [r5, r3] diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index ee169f98..4cd22924 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -199,7 +199,7 @@ _021D9B98: mov r1, #4 add r0, r7, #0 add r2, r1, #0 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r0, #0x6e mov r1, #4 bl NARC_ctor diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index eaee32f8..bba92897 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -255,7 +255,7 @@ MOD05_021DB61C: ; 0x021DB61C str r1, [sp] mov r0, #4 add r1, r2, #0 - bl FUN_020161A4 + bl AllocAndReadFile mov r1, #0 str r0, [sp, #0x14] str r1, [sp, #8] diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s index f65de9d8..ae93e2a3 100644 --- a/arm9/modules/05/asm/mod05_021DBEF4.s +++ b/arm9/modules/05/asm/mod05_021DBEF4.s @@ -120,7 +120,7 @@ _021DBFA8: add r7, #0x10 mov r0, #4 add r1, sp, #0xc - bl FUN_020161A4 + bl AllocAndReadFile str r0, [r7, r5] add r0, r6, #0 str r0, [sp, #8] @@ -128,7 +128,7 @@ _021DBFA8: str r0, [sp, #8] ldr r0, [r7, r5] mov r1, #4 - bl FUN_02016324 + bl OpenFileCached ldr r1, [sp, #8] str r0, [r1, r5] add r0, r1, #0 diff --git a/arm9/modules/05/asm/mod05_021E4AE4.s b/arm9/modules/05/asm/mod05_021E4AE4.s index 98146a9c..09f66fe5 100644 --- a/arm9/modules/05/asm/mod05_021E4AE4.s +++ b/arm9/modules/05/asm/mod05_021E4AE4.s @@ -1093,7 +1093,7 @@ MOD05_021E5294: ; 0x021E5294 add r1, r0, #0 add r0, r4, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator pop {r4, pc} .section .rodata diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 006e8bb1..a67d2d02 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -13882,7 +13882,7 @@ MOD05_021EF4F8: ; 0x021EF4F8 MOD05_021EF514: ; 0x021EF514 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_020162FC + bl ClearFileCache bl NNS_GfdResetLnkTexVramState bl NNS_GfdResetLnkPlttVramState mov r4, #0 @@ -24929,7 +24929,7 @@ MOD05_021F4968: ; 0x021F4968 sub r1, r1, r0 bx r3 nop -_021F4974: .word FUN_02016B44 +_021F4974: .word ReallocFromHeap thumb_func_start MOD05_021F4978 MOD05_021F4978: ; 0x021F4978 @@ -27084,7 +27084,7 @@ MOD05_021F5990: ; 0x021F5990 str r0, [sp] add r7, r1, #0 str r3, [sp, #4] - bl FUN_0201681C + bl CreateHeap cmp r0, #1 beq _021F59B2 bl GF_AssertFail @@ -27142,7 +27142,7 @@ _021F5A0E: add r0, r6, #0 bl FreeToHeap add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap pop {r4, r5, r6, pc} .balign 4, 0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 3b86cb19..6fbee88b 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -2285,7 +2285,7 @@ MOD06_0223A75C: ; 0x0223A75C add r0, r4, r0 mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 pop {r3, r4, r5, pc} @@ -2964,7 +2964,7 @@ MOD06_0223AC78: ; 0x0223AC78 add r0, r4, r0 add r1, r5, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r2, #0x4f lsl r2, r2, #2 add r0, r4, #0 @@ -4020,7 +4020,7 @@ MOD06_0223B458: ; 0x0223B458 add r0, #0xc4 add r1, r7, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -4587,7 +4587,7 @@ MOD06_0223B828: ; 0x0223B828 add r0, #0xdc add r1, r7, #0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r6, #0 add r0, #0x78 mov r1, #0x62 @@ -5151,13 +5151,13 @@ _0223BCDA: str r0, [sp, #0x10] _0223BCDE: mov r0, #4 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223BCEC bl GF_AssertFail _0223BCEC: mov r0, #0xb - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223BCFA bl GF_AssertFail @@ -5864,13 +5864,13 @@ _0223C2DC: str r0, [sp, #0x10] _0223C2E4: mov r0, #4 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223C2F2 bl GF_AssertFail _0223C2F2: mov r0, #0xb - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _0223C300 bl GF_AssertFail @@ -20061,7 +20061,7 @@ MOD06_022434D0: ; 0x022434D0 mov r0, #3 mov r1, #0x3b lsl r2, r2, #0xe - bl FUN_02016828 + bl CreateHeapAtEnd ldr r1, _02243684 ; =0x000008CC mov r0, #0x3b bl AllocFromHeap @@ -20275,7 +20275,7 @@ _022436A6: add r0, r4, #0 bl FreeToHeap add r0, r5, #0 - bl FUN_020168D0 + bl DestroyHeap _022436BE: pop {r3, r4, r5, pc} .align 2, 0 @@ -43590,7 +43590,7 @@ MOD06_0224EA64: ; 0x0224EA64 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r1, #3 @@ -43704,7 +43704,7 @@ MOD06_0224EB30: ; 0x0224EB30 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43738,7 +43738,7 @@ MOD06_0224EB78: ; 0x0224EB78 add r0, #0xdc mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 add r0, #0xdc mov r2, #4 @@ -43878,7 +43878,7 @@ MOD06_0224EC5C: ; 0x0224EC5C add r0, r0, r1 mov r1, #4 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator ldr r5, [sp, #8] mov r1, #0x6e add r4, sp, #0x10 @@ -44299,7 +44299,7 @@ MOD06_0224EF98: ; 0x0224EF98 mov r1, #4 add r0, r5, r0 mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r5, #0 mov r1, #0x8d mov r2, #8 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 2a6bb196..65a74381 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -42,7 +42,7 @@ _0222D600: mov r0, #3 mov r1, #5 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, [r5] mov r0, #4 tst r0, r1 @@ -175,7 +175,7 @@ _0222D704: b _0222D7EA _0222D714: mov r0, #5 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xd str r0, [r4] b _0222D7EA @@ -187,7 +187,7 @@ _0222D720: ldr r0, _0222D7F0 ; =SDK_OVERLAY_MODULE_07_ID bl UnloadOverlayByID mov r0, #5 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3e bl FUN_02031588 mov r0, #0xc @@ -210,7 +210,7 @@ _0222D752: mov r0, #3 mov r1, #0x49 lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r0, [r5, #4] ldr r1, [sp, #0x24] bl GetPartyMonByIndex @@ -266,7 +266,7 @@ _0222D7C2: add r0, r5, #0 bl FUN_0206C92C mov r0, #0x49 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xd str r0, [r4] b _0222D7EA diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index effb333a..8c91e781 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -40,7 +40,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 mov r0, #3 mov r1, #0x15 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D868 ; =0x00001658 add r0, r5, #0 mov r2, #0x15 @@ -102,7 +102,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0x23 add r1, r4, #0 lsl r2, r2, #4 @@ -521,7 +521,7 @@ MOD12_0222D9B0: ; 0x0222D9B0 bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x15 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _0222DADC ; =SDK_OVERLAY_MODULE_08_ID @@ -3175,7 +3175,7 @@ MOD12_0222EF04: ; 0x0222EF04 mov r0, #3 mov r1, #0x16 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222F168 ; =0x00000F68 add r0, r4, #0 mov r2, #0x16 @@ -3237,7 +3237,7 @@ MOD12_0222EF04: ; 0x0222EF04 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_0222F548 bl FUN_0201CC08 @@ -3686,7 +3686,7 @@ _0222F3AE: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x16 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _0222F450 ; =SDK_OVERLAY_MODULE_08_ID @@ -5015,7 +5015,7 @@ MOD12_0222FE4C: ; 0x0222FE4C mov r0, #3 mov r1, #0x17 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _022300EC ; =0x00001BF4 add r0, r4, #0 mov r2, #0x17 @@ -5099,7 +5099,7 @@ MOD12_0222FE4C: ; 0x0222FE4C bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r1, r5, #0 ldr r0, [r5] add r1, #0x14 @@ -5530,7 +5530,7 @@ _02230296: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x17 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 ldr r0, _022303B8 ; =SDK_OVERLAY_MODULE_08_ID @@ -41102,7 +41102,7 @@ MOD12_02241210: ; 0x02241210 mov r0, #3 mov r1, #0x18 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x4a add r0, r4, #0 lsl r1, r1, #6 @@ -41182,7 +41182,7 @@ MOD12_02241210: ; 0x02241210 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_02241864 bl FUN_0201CC08 @@ -41577,7 +41577,7 @@ _022415D4: bl Main_SetVBlankIntrCB bl FUN_02015F1C mov r0, #0x18 - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 mov r1, #5 mov r2, #2 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index bdfed5b1..d5f05188 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -11,12 +11,12 @@ StoragePC_Overlay_Init: ; 0x021D74E0 mov r0, #3 mov r1, #9 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0xf mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r1, #0x87 add r0, r5, #0 lsl r1, r1, #2 @@ -132,9 +132,9 @@ _021D75DE: add r0, r4, #0 bl MOD14_021DB398 mov r0, #9 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -5546,7 +5546,7 @@ _021DA1FE: ldr r0, [r4, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x12 lsl r0, r0, #4 ldr r0, [r4, r0] @@ -5592,7 +5592,7 @@ _021DA256: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0x12 lsl r2, r2, #4 ldr r0, [r4, r2] @@ -5658,7 +5658,7 @@ _021DA2F2: ldr r0, [r5, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap add r0, r5, #0 bl MOD14_021D83E4 mov r1, #0x4b @@ -5693,7 +5693,7 @@ _021DA334: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 bl MOD14_021DC3F4 cmp r0, #1 @@ -5803,7 +5803,7 @@ _021DA41E: ldr r0, [r4, r0] bl MOD14_021DCA38 mov r0, #0xa - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r4, r0] @@ -5889,7 +5889,7 @@ _021DA4F4: mov r0, #3 mov r1, #0xa lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r0, #0x45 lsl r0, r0, #2 add r0, r4, r0 diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 97282c02..a1f0f2d1 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -23,12 +23,12 @@ _021D74F2: mov r0, #3 mov r1, #0x22 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #0xa mov r0, #3 mov r1, #0x23 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 bl MOD15_021D7628 ldr r0, [r0, #0x14] @@ -170,9 +170,9 @@ MOD15_021D7608: ; 0x021D7608 add r1, r4, #0 bl MOD15_021D7774 mov r0, #0x22 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x23 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} .align 2, 0 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index e9eedca1..9417b6bd 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -16,7 +16,7 @@ MOD16_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x25 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #4 mov r2, #0x25 @@ -168,7 +168,7 @@ _021D7630: add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x25 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 mov r1, #0x7f bl FUN_020051EC diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 955741b3..7d11697e 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -2042,12 +2042,12 @@ MOD17_021D83E4: ; 0x021D83E4 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D84D8 ; =0x000006D8 add r0, r4, #0 mov r2, #0xd @@ -2511,9 +2511,9 @@ _021D87F0: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} nop @@ -2532,12 +2532,12 @@ MOD17_021D8818: ; 0x021D8818 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D897C ; =0x000006D8 add r0, r5, #0 mov r2, #0xd @@ -3119,9 +3119,9 @@ _021D8D30: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap bl FUN_02083404 bl FUN_02033ED0 mov r0, #1 @@ -13780,12 +13780,12 @@ MOD17_021DDB58: ; 0x021DDB58 mov r0, #3 mov r1, #0xd lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r2, #1 mov r0, #3 mov r1, #0xe lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x65 add r0, r5, #0 lsl r1, r1, #2 @@ -13990,9 +13990,9 @@ MOD17_021DDCF4: ; 0x021DDCF4 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0xd - bl FUN_020168D0 + bl DestroyHeap mov r0, #0xe - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 9b2fdf67..e3fbe038 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -1747,7 +1747,7 @@ MOD18_0223A3D4: ; 0x0223A3D4 mov r0, #3 mov r1, #0x1d lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r0, #0x1d bl FUN_02016B94 add r4, r0, #0 @@ -1984,7 +1984,7 @@ _0223A5F8: ldr r0, [r0] str r1, [r0, #4] mov r0, #0x1d - bl FUN_020168D0 + bl DestroyHeap bl MOD18_0223D638 ldr r1, _0223A648 ; =0x02251380 ldr r1, [r1] @@ -43226,7 +43226,7 @@ _0224E848: ; jump table _0224E858: mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD18_0224E01C ldr r3, _0224E940 ; =0x00000504 add r1, r6, #0 diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s index 8f3a28ce..bb49a485 100644 --- a/arm9/modules/19/asm/module_19.s +++ b/arm9/modules/19/asm/module_19.s @@ -11,7 +11,7 @@ MOD19_02252440: ; 0x02252440 mov r0, #3 mov r1, #8 lsl r2, r0, #0xf - bl FUN_0201681C + bl CreateHeap mov r0, #0 bl GXS_SetGraphicsMode mov r0, #0x80 @@ -91,7 +91,7 @@ MOD19_022524F4: ; 0x022524F4 mov r1, #4 bl FUN_020178A0 mov r0, #8 - bl FUN_020168D0 + bl DestroyHeap pop {r3, pc} thumb_func_end MOD19_022524F4 diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index a77f95fc..e812d527 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -21,11 +21,11 @@ MOD20_02252448: ; 0x02252448 mov r1, #7 lsl r2, r0, #0xe add r7, r3, #0 - bl FUN_0201681C + bl CreateHeap mov r0, #3 mov r1, #8 lsl r2, r0, #0xe - bl FUN_0201681C + bl CreateHeap mov r0, #7 mov r1, #0x60 bl AllocFromHeap @@ -238,9 +238,9 @@ _022525C6: add r0, r5, #0 bl FUN_0200CAB4 mov r0, #7 - bl FUN_020168D0 + bl DestroyHeap mov r0, #8 - bl FUN_020168D0 + bl DestroyHeap pop {r3, r4, r5, pc} .align 2, 0 _022525EC: .word MOD20_022544CC diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index cdf4b770..577a6ac9 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -621,7 +621,7 @@ MOD24_02254CA0: ; 0x02254CA0 add r4, r0, #0 beq _02254CFA mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CC0 bl GF_AssertFail @@ -631,7 +631,7 @@ _02254CC0: mov r1, #0x10 bl MOD20_022536F4 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CD8 bl GF_AssertFail @@ -642,7 +642,7 @@ _02254CD8: bl MOD20_02252D24 str r0, [r4, #0x50] mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254CF4 bl GF_AssertFail @@ -699,7 +699,7 @@ MOD24_02254D48: ; 0x02254D48 add r4, r0, #0 beq _02254D84 mov r0, #7 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254D5C bl GF_AssertFail @@ -783,7 +783,7 @@ MOD24_02254DDC: ; 0x02254DDC sub sp, #0x14 mov r0, #8 add r4, r1, #0 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254DF0 bl GF_AssertFail @@ -802,7 +802,7 @@ _02254DF0: mov r3, #0 bl FUN_02016C18 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E1E bl GF_AssertFail @@ -835,7 +835,7 @@ _02254E1E: add r1, r0, #0 bl MOD20_02252D7C mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E68 bl GF_AssertFail @@ -845,7 +845,7 @@ _02254E68: ldr r0, [r5, #0x70] bl CopyWindowToVram mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E82 bl GF_AssertFail @@ -853,7 +853,7 @@ _02254E82: add r0, r5, #0 bl MOD24_02255078 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254E96 bl GF_AssertFail @@ -877,7 +877,7 @@ _02254E96: add r0, r4, #0 bl MOD24_02254DC8 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254ECC bl GF_AssertFail diff --git a/arm9/modules/36/asm/module_36.s b/arm9/modules/36/asm/module_36.s index 0149e180..0b141199 100644 --- a/arm9/modules/36/asm/module_36.s +++ b/arm9/modules/36/asm/module_36.s @@ -981,7 +981,7 @@ MOD36_02254F5C: ; 0x02254F5C sub sp, #0x14 mov r0, #8 add r5, r1, #0 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254F70 bl GF_AssertFail @@ -1000,7 +1000,7 @@ _02254F70: mov r3, #0 bl FUN_02016C18 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254F9E bl GF_AssertFail @@ -1034,7 +1034,7 @@ _02254F9E: add r1, r0, #0 bl MOD20_02252D7C mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02254FEA bl GF_AssertFail @@ -1061,7 +1061,7 @@ _02254FEA: add r0, r5, #0 bl MOD36_02254F48 mov r0, #8 - bl FUN_02016B90 + bl GF_heap_c_dummy_return_true cmp r0, #0 bne _02255028 bl GF_AssertFail diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c index 41f2706a..08da79f4 100644 --- a/arm9/modules/52/src/module_52.c +++ b/arm9/modules/52/src/module_52.c @@ -159,7 +159,7 @@ THUMB_FUNC BOOL MOD52_021D74E0(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -179,7 +179,7 @@ THUMB_FUNC BOOL MOD52_021D750C(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020FD144); return 1; @@ -189,7 +189,7 @@ THUMB_FUNC BOOL MOD52_021D7528(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -211,7 +211,7 @@ THUMB_FUNC BOOL MOD52_021D7560(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0xFFFFFFFF, &UNK_020F2B7C); return 1; @@ -221,7 +221,7 @@ THUMB_FUNC BOOL MOD52_021D757C(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_0201681C(3, 0x4d, 2 << 16); + CreateHeap(3, 0x4d, 2 << 16); InitializeMainRNG(); return 1; @@ -252,7 +252,7 @@ THUMB_FUNC BOOL MOD52_021D75E8(struct UnkStruct_02006234 *arg1, u32 *arg2) { #pragma unused(arg1) #pragma unused(arg2) - FUN_020168D0(0x4d); + DestroyHeap(0x4d); RegisterMainOverlay(0XFFFFFFFF, &UNK_020F2B8C); return 1; diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index d070f979..7049c5bb 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -37,7 +37,7 @@ _021D74F6: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7640 ; =0x0000940C add r0, r6, #0 mov r2, #0x27 @@ -60,7 +60,7 @@ _021D74F6: str r0, [r4, #0x10] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD53_021D78D0 ldr r0, [r4] bl MOD53_021D78F0 @@ -417,7 +417,7 @@ _021D786E: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl FUN_020168D0 + bl DestroyHeap mov r0, #2 bl FUN_02032B6C mov r0, #1 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index b11b96cf..a0d5ce50 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -38,7 +38,7 @@ _021D74F6: mov r0, #3 mov r1, #0x33 lsl r2, r2, #0xc - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7638 ; =0x00004A60 add r0, r6, #0 mov r2, #0x33 @@ -67,7 +67,7 @@ _021D74F6: str r0, [r4, #0x28] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD54_021D7874 ldr r0, [r4] bl MOD54_021D7894 @@ -333,7 +333,7 @@ _021D776C: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x33 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index b9f3c277..51b82ddf 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -43,7 +43,7 @@ MOD55_021D7504: ; 0x021D7504 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x34 bl FUN_02016B94 str r0, [r4, #4] @@ -89,7 +89,7 @@ _021D7580: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7610 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -164,7 +164,7 @@ _021D7628: mov r0, #3 mov r1, #0x34 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D76B8 ; =0x0000041C add r0, r6, #0 mov r2, #0x34 @@ -349,7 +349,7 @@ MOD55_021D77AC: ; 0x021D77AC add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x34 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end MOD55_021D77AC diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 531194c6..ac016f49 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -267,7 +267,7 @@ MOD56_02211FD4: ; 0x02211FD4 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x36 bl FUN_02016B94 add r1, r4, #0 @@ -340,14 +340,14 @@ _02212098: mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap b _022120BE _022120B2: mov r2, #0xb mov r0, #3 mov r1, #0x36 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap _022120BE: mov r1, #0x3f add r0, r4, #0 @@ -564,7 +564,7 @@ _02212274: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x36 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 481488f8..a9163534 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -28,12 +28,12 @@ MOD57_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0xa mov r0, #3 mov r1, #0x19 lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap ldr r1, _021D76F0 ; =0x00003320 add r0, r5, #0 mov r2, #0x19 @@ -561,7 +561,7 @@ MOD57_021D7944: ; 0x021D7944 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x19 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 mov r1, #0x7f bl FUN_020051EC diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index eb13ddb7..99967607 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -43,7 +43,7 @@ _021D9A36: mov r0, #3 mov r1, #0x27 lsl r2, r2, #6 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D9B74 ; =0x00005CB0 add r0, r6, #0 mov r2, #0x27 @@ -66,7 +66,7 @@ _021D9A36: str r0, [r4, #0x14] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD58_021D9CDC ldr r0, [r4] bl MOD58_021D9CFC @@ -274,7 +274,7 @@ _021D9C40: add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x27 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 5604bf3c..a48cd966 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -56,7 +56,7 @@ _021D7592: str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD59_021D778C add r0, r4, #0 @@ -189,7 +189,7 @@ MOD59_021D76C0: ; 0x021D76C0 add r0, r6, #0 bl OverlayManager_FreeData add r0, r5, #0 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID ldr r1, _021D7720 ; =MOD52_021D76D8 bl RegisterMainOverlay diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 2925c404..e4325d83 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -11,7 +11,7 @@ MOD59_021D9868: ; 0x021D9868 mov r0, #3 mov r1, #0x53 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 mov r1, #0x28 mov r2, #0x53 @@ -81,7 +81,7 @@ _021D98C6: str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD59_021D9A20 add r0, r4, #0 @@ -200,7 +200,7 @@ MOD59_021D99F8: ; 0x021D99F8 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index 4d7a4a98..be8dac20 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -10,7 +10,7 @@ extern u32 FUN_02077A84(u32 heap_id, u32 param1, u32 param2, u32 param3, struct THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) { //note: 0xb4 is likely the overlay data struct size, once struct is padded replace with sizeof - FUN_0201681C(3, 0x52, 1 << 18); + CreateHeap(3, 0x52, 1 << 18); MOD59_OverlayData *data = (MOD59_OverlayData *) OverlayManager_CreateAndGetData(param0, 0xb4, 0x52); (void)memset((void *)data, 0, 0xb4); diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 8c6d04fc..a30f563f 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -13,7 +13,7 @@ MOD60_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x26 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -215,7 +215,7 @@ _021D769A: add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index ed9e0e05..d13a3071 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -12,7 +12,7 @@ MOD61_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x29 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xbc mov r2, #0x29 @@ -80,7 +80,7 @@ MOD61_021D7568: ; 0x021D7568 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index ea96bf3b..4f086525 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -37,12 +37,12 @@ MOD63_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #1 mov r0, #3 mov r1, #0x1e lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x79 add r0, r4, #0 lsl r1, r1, #2 @@ -363,7 +363,7 @@ MOD63_021D77B4: ; 0x021D77B4 add r0, r7, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap cmp r5, #1 beq _021D77F2 cmp r5, #2 @@ -500,7 +500,7 @@ MOD63_021D78BC: ; 0x021D78BC add r0, #0x68 add r1, r4, #0 mov r2, #4 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator mov r0, #0x30 add r1, r6, #0 add r2, r4, #0 diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 6f6f8f75..24804568 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -582,11 +582,11 @@ MOD63_021D8D10: ; 0x021D8D10 bl GX_DisableEngineBLayers mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #3 mov r1, #0x4c lsl r2, r0, #0x11 - bl FUN_0201681C + bl CreateHeap mov r1, #0xab add r0, r4, #0 lsl r1, r1, #2 @@ -739,7 +739,7 @@ MOD63_021D8E68: ; 0x021D8E68 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4c - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _021D8E98 ; =MOD63_021DBAB8 bl RegisterMainOverlay @@ -1930,7 +1930,7 @@ _021D9840: ldr r1, [r2, #0x14] add r1, r2, r1 sub r1, r1, r0 - bl FUN_02016B44 + bl ReallocFromHeap mov r0, #0x80 mov r1, #0x4c bl NARC_ctor diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 7a70bf1f..0c56aa30 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -12,7 +12,7 @@ MOD64_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2f lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7630 ; =0x000006B4 add r0, r4, #0 mov r2, #0x2f @@ -30,7 +30,7 @@ _021D7504: add r0, r5, r0 mov r1, #0x2f mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r0, r4, #0 bl OverlayManager_GetField18 add r4, r0, #0 @@ -299,7 +299,7 @@ _021D7726: add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2f - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} thumb_func_end MOD64_021D76F4 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index e9e1ed78..1050ff4e 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -13,7 +13,7 @@ MOD65_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x2d lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #2 add r0, r4, #0 lsl r1, r1, #8 @@ -80,7 +80,7 @@ MOD65_021D753C: ; 0x021D753C add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} thumb_func_end MOD65_021D753C @@ -2710,7 +2710,7 @@ MOD65_021D8A08: ; 0x021D8A08 mov r0, #3 mov r1, #0x2e lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x6f add r0, r4, #0 lsl r1, r1, #2 @@ -2921,7 +2921,7 @@ MOD65_021D8BBC: ; 0x021D8BBC add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index c902cd22..f8cb1081 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -13,7 +13,7 @@ MOD66_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x11 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 mov r1, #0xe4 mov r2, #0x11 @@ -119,7 +119,7 @@ MOD66_021D75B0: ; 0x021D75B0 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x11 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD66_021D75B0 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 60bd02b5..c39f5c7d 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -30,12 +30,12 @@ MOD67_021D74E0: ; 0x021D74E0 strh r1, [r3] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #2 mov r0, #3 mov r1, #0x2a lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r4, #0 bl OverlayManager_GetField18 add r5, r0, #0 @@ -165,7 +165,7 @@ MOD67_021D7624: ; 0x021D7624 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x2a - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index b2170444..6e79c8cf 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -32,7 +32,7 @@ MOD68_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x24 lsr r2, r2, #9 - bl FUN_0201681C + bl CreateHeap mov r1, #0x81 add r0, r4, #0 lsl r1, r1, #2 @@ -73,7 +73,7 @@ MOD68_021D74E0: ; 0x021D74E0 bl MOD68_021D7870 mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl FUN_0201CC08 mov r0, #4 bl FUN_0201CC24 @@ -173,7 +173,7 @@ MOD68_021D762C: ; 0x021D762C add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x24 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D767C ; =0x04000050 mov r1, #0 strh r1, [r0] diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 58d0b4f8..c9bce6b2 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -13,7 +13,7 @@ HOF_OverlayInit: ; 0x0222D5C0 mov r0, #3 mov r1, #0x3f lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D70C ; =0x00001B60 add r0, r5, #0 mov r2, #0x3f @@ -213,7 +213,7 @@ _0222D762: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x3f - bl FUN_020168D0 + bl DestroyHeap ldr r0, [r5] add r0, r0, #1 str r0, [r5] diff --git a/arm9/modules/70/asm/module_70.s b/arm9/modules/70/asm/module_70.s index 9db294af..daff2762 100644 --- a/arm9/modules/70/asm/module_70.s +++ b/arm9/modules/70/asm/module_70.s @@ -11,12 +11,12 @@ MOD70_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x3c lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap mov r2, #7 mov r0, #3 mov r1, #0x3d lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xdc mov r2, #0x3c @@ -76,9 +76,9 @@ MOD70_021D755C: ; 0x021D755C add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x3d - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3c - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 303bee40..d01ea938 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -27,7 +27,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 ldr r2, _0222D734 ; =0x000707D0 mov r0, #3 mov r1, #0x1a - bl FUN_0201681C + bl CreateHeap ldr r1, _0222D738 ; =0x000036B4 add r0, r5, #0 mov r2, #0x1a @@ -74,7 +74,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 bl MOD71_0222E76C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD71_0222E558 mov r0, #0x5d lsl r0, r0, #2 @@ -932,7 +932,7 @@ _0222DDA6: mov r0, #0x50 bl FUN_02031588 mov r0, #2 - bl FUN_020166A8 + bl SetSoftResetDisableMask add r0, r4, #0 bl MOD71_02230B88 ldr r0, [r4, #0x4c] @@ -1317,7 +1317,7 @@ _0222E094: mov r2, #1 bl MOD71_02230F40 mov r0, #2 - bl FUN_020166B8 + bl ClearSoftResetDisableMask add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} @@ -1777,7 +1777,7 @@ MOD71_0222E438: ; 0x0222E438 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x1a - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} nop diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 7d9850cc..3caf2693 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -23,7 +23,7 @@ MOD73_021D74F0: ; 0x021D74F0 mov r0, #3 mov r1, #0x38 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D757C ; =0x000015E8 add r0, r5, #0 mov r2, #0x38 @@ -201,7 +201,7 @@ MOD73_021D7640: ; 0x021D7640 mov r0, #0 str r0, [r6, #0x18] add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 651527c1..75afef9d 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -13,7 +13,7 @@ MOD74_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4a lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0xad add r0, r4, #0 lsl r1, r1, #2 @@ -56,7 +56,7 @@ MOD74_021D7540: ; 0x021D7540 add r0, r5, #0 bl OverlayManager_FreeData ldr r0, [r4] - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 3500c458..a425935f 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -32,7 +32,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 mov r1, #6 mov r0, #3 lsl r2, r1, #0xf - bl FUN_0201681C + bl CreateHeap ldr r1, _021E6D60 ; =0x000004A4 add r0, r5, #0 mov r2, #6 @@ -68,7 +68,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 bl FUN_0200E1D0 mov r0, #3 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD75_021E7470 add r0, r4, #0 @@ -460,7 +460,7 @@ MOD75_021E6F00: ; 0x021E6F00 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #6 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index fc6dc5bd..06e6303e 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -11,7 +11,7 @@ MOD76_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x43 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap mov r1, #0x62 add r0, r5, #0 lsl r1, r1, #2 @@ -166,7 +166,7 @@ MOD76_021D761C: ; 0x021D761C add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x43 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} thumb_func_end MOD76_021D761C diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 6affcb88..0b432b90 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -28,7 +28,7 @@ MOD77_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x32 lsl r2, r2, #7 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D75DC ; =0x0000C32C add r0, r4, #0 mov r2, #0x32 @@ -100,7 +100,7 @@ _021D7540: bl GX_SwapDisplay mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r5, #0 bl MOD77_021D7C64 mov r0, #1 @@ -831,7 +831,7 @@ MOD77_021D7BAC: ; 0x021D7BAC add r0, r6, #0 bl OverlayManager_FreeData add r0, r5, #0 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _021D7C20 ; =gMain + 0x60 mov r1, #0 strb r1, [r0, #5] diff --git a/arm9/modules/78/asm/module_78.s b/arm9/modules/78/asm/module_78.s index 7fc7439a..85167a84 100644 --- a/arm9/modules/78/asm/module_78.s +++ b/arm9/modules/78/asm/module_78.s @@ -12,7 +12,7 @@ MOD78_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x48 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0xa0 mov r2, #0x48 @@ -259,7 +259,7 @@ _021D76C8: bl OverlayManager_FreeData bl FUN_0201B398 mov r0, #0x48 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} thumb_func_end MOD78_021D76B8 @@ -338,7 +338,7 @@ MOD78_021D778C: ; 0x021D778C add r0, #0x70 mov r1, #0x48 mov r2, #4 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator add r1, r5, #0 add r1, #0x9c ldrb r2, [r1] diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s index 24356937..6564b7da 100644 --- a/arm9/modules/79/asm/module_79_arm.s +++ b/arm9/modules/79/asm/module_79_arm.s @@ -3438,7 +3438,7 @@ _022152DC: cmp r0, #0 beq _02215448 add r4, r0, #9 - ldr r1, _0221562C ; =UNK_0210430C + ldr r1, _0221562C ; =__msl_digit mov r2, #0 b _02215330 _0221532C: @@ -3460,7 +3460,7 @@ _02215358: cmp r0, #0 bne _0221532C mov r3, r4 - ldr r1, _0221562C ; =UNK_0210430C + ldr r1, _0221562C ; =__msl_digit mov r2, #0 b _02215374 _02215370: @@ -3655,7 +3655,7 @@ _0221561C: .word MOD79_02216F64 _02215620: .word MOD79_02216F6C _02215624: .word 0x51EB851F _02215628: .word MOD79_02216F70 -_0221562C: .word UNK_0210430C +_0221562C: .word __msl_digit _02215630: .word MOD79_02216F7C _02215634: .word MOD79_02216F8C _02215638: .word MOD79_0221673C @@ -4101,7 +4101,7 @@ _02215C1C: bl sscanf mov r3, #0 mov ip, #1 - ldr r2, _02215D24 ; =UNK_0210430C + ldr r2, _02215D24 ; =__msl_digit b _02215C5C _02215C50: ldr r1, [sp, #0x14] @@ -4163,7 +4163,7 @@ _02215D14: .word 0x0000024E _02215D18: .word MOD79_02217000 _02215D1C: .word 0x0000024F _02215D20: .word MOD79_02217020 -_02215D24: .word UNK_0210430C +_02215D24: .word __msl_digit arm_func_end MOD79_02215BD8 arm_func_start MOD79_02215D28 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 83e02d71..db04b6c2 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1391,7 +1391,7 @@ _0222DFE4: mov r0, #3 mov r1, #0x3e lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222E108 ; =0x00001044 add r0, r6, #0 mov r2, #0x3e @@ -1453,7 +1453,7 @@ _0222DFE4: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD80_0222E338 @@ -1689,7 +1689,7 @@ MOD80_0222E25C: ; 0x0222E25C add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x3e - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index c8b46eb9..599ede77 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -16,11 +16,11 @@ _02237E50: mov r0, #3 mov r1, #0x39 lsl r2, r0, #0xf - bl FUN_0201681C + bl CreateHeap mov r0, #3 mov r1, #0x3a lsl r2, r0, #0xf - bl FUN_0201681C + bl CreateHeap bl MOD81_02238858 ldr r1, _02237FD0 ; =0x00000492 mov r0, #3 @@ -237,9 +237,9 @@ MOD81_02238004: ; 0x02238004 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x39 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0x3a - bl FUN_020168D0 + bl DestroyHeap add r0, r6, #0 bl OS_RestoreInterrupts mov r0, #1 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index f1a3e494..20b82216 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -641,7 +641,7 @@ _0222DA48: mov r0, #3 mov r1, #0x44 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222DB58 ; =0x00000EC8 add r0, r6, #0 mov r2, #0x44 @@ -695,7 +695,7 @@ _0222DA48: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD82_0222DD04 @@ -887,7 +887,7 @@ MOD82_0222DC50: ; 0x0222DC50 add r1, r0, #0 bl Main_SetVBlankIntrCB mov r0, #0x44 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 09c161b4..0527c923 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1916,7 +1916,7 @@ MOD83_0222E48C: ; 0x0222E48C mov r0, #3 mov r1, #0x51 lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap mov r1, #0x57 add r0, r5, #0 lsl r1, r1, #2 @@ -2372,7 +2372,7 @@ MOD83_0222E850: ; 0x0222E850 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x51 - bl FUN_020168D0 + bl DestroyHeap mov r0, #0 bl MOD83_02239450 mov r0, #1 @@ -3085,7 +3085,7 @@ MOD83_0222EDF8: ; 0x0222EDF8 mov r2, #3 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap ldr r1, _0222EE88 ; =0x00000496 mov r0, #9 mov r2, #1 @@ -3312,14 +3312,14 @@ MOD83_0222F048: ; 0x0222F048 push {r4, lr} add r4, r0, #0 mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap ldr r0, _0222F06C ; =SDK_OVERLAY_MODULE_63_ID ldr r1, _0222F070 ; =MOD63_021DBAB8 bl RegisterMainOverlay add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x55 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, pc} nop @@ -6505,7 +6505,7 @@ MOD83_02230954: ; 0x02230954 mov r0, #3 mov r1, #0x56 lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _022309FC ; =0x00002998 add r0, r5, #0 mov r2, #0x56 @@ -6561,7 +6561,7 @@ _022309D0: mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap mov r0, #1 pop {r3, r4, r5, pc} nop @@ -7695,11 +7695,11 @@ _0223139A: bl RegisterMainOverlay _022313A6: mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x56 - bl FUN_020168D0 + bl DestroyHeap ldr r0, _022313E0 ; =0x000015D4 ldr r0, [r4, r0] cmp r0, #2 @@ -9726,7 +9726,7 @@ MOD83_022323A8: ; 0x022323A8 mov r0, #3 mov r1, #0x57 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _0223240C ; =0x00003CF4 add r0, r4, #0 mov r2, #0x57 @@ -9759,7 +9759,7 @@ MOD83_022323A8: ; 0x022323A8 mov r0, #0 mov r1, #0x5b lsl r2, r2, #8 - bl FUN_0201681C + bl CreateHeap mov r0, #1 pop {r4, pc} .align 2, 0 @@ -11366,11 +11366,11 @@ _02233104: ldr r1, _02233164 ; =MOD83_0223A434 bl RegisterMainOverlay mov r0, #0x5b - bl FUN_020168D0 + bl DestroyHeap ldr r0, [sp] bl OverlayManager_FreeData mov r0, #0x57 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r3, r4, r5, r6, r7, pc} nop @@ -15353,11 +15353,11 @@ MOD83_02234E40: ; 0x02234E40 add r0, r4, #0 bl FUN_0202BF90 mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r5, #0x10] bl FUN_02022720 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, r4, r5, pc} thumb_func_end MOD83_02234E40 @@ -18509,7 +18509,7 @@ MOD83_02236764: ; 0x02236764 mov r0, #3 mov r1, #0x4e lsl r2, r2, #0xe - bl FUN_0201681C + bl CreateHeap ldr r1, _022367F0 ; =0x00012608 add r0, r5, #0 mov r2, #0x4e @@ -19168,7 +19168,7 @@ _02236CAE: mov r0, #0x15 str r0, [r5] mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask b _02236D90 _02236CF0: ldr r0, _02236DB0 ; =0x0000E88C @@ -19219,7 +19219,7 @@ _02236D36: mov r0, #0x16 str r0, [r5] mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask b _02236D90 _02236D54: ldr r0, _02236DC8 ; =gMain + 0x40 @@ -19287,7 +19287,7 @@ MOD83_02236DD0: ; 0x02236DD0 add r0, r4, #0 bl OverlayManager_FreeData mov r0, #0x4e - bl FUN_020168D0 + bl DestroyHeap mov r0, #0 bl MOD83_02239450 mov r0, #1 @@ -22827,7 +22827,7 @@ MOD83_022387A0: ; 0x022387A0 add r6, r1, #0 mov r0, #3 add r2, r3, #0 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 add r1, r4, #0 add r2, r6, #0 @@ -24577,7 +24577,7 @@ _022394E4: ; jump table .short _02239538 - _022394E4 - 2 ; case 4 _022394EE: mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r4, #0x14] mov r1, #2 bl FUN_02022840 @@ -24610,7 +24610,7 @@ _02239528: cmp r0, #1 bhi _02239534 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask _02239534: add r0, r5, #0 pop {r3, r4, r5, pc} @@ -24645,7 +24645,7 @@ MOD83_0223955C: ; 0x0223955C ldr r0, [r0, #0x14] bl FUN_0202287C mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, pc} nop _02239570: .word MOD83_0223BC30 diff --git a/arm9/modules/84/asm/module_84_thumb1.s b/arm9/modules/84/asm/module_84_thumb1.s index a5838988..3c6bd557 100644 --- a/arm9/modules/84/asm/module_84_thumb1.s +++ b/arm9/modules/84/asm/module_84_thumb1.s @@ -25,7 +25,7 @@ _021D74FC: mov r0, #3 mov r1, #0x4b lsl r2, r0, #0x10 - bl FUN_0201681C + bl CreateHeap ldr r1, _021D7670 ; =0x00001244 add r0, r6, #0 mov r2, #0x4b @@ -269,7 +269,7 @@ _021D772E: add r0, r6, #0 bl OverlayManager_FreeData mov r0, #0x4b - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} _021D773E: @@ -934,7 +934,7 @@ MOD84_021D7BC8: ; 0x021D7BC8 add r0, #0x6c mov r1, #0x4b mov r2, #0x20 - bl FUN_02016B20 + bl GF_ExpHeap_FndInitAllocator ldr r0, [r4, #4] mov r1, #0 bl NNS_G3dGetAnmByIdx diff --git a/arm9/modules/85/asm/module_85.s b/arm9/modules/85/asm/module_85.s index 221d2f9d..4ccc0477 100644 --- a/arm9/modules/85/asm/module_85.s +++ b/arm9/modules/85/asm/module_85.s @@ -18,7 +18,7 @@ MOD85_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x4f lsl r2, r2, #0x12 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #8 mov r2, #0x4f @@ -193,7 +193,7 @@ MOD85_021D7644: ; 0x021D7644 add r0, r5, #0 bl OverlayManager_FreeData mov r0, #0x4f - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 2bd7d12a..0c2e1774 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -11,7 +11,7 @@ MOD86_021D74E0: ; 0x021D74E0 mov r0, #3 mov r1, #0x54 lsl r2, r2, #0x10 - bl FUN_0201681C + bl CreateHeap add r0, r5, #0 mov r1, #0x44 mov r2, #0x54 @@ -57,7 +57,7 @@ MOD86_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD86_021D76EC add r0, r4, #0 @@ -233,7 +233,7 @@ MOD86_021D76B0: ; 0x021D76B0 add r0, r5, #0 bl OverlayManager_FreeData add r0, r4, #0 - bl FUN_020168D0 + bl DestroyHeap mov r0, #1 pop {r4, r5, r6, pc} .align 2, 0 |