From d89bd1ac8b1304313bae285ada7d24601cf67d09 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sun, 10 Jun 2018 14:20:59 +0200 Subject: Merge branch 'math_etc' into 'master' --- macros/farcall.asm | 2 +- macros/wram.asm | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'macros') diff --git a/macros/farcall.asm b/macros/farcall.asm index 05bb7b1..5e39410 100644 --- a/macros/farcall.asm +++ b/macros/farcall.asm @@ -12,7 +12,7 @@ callab: MACRO ; address, bank ENDM homecall: MACRO - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(\1) call Bankswitch diff --git a/macros/wram.asm b/macros/wram.asm index cb0d3f1..da67ba5 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -372,3 +372,13 @@ warp_struct: MACRO \1MapGroup:: ds 1 \1MapNumber:: ds 1 ENDM + +ptrba: MACRO +\1Bank:: db +\1Addr:: dw +ENDM + +ptrab: MACRO +\1Addr:: dw +\1Bank:: db +ENDM -- cgit v1.2.3