use "x + -1" not "x +- 1"

(TODO: use "x - 1" once rgbds allows it)
This commit is contained in:
Rangi
2018-02-02 22:55:38 -05:00
parent 45373ec601
commit e32e5212af
27 changed files with 36 additions and 37 deletions

View File

@@ -263,7 +263,7 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
ld a, [hl]
and $f0
ld [hli], a
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
dec c

View File

@@ -1510,7 +1510,7 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
inc hl
ld [de], a ; y
inc de
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
ld a, [hli]
ld [de], a
inc de
@@ -1560,7 +1560,7 @@ BillsPC_UpdateInsertCursor: ; e2e8c
inc hl
ld [de], a ; y
inc de
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
ld a, [hli]
ld [de], a
inc de

View File

@@ -408,10 +408,10 @@ ValidateBTParty: ; 170394
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

View File

@@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e
CopyTempContestant: ; 138a0
; 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

View File

@@ -57,7 +57,7 @@ CelebiShrineEvent: ; 4989a
ld c, 4
.OAMloop:
ld [hli], a ; tile id
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
inc a

View File

@@ -398,7 +398,7 @@ FlyToAnim: ; 8cb33
ld c, 4
.OAMloop
ld [hli], a ; tile id
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
inc a

View File

@@ -98,10 +98,10 @@ RotateUnownFrontpic: ; e0000
overworldmaprect: MACRO
y = 0
rept \1
x = \1 * (\2 +- 1) + y
x = \1 * (\2 + -1) + y
rept \2
dw OverworldMap tile x
x = x +- \2
x = x + -\2
endr
y = y + 1
endr

View File

@@ -352,7 +352,7 @@ EvolutionAnimation: ; 4e5e1
ld a, [hl]
or b
ld [hli], a ; attributes
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
dec c

View File

@@ -120,7 +120,7 @@ Options_TextSpeed: ; e42f5
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

View File

@@ -579,7 +579,7 @@ PokeAnim_CopyBitmaskToBuffer: ; d033b
poke_anim_box: MACRO
y = 7
rept \1
x = 7 +- \1
x = 7 + -\1
rept \1
db x + y
x = x + 1

View File

@@ -219,7 +219,7 @@ CheckOwnMon: ; 0x4a7ba
ld hl, PlayerName
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

View File

@@ -267,7 +267,7 @@ Unreferenced_Function9282c: ; 9282c
ld a, [hl]
xor %00100000
ld [hli], a ; tile id
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
dec c

View File

@@ -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
BattleStatsScreenInit: ; 4dc7b (13:5c7b)
ld a, [wLinkMode]

View File

@@ -377,7 +377,7 @@ AnimateTitleCrystal: ; 10ef32
ld a, [hl]
add 2
ld [hli], a ; y
rept SPRITEOAMSTRUCT_LENGTH +- 1
rept SPRITEOAMSTRUCT_LENGTH + -1
inc hl
endr
dec c