thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +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

19
engine/battle/core.asm
View file

@ -863,7 +863,7 @@ FaintEnemyPokemon:
ld a, $01
ld [wDontSwitchOffMysteryBoxYet], a
ld hl, MeltanIncrement ; Load text to show it's going up.
ld hl, _MeltanIncrement ; Load text to show it's going up.
call PrintText ; Yep text.
call PrintEmptyString ; vs text likes this.
.skip
@ -6220,11 +6220,17 @@ LoadEnemyMonData:
cp LINK_STATE_BATTLING
jp z, LoadEnemyMonFromParty
; Upon initiating a battle, check if the Mystery Box has been activated.
; Mystery Box functionality.
; First, we need to check if it's a trainer battle, or everyone will use Meltan.
ld a, [wIsInBattle]
cp $2 ; is it a trainer battle?
jr z, .skip ; If so, skip.
; Upon initiating a battle, if not a trainer battle, check if the Mystery Box has been activated.
; ~50% of the time, Meltan will replace what you encounter.
ld a, [wMysteryBoxActive] ; Load the box.
cp $01 ; Check if it's active.
jr nz, .cont ; If not, load a normal Pokemon. I know this looks sort of weird, it's just how it panned out.
jr nz, .skip ; If not, load a normal Pokemon. I know this looks sort of weird, it's just how it panned out.
; This didn't work for some reason. It seems unnecessary, anyway...
;call Random
@ -6235,7 +6241,7 @@ LoadEnemyMonData:
ld a, MELTAN ; Meltan is loaded...
ld [wEnemyMonSpecies2], a ; Here!
.cont ; Standard loading.
.skip ; Standard loading.
ld a, [wEnemyMonSpecies2]
ld [wEnemyMonSpecies], a
ld [wd0b5], a
@ -7201,8 +7207,3 @@ StupidBattleTentFix:
text "Oops! Better"
line "luck next time!"
prompt
MeltanIncrement:
text "<PLAYER> found"
line "10 MELTAN CANDY!"
prompt