callba/callab → farcall/callfar

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

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