diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-03-14 18:56:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 18:56:39 -0400 |
| commit | 179dc85ba1464ce6ec358f54a638e1dd70fb8283 (patch) | |
| tree | 27e8cfe2b50d7d16bc53beeeb57bf416afb8a988 | |
| parent | 27052bf60a527797f97b0e027a43a5766dc3a0a6 (diff) | |
| parent | 2ffbde764ec46d49e696df1f7d8b4b038638afad (diff) | |
Merge pull request #616 from Rangi42/master
Minor code+docs fixes
| -rw-r--r-- | docs/bugs_and_glitches.md | 2 | ||||
| -rw-r--r-- | engine/gfx/color.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index d5fb2b7bb..2d2b48fba 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1137,7 +1137,7 @@ Then edit [engine/battle/start_battle.asm](https://github.com/pret/pokecrystal/b xor a ldh [hMapAnims], a call DelayFrame -- ld b, 6 +- ld b, PARTY_LENGTH - ld hl, wPartyMon1HP - ld de, PARTYMON_STRUCT_LENGTH - 1 - diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 57ea26102..ec500e85f 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1091,7 +1091,7 @@ SGBBorder_MorePalPushing: jr nz, .loop ld bc, $140 call CopyData - ld bc, Start + ld bc, $100 call ClearBytes ld bc, 16 palettes call CopyData |