diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 2 | ||||
| -rwxr-xr-x | engine/billspc.asm | 4 | ||||
| -rwxr-xr-x | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rwxr-xr-x | engine/events/bug_contest/judging.asm | 2 | ||||
| -rwxr-xr-x | engine/events/celebi.asm | 2 | ||||
| -rwxr-xr-x | engine/events/field_moves.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown_2.asm | 4 | ||||
| -rwxr-xr-x | engine/evolution_animation.asm | 2 | ||||
| -rwxr-xr-x | engine/options_menu.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 2 | ||||
| -rwxr-xr-x | engine/search.asm | 2 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 2 | ||||
| -rwxr-xr-x | engine/stats_screen.asm | 2 | ||||
| -rw-r--r-- | engine/title.asm | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 0bbedf909..707fcfd71 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -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 diff --git a/engine/billspc.asm b/engine/billspc.asm index 53f2c176e..f9c6a4c5f 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -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 diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 887457e2c..befc49a9a 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -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 diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 6c8d7e82d..d8e46100b 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -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 diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm index f6cedd074..3fc1dd145 100755 --- a/engine/events/celebi.asm +++ b/engine/events/celebi.asm @@ -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 diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm index 6b840a25a..b094b5260 100755 --- a/engine/events/field_moves.asm +++ b/engine/events/field_moves.asm @@ -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 diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 1e0b90fc5..5cdc21146 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -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 diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 2e6e82e25..e9f51b1cc 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -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 diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 4ab215282..ad2990539 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -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 diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 4317d96f8..e4ddb403a 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -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 diff --git a/engine/search.asm b/engine/search.asm index 0d4a8dc3c..e7f6a639f 100755 --- a/engine/search.asm +++ b/engine/search.asm @@ -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 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 68df631e4..7c2fbd352 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -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 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 8079088d9..e710f4cad 100755 --- a/engine/stats_screen.asm +++ b/engine/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 BattleStatsScreenInit: ; 4dc7b (13:5c7b) ld a, [wLinkMode] diff --git a/engine/title.asm b/engine/title.asm index 55ba145bf..9b51ee878 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -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 |