summaryrefslogtreecommitdiff
path: root/libagbsyscall/libagbsyscall.s
diff options
context:
space:
mode:
Diffstat (limited to 'libagbsyscall/libagbsyscall.s')
-rw-r--r--libagbsyscall/libagbsyscall.s120
1 files changed, 60 insertions, 60 deletions
diff --git a/libagbsyscall/libagbsyscall.s b/libagbsyscall/libagbsyscall.s
index 893235e32..00c40d08e 100644
--- a/libagbsyscall/libagbsyscall.s
+++ b/libagbsyscall/libagbsyscall.s
@@ -55,8 +55,8 @@
.ifdef L_IntrWait
thumb_func_start IntrWait
IntrWait:
- mov r2, #0
- swi 4
+ movs r2, #0
+ svc #4
bx lr
thumb_func_end IntrWait
.endif
@@ -64,7 +64,7 @@ IntrWait:
.ifdef L_RegisterRamReset
thumb_func_start RegisterRamReset
RegisterRamReset:
- swi 1
+ svc #1
bx lr
thumb_func_end RegisterRamReset
.endif
@@ -72,7 +72,7 @@ RegisterRamReset:
.ifdef L_Sqrt
thumb_func_start Sqrt
Sqrt:
- swi 8
+ svc #8
bx lr
thumb_func_end Sqrt
.endif
@@ -80,7 +80,7 @@ Sqrt:
.ifdef L_MusicPlayerOpen
thumb_func_start MusicPlayerOpen
MusicPlayerOpen:
- swi 32
+ svc #32
bx lr
thumb_func_end MusicPlayerOpen
.endif
@@ -88,8 +88,8 @@ MusicPlayerOpen:
.ifdef L_SoundBiasReset
thumb_func_start SoundBiasReset
SoundBiasReset:
- mov r0, #0
- swi 25
+ movs r0, #0
+ svc #25
bx lr
thumb_func_end SoundBiasReset
.endif
@@ -97,7 +97,7 @@ SoundBiasReset:
.ifdef L_SoundDriverVSyncOn
thumb_func_start SoundDriverVSyncOn
SoundDriverVSyncOn:
- swi 41
+ svc #41
bx lr
thumb_func_end SoundDriverVSyncOn
.endif
@@ -105,7 +105,7 @@ SoundDriverVSyncOn:
.ifdef L_Mod
thumb_func_start Mod
Mod:
- swi 6
+ svc #6
mov r0, r1
bx lr
thumb_func_end Mod
@@ -114,8 +114,8 @@ Mod:
.ifdef L_VBlankIntrWait
thumb_func_start VBlankIntrWait
VBlankIntrWait:
- mov r2, #0
- swi 5
+ movs r2, #0
+ svc #5
bx lr
thumb_func_end VBlankIntrWait
.endif
@@ -123,7 +123,7 @@ VBlankIntrWait:
.ifdef L_MusicPlayerStart
thumb_func_start MusicPlayerStart
MusicPlayerStart:
- swi 33
+ svc #33
bx lr
thumb_func_end MusicPlayerStart
.endif
@@ -131,7 +131,7 @@ MusicPlayerStart:
.ifdef L_SoundDriverVSyncOff
thumb_func_start SoundDriverVSyncOff
SoundDriverVSyncOff:
- swi 40
+ svc #40
bx lr
thumb_func_end SoundDriverVSyncOff
.endif
@@ -139,34 +139,34 @@ SoundDriverVSyncOff:
.ifdef L_HuffUnComp
thumb_func_start HuffUnComp
HuffUnComp:
- swi 19
+ svc #19
bx lr
thumb_func_end HuffUnComp
.endif
.ifdef L_SoftResetExram
- thumb_func_start SoftResetExram
+ arm_func_start SoftResetExram
SoftResetExram:
ldr r3, =REG_IME
- mov r2, #0
+ movs r2, #0
strb r2, [r3, #0]
ldr r3, =SOFT_RESET_DIRECT_BUF
- mov r2, #1
+ movs r2, #1
strb r2, [r3, #0]
- sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
+ subs r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
mov sp, r3
- mov r2, #RESET_EX_WRAM_FLAG
- bic r0, r2
- swi 1
- swi 0
+ movs r2, #RESET_EX_WRAM_FLAG
+ bics r0, r2
+ svc #1
+ svc #0
.pool
- thumb_func_end SoftResetExram
+ arm_func_end SoftResetExram
.endif
.ifdef L_MusicPlayerFadeOut
thumb_func_start MusicPlayerFadeOut
MusicPlayerFadeOut:
- swi 36
+ svc #36
bx lr
thumb_func_end MusicPlayerFadeOut
.endif
@@ -174,7 +174,7 @@ MusicPlayerFadeOut:
.ifdef L_LZ77UnCompWram
thumb_func_start LZ77UnCompWram
LZ77UnCompWram:
- swi 17
+ svc #17
bx lr
thumb_func_end LZ77UnCompWram
.endif
@@ -182,7 +182,7 @@ LZ77UnCompWram:
.ifdef L_SoundDriverMain
thumb_func_start SoundDriverMain
SoundDriverMain:
- swi 28
+ svc #28
bx lr
thumb_func_end SoundDriverMain
.endif
@@ -190,7 +190,7 @@ SoundDriverMain:
.ifdef L_SoundBiasChange
thumb_func_start SoundBiasChange
SoundBiasChange:
- swi 25
+ svc #25
bx lr
thumb_func_end SoundBiasChange
.endif
@@ -198,7 +198,7 @@ SoundBiasChange:
.ifdef L_LZ77UnCompVram
thumb_func_start LZ77UnCompVram
LZ77UnCompVram:
- swi 18
+ svc #18
bx lr
thumb_func_end LZ77UnCompVram
.endif
@@ -206,7 +206,7 @@ LZ77UnCompVram:
.ifdef L_ArcTan2
thumb_func_start ArcTan2
ArcTan2:
- swi 10
+ svc #10
bx lr
thumb_func_end ArcTan2
.endif
@@ -214,7 +214,7 @@ ArcTan2:
.ifdef L_MusicPlayerStop
thumb_func_start MusicPlayerStop
MusicPlayerStop:
- swi 34
+ svc #34
bx lr
thumb_func_end MusicPlayerStop
.endif
@@ -222,7 +222,7 @@ MusicPlayerStop:
.ifdef L_DivArm
thumb_func_start DivArm
DivArm:
- swi 7
+ svc #7
bx lr
thumb_func_end DivArm
.endif
@@ -230,7 +230,7 @@ DivArm:
.ifdef L_ModArm
thumb_func_start ModArm
ModArm:
- swi 7
+ svc #7
mov r0, r1
bx lr
thumb_func_end ModArm
@@ -239,7 +239,7 @@ ModArm:
.ifdef L_SoundDriverVSync
thumb_func_start SoundDriverVSync
SoundDriverVSync:
- swi 29
+ svc #29
bx lr
thumb_func_end SoundDriverVSync
.endif
@@ -247,7 +247,7 @@ SoundDriverVSync:
.ifdef L_SoundDriverInit
thumb_func_start SoundDriverInit
SoundDriverInit:
- swi 26
+ svc #26
bx lr
thumb_func_end SoundDriverInit
.endif
@@ -255,7 +255,7 @@ SoundDriverInit:
.ifdef L_BgAffineSet
thumb_func_start BgAffineSet
BgAffineSet:
- swi 14
+ svc #14
bx lr
thumb_func_end BgAffineSet
.endif
@@ -263,7 +263,7 @@ BgAffineSet:
.ifdef L_Diff8bitUnFilterWram
thumb_func_start Diff8bitUnFilterWram
Diff8bitUnFilterWram:
- swi 22
+ svc #22
bx lr
thumb_func_end Diff8bitUnFilterWram
.endif
@@ -272,7 +272,7 @@ Diff8bitUnFilterWram:
thumb_func_start MultiBoot
MultiBoot:
mov r1, #1
- swi 37
+ svc #37
bx lr
thumb_func_end MultiBoot
.endif
@@ -280,7 +280,7 @@ MultiBoot:
.ifdef L_MidiKey2Freq
thumb_func_start MidiKey2Freq
MidiKey2Freq:
- swi 31
+ svc #31
bx lr
thumb_func_end MidiKey2Freq
.endif
@@ -288,7 +288,7 @@ MidiKey2Freq:
.ifdef L_Div
thumb_func_start Div
Div:
- swi 6
+ svc #6
bx lr
thumb_func_end Div
.endif
@@ -296,7 +296,7 @@ Div:
.ifdef L_Diff8bitUnFilterVram
thumb_func_start Diff8bitUnFilterVram
Diff8bitUnFilterVram:
- swi 23
+ svc #23
bx lr
thumb_func_end Diff8bitUnFilterVram
.endif
@@ -304,7 +304,7 @@ Diff8bitUnFilterVram:
.ifdef L_ArcTan
thumb_func_start ArcTan
ArcTan:
- swi 9
+ svc #9
bx lr
thumb_func_end ArcTan
.endif
@@ -312,7 +312,7 @@ ArcTan:
.ifdef L_ObjAffineSet
thumb_func_start ObjAffineSet
ObjAffineSet:
- swi 15
+ svc #15
bx lr
thumb_func_end ObjAffineSet
.endif
@@ -321,15 +321,15 @@ ObjAffineSet:
thumb_func_start SoftResetRom
SoftResetRom:
ldr r3, =REG_IME
- mov r2, #0
+ movs r2, #0
strb r2, [r3, #0]
ldr r3, =SOFT_RESET_DIRECT_BUF
- mov r2, #0
+ movs r2, #0
strb r2, [r3, #0]
sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
mov sp, r3
- swi 1
- swi 0
+ svc #1
+ svc #0
.pool
thumb_func_end SoftResetRom
.endif
@@ -337,7 +337,7 @@ SoftResetRom:
.ifdef L_SoundDriverMode
thumb_func_start SoundDriverMode
SoundDriverMode:
- swi 27
+ svc #27
bx lr
thumb_func_end SoundDriverMode
.endif
@@ -345,7 +345,7 @@ SoundDriverMode:
.ifdef L_RLUnCompWram
thumb_func_start RLUnCompWram
RLUnCompWram:
- swi 20
+ svc #20
bx lr
thumb_func_end RLUnCompWram
.endif
@@ -353,7 +353,7 @@ RLUnCompWram:
.ifdef L_BitUnPack
thumb_func_start BitUnPack
BitUnPack:
- swi 16
+ svc #16
bx lr
thumb_func_end BitUnPack
.endif
@@ -361,7 +361,7 @@ BitUnPack:
.ifdef L_SoundChannelClear
thumb_func_start SoundChannelClear
SoundChannelClear:
- swi 30
+ svc #30
bx lr
thumb_func_end SoundChannelClear
.endif
@@ -369,7 +369,7 @@ SoundChannelClear:
.ifdef L_CpuFastSet
thumb_func_start CpuFastSet
CpuFastSet:
- swi 12
+ svc #12
bx lr
thumb_func_end CpuFastSet
.endif
@@ -377,7 +377,7 @@ CpuFastSet:
.ifdef L_CpuSet
thumb_func_start CpuSet
CpuSet:
- swi 11
+ svc #11
bx lr
thumb_func_end CpuSet
.endif
@@ -385,7 +385,7 @@ CpuSet:
.ifdef L_Diff16bitUnFilter
thumb_func_start Diff16bitUnFilter
Diff16bitUnFilter:
- swi 24
+ svc #24
bx lr
thumb_func_end Diff16bitUnFilter
.endif
@@ -393,8 +393,8 @@ Diff16bitUnFilter:
.ifdef L_SoundBiasSet
thumb_func_start SoundBiasSet
SoundBiasSet:
- mov r0, #1
- swi 25
+ movs r0, #1
+ svc #25
bx lr
thumb_func_end SoundBiasSet
.endif
@@ -402,7 +402,7 @@ SoundBiasSet:
.ifdef L_MusicPlayerContinue
thumb_func_start MusicPlayerContinue
MusicPlayerContinue:
- swi 35
+ svc #35
bx lr
thumb_func_end MusicPlayerContinue
.endif
@@ -411,12 +411,12 @@ MusicPlayerContinue:
thumb_func_start SoftReset
SoftReset:
ldr r3, =REG_IME
- mov r2, #0
+ movs r2, #0
strb r2, [r3, #0]
ldr r1, =0x3007f00
mov sp, r1
- swi 1
- swi 0
+ svc #1
+ svc #0
.pool
thumb_func_end SoftReset
.endif
@@ -424,7 +424,7 @@ SoftReset:
.ifdef L_RLUnCompVram
thumb_func_start RLUnCompVram
RLUnCompVram:
- swi 21
+ svc #21
bx lr
thumb_func_end RLUnCompVram
.endif