summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle_anims/anim_commands.asm2
-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
-rw-r--r--engine/games/slot_machine.asm2
-rw-r--r--engine/gfx/pic_animation.asm2
-rw-r--r--engine/menus/options_menu.asm2
-rw-r--r--engine/movie/crystal_intro.asm6
-rw-r--r--engine/movie/evolution_animation.asm2
-rw-r--r--engine/movie/title.asm2
-rw-r--r--engine/pokemon/bills_pc.asm4
-rw-r--r--engine/pokemon/move_mon.asm4
-rw-r--r--engine/pokemon/search.asm2
-rw-r--r--engine/pokemon/stats_screen.asm2
16 files changed, 22 insertions, 22 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index c0424088e..bbfc1240e 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -244,7 +244,7 @@ BattleAnim_ClearOAM:
ld a, [hl]
and $ff ^ (PALETTE_MASK | VRAM_BANK_1) ; PAL_BATTLE_OB_ENEMY (0)
ld [hli], a
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
dec c
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
diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm
index 2765dd870..eaf7999bd 100644
--- a/engine/games/slot_machine.asm
+++ b/engine/games/slot_machine.asm
@@ -261,7 +261,7 @@ Unreferenced_Function9282c:
ld a, [hl]
xor %00100000
ld [hli], a ; tile id
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
dec c
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index 8eff13ad1..fda39e5c6 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -538,7 +538,7 @@ PokeAnim_CopyBitmaskToBuffer:
poke_anim_box: MACRO
y = 7
rept \1
-x = 7 + -\1
+x = 7 - \1
rept \1
db x + y
x = x + 1
diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm
index d1aa563f6..9a6b0fdc7 100644
--- a/engine/menus/options_menu.asm
+++ b/engine/menus/options_menu.asm
@@ -114,7 +114,7 @@ Options_TextSpeed:
ld a, c ; right pressed
cp OPT_TEXT_SPEED_SLOW
jr c, .Increase
- ld c, OPT_TEXT_SPEED_FAST + -1
+ ld c, OPT_TEXT_SPEED_FAST - 1
.Increase:
inc c
diff --git a/engine/movie/crystal_intro.asm b/engine/movie/crystal_intro.asm
index eeab51062..9fbd67078 100644
--- a/engine/movie/crystal_intro.asm
+++ b/engine/movie/crystal_intro.asm
@@ -1796,16 +1796,16 @@ endr
hue = 31
rept 8
RGB hue, hue, hue
-hue = hue + -1
+hue = hue - 1
RGB hue, hue, hue
-hue = hue + -2
+hue = hue - 2
endr
.SlowFadePalettes:
hue = 31
rept 16
RGB hue, hue, hue
-hue = hue + -1
+hue = hue - 1
endr
Intro_LoadTilemap:
diff --git a/engine/movie/evolution_animation.asm b/engine/movie/evolution_animation.asm
index ed500d1f8..0960fb3e7 100644
--- a/engine/movie/evolution_animation.asm
+++ b/engine/movie/evolution_animation.asm
@@ -339,7 +339,7 @@ EvolutionAnimation:
ld a, [hl]
or b
ld [hli], a ; attributes
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
dec c
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 50c8721d0..dce02804f 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -356,7 +356,7 @@ AnimateTitleCrystal:
ld a, [hl]
add 2
ld [hli], a ; y
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
inc hl
endr
dec c
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index dd4977f1b..d3d7c9922 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1472,7 +1472,7 @@ BillsPC_UpdateSelectionCursor:
inc hl
ld [de], a ; y
inc de
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
ld a, [hli]
ld [de], a
inc de
@@ -1520,7 +1520,7 @@ BillsPC_UpdateInsertCursor:
inc hl
ld [de], a ; y
inc de
-rept SPRITEOAMSTRUCT_LENGTH + -1
+rept SPRITEOAMSTRUCT_LENGTH - 1
ld a, [hli]
ld [de], a
inc de
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 8133e2671..bfd2f91f2 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -117,7 +117,7 @@ GeneratePartyMonStats:
and a
jr nz, .randomlygeneratemoves
ld de, wEnemyMonMoves
-rept NUM_MOVES + -1
+rept NUM_MOVES - 1
ld a, [de]
inc de
ld [hli], a
@@ -128,7 +128,7 @@ endr
.randomlygeneratemoves
xor a
-rept NUM_MOVES + -1
+rept NUM_MOVES - 1
ld [hli], a
endr
ld [hl], a
diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm
index 2ea1beacf..bc3e6ae3b 100644
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -216,7 +216,7 @@ CheckOwnMon:
ld hl, wPlayerName
-rept NAME_LENGTH_JAPANESE + -2 ; should be PLAYER_NAME_LENGTH + -2
+rept NAME_LENGTH_JAPANESE - 2 ; should be PLAYER_NAME_LENGTH - 2
ld a, [de]
cp [hl]
jr nz, .notfound
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index ae7e71cf2..62db2e851 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -2,7 +2,7 @@
const PINK_PAGE ; 1
const GREEN_PAGE ; 2
const BLUE_PAGE ; 3
-NUM_STAT_PAGES EQU const_value + -1
+NUM_STAT_PAGES EQU const_value - 1
STAT_PAGE_MASK EQU %00000011
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 17:36:08 +0000