diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 22:55:38 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-02 22:55:38 -0500 |
| commit | e32e5212af3783f530af884852570d8003e69486 (patch) | |
| tree | 895ce2f17a0354bf4beef7818434495b9d60f237 /macros | |
| parent | 45373ec601e5af5bc2be7a72b8556e4311efdc05 (diff) | |
use "x + -1" not "x +- 1"
(TODO: use "x - 1" once rgbds allows it)
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/data.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 2 | ||||
| -rwxr-xr-x | macros/wram.asm | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/macros/data.asm b/macros/data.asm index 1806f5f59..0c9ef91f0 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -112,7 +112,7 @@ ENDM sine_wave: MACRO -x = 0 +x = 0.0 rept \1 dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees" diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index 943a000a9..8f33512ec 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 830b5680d..66aab34fe 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -107,7 +107,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:: @@ -175,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 @@ -221,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 @@ -237,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 |