diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 260c7d7e..fcbabf01 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 8a221887..e638892b 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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