thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix, ball miss text enhancements

Browse source 
This fixes a bug where Meltans would invade Trainer Battles under the effects of the Mystery Box.

I also did some minor groundwork where the Candy Jar check is a function. I intend to change it so that catching a Pokemon would incur it too. I ended up with glitches when doing that, though.

The "ball miss" message is now modular, with a new message being spat out when not in the Safari Zone. The message talks about it being "too strong" and "breaking the ball", making it far more intense and matching some early anime scenes.
This commit is contained in:
Llinos Evans 2023-06-04 10:52:00 +01:00
parent d07897bb4f
commit 0aa26308f2
6 changed files with 46 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
engine/items/item_effects.asm
View file

@ -497,9 +497,23 @@ ItemUseBall:
cp $10
ld hl, ItemUseBallText00
jp z, .printMessage
cp $20
ld hl, ItemUseBallText01
jp z, .printMessage
; The "ball miss" message has been reworked. I want to make it less misleading.
; Essentially, in normal battles, it'll say the Pokemon is too strong and broke the ball.
; In the Safari Zone, this mechanic happens a lot, so I'll keep the old text for that.
; This results in a convoluted series of statements, but I think I did a good job.
cp $20 ; First, let's load the usual ball anim check.
jr nz, .skip ; We're skipping from here early to make life easier for us.
ld hl, ItemUseBallText01 ; Load Safari Zone version (this is the old text)
ld a, [wBattleType] ; Alright, what are we actually working with here?
cp BATTLE_TYPE_SAFARI ; Safari Zone?
jp z, .printMessage ; Yep? Alright, ship the old text.
ld hl, ItemUseBallText01_Alt ; No? New one, then.
jp .printMessage ; Here ya go, pardner.
.skip
ld a, [wPokeBallAnimData] ; ok back to normal :3
cp $61
ld hl, ItemUseBallText02
jp z, .printMessage
@ -647,6 +661,10 @@ ItemUseBallText01:
;"You missed the pokemon!"
text_far _ItemUseBallText01
text_end
ItemUseBallText01_Alt:
;"It's too strong!"
text_far _ItemUseBallText01_Alt
text_end
ItemUseBallText02:
;"Darn! The pokemon broke free!"
text_far _ItemUseBallText02