Revert "Fix macros in kernel.inc"

This reverts commit 0fcb327.

Author: ddevault

Makefile

@@ -91,7 +91,7 @@ kernel: baserom $(OUTDIR)$(PLATFORM)/00.bin $(OUTDIR)$(PLATFORM)/01.bin $(OUTDIR
 	patchrom -c src/01/jumptable.config $(BINDIR)kernel.rom 01 < $(BINDIR)01.sym > $(BINDIR)01.h
 	patchrom -c src/02/jumptable.config $(BINDIR)kernel.rom 02 < $(BINDIR)02.sym > $(BINDIR)02.h
 	cat headers/kernel.h.start $(BINDIR)00.h $(BINDIR)01.h $(BINDIR)02.h headers/kernel.h.end > $(BINDIR)../include/kernel.h
-	#cp headers/*.h $(BINDIR)../include/ # There are currently no additional headers
+	cp headers/*.h $(BINDIR)../include/
 	# Generate kernel upgrade file
 	mktiupgrade -p -k keys/$(KEY).key -d $(DEVICE) $(BINDIR)kernel.rom $(BINDIR)kernel.$(UPGRADEEXT) 00 01 02 03
 

include/kernel.inc

@@ -6,81 +6,81 @@ rlcall .equ 0x10
 rpcall .equ 0x20
 
 .macro kcall(addr)
-    rst 0x08
+    rst rkcall
     call addr
 .endmacro
 .macro kcall(cc, addr)
-    rst 0x08
+    rst rkcall
     call cc, addr
 .endmacro
 .macro kjp(addr)
-    rst 0x08
+    rst rkcall
     jp addr
 .endmacro
 .macro kjp(cc, addr)
-    rst 0x08
+    rst rkcall
     jp cc, addr
 .endmacro
 .macro kld(to, from)
-    rst 0x08
+    rst rkcall
     ld to, from
 .endmacro
 
 .macro lcall(id, addr)
-    rst 0x10
+    rst rlcall
     .db id
     call addr
 .endmacro
 .macro lcall(id, cc, addr)
-    rst 0x10
+    rst rlcall
     .db id
     call cc, addr
 .endmacro
 .macro ljp(id, addr)
-    rst 0x10
+    rst rlcall
     .db id
     jp addr
 .endmacro
 .macro ljp(id, cc, addr)
-    rst 0x10
+    rst rlcall
     .db id
     jp cc, addr
 .endmacro
 .macro lld(id, to, from)
-    rst 0x10
+    rst rlcall
     .db id
     ld to, from
 .endmacro
 
 .macro icall(addr)
-    rst 0x10
+    rst rlcall
     .db libId
     call addr
 .endmacro
 .macro icall(cc, addr)
-    rst 0x10
+    rst rlcall
     .db libId
     call cc, addr
 .endmacro
 .macro ijp(addr)
-    rst 0x10
+    rst rlcall
     .db libId
     jp addr
 .endmacro
 .macro ijp(cc, addr)
-    rst 0x10
+    rst rlcall
     .db libId
     jp cc, addr
 .endmacro
 .macro ild(to, from)
-    rst 0x10
+    rst rlcall
     .db libId
     ld to, from
 .endmacro
 
 .macro pcall(function)
     .if function & 0xFF
-        rst 0x20
+        rst rpcall
         .dw function
     .else
         call 0x4000 - (((function >> 8) + 1) * 3)
@@ -90,7 +90,7 @@ rpcall .equ 0x20
     .if function & 0xFF
         jr flags, $+4
         jr $+5
-        rst 0x20
+        rst rpcall
         .dw function
     .else
         call flags, 0x4000 - (((function >> 8) + 1) * 3)