diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 12:47:30 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-24 12:47:30 -0500 |
| commit | c66d195089b1e1b823be4f0a0fc9b8f41f5f790d (patch) | |
| tree | 47869a9d9ed7f5c2c8a8974b5a46a35e65ffef6a /macros | |
| parent | d787c66374df60fceb34fa5860c34bf56e476cbe (diff) | |
callba/callab → farcall/callfar
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/code.asm | 10 | ||||
| -rw-r--r-- | macros/rst.asm | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/macros/code.asm b/macros/code.asm index 5e247e9a3..93b35bd94 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -14,7 +14,7 @@ if _NARG >= 5 else lb \1, \2 * 8, \3 * 8 endc -endm + ENDM depixel EQUS "ldpixel de," bcpixel EQUS "ldpixel bc," @@ -33,7 +33,7 @@ jumptable: MACRO ld h, [hl] ld l, a jp hl -endm + ENDM ; Many mobile functions were dummied out in localization. mobile EQUS "ret" @@ -47,9 +47,9 @@ maskbits: macro ; jr nc, .loop x = 1 rept 8 -IF \1 > x +if \1 > x x = (x + 1) * 2 +- 1 -ENDC +endc endr and x -endm + ENDM diff --git a/macros/rst.asm b/macros/rst.asm index fe7e42723..cf4cc5314 100644 --- a/macros/rst.asm +++ b/macros/rst.asm @@ -8,22 +8,22 @@ farcall: MACRO ; bank, address rst FarCall ENDM -callba EQUS "farcall" - -callab: MACRO ; address, bank +callfar: MACRO ; address, bank ld hl, \1 ld a, BANK(\1) rst FarCall ENDM +; legacy support for pre-2018 pokecrystal +callba EQUS "farcall" +callab EQUS "callfar" + homecall: MACRO ld a, [hROMBank] push af ld a, BANK(\1) rst Bankswitch - call \1 - pop af rst Bankswitch -ENDM + ENDM |