thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Master Ball hotfix

Browse source 
This fixes an issue that caused regular Poke Balls to fail. Repositioned the Master Ball to fit with its processing.

This...may fix ViWalls's issue? For some reason, Poke Balls are glitching for him. This fixes *a* glitch, anyway.
This commit is contained in:
Llinos Evans 2023-07-30 00:30:59 +01:00
parent 52dbf39758
commit 57152ab70c
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/experience.asm
View file

@ -16,7 +16,7 @@ GainExperience:
xor a
; ld [wWhichPokemon], a
; ld hl, wPartyMon1
xor a
; xor a
ld [wWhichPokemon], a
.partyMonLoop ; loop over each mon and add gained exp
inc hl

19
engine/items/item_effects.asm
View file

@ -172,16 +172,7 @@ ItemUseBall:
and a
jp z, ItemUseNotTime
; By this point, the Master Ball is possible to use.
; This changes Chief's dialogue in the end-game.
ld hl, wcf91 ; Get item ID
ld a, [hl] ; Ayup
cp MASTER_BALL ; Is it the Master Ball fam?
jr nz, .masterBallSkip ; Aye?
SetEvent EVENT_USED_MASTER_BALL ; Aye.
; Balls can't catch trainers' Pokémon.
.masterBallSkip ; Get kicked over here if it's not.
; Balls can't catch trainer's Pokemon
dec a
jp nz, ThrowBallAtTrainerMon
@ -393,6 +384,14 @@ ItemUseBall:
jr c, .failedToCapture
.captured
; By this point, the Master Ball is possible to use.
; This changes Chief's dialogue in the end-game.
ld hl, wcf91 ; Get item ID
ld a, [hl] ; Ayup
cp MASTER_BALL ; Is it the Master Ball fam?
jr nz, .masterBallSkip ; Aye?
SetEvent EVENT_USED_MASTER_BALL ; Aye.
.masterBallSkip ; Get kicked over here if it's not.
jr .skipShakeCalculations
.failedToCapture