darkkirb/donut-decomp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge mem

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:44:24 +01:00
parent 805640ca5d
commit c7289d1990
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
10 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
asm/mem/mem_allocator_800a37d0.s → asm/mem/mem_allocator.s
View file

@ -36,3 +36,11 @@ MEMInitAllocatorForExpHeap:
/* 800A3824 0009F664 90 03 00 0C */ stw r0, 0xc(r3)
/* 800A3828 0009F668 4E 80 00 20 */ blr
/* 800A382C 0009F66C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc"
"@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc":
.4byte AllocatorAllocForExpHeap_
.4byte AllocatorFreeForExpHeap_

8
asm/mem/mem_allocator_8055e968.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc"
"@LOCAL@MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi@sAllocatorFunc":
.4byte AllocatorAllocForExpHeap_
.4byte AllocatorFreeForExpHeap_

0
asm/mem/mem_expHeap_800a2ab0.s → asm/mem/mem_expHeap.s
View file

0
asm/mem/mem_frameHeap_800a32e0.s → asm/mem/mem_frameHeap.s
View file

16
asm/mem/mem_heapCommon_800a2640.s → asm/mem/mem_heapCommon.s
View file

@ -369,3 +369,19 @@ lbl_800A2A74:
/* 800A2AA4 0009E8E4 38 21 00 20 */ addi r1, r1, 0x20
/* 800A2AA8 0009E8E8 4E 80 00 20 */ blr
/* 800A2AAC 0009E8EC 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global sRootList
sRootList:
.skip 0x10
.global sRootMutex
sRootMutex:
.skip 0x18
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global sRootListInitialized
sRootListInitialized:
.skip 0x8

10
asm/mem/mem_heapCommon_804fe258.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global sRootList
sRootList:
.skip 0x10
.global sRootMutex
sRootMutex:
.skip 0x18

6
asm/mem/mem_heapCommon_8055cf18.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global sRootListInitialized
sRootListInitialized:
.skip 0x8

0
asm/mem/mem_list_800a3830.s → asm/mem/mem_list.s
View file

0
asm/mem/mem_unitHeap_800a3530.s → asm/mem/mem_unitHeap.s
View file

16
obj_files.mk
View file

@ -330,14 +330,15 @@ $(BUILD_DIR)/asm/tpl/TPL.o \
\
$(BUILD_DIR)/asm/esp/esp.o \
\
$(BUILD_DIR)/asm/mem/mem_heapCommon.o \
$(BUILD_DIR)/asm/mem/mem_expHeap.o \
$(BUILD_DIR)/asm/mem/mem_frameHeap.o \
$(BUILD_DIR)/asm/mem/mem_unitHeap.o \
$(BUILD_DIR)/asm/mem/mem_allocator.o \
$(BUILD_DIR)/asm/mem/mem_list.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/mem/mem_heapCommon_800a2640.o \
$(BUILD_DIR)/asm/mem/mem_expHeap_800a2ab0.o \
$(BUILD_DIR)/asm/mem/mem_frameHeap_800a32e0.o \
$(BUILD_DIR)/asm/mem/mem_unitHeap_800a3530.o \
$(BUILD_DIR)/asm/mem/mem_allocator_800a37d0.o \
$(BUILD_DIR)/asm/mem/mem_list_800a3830.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_draworder_800a3950.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_800a3a70.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_800a4670.o \
@ -4961,7 +4962,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \
$(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \
$(BUILD_DIR)/asm/src/Alarm_804966e0.o \
$(BUILD_DIR)/asm/src/StateChanger_804966f0.o \
$(BUILD_DIR)/asm/mem/mem_heapCommon_804fe258.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_804fe280.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8050a398.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_resource_8050a3c8.o \
@ -5470,7 +5470,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
$(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
$(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
$(BUILD_DIR)/asm/mem/mem_heapCommon_8055cf18.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055cf20.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8055cf30.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_emform_8055cf38.o \
@ -5655,7 +5654,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
$(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
$(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o \
$(BUILD_DIR)/asm/mem/mem_allocator_8055e968.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_8055e970.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055e978.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_emitter_8055e980.o \