diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-04-17 18:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 18:25:59 +0000 |
| commit | 19aee926af86c1351ca85ca45da26f5d6f3cd8d6 (patch) | |
| tree | 82d2d640096a0cb3fc2dddec35fb9ac5a2addfef /engine/events | |
| parent | 93ed0ed19ce615f99a36062cd2133e8ee2e75cc1 (diff) | |
| parent | 164e1b89afc1773a14598c377c8c8d0bfa01a1a1 (diff) | |
Merge pull request #712 from Rangi42/master
Miscellaneous fixes
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/diploma.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown.asm | 6 | ||||
| -rw-r--r-- | engine/events/print_unown_2.asm | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 7cb982de5..f0008b7fd 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -52,7 +52,7 @@ PlaceDiplomaOnScreen: PrintDiplomaPage2: hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, $7f + ld a, " " call ByteFill ld hl, DiplomaPage2Tilemap decoord 0, 0 diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index f90d225fb..484ea3792 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -112,7 +112,7 @@ _UnownPrinter: ld a, [hl] and a jr nz, .wrap_around_left - ld [hl], 26 + 1 + ld [hl], NUM_UNOWN + 1 .wrap_around_left dec [hl] jr .return @@ -120,7 +120,7 @@ _UnownPrinter: .press_right ld hl, wJumptableIndex ld a, [hl] - cp 26 + cp NUM_UNOWN jr c, .wrap_around_right ld [hl], -1 .wrap_around_right @@ -132,7 +132,7 @@ _UnownPrinter: .UpdateUnownFrontpic: ld a, [wJumptableIndex] - cp 26 + cp NUM_UNOWN jr z, .vacant inc a ld [wUnownLetter], a diff --git a/engine/events/print_unown_2.asm b/engine/events/print_unown_2.asm index 5dc7b1b94..8751c2434 100644 --- a/engine/events/print_unown_2.asm +++ b/engine/events/print_unown_2.asm @@ -1,7 +1,7 @@ RotateUnownFrontpic: ; something to do with Unown printer push de - xor a ; sScratch + xor a ; BANK(sScratch) call GetSRAMBank ld hl, sScratch ld bc, 0 |