From e4c2fafa743f90a2cb8a377fbc8474766c5d7508 Mon Sep 17 00:00:00 2001 From: Gericom Date: Sun, 4 Jan 2026 11:00:33 +0100 Subject: [PATCH] Updated to latest blocksds (Fixes #14) --- .github/workflows/nightly.yml | 2 +- .github/workflows/release.yml | 2 +- arm9/source/globalHeap.cpp | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8dfa30b..82fda25 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,7 +14,7 @@ on: jobs: pico_launcher: runs-on: ubuntu-latest - container: skylyrac/blocksds:slim-v1.13.1 + container: skylyrac/blocksds:slim-v1.16.0 name: Build Pico Launcher steps: - name: Checkout repo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1361cfc..fae3caa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: pico_launcher: runs-on: ubuntu-latest - container: skylyrac/blocksds:slim-v1.13.1 + container: skylyrac/blocksds:slim-v1.16.0 name: Build Pico Launcher steps: - name: Checkout repo diff --git a/arm9/source/globalHeap.cpp b/arm9/source/globalHeap.cpp index 37993f8..ee3cbad 100644 --- a/arm9/source/globalHeap.cpp +++ b/arm9/source/globalHeap.cpp @@ -60,6 +60,16 @@ extern "C" void* memalign(size_t alignment, size_t size) return result; } +extern "C" void* calloc(size_t num, size_t size) +{ + void* result = malloc(num * size); + if (result) + { + memset(result, 0, num * size); + } + return result; +} + void* operator new(std::size_t blocksize) { return malloc(blocksize);