summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-03-21 14:01:05 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-03-21 14:01:05 -0400
commit6a6ba10315baf4b0092c6d952a2f0cb502b6ac8e (patch)
tree5a32545646f9214cd7674320495cc3e8c6929875 /engine/events
parent5a5f5ececdde2c4c62bdee649d8b1d3edba96fed (diff)
rgbds supports 'X - 1' instead of 'X + -1'
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/battle_tower/battle_tower.asm4
-rw-r--r--engine/events/bug_contest/judging.asm2
-rw-r--r--engine/events/celebi.asm2
-rw-r--r--engine/events/field_moves.asm2
-rw-r--r--engine/events/print_unown_2.asm4
5 files changed, 7 insertions, 7 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 3e3bbb57f..9d10d7289 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -395,10 +395,10 @@ ValidateBTParty:
ld a, [hl]
and a
x = $ff
-rept ($ff + -NUM_POKEMON)
+rept ($ff - NUM_POKEMON)
jr z, .invalid
cp x
-x = x + -1
+x = x - 1
endr
jr nz, .valid
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index 9f8c0c5c2..9945f2031 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -211,7 +211,7 @@ DetermineContestWinners:
CopyTempContestant:
; Could've just called CopyBytes.
ld de, wBugContestTempWinnerID
-rept BUG_CONTESTANT_SIZE + -1
+rept BUG_CONTESTANT_SIZE - 1
ld a, [de]
inc de
ld [hli], a
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 2e497c86e..d53fa8589 100644
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -57,7 +57,7 @@ CelebiShrineEvent:
ld c, 4
.OAMloop:
ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
inc a
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index c898c6690..6413840cc 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -383,7 +383,7 @@ FlyToAnim:
ld c, 4
.OAMloop
ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
inc a
diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm
index 77eb050a1..5dc7b1b94 100644
--- a/engine/events/print_unown_2.asm
+++ b/engine/events/print_unown_2.asm
@@ -98,10 +98,10 @@ RotateUnownFrontpic:
gbprinterrect: MACRO
y = 0
rept \1
-x = \1 * (\2 + -1) + y
+x = \1 * (\2 - 1) + y
rept \2
dw wGameboyPrinterRAM tile x
-x = x + -\2
+x = x - \2
endr
y = y + 1
endr