diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /macros/wram.asm | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'macros/wram.asm')
| -rwxr-xr-x | macros/wram.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index 4294abb5..1e7ab534 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -106,7 +106,7 @@ curbox: MACRO \1Species:: ds MONS_PER_BOX + 1 \1Mons:: \1Mon1:: box_struct \1Mon1 -\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX + -1) +\1Mon2:: ds BOXMON_STRUCT_LENGTH * (MONS_PER_BOX - 1) \1MonOT:: ds NAME_LENGTH * MONS_PER_BOX \1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX \1MonNicknamesEnd:: @@ -206,7 +206,7 @@ hof_mon: MACRO \1ID:: dw \1DVs:: dw \1Level:: db -\1Nickname:: ds MON_NAME_LENGTH + -1 +\1Nickname:: ds MON_NAME_LENGTH - 1 \1End:: ENDM @@ -227,6 +227,7 @@ link_battle_record: MACRO \1Wins:: dw \1Losses:: dw \1Draws:: dw +\1End:: ENDM trademon: MACRO |