diff options
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/code.asm | 4 | ||||
| -rw-r--r-- | src/macros/data.asm | 5 | ||||
| -rw-r--r-- | src/macros/wram.asm | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/macros/code.asm b/src/macros/code.asm index 9e8a4ce..55f4b63 100644 --- a/src/macros/code.asm +++ b/src/macros/code.asm @@ -3,7 +3,11 @@ lb: MACRO ; r, hi, lo ENDM ldtx: MACRO +if _NARG == 2 ld \1, \2_ +else + ld \1, \2_ \3 +endc ENDM bank1call: MACRO diff --git a/src/macros/data.asm b/src/macros/data.asm index 80978b7..7028636 100644 --- a/src/macros/data.asm +++ b/src/macros/data.asm @@ -84,3 +84,8 @@ ENDM tx: MACRO dw \1_ ENDM + +txsymbol: MACRO + const SYM_\1 + charmap "\1>", const_value + -1 +ENDM diff --git a/src/macros/wram.asm b/src/macros/wram.asm index e692a92..cedb0dd 100644 --- a/src/macros/wram.asm +++ b/src/macros/wram.asm @@ -15,7 +15,7 @@ card_data_struct: MACRO \1RetreatCost:: ds 1 \1Weakness:: ds 1 \1Resistance:: ds 1 -\1Kind:: ds 2 +\1Category:: ds 2 \1PokedexNumber:: ds 1 \1Unknown1:: ds 1 \1Level:: ds 1 |