diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/data.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 2 | ||||
| -rw-r--r-- | macros/wram.asm | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/macros/data.asm b/macros/data.asm index 59f518b8d..76a5d31de 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -51,7 +51,7 @@ dx: MACRO x = 8 * ((\1) - 1) rept \1 db ((\2) >> x) & $ff -x = x + -8 +x = x - 8 endr ENDM diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index 3756481dd..a6241a0d8 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -4,7 +4,7 @@ frame: MACRO db \1 x = \2 if _NARG > 2 -rept _NARG + -2 +rept _NARG - 2 x = x | (1 << (\3 + 1)) shift endr diff --git a/macros/wram.asm b/macros/wram.asm index af306d1f8..abc7df48e 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -106,7 +106,7 @@ box: 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:: @@ -171,7 +171,7 @@ channel_struct: MACRO ENDM battle_tower_struct: MACRO -\1Name:: ds NAME_LENGTH + -1 +\1Name:: ds NAME_LENGTH - 1 \1TrainerClass:: ds 1 \1Mon1:: party_struct \1Mon1 \1Mon1Name:: ds MON_NAME_LENGTH @@ -217,7 +217,7 @@ hof_mon: MACRO \1ID:: dw \1DVs:: dw \1Level:: db -\1Nickname:: ds MON_NAME_LENGTH + -1 +\1Nickname:: ds MON_NAME_LENGTH - 1 \1End:: ENDM @@ -233,7 +233,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 |