summaryrefslogtreecommitdiff
path: root/arm9/global.inc
diff options
context:
space:
mode:
authorCleverking2003 <30466983+Cleverking2003@users.noreply.github.com>2020-05-24 19:54:23 +0300
committerGitHub <noreply@github.com>2020-05-24 19:54:23 +0300
commit1856ec317f9952f1c379aa5c20488832e98417f0 (patch)
treee49187e81c3ad40578eea0cc54ceb1ec8a6d81ff /arm9/global.inc
parent8cfbe69596f9d3079d0098f30ea58debd5487271 (diff)
parentc29ab952787c437b15a70a88dbb07f309a877574 (diff)
Merge pull request #106 from red031000/master
OS_spinLock + OS_vsnprintf
Diffstat (limited to 'arm9/global.inc')
-rw-r--r--arm9/global.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/arm9/global.inc b/arm9/global.inc
index 2117f570..f130ad11 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -7163,12 +7163,14 @@
.extern OS_SleepThread
.extern OS_SpinWait
.extern OS_Terminate
+.extern OS_TryLockByWord
.extern OS_TryLockCard
.extern OS_TryLockCartridge
.extern OS_TryLockMutex
+.extern OS_UnlockByWord
.extern OS_UnlockCard
+.extern OS_UnLockCartridge
.extern OS_UnlockCartridge
-.extern OS_UnlockCartridge2
.extern OS_UnlockMutex
.extern OS_WaitIrq
.extern OS_WaitVBlankIntr
@@ -7178,7 +7180,10 @@
.extern OSi_AlarmQueue
.extern OSi_CurrentThreadPtr
.extern OSi_DebuggerHandler
+.extern OSi_DoLockByWord
.extern OSi_DoResetSystem
+.extern OSi_DoTryLockByWord
+.extern OSi_DoUnlockByWord
.extern OSi_EnterDmaCallback
.extern OSi_EnterTimerCallback
.extern OSi_ExContext