Fix some of the issues explained in #595

This commit is contained in:
Rangi 2019-01-27 14:00:21 -05:00
parent 9ecc991814
commit 4fe0d93d4c

View File

@ -281,7 +281,7 @@ This bug affects Acid, Iron Tail, and Rock Smash.
ld a, [hli] ld a, [hli]
or [hl] or [hl]
- ret z - ret z
+ jp z, .failed + jr z, .failed
``` ```
Add this to the end of each file: Add this to the end of each file:
@ -712,7 +712,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
## Moon Ball does not boost catch rate ## Moon Ball does not boost catch rate
**Fix:** Edit `MoonBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): **Fix:** Edit `MoonBallMultiplier` in [items/item_effects.asm](/engine/items/item_effects.asm):
```diff ```diff
-; Moon Stone's constant from Pokémon Red is used. -; Moon Stone's constant from Pokémon Red is used.
@ -730,7 +730,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
## Love Ball boosts catch rate for the wrong gender ## Love Ball boosts catch rate for the wrong gender
**Fix:** Edit `LoveBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): **Fix:** Edit `LoveBallMultiplier` in [items/item_effects.asm](/engine/items/item_effects.asm):
```diff ```diff
.wildmale .wildmale
@ -746,7 +746,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper
## Fast Ball only boosts catch rate for three Pokémon ## Fast Ball only boosts catch rate for three Pokémon
**Fix:** Edit `FastBallMultiplier` in [items/item_effects.asm](/items/item_effects.asm): **Fix:** Edit `FastBallMultiplier` in [items/item_effects.asm](/engine/items/item_effects.asm):
```diff ```diff
.loop .loop
@ -972,7 +972,7 @@ First, edit [engine/battle/battle_transition.asm](/engine/battle/battle_transiti
+ jr nz, .loop + jr nz, .loop
+ +
+.okay +.okay
+ ld de, MON_LEVEL - MON_HP + ld de, MON_LEVEL - MON_HP - 1
+ add hl, de + add hl, de
ld de, 0 ld de, 0
- ld a, [wBattleMonLevel] - ld a, [wBattleMonLevel]
@ -1067,10 +1067,10 @@ Finally, edit [engine/battle/read_trainer_party.asm](/engine/battle/read_trainer
+.skip_trainer +.skip_trainer
+ dec b + dec b
+ jr z, .got_trainer + jr z, .got_trainer
+.loop1 +.skip_party
+ ld a, [hli] + ld a, [hli]
+ cp $ff + cp $ff
+ jr nz, .loop1 + jr nz, .skip_party
+ jr .skip_trainer + jr .skip_trainer
+.got_trainer +.got_trainer
+ +