Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work

1 files changed, 5 insertions, 5 deletions

diff --git a/arm9/lib/libnns/src/NNS_FND_allocator.c b/arm9/lib/libnns/src/NNS_FND_allocator.c
index 31d0eb70..c459c3d0 100644
--- a/arm9/lib/libnns/src/NNS_FND_allocator.c
+++ b/arm9/lib/libnns/src/NNS_FND_allocator.c
@@ -2,27 +2,27 @@
 #include "NNS_FND_allocator.h"

 #include "NNS_FND_expheap.h"

 

-void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)

+ARM_FUNC void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)

 {

     return NNS_FndAllocFromExpHeapEx(pAllocator->pHeap, size, pAllocator->heapParam1);

 }

 

-void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)

+ARM_FUNC void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)

 {

     NNS_FndFreeToExpHeap(pAllocator->pHeap, memBlock);

 }

 

-void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)

+ARM_FUNC void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)

 {

     return pAllocator->pFunc->pfAlloc(pAllocator, size);

 }

 

-void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)

+ARM_FUNC void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)

 {

     pAllocator->pFunc->pfFree(pAllocator, memBlock);

 }

 

-void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)

+ARM_FUNC void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)

 {

     static const NNSFndAllocatorFunc pFunc = {AllocatorAllocForExpHeap, AllocatorFreeForExpHeap};

     pAllocator->pFunc = &pFunc;