From e8ee1f1ff2ec6b306941b5185817e00620fbf80d Mon Sep 17 00:00:00 2001 From: Adex-8x Date: Tue, 17 Feb 2026 20:04:03 -0500 Subject: [PATCH 1/2] smol fixes --- headers/functions/arm9/libs.h | 2 +- headers/types/common/util.h | 2 ++ symbols/arm9/libs.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/headers/functions/arm9/libs.h b/headers/functions/arm9/libs.h index 954f048a..f761a068 100644 --- a/headers/functions/arm9/libs.h +++ b/headers/functions/arm9/libs.h @@ -332,7 +332,7 @@ int OSi_DoUnlockByWord(uint16_t lock_id, struct os_lock_word* lockp, lock_ctrl_f bool disable_fiq); int OS_UnlockByWord(uint16_t lock_id, struct os_lock_word* lockp, lock_ctrl_funcp ctrl_funcp); int OS_UnlockCartridge(uint16_t lock_id); -int OS_UnLockCartridge(uint16_t lock_id); +int OS_UnlockCartridgeVeneer(uint16_t lock_id); void OSi_FreeCartridgeBus(void); int IncrementThreadCount(void); void OSi_InsertLinkToQueue(struct os_thread_queue* queue, struct thread* thread); diff --git a/headers/types/common/util.h b/headers/types/common/util.h index 9fe4d5a4..0578a429 100644 --- a/headers/types/common/util.h +++ b/headers/types/common/util.h @@ -125,6 +125,7 @@ typedef void (*thread_entry_fn_t)(void); // Specifies a function called when a thread exits typedef void (*thread_exit_fn_t)(void); +#pragma pack(4) struct cp_context { uint64_t div_numer; uint64_t div_denom; @@ -133,6 +134,7 @@ struct cp_context { uint16_t sqrt_mode; }; ASSERT_SIZE(struct cp_context, 28); +#pragma pack(pop) struct os_context { uint32_t cpsr; diff --git a/symbols/arm9/libs.yml b/symbols/arm9/libs.yml index 127b8b62..64b8dbe8 100644 --- a/symbols/arm9/libs.yml +++ b/symbols/arm9/libs.yml @@ -1905,7 +1905,7 @@ libs: EU: 0x20792D8 NA: 0x2078F40 JP: 0x2079228 - - name: OS_UnLockCartridge + - name: OS_UnlockCartridgeVeneer address: EU: 0x20792F8 NA: 0x2078F60 From 94b6cf7067f7fa078d4ddf9d316bf4f975917b8e Mon Sep 17 00:00:00 2001 From: Adex-8x Date: Tue, 17 Feb 2026 21:24:46 -0500 Subject: [PATCH 2/2] oops pragma pack push --- headers/types/common/util.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/headers/types/common/util.h b/headers/types/common/util.h index 0578a429..f1327ddf 100644 --- a/headers/types/common/util.h +++ b/headers/types/common/util.h @@ -125,7 +125,7 @@ typedef void (*thread_entry_fn_t)(void); // Specifies a function called when a thread exits typedef void (*thread_exit_fn_t)(void); -#pragma pack(4) +#pragma pack(push, 4) struct cp_context { uint64_t div_numer; uint64_t div_denom; @@ -153,6 +153,7 @@ ASSERT_SIZE(struct os_context, 100); typedef void (*os_alarm_handler)(void*); +#pragma pack(push, 4) struct osi_alarm { os_alarm_handler handler; void* arg; @@ -166,6 +167,7 @@ struct osi_alarm { uint64_t start; }; ASSERT_SIZE(struct osi_alarm, 44); +#pragma pack(pop) typedef void (*os_thread_destructor)(void*);