diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-02-03 22:18:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 22:18:22 -0600 |
| commit | 6e5930f1fd92ba435c58a7936b15ded2cd4118aa (patch) | |
| tree | cf2d7134e0a8caf413938b5062f2ae80be9d6239 /src/macros | |
| parent | dd304349c3e19bfe5d3cec3666367cc561b2d833 (diff) | |
| parent | 616d0d2468c1d4d3c7c6e59e9a4a8dc84b16577b (diff) | |
Merge pull request #94 from ElectroDeoxys/master
Consolidate "move" and "attack"
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/wram.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/macros/wram.asm b/src/macros/wram.asm index d17c505..5e7eb1c 100644 --- a/src/macros/wram.asm +++ b/src/macros/wram.asm @@ -10,8 +10,8 @@ card_data_struct: MACRO \1Stage:: ds 1 \1NonPokemonDescription:: ; ds 2 \1PreEvoName:: ds 2 -\1Move1:: move_data_struct \1Move1 -\1Move2:: move_data_struct \1Move2 +\1Atk1:: atk_data_struct \1Atk1 +\1Atk2:: atk_data_struct \1Atk2 \1RetreatCost:: ds 1 \1Weakness:: ds 1 \1Resistance:: ds 1 @@ -25,7 +25,7 @@ card_data_struct: MACRO \1Unknown2:: ds 1 ENDM -move_data_struct: MACRO +atk_data_struct: MACRO \1EnergyCost:: ds NUM_TYPES / 2 \1Name:: ds 2 \1Description:: ds 4 |