diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-08-13 14:54:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 14:54:31 +0200 |
| commit | f5330d15daed2d77ff48360554a36162843fe199 (patch) | |
| tree | f8142591ea01c720be6d6b979b2fadb84e3018f0 /src/macros | |
| parent | 783f5fe610c69006742b4976ab4f183f39512d89 (diff) | |
| parent | 3581a4baed71f596eedb9c234b910f1d6a7736be (diff) | |
Merge pull request #48 from xCrystal/master
More home and bank1 progress
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/constants.asm | 7 | ||||
| -rw-r--r-- | src/macros/data.asm | 9 | ||||
| -rw-r--r-- | src/macros/wram.asm | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/src/macros/constants.asm b/src/macros/constants.asm index ceb0c7f..177fcd6 100644 --- a/src/macros/constants.asm +++ b/src/macros/constants.asm @@ -10,10 +10,3 @@ const: MACRO \1 EQU const_value const_value = const_value + 1 ENDM - -deck_const: MACRO -if const_value >= 2 -\1_ID EQU const_value + -2 -endc - const \1 -ENDM diff --git a/src/macros/data.asm b/src/macros/data.asm index 80c4ba2..53926da 100644 --- a/src/macros/data.asm +++ b/src/macros/data.asm @@ -85,15 +85,6 @@ tx: MACRO dw \1_ ENDM -txsymbol: MACRO - const SYM_\1 - charmap "\1>", const_value + -1 -ENDM - -fwcharmap: MACRO - charmap STRCAT("FW\1_", \2), \3 -ENDM - textitem: MACRO db \1, \2 tx \3 diff --git a/src/macros/wram.asm b/src/macros/wram.asm index ad6075f..ca8a9d0 100644 --- a/src/macros/wram.asm +++ b/src/macros/wram.asm @@ -26,7 +26,7 @@ card_data_struct: MACRO ENDM move_data_struct: MACRO -\1Energy:: ds NUM_TYPES / 2 +\1EnergyCost:: ds NUM_TYPES / 2 \1Name:: ds 2 \1Description:: ds 4 \1Damage:: ds 1 |