Skip to content

Commit 038ccca

Browse files
red031000red031000
authored
Merge pull request #576 from AsparagusEduardo/pret/pr/sinjoh/heap2
Synced `heap.c/h` structure and names with pokeheartgold and pokeplatinum
2 parents cf51c28 + 27950d5 commit 038ccca

File tree

396 files changed

+4602
-4528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+4602
-4528
lines changed

‎arm9/asm/scrcmd_12.s‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ _02043266:
669669
cmp r7, #0x0
670670
beq _02043270
671671
add r0, r7, #0x0
672-
bl FreeToHeap
672+
bl Heap_Free
673673
_02043270:
674674
add sp, #0x38
675675
pop {r3-r7, pc}

‎arm9/asm/unk_02001B80.s‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sub_02001B8C: ; 0x02001B8C
2424
mov r1, #0x20
2525
add r7, r2, #0x0
2626
str r0, [sp, #0x4]
27-
bl AllocFromHeap
27+
bl Heap_Alloc
2828
add r4, r0, #0x0
2929
add r3, r5, #0x0
3030
ldmia r3!, {r0-r1}
@@ -125,7 +125,7 @@ _02001C68:
125125
bl DestroyListMenuCursorObj
126126
ldrb r0, [r4, #0x1c]
127127
add r1, r4, #0x0
128-
bl FreeToHeapExplicit
128+
bl Heap_FreeExplicit
129129
pop {r4, pc}
130130

131131
thumb_func_start sub_02001C78
@@ -886,7 +886,7 @@ sub_020021EC: ; 0x020021EC
886886
bl RemoveWindow
887887
ldr r1, [r5, #0x4]
888888
add r0, r4, #0x0
889-
bl FreeToHeapExplicit
889+
bl Heap_FreeExplicit
890890
ldr r0, [r5, #0x0]
891891
bl ListMenuItems_Delete
892892
add r0, r5, #0x0

‎arm9/asm/unk_0200E1D0_s.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ sub_0200E6CC: ; 0x0200E6CC
720720
mov r1, #0x10
721721
add r6, r2, #0x0
722722
add r7, r3, #0x0
723-
bl AllocFromHeapAtEnd
723+
bl Heap_AllocAtEnd
724724
add r1, r0, #0x0
725725
str r5, [r1, #0x0]
726726
str r4, [r1, #0x4]
@@ -741,7 +741,7 @@ sub_0200E6F8: ; 0x0200E6F8
741741
add r4, r1, #0x0
742742
add r0, r2, #0x0
743743
mov r1, #0x8
744-
bl AllocFromHeapAtEnd
744+
bl Heap_AllocAtEnd
745745
add r1, r0, #0x0
746746
mov r2, #0x1
747747
str r5, [r1, #0x0]
@@ -766,7 +766,7 @@ sub_0200E71C: ; 0x0200E71C
766766
add r0, r5, #0x0
767767
bl SysTask_Destroy
768768
add r0, r4, #0x0
769-
bl FreeToHeap
769+
bl Heap_Free
770770
pop {r3-r5, pc}
771771

772772
thumb_func_start sub_0200E73C
@@ -780,7 +780,7 @@ sub_0200E73C: ; 0x0200E73C
780780
add r0, r5, #0x0
781781
bl SysTask_Destroy
782782
add r0, r4, #0x0
783-
bl FreeToHeap
783+
bl Heap_Free
784784
pop {r3-r5, pc}
785785

786786
thumb_func_start sub_0200E758

‎arm9/asm/unk_0200E850.s‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ sub_0200F20C: ; 0x0200F20C
15421542
ldr r0, [r5, #0x20]
15431543
add r6, r1, #0x0
15441544
mov r1, #0x1c
1545-
bl AllocFromHeap
1545+
bl Heap_Alloc
15461546
str r0, [r5, #0x14]
15471547
mov r2, #0x1c
15481548
mov r1, #0x0
@@ -1643,7 +1643,7 @@ _0200F2C4:
16431643
str r0, [r5, #0xc]
16441644
b _0200F2E8
16451645
_0200F2D4:
1646-
bl FreeToHeap
1646+
bl Heap_Free
16471647
add r0, r4, #0x0
16481648
str r0, [r5, #0x14]
16491649
ldr r0, [r5, #0xc]
@@ -2001,7 +2001,7 @@ sub_0200F55C: ; 0x0200F55C
20012001
_0200F572:
20022002
ldr r1, _0200F5B8 ; =0x00000604
20032003
add r0, r3, #0x0
2004-
bl AllocFromHeap
2004+
bl Heap_Alloc
20052005
str r0, [r5, #0x0]
20062006
mov r0, #0x1
20072007
str r0, [r5, #0x4]
@@ -2014,7 +2014,7 @@ _0200F572:
20142014
_0200F58C:
20152015
ldr r1, _0200F5BC ; =0x00000C08
20162016
add r0, r3, #0x0
2017-
bl AllocFromHeap
2017+
bl Heap_Alloc
20182018
str r0, [r5, #0x0]
20192019
mov r0, #0x2
20202020
str r0, [r5, #0x4]
@@ -2049,7 +2049,7 @@ sub_0200F5C8: ; 0x0200F5C8
20492049
push {r4, lr}
20502050
add r4, r0, #0x0
20512051
ldr r0, [r4, #0x0]
2052-
bl FreeToHeap
2052+
bl Heap_Free
20532053
mov r0, #0x0
20542054
str r0, [r4, #0x0]
20552055
pop {r4, pc}
@@ -3000,7 +3000,7 @@ sub_0200FCC8: ; 0x0200FCC8
30003000
ldr r0, [r5, #0x20]
30013001
add r6, r1, #0x0
30023002
mov r1, #0x4c
3003-
bl AllocFromHeap
3003+
bl Heap_Alloc
30043004
str r0, [r5, #0x14]
30053005
add r4, r0, #0x0
30063006
ldr r0, [r5, #0x10]
@@ -3064,7 +3064,7 @@ _0200FD34:
30643064
b _0200FD66
30653065
_0200FD50:
30663066
add r0, r4, #0x0
3067-
bl FreeToHeap
3067+
bl Heap_Free
30683068
add r0, r6, #0x0
30693069
str r0, [r5, #0x14]
30703070
ldr r0, [r5, #0xc]
@@ -3088,7 +3088,7 @@ sub_0200FD6C: ; 0x0200FD6C
30883088
add r6, r1, #0x0
30893089
mov r1, #0x98
30903090
add r7, r2, #0x0
3091-
bl AllocFromHeap
3091+
bl Heap_Alloc
30923092
str r0, [r5, #0x14]
30933093
add r4, r0, #0x0
30943094
ldr r0, [r5, #0x10]
@@ -3156,7 +3156,7 @@ _0200FDDC:
31563156
b _0200FE1A
31573157
_0200FE04:
31583158
add r0, r4, #0x0
3159-
bl FreeToHeap
3159+
bl Heap_Free
31603160
add r0, r6, #0x0
31613161
str r0, [r5, #0x14]
31623162
ldr r0, [r5, #0xc]
@@ -3307,7 +3307,7 @@ sub_0200FF18: ; 0x0200FF18
33073307
ldr r0, [r5, #0x20]
33083308
add r4, r1, #0x0
33093309
mov r1, #0x38
3310-
bl AllocFromHeap
3310+
bl Heap_Alloc
33113311
str r0, [r5, #0x14]
33123312
ldr r0, [r5, #0x10]
33133313
add r1, r4, #0x0
@@ -3359,7 +3359,7 @@ _0200FF84:
33593359
add r0, r4, #0x0
33603360
bl sub_0200F5C0
33613361
ldr r0, [r5, #0x14]
3362-
bl FreeToHeap
3362+
bl Heap_Free
33633363
add r0, r6, #0x0
33643364
str r0, [r5, #0x14]
33653365
ldr r0, [r5, #0xc]
@@ -3676,7 +3676,7 @@ sub_020101EC: ; 0x020101EC
36763676
ldr r0, [r5, #0x20]
36773677
add r4, r1, #0x0
36783678
mov r1, #0x30
3679-
bl AllocFromHeap
3679+
bl Heap_Alloc
36803680
str r0, [r5, #0x14]
36813681
ldr r0, [r5, #0x10]
36823682
add r1, r4, #0x0
@@ -3728,7 +3728,7 @@ _02010258:
37283728
add r0, r4, #0x0
37293729
bl sub_0200F5C0
37303730
ldr r0, [r5, #0x14]
3731-
bl FreeToHeap
3731+
bl Heap_Free
37323732
add r0, r6, #0x0
37333733
str r0, [r5, #0x14]
37343734
ldr r0, [r5, #0xc]
@@ -3933,7 +3933,7 @@ sub_020103F0: ; 0x020103F0
39333933
ldr r0, [r5, #0x20]
39343934
add r4, r1, #0x0
39353935
mov r1, #0x34
3936-
bl AllocFromHeap
3936+
bl Heap_Alloc
39373937
str r0, [r5, #0x14]
39383938
ldr r0, [r5, #0x10]
39393939
add r1, r4, #0x0
@@ -3985,7 +3985,7 @@ _0201045C:
39853985
add r0, r4, #0x0
39863986
bl sub_0200F5C0
39873987
ldr r0, [r5, #0x14]
3988-
bl FreeToHeap
3988+
bl Heap_Free
39893989
add r0, r6, #0x0
39903990
str r0, [r5, #0x14]
39913991
ldr r0, [r5, #0xc]
@@ -4260,7 +4260,7 @@ sub_02010688: ; 0x02010688
42604260
ldr r0, [r5, #0x20]
42614261
add r4, r1, #0x0
42624262
mov r1, #0x30
4263-
bl AllocFromHeap
4263+
bl Heap_Alloc
42644264
str r0, [r5, #0x14]
42654265
ldr r0, [r5, #0x10]
42664266
add r1, r4, #0x0
@@ -4314,7 +4314,7 @@ _020106F4:
43144314
add r0, r4, #0x0
43154315
bl sub_0200F5C0
43164316
ldr r0, [r5, #0x14]
4317-
bl FreeToHeap
4317+
bl Heap_Free
43184318
add r0, r6, #0x0
43194319
str r0, [r5, #0x14]
43204320
ldr r0, [r5, #0xc]
@@ -4346,7 +4346,7 @@ sub_02010720: ; 0x02010720
43464346
mul r1, r2
43474347
str r3, [sp, #0x1c]
43484348
str r0, [sp, #0x44]
4349-
bl AllocFromHeap
4349+
bl Heap_Alloc
43504350
str r0, [r7, #0xc]
43514351
cmp r0, #0x0
43524352
bne _02010748
@@ -4507,7 +4507,7 @@ sub_02010884: ; 0x02010884
45074507
push {r4, lr}
45084508
add r4, r0, #0x0
45094509
ldr r0, [r4, #0xc]
4510-
bl FreeToHeap
4510+
bl Heap_Free
45114511
mov r0, #0x0
45124512
str r0, [r4, #0xc]
45134513
pop {r4, pc}
@@ -4620,7 +4620,7 @@ sub_02010948: ; 0x02010948
46204620
ldr r0, [r5, #0x20]
46214621
add r4, r1, #0x0
46224622
mov r1, #0x38
4623-
bl AllocFromHeap
4623+
bl Heap_Alloc
46244624
str r0, [r5, #0x14]
46254625
mov r1, #0x0
46264626
mov r2, #0x38
@@ -4677,7 +4677,7 @@ _020109BC:
46774677
add r0, r4, #0x0
46784678
bl sub_0200F5C0
46794679
ldr r0, [r5, #0x14]
4680-
bl FreeToHeap
4680+
bl Heap_Free
46814681
add r0, r6, #0x0
46824682
str r0, [r5, #0x14]
46834683
ldr r0, [r5, #0xc]
@@ -5033,7 +5033,7 @@ sub_02010C7C: ; 0x02010C7C
50335033
ldr r0, [r5, #0x20]
50345034
add r4, r1, #0x0
50355035
mov r1, #0x38
5036-
bl AllocFromHeap
5036+
bl Heap_Alloc
50375037
str r0, [r5, #0x14]
50385038
mov r1, #0x0
50395039
mov r2, #0x38
@@ -5090,7 +5090,7 @@ _02010CF0:
50905090
add r0, r4, #0x0
50915091
bl sub_0200F5C0
50925092
ldr r0, [r5, #0x14]
5093-
bl FreeToHeap
5093+
bl Heap_Free
50945094
add r0, r6, #0x0
50955095
str r0, [r5, #0x14]
50965096
ldr r0, [r5, #0xc]
@@ -5377,7 +5377,7 @@ sub_02010F2C: ; 0x02010F2C
53775377
mov r1, #0xcd
53785378
ldr r0, [r5, #0x20]
53795379
lsl r1, r1, #0x2
5380-
bl AllocFromHeap
5380+
bl Heap_Alloc
53815381
mov r2, #0xcd
53825382
str r0, [r5, #0x14]
53835383
mov r1, #0x0
@@ -5436,7 +5436,7 @@ _02010FAA:
54365436
add r0, r4, #0x0
54375437
bl sub_0201111C
54385438
ldr r0, [r5, #0x14]
5439-
bl FreeToHeap
5439+
bl Heap_Free
54405440
add r0, r6, #0x0
54415441
str r0, [r5, #0x14]
54425442
ldr r0, [r5, #0xc]
@@ -5716,7 +5716,7 @@ sub_020111AC: ; 0x020111AC
57165716
mov r1, #0xe2
57175717
ldr r0, [r5, #0x20]
57185718
lsl r1, r1, #0x2
5719-
bl AllocFromHeap
5719+
bl Heap_Alloc
57205720
mov r2, #0xe2
57215721
mov r1, #0x0
57225722
lsl r2, r2, #0x2
@@ -5797,7 +5797,7 @@ _02011242:
57975797
str r0, [r5, #0xc]
57985798
b _02011272
57995799
_02011258:
5800-
bl FreeToHeap
5800+
bl Heap_Free
58015801
add r0, r4, #0x0
58025802
str r0, [r5, #0x14]
58035803
ldr r0, [r5, #0xc]

0 commit comments

Comments
 (0)