Bug Fixes & Enhancements

- Most, if not all, Silph Co. warps have been fixed. Inappropriate ones have been removed.
- The Metal Coat can now be found where one corrupted Silph Co. warp was to fill dead space, and another is in the Power Plant, replacing Carbos.
- Bill now trades you Hisuian Arcanine after being saved.
- Bill's Grandfather now trades you Hisuian Electrode. Had to remove Crinkles, but Tangela is literally right next to Cinnabar, c'mon lol
- Toedscool can now be found behind Pallet Town, replacing Gloom and Weepinbell, making it more focused.
- Now you can't run from Omega! May expand this to more Pokemon depending on feedback and whether it's ok on processing. Main concern is making the run button too laggy - it raised some eyebrows.
This commit is contained in:
Llinos Evans 2023-09-02 19:33:14 +01:00
parent 6da8a703ab
commit dadd7ee6a6
21 changed files with 192 additions and 46 deletions

View file

@ -1594,6 +1594,9 @@ TryRunningFromBattle:
cp BATTLE_TYPE_SAFARI
jp z, .canEscape ; jump if it's a safari battle
ld a, [wLinkState]
ld a, [wCurOpponent]
cp OMEGA
jp z, .omegaCantEscape
cp LINK_STATE_BATTLING
jp z, .canEscape
ld a, [wIsInBattle]
@ -1666,6 +1669,9 @@ TryRunningFromBattle:
ld [wActionResultOrTookBattleTurn], a ; you lose your turn when you can't escape
ld hl, CantEscapeText
jr .printCantEscapeOrNoRunningText
.omegaCantEscape
ld hl, NoRunningOmega
jr .printCantEscapeOrNoRunningText
.trainerBattle
ld hl, NoRunningText
.printCantEscapeOrNoRunningText
@ -1712,6 +1718,13 @@ NoRunningText:
text_far _NoRunningText
text_end
NoRunningOmega:
text "It's far too"
line "aggressive! You"
cont "can't run!"
prompt
text_end
GotAwayText:
text_far _GotAwayText
text_end