diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:13:29 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:39:06 +0100 |
| commit | e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 (patch) | |
| tree | dabac449a3cf7bf08c6cb134701ce296a5403c61 /macros/wram.asm | |
| parent | c3abe8f88b62b121ec7e76cac91467df7471223a (diff) | |
Pkmn -> Mon
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
Diffstat (limited to 'macros/wram.asm')
| -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 |