Skip to content

Some small fixes #365

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
UsernameFodder merged 2 commits into from
Feb 18, 2026
Merged

Some small fixes #365

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
e8ee1f1
smol fixes
Adex-8x Feb 18, 2026
94b6cf7
oops pragma pack push
Adex-8x Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion headers/functions/arm9/libs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions headers/types/common/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(push, 4)
struct cp_context {
uint64_t div_numer;
uint64_t div_denom;
Expand All @@ -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;
Expand All @@ -151,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;
Expand All @@ -164,6 +167,7 @@ struct osi_alarm {
uint64_t start;
};
ASSERT_SIZE(struct osi_alarm, 44);
#pragma pack(pop)

typedef void (*os_thread_destructor)(void*);

Expand Down
2 changes: 1 addition & 1 deletion symbols/arm9/libs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,7 +1905,7 @@ libs:
EU: 0x20792D8
NA: 0x2078F40
JP: 0x2079228
- name: OS_UnLockCartridge
- name: OS_UnlockCartridgeVeneer
address:
EU: 0x20792F8
NA: 0x2078F60
Expand Down
Loading