pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@ -1320,7 +1320,7 @@ GetNoiseSample: ; e86c5
; load ptr to sample header in NoiseSampleAddress ; load ptr to sample header in NoiseSampleAddress
; are we on the last channel? ; are we on the last channel?
ld a, [CurChannel] ld a, [CurChannel]
and NUM_MUSIC_CHANS +- 1 and NUM_MUSIC_CHANS + -1
cp CHAN4 cp CHAN4
; ret if not ; ret if not
ret nz ret nz
@ -2102,7 +2102,7 @@ Music_Volume: ; e89d2
; e89e1 ; e89e1
Music_TempoRelative: ; e89e1 Music_TempoRelative: ; e89e1
; set global tempo to current channel tempo +- param ; set global tempo to current channel tempo +/- param
; params: 1 signed ; params: 1 signed
call GetMusicByte call GetMusicByte
ld e, a ld e, a

3
constants/deco_constants.asm
View File

@ -121,8 +121,7 @@ __enum__ = 0
deco GEODUDE_DOLL deco GEODUDE_DOLL
deco MACHOP_DOLL deco MACHOP_DOLL
deco TENTACOOL_DOLL deco TENTACOOL_DOLL
NUM_NON_TROPHY_DECOS = __enum__
deco GOLD_TROPHY_DOLL deco GOLD_TROPHY_DOLL
deco SILVER_TROPHY_DOLL deco SILVER_TROPHY_DOLL
NUM_DECOS = __enum__ NUM_DECOS = __enum__
NUM_NON_TROPHY_DECOS = NUM_DECOS +- 2

2
constants/item_constants.asm
View File

@ -288,7 +288,7 @@ NUM_HMS = const_value - HM01
add_mt FLAMETHROWER add_mt FLAMETHROWER
add_mt THUNDERBOLT add_mt THUNDERBOLT
add_mt ICE_BEAM add_mt ICE_BEAM
NUM_TM_HM_TUTOR = __enum__ +- 1 NUM_TM_HM_TUTOR = __enum__ + -1
USE_SCRIPT_VAR EQU $00 USE_SCRIPT_VAR EQU $00
ITEM_FROM_MEM EQU $ff ITEM_FROM_MEM EQU $ff

4
constants/pokemon_constants.asm
View File

@ -271,7 +271,7 @@ JOHTO_POKEMON EQU const_value
const LUGIA ; f9 const LUGIA ; f9
const HO_OH ; fa const HO_OH ; fa
const CELEBI ; fb const CELEBI ; fb
NUM_POKEMON EQU const_value +- 1 NUM_POKEMON EQU const_value + -1
const MON_FC ; fc const MON_FC ; fc
const EGG ; fd const EGG ; fd
const MON_FE ; fe const MON_FE ; fe
@ -311,4 +311,4 @@ NUM_POKEMON EQU const_value +- 1
const UNOWN_X ; 24 const UNOWN_X ; 24
const UNOWN_Y ; 25 const UNOWN_Y ; 25
const UNOWN_Z ; 26 const UNOWN_Z ; 26
NUM_UNOWN EQU const_value +- 1 ; 26 NUM_UNOWN EQU const_value + -1 ; 26

2
constants/pokemon_data_constants.asm
View File

@ -125,7 +125,7 @@ MONS_PER_BOX EQU 20
NUM_BOXES EQU 14 NUM_BOXES EQU 14
; hall of fame ; hall of fame
HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH +- 1) ; species, id, dvs, level, nick HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, level, nick
HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
NUM_HOF_TEAMS = 30 NUM_HOF_TEAMS = 30

2
constants/script_constants.asm
View File

@ -200,7 +200,7 @@ EMOTE_MEM EQU -1
const FRUITTREE_PEWTER_CITY_1 ; 1c const FRUITTREE_PEWTER_CITY_1 ; 1c
const FRUITTREE_PEWTER_CITY_2 ; 1d const FRUITTREE_PEWTER_CITY_2 ; 1d
const FRUITTREE_FUCHSIA_CITY ; 1e const FRUITTREE_FUCHSIA_CITY ; 1e
NUM_FRUIT_TREES EQU const_value +- 1 NUM_FRUIT_TREES EQU const_value + -1
; describedecoration arguments ; describedecoration arguments
; DescribeDecoration.JumpTable indexes (see engine/decorations.asm) ; DescribeDecoration.JumpTable indexes (see engine/decorations.asm)

2
data/wild/roammon_maps.asm
View File

@ -4,7 +4,7 @@
roam_map: MACRO roam_map: MACRO
map \1 map \1
db _NARG - 1 db _NARG - 1
rept _NARG +- 1 rept _NARG + -1
map \2 map \2
shift shift
endr endr

4
docs/bugs_and_glitches.md
View File

@ -1110,7 +1110,7 @@ In [engine/search.asm](/engine/search.asm):
ld hl, PlayerName 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] ld a, [de]
cp [hl] cp [hl]
jr nz, .notfound jr nz, .notfound
@ -1132,7 +1132,7 @@ endr
ret ret
``` ```
**Fix:** Change `rept NAME_LENGTH_JAPANESE +- 2` to `rept PLAYER_NAME_LENGTH +- 2`. **Fix:** Change `rept NAME_LENGTH_JAPANESE + -2` to `rept PLAYER_NAME_LENGTH + -2`.
## Catching a Transformed Pokémon always catches a Ditto ## Catching a Transformed Pokémon always catches a Ditto

2
engine/battle_anims/anim_commands.asm
View File

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

4
engine/billspc.asm
View File

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

4
engine/events/battle_tower/battle_tower.asm
View File

@ -408,10 +408,10 @@ ValidateBTParty: ; 170394
ld a, [hl] ld a, [hl]
and a and a
x = $ff x = $ff
rept ($ff +- NUM_POKEMON) rept ($ff + -NUM_POKEMON)
jr z, .invalid jr z, .invalid
cp x cp x
x = x +- 1 x = x + -1
endr endr
jr nz, .valid jr nz, .valid

2
engine/events/bug_contest/judging.asm
View File

@ -229,7 +229,7 @@ DetermineContestWinners: ; 1383e
CopyTempContestant: ; 138a0 CopyTempContestant: ; 138a0
; Could've just called CopyBytes. ; Could've just called CopyBytes.
ld de, wBugContestTempWinnerID ld de, wBugContestTempWinnerID
rept BUG_CONTESTANT_SIZE +- 1 rept BUG_CONTESTANT_SIZE + -1
ld a, [de] ld a, [de]
inc de inc de
ld [hli], a ld [hli], a

2
engine/events/celebi.asm
View File

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

2
engine/events/field_moves.asm
View File

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

4
engine/events/print_unown_2.asm
View File

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

2
engine/evolution_animation.asm
View File

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

2
engine/options_menu.asm
View File

@ -120,7 +120,7 @@ Options_TextSpeed: ; e42f5
ld a, c ; right pressed ld a, c ; right pressed
cp OPT_TEXT_SPEED_SLOW cp OPT_TEXT_SPEED_SLOW
jr c, .Increase jr c, .Increase
ld c, OPT_TEXT_SPEED_FAST +- 1 ld c, OPT_TEXT_SPEED_FAST + -1
.Increase: .Increase:
inc c inc c

2
engine/pic_animation.asm
View File

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

2
engine/search.asm
View File

@ -219,7 +219,7 @@ CheckOwnMon: ; 0x4a7ba
ld hl, PlayerName 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] ld a, [de]
cp [hl] cp [hl]
jr nz, .notfound jr nz, .notfound

2
engine/slot_machine.asm
View File

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

2
engine/stats_screen.asm
View File

@ -2,7 +2,7 @@
const PINK_PAGE ; 1 const PINK_PAGE ; 1
const GREEN_PAGE ; 2 const GREEN_PAGE ; 2
const BLUE_PAGE ; 3 const BLUE_PAGE ; 3
NUM_STAT_PAGES EQU const_value +- 1 NUM_STAT_PAGES EQU const_value + -1
BattleStatsScreenInit: ; 4dc7b (13:5c7b) BattleStatsScreenInit: ; 4dc7b (13:5c7b)
ld a, [wLinkMode] ld a, [wLinkMode]

2
engine/title.asm
View File

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

2
gfx/tilesets/palette_maps.asm
View File

@ -2,7 +2,7 @@ tilepal: MACRO
; used in gfx/tilesets/*_palette_map.asm ; used in gfx/tilesets/*_palette_map.asm
; vram bank, pals ; vram bank, pals
x = \1 << OAM_TILE_BANK x = \1 << OAM_TILE_BANK
rept (_NARG +- 1) / 2 rept (_NARG + -1) / 2
dn (x | PAL_BG_\3), (x | PAL_BG_\2) dn (x | PAL_BG_\3), (x | PAL_BG_\2)
shift shift
shift shift

2
macros/data.asm
View File

@ -112,7 +112,7 @@ ENDM
sine_wave: MACRO sine_wave: MACRO
x = 0 x = 0.0
rept \1 rept \1
dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees" x = x + (32768.0 / \1) ; a circle has 65536.0 "degrees"

2
macros/scripts/gfx_anims.asm
View File

@ -4,7 +4,7 @@ frame: MACRO
db \1 db \1
x = \2 x = \2
if _NARG > 2 if _NARG > 2
rept _NARG +- 2 rept _NARG + -2
x = x | (1 << (\3 + 1)) x = x | (1 << (\3 + 1))
shift shift
endr endr

8
macros/wram.asm
View File

@ -107,7 +107,7 @@ box: MACRO
\1Species:: ds MONS_PER_BOX + 1 \1Species:: ds MONS_PER_BOX + 1
\1Mons:: \1Mons::
\1Mon1:: box_struct \1Mon1 \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 \1MonOT:: ds NAME_LENGTH * MONS_PER_BOX
\1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX \1MonNicknames:: ds MON_NAME_LENGTH * MONS_PER_BOX
\1MonNicknamesEnd:: \1MonNicknamesEnd::
@ -175,7 +175,7 @@ channel_struct: MACRO
ENDM ENDM
battle_tower_struct: MACRO battle_tower_struct: MACRO
\1Name:: ds NAME_LENGTH +- 1 \1Name:: ds NAME_LENGTH + -1
\1TrainerClass:: ds 1 \1TrainerClass:: ds 1
\1Pkmn1:: party_struct \1Pkmn1 \1Pkmn1:: party_struct \1Pkmn1
\1Pkmn1Name:: ds MON_NAME_LENGTH \1Pkmn1Name:: ds MON_NAME_LENGTH
@ -221,7 +221,7 @@ hof_mon: MACRO
\1ID:: dw \1ID:: dw
\1DVs:: dw \1DVs:: dw
\1Level:: db \1Level:: db
\1Nickname:: ds MON_NAME_LENGTH +- 1 \1Nickname:: ds MON_NAME_LENGTH + -1
\1End:: \1End::
ENDM ENDM
@ -237,7 +237,7 @@ hall_of_fame: MACRO
ENDM ENDM
link_battle_record: MACRO link_battle_record: MACRO
\1Name:: ds NAME_LENGTH +- 1 \1Name:: ds NAME_LENGTH + -1
\1ID:: dw \1ID:: dw
\1Wins:: dw \1Wins:: dw
\1Losses:: dw \1Losses:: dw

2
mobile/fixed_words.asm
View File

@ -4120,7 +4120,7 @@ macro_11f220: MACRO
; 12 words per page (0-based indexing) ; 12 words per page (0-based indexing)
x = \1 / 12 x = \1 / 12
if \1 % 12 == 0 if \1 % 12 == 0
x = x +- 1 x = x + -1
endc endc
db x db x
ENDM ENDM