summaryrefslogtreecommitdiff
path: root/libagbsyscall
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 04:22:50 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 06:30:55 -0300
commit7dc95a0103af08c95c9093b6efa6c77af77a2538 (patch)
tree663537916626ab264bbdef4ea3606415457c36a3 /libagbsyscall
parent58a2b62bae1406d2c768698ed13efcd6a5ffbeec (diff)
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
Diffstat (limited to 'libagbsyscall')
-rw-r--r--libagbsyscall/libagbsyscall.s19
1 files changed, 8 insertions, 11 deletions
diff --git a/libagbsyscall/libagbsyscall.s b/libagbsyscall/libagbsyscall.s
index 0c90da9ed..00c40d08e 100644
--- a/libagbsyscall/libagbsyscall.s
+++ b/libagbsyscall/libagbsyscall.s
@@ -1,12 +1,9 @@
.include "../constants/gba_constants.inc"
.include "../asm/macros/function.inc"
-
- .syntax unified
.text
.set SOFT_RESET_DIRECT_BUF, 0x03007FFA
- .set USER_STACK, 0x03007F00
.set RESET_EX_WRAM_FLAG, 0x1
.ifdef NO_GRANULAR_AGBSYSCALL
@@ -109,7 +106,7 @@ SoundDriverVSyncOn:
thumb_func_start Mod
Mod:
svc #6
- adds r0, r1, #0
+ mov r0, r1
bx lr
thumb_func_end Mod
.endif
@@ -148,7 +145,7 @@ HuffUnComp:
.endif
.ifdef L_SoftResetExram
- thumb_func_start SoftResetExram
+ arm_func_start SoftResetExram
SoftResetExram:
ldr r3, =REG_IME
movs r2, #0
@@ -156,14 +153,14 @@ SoftResetExram:
ldr r3, =SOFT_RESET_DIRECT_BUF
movs r2, #1
strb r2, [r3, #0]
- subs r3, #SOFT_RESET_DIRECT_BUF - USER_STACK
+ subs r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
mov sp, r3
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
@@ -234,7 +231,7 @@ DivArm:
thumb_func_start ModArm
ModArm:
svc #7
- adds r0, r1, #0
+ mov r0, r1
bx lr
thumb_func_end ModArm
.endif
@@ -274,7 +271,7 @@ Diff8bitUnFilterWram:
.ifdef L_MultiBoot
thumb_func_start MultiBoot
MultiBoot:
- movs r1, #1
+ mov r1, #1
svc #37
bx lr
thumb_func_end MultiBoot
@@ -329,7 +326,7 @@ SoftResetRom:
ldr r3, =SOFT_RESET_DIRECT_BUF
movs r2, #0
strb r2, [r3, #0]
- subs r3, #SOFT_RESET_DIRECT_BUF - USER_STACK
+ sub r3, #SOFT_RESET_DIRECT_BUF - 0x3007f00
mov sp, r3
svc #1
svc #0
@@ -416,7 +413,7 @@ SoftReset:
ldr r3, =REG_IME
movs r2, #0
strb r2, [r3, #0]
- ldr r1, =USER_STACK
+ ldr r1, =0x3007f00
mov sp, r1
svc #1
svc #0