diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-23 21:05:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 21:05:39 -0400 |
| commit | 63798d56d05cf87ada77bd26727ea7725630b0b2 (patch) | |
| tree | c90b2bebe86dffe78e6597d220f70196d3e69e25 /engine/events | |
| parent | 624864307e4e7a5055c01d7f06145feec35527a7 (diff) | |
| parent | 0345e4fb0e3f39a038e9eced72380a5a1ab6694f (diff) | |
Merge pull request #699 from Rangi42/master
Resolve some miscellaneous issues
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rw-r--r-- | engine/events/bug_contest/judging.asm | 2 | ||||
| -rw-r--r-- | engine/events/celebi.asm | 2 | ||||
| -rw-r--r-- | engine/events/field_moves.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown_2.asm | 4 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 |
6 files changed, 8 insertions, 8 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 diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index b7426caec..b3a0082e1 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -535,7 +535,7 @@ InitializeEventsScript: setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_DECO_BED_1 - setevent EVENT_DECO_PLANT_4 + setevent EVENT_DECO_POSTER_1 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN setevent EVENT_OLIVINE_GYM_JASMINE setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN |