diff options
author | ISSOtm <eldredhabert0@gmail.com> | 2018-06-10 14:20:59 +0200 |
---|---|---|
committer | ISSOtm <eldredhabert0@gmail.com> | 2018-06-10 14:20:59 +0200 |
commit | d89bd1ac8b1304313bae285ada7d24601cf67d09 (patch) | |
tree | 7d83ac3340a0535aa85269e7247008164f9b8d7d /macros | |
parent | b136e995a3b22a674c44241a68365d8b1152cb8b (diff) |
Merge branch 'math_etc' into 'master'
Diffstat (limited to 'macros')
-rw-r--r-- | macros/farcall.asm | 2 | ||||
-rw-r--r-- | macros/wram.asm | 10 |
2 files changed, 11 insertions, 1 deletions
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 |