Skip to content

Synced heap.c/h structure and names with pokeheartgold and pokeplatinum #576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
red031000 merged 2 commits into from
Dec 24, 2025
Merged

Synced heap.c/h structure and names with pokeheartgold and pokeplatinum #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a3ee0
Synced `heap.c/h` structure and names with pokeheartgold and pokeplat…
AsparagusEduardo Dec 23, 2025
27950d5
format
AsparagusEduardo Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion arm9/asm/scrcmd_12.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ _02043266:
cmp r7, #0x0
beq _02043270
add r0, r7, #0x0
bl FreeToHeap
bl Heap_Free
_02043270:
add sp, #0x38
pop {r3-r7, pc}
Expand Down
6 changes: 3 additions & 3 deletions arm9/asm/unk_02001B80.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sub_02001B8C: ; 0x02001B8C
mov r1, #0x20
add r7, r2, #0x0
str r0, [sp, #0x4]
bl AllocFromHeap
bl Heap_Alloc
add r4, r0, #0x0
add r3, r5, #0x0
ldmia r3!, {r0-r1}
Expand Down Expand Up @@ -125,7 +125,7 @@ _02001C68:
bl DestroyListMenuCursorObj
ldrb r0, [r4, #0x1c]
add r1, r4, #0x0
bl FreeToHeapExplicit
bl Heap_FreeExplicit
pop {r4, pc}

thumb_func_start sub_02001C78
Expand Down Expand Up @@ -886,7 +886,7 @@ sub_020021EC: ; 0x020021EC
bl RemoveWindow
ldr r1, [r5, #0x4]
add r0, r4, #0x0
bl FreeToHeapExplicit
bl Heap_FreeExplicit
ldr r0, [r5, #0x0]
bl ListMenuItems_Delete
add r0, r5, #0x0
Expand Down
8 changes: 4 additions & 4 deletions arm9/asm/unk_0200E1D0_s.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ sub_0200E6CC: ; 0x0200E6CC
mov r1, #0x10
add r6, r2, #0x0
add r7, r3, #0x0
bl AllocFromHeapAtEnd
bl Heap_AllocAtEnd
add r1, r0, #0x0
str r5, [r1, #0x0]
str r4, [r1, #0x4]
Expand All @@ -741,7 +741,7 @@ sub_0200E6F8: ; 0x0200E6F8
add r4, r1, #0x0
add r0, r2, #0x0
mov r1, #0x8
bl AllocFromHeapAtEnd
bl Heap_AllocAtEnd
add r1, r0, #0x0
mov r2, #0x1
str r5, [r1, #0x0]
Expand All @@ -766,7 +766,7 @@ sub_0200E71C: ; 0x0200E71C
add r0, r5, #0x0
bl SysTask_Destroy
add r0, r4, #0x0
bl FreeToHeap
bl Heap_Free
pop {r3-r5, pc}

thumb_func_start sub_0200E73C
Expand All @@ -780,7 +780,7 @@ sub_0200E73C: ; 0x0200E73C
add r0, r5, #0x0
bl SysTask_Destroy
add r0, r4, #0x0
bl FreeToHeap
bl Heap_Free
pop {r3-r5, pc}

thumb_func_start sub_0200E758
Expand Down
54 changes: 27 additions & 27 deletions arm9/asm/unk_0200E850.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,7 +1542,7 @@ sub_0200F20C: ; 0x0200F20C
ldr r0, [r5, #0x20]
add r6, r1, #0x0
mov r1, #0x1c
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
mov r2, #0x1c
mov r1, #0x0
Expand Down Expand Up @@ -1643,7 +1643,7 @@ _0200F2C4:
str r0, [r5, #0xc]
b _0200F2E8
_0200F2D4:
bl FreeToHeap
bl Heap_Free
add r0, r4, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -2001,7 +2001,7 @@ sub_0200F55C: ; 0x0200F55C
_0200F572:
ldr r1, _0200F5B8 ; =0x00000604
add r0, r3, #0x0
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x0]
mov r0, #0x1
str r0, [r5, #0x4]
Expand All @@ -2014,7 +2014,7 @@ _0200F572:
_0200F58C:
ldr r1, _0200F5BC ; =0x00000C08
add r0, r3, #0x0
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x0]
mov r0, #0x2
str r0, [r5, #0x4]
Expand Down Expand Up @@ -2049,7 +2049,7 @@ sub_0200F5C8: ; 0x0200F5C8
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0x0]
bl FreeToHeap
bl Heap_Free
mov r0, #0x0
str r0, [r4, #0x0]
pop {r4, pc}
Expand Down Expand Up @@ -3000,7 +3000,7 @@ sub_0200FCC8: ; 0x0200FCC8
ldr r0, [r5, #0x20]
add r6, r1, #0x0
mov r1, #0x4c
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
add r4, r0, #0x0
ldr r0, [r5, #0x10]
Expand Down Expand Up @@ -3064,7 +3064,7 @@ _0200FD34:
b _0200FD66
_0200FD50:
add r0, r4, #0x0
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand All @@ -3088,7 +3088,7 @@ sub_0200FD6C: ; 0x0200FD6C
add r6, r1, #0x0
mov r1, #0x98
add r7, r2, #0x0
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
add r4, r0, #0x0
ldr r0, [r5, #0x10]
Expand Down Expand Up @@ -3156,7 +3156,7 @@ _0200FDDC:
b _0200FE1A
_0200FE04:
add r0, r4, #0x0
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -3307,7 +3307,7 @@ sub_0200FF18: ; 0x0200FF18
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x38
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
ldr r0, [r5, #0x10]
add r1, r4, #0x0
Expand Down Expand Up @@ -3359,7 +3359,7 @@ _0200FF84:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -3676,7 +3676,7 @@ sub_020101EC: ; 0x020101EC
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x30
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
ldr r0, [r5, #0x10]
add r1, r4, #0x0
Expand Down Expand Up @@ -3728,7 +3728,7 @@ _02010258:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -3933,7 +3933,7 @@ sub_020103F0: ; 0x020103F0
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x34
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
ldr r0, [r5, #0x10]
add r1, r4, #0x0
Expand Down Expand Up @@ -3985,7 +3985,7 @@ _0201045C:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -4260,7 +4260,7 @@ sub_02010688: ; 0x02010688
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x30
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
ldr r0, [r5, #0x10]
add r1, r4, #0x0
Expand Down Expand Up @@ -4314,7 +4314,7 @@ _020106F4:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -4346,7 +4346,7 @@ sub_02010720: ; 0x02010720
mul r1, r2
str r3, [sp, #0x1c]
str r0, [sp, #0x44]
bl AllocFromHeap
bl Heap_Alloc
str r0, [r7, #0xc]
cmp r0, #0x0
bne _02010748
Expand Down Expand Up @@ -4507,7 +4507,7 @@ sub_02010884: ; 0x02010884
push {r4, lr}
add r4, r0, #0x0
ldr r0, [r4, #0xc]
bl FreeToHeap
bl Heap_Free
mov r0, #0x0
str r0, [r4, #0xc]
pop {r4, pc}
Expand Down Expand Up @@ -4620,7 +4620,7 @@ sub_02010948: ; 0x02010948
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x38
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
Expand Down Expand Up @@ -4677,7 +4677,7 @@ _020109BC:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -5033,7 +5033,7 @@ sub_02010C7C: ; 0x02010C7C
ldr r0, [r5, #0x20]
add r4, r1, #0x0
mov r1, #0x38
bl AllocFromHeap
bl Heap_Alloc
str r0, [r5, #0x14]
mov r1, #0x0
mov r2, #0x38
Expand Down Expand Up @@ -5090,7 +5090,7 @@ _02010CF0:
add r0, r4, #0x0
bl sub_0200F5C0
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -5377,7 +5377,7 @@ sub_02010F2C: ; 0x02010F2C
mov r1, #0xcd
ldr r0, [r5, #0x20]
lsl r1, r1, #0x2
bl AllocFromHeap
bl Heap_Alloc
mov r2, #0xcd
str r0, [r5, #0x14]
mov r1, #0x0
Expand Down Expand Up @@ -5436,7 +5436,7 @@ _02010FAA:
add r0, r4, #0x0
bl sub_0201111C
ldr r0, [r5, #0x14]
bl FreeToHeap
bl Heap_Free
add r0, r6, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down Expand Up @@ -5716,7 +5716,7 @@ sub_020111AC: ; 0x020111AC
mov r1, #0xe2
ldr r0, [r5, #0x20]
lsl r1, r1, #0x2
bl AllocFromHeap
bl Heap_Alloc
mov r2, #0xe2
mov r1, #0x0
lsl r2, r2, #0x2
Expand Down Expand Up @@ -5797,7 +5797,7 @@ _02011242:
str r0, [r5, #0xc]
b _02011272
_02011258:
bl FreeToHeap
bl Heap_Free
add r0, r4, #0x0
str r0, [r5, #0x14]
ldr r0, [r5, #0xc]
Expand Down
Loading