summaryrefslogtreecommitdiff
path: root/src/macros/wram.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-02-22 19:41:55 +0100
committerxCrystal <rgr.crystal@gmail.com>2018-02-22 19:41:55 +0100
commit46416da9fa3e33738fce25bbd79d9b61476b5164 (patch)
treef07535871e6efa7606a520f8ad6cafdf071c6ea2 /src/macros/wram.asm
parentd543a896fd381046dee795f3020237d6da623a9e (diff)
More duel related disassembly and more DUELVAR constants
Diffstat (limited to 'src/macros/wram.asm')
-rw-r--r--src/macros/wram.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/macros/wram.asm b/src/macros/wram.asm
index 9a7ffc2..9825a36 100644
--- a/src/macros/wram.asm
+++ b/src/macros/wram.asm
@@ -5,12 +5,10 @@ card_data_struct: MACRO
\1Rarity:: db
\1Set:: db
\1ID:: db
-\1EnergyCardEffectCommands:: ; dw
-\1TrainerCardEffectCommands:: ; dw
+\1EffectCommands:: ; dw
\1HP:: db
\1Stage:: db
-\1EnergyCardDescription:: ; dw
-\1TrainerCardDescription:: ; dw
+\1NonPokemonDescription:: ; dw
\1PreEvoName:: dw
\1Move1:: move_data_struct \1Move1
\1Move2:: move_data_struct \1Move2