diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 20:12:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 20:12:59 -0500 |
| commit | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (patch) | |
| tree | b7444d7ddc95703ef9e3a2f5a2f14c21664bb8f8 /macros | |
| parent | f404af8a4326e4cc632a3810ff77a013c1d3e24f (diff) | |
| parent | 3d34f5a5a371ad2b9979ae36763cdfb52c581dab (diff) | |
Merge pull request #477 from mid-kid/master
Medium-sized cleanups
Diffstat (limited to 'macros')
| -rwxr-xr-x | macros/wram.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index 7c8ca44a1..136e42e6a 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -178,15 +178,15 @@ ENDM battle_tower_struct: MACRO \1Name:: ds NAME_LENGTH +- 1 \1TrainerClass:: ds 1 -\1Pkmn1:: party_struct \1Pkmn1 -\1Pkmn1Name:: ds MON_NAME_LENGTH -\1Pkmn1NameEnd:: -\1Pkmn2:: party_struct \1Pkmn2 -\1Pkmn2Name:: ds MON_NAME_LENGTH -\1Pkmn2NameEnd:: -\1Pkmn3:: party_struct \1Pkmn3 -\1Pkmn3Name:: ds MON_NAME_LENGTH -\1Pkmn3NameEnd:: +\1Mon1:: party_struct \1Mon1 +\1Mon1Name:: ds MON_NAME_LENGTH +\1Mon1NameEnd:: +\1Mon2:: party_struct \1Mon2 +\1Mon2Name:: ds MON_NAME_LENGTH +\1Mon2NameEnd:: +\1Mon3:: party_struct \1Mon3 +\1Mon3Name:: ds MON_NAME_LENGTH +\1Mon3NameEnd:: \1TrainerData:: ds BATTLETOWER_TRAINERDATALENGTH \1TrainerEnd:: ENDM |