git.y1.nz

commit 7290a6aaea0a9ec7c5bc8deeae81a73687a79928
parent 114d11fa4752178d5bb1a39b59000a8034f39b6f
Author: Toxa <untoxa@mail.ru>
Date:   Sat, 28 Jan 2023 15:28:34 +0300

fix .add_int on AP and MEGADUCK

Diffstat:
M
gbdk-lib/libc/targets/sm83/ap/crt0.s
9
+++++----
M
gbdk-lib/libc/targets/sm83/duck/crt0.s
9
+++++----
M
gbdk-lib/libc/targets/sm83/gb/crt0.s
5
+++--
M
gbdk-lib/libc/targets/sm83/mv_spr.s
3
+--
M
gbdk-lib/libc/targets/sm83/set_prop.s
3
+--

5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/gbdk-lib/libc/targets/sm83/ap/crt0.s b/gbdk-lib/libc/targets/sm83/ap/crt0.s
@@ -273,10 +273,11 @@ _exit::
 
 _set_interrupts::
         DI
-        LDH     (.IE),A         ; interrupts are still disabled here
+        LDH     (.IE),A
         XOR     A
+        EI
         LDH     (.IF),A         ; Clear pending interrupts
-        RETI
+        RET
 
         ;; Copy OAM data to OAM RAM
 .start_refresh_OAM:
@@ -463,9 +464,9 @@ _add_VBL::
         INC     HL
         JR      1$
 2$:
-        LD      A,B
+        LD      A,D
         LD      (HL-),A
-        LD      (HL),C
+        LD      (HL),E
         RET
 
         ;; Wait for VBL interrupt to be finished
diff --git a/gbdk-lib/libc/targets/sm83/duck/crt0.s b/gbdk-lib/libc/targets/sm83/duck/crt0.s
@@ -213,10 +213,11 @@ _exit::
 
 _set_interrupts::
         DI
-        LDH     (.IE),A         ; interrupts are still disabled here
+        LDH     (.IE),A
         XOR     A
+        EI
         LDH     (.IF),A         ; Clear pending interrupts
-        RETI
+        RET
 
         ;; Copy OAM data to OAM RAM
 .start_refresh_OAM:
@@ -403,9 +404,9 @@ _add_VBL::
         INC     HL
         JR      1$
 2$:
-        LD      A,B
+        LD      A,D
         LD      (HL-),A
-        LD      (HL),C
+        LD      (HL),E
         RET
 
         ;; Wait for VBL interrupt to be finished
diff --git a/gbdk-lib/libc/targets/sm83/gb/crt0.s b/gbdk-lib/libc/targets/sm83/gb/crt0.s
@@ -279,10 +279,11 @@ _exit::
 
 _set_interrupts::
         DI
-        LDH     (.IE),A         ; interrupts are still disabled here
+        LDH     (.IE),A
         XOR     A
+        EI
         LDH     (.IF),A         ; Clear pending interrupts
-        RETI
+        RET
 
         ;; Copy OAM data to OAM RAM
 .start_refresh_OAM:
diff --git a/gbdk-lib/libc/targets/sm83/mv_spr.s b/gbdk-lib/libc/targets/sm83/mv_spr.s
@@ -13,6 +13,5 @@
 	LD	A,E		; Set Y
 	LD	(HL+),A
 
-	LD	A,D		; Set X
-	LD	(HL+),A
+	LD	(HL),D  ; Set X
 	RET
diff --git a/gbdk-lib/libc/targets/sm83/set_prop.s b/gbdk-lib/libc/targets/sm83/set_prop.s
@@ -11,6 +11,5 @@
 	LD	B,#0x00
 	ADD	HL,BC
 
-	LD	A,D		; Set sprite properties
-	LD	(HL),A
+	LD	(HL),D	; Set sprite properties
 	RET

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.