diff options
Diffstat (limited to 'macros/wram.asm')
| -rwxr-xr-x | macros/wram.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/macros/wram.asm b/macros/wram.asm index 7c8ca44a1..ff144d71f 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -103,12 +103,11 @@ battle_struct: MACRO ENDM box: MACRO -\1:: \1Count:: db \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:: @@ -176,7 +175,7 @@ channel_struct: MACRO ENDM battle_tower_struct: MACRO -\1Name:: ds NAME_LENGTH +- 1 +\1Name:: ds NAME_LENGTH + -1 \1TrainerClass:: ds 1 \1Pkmn1:: party_struct \1Pkmn1 \1Pkmn1Name:: ds MON_NAME_LENGTH @@ -222,7 +221,7 @@ hof_mon: MACRO \1ID:: dw \1DVs:: dw \1Level:: db -\1Nickname:: ds MON_NAME_LENGTH +- 1 +\1Nickname:: ds MON_NAME_LENGTH + -1 \1End:: ENDM @@ -238,7 +237,7 @@ hall_of_fame: MACRO ENDM link_battle_record: MACRO -\1Name:: ds NAME_LENGTH +- 1 +\1Name:: ds NAME_LENGTH + -1 \1ID:: dw \1Wins:: dw \1Losses:: dw @@ -285,7 +284,6 @@ slot_reel: MACRO ENDM object_struct: MACRO -\1Struct:: \1Sprite:: db \1MapObjectIndex:: db \1SpriteTile:: db @@ -323,7 +321,6 @@ object_struct: MACRO ENDM map_object: MACRO -\1Object:: \1ObjectStructID:: db \1ObjectSprite:: db \1ObjectYCoord:: db |