Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW)

This commit is contained in:
Remy Oukaour
2017-12-28 21:22:35 -05:00
committed by yenatch
parent 4c35f3ac85
commit b9a68fec25
12 changed files with 40 additions and 40 deletions

View File

@@ -1,7 +1,7 @@
; Used in data/pokemon/base_stats/*.asm
define: MACRO
if !def(\1)
if !DEF(\1)
\1 EQUS \2
endc
ENDM
@@ -9,7 +9,7 @@ ENDM
const_value = 0
add_tm: MACRO
if !def(TM01)
if !DEF(TM01)
TM01 = const_value
enum_start 1
endc
@@ -19,7 +19,7 @@ endc
ENDM
add_hm: MACRO
if !def(HM01)
if !DEF(HM01)
HM01 = const_value
endc
define _\@_1, "HM_\1"
@@ -38,7 +38,7 @@ tms1 = 0
tms2 = 0
tms3 = 0
rept _NARG
if def(\1_TMNUM)
if DEF(\1_TMNUM)
if \1_TMNUM < 24 + 1
tms1 = tms1 | (1 << ((\1_TMNUM) - 1))
elif \1_TMNUM < 48 + 1

View File

@@ -43,9 +43,9 @@ debgcoord EQUS "bgcoord de,"
bcbgcoord EQUS "bgcoord bc,"
bgcoord: MACRO
IF _NARG >= 4
if _NARG >= 4
ld \1, \3 bgrows + \2 + \4
ELSE
else
ld \1, \3 bgrows + \2 + vBGMap0
ENDC
endc
ENDM

View File

@@ -538,13 +538,13 @@ jumptextfaceplayer: MACRO
dw \1 ; text_pointer
ENDM
; IF _CRYSTAL
; if _CRYSTAL
enum farjumptext_command ; $52
farjumptext: MACRO
db farjumptext_command
dba \1
ENDM
; ENDC
; endc
enum jumptext_command ; $53
jumptext: MACRO