diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-04-23 19:07:41 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-04-23 19:07:41 -0400 |
| commit | cca2afe8273875723092c60e3c8e112c280f4384 (patch) | |
| tree | 1170d6dffc9fcf97b87345e7fa4bbd60c603787a | |
| parent | e4d60b4e5bdbb2303452e3c7f470e6eb02cae68c (diff) | |
More fixes for fixes
| -rw-r--r-- | docs/bugs_and_glitches.md | 5 | ||||
| -rw-r--r-- | engine/overworld/events.asm | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index a3a137dfb..c9437b3e1 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1711,6 +1711,7 @@ This supports up to six entries. call ValidateTempWildMonSpecies jr c, .nowildbattle +- ld a, b ; This is in the wrong place. cp UNOWN jr nz, .done ``` @@ -1726,7 +1727,7 @@ This supports up to six entries. ld de, 3 ld hl, .pointers call IsInArray - jr nc, .nope_bugged + jr nc, .nope pop bc inc hl @@ -1735,7 +1736,7 @@ This supports up to six entries. ld l, a jp hl - .nope_bugged + .nope - ; pop bc + pop bc xor a diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index b3efa9d86..178a889a3 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -560,7 +560,7 @@ TryObjectEvent: ld de, 3 ld hl, .pointers call IsInArray - jr nc, .nope_bugged + jr nc, .nope pop bc inc hl @@ -569,7 +569,7 @@ TryObjectEvent: ld l, a jp hl -.nope_bugged +.nope ; pop bc xor a ret |