diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /items | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_descriptions.asm | 3 | ||||
| -rw-r--r-- | items/item_effects.asm | 44 |
2 files changed, 19 insertions, 28 deletions
diff --git a/items/item_descriptions.asm b/items/item_descriptions.asm index 7ff574d11..40e91b2c9 100644 --- a/items/item_descriptions.asm +++ b/items/item_descriptions.asm @@ -21,9 +21,8 @@ PrintItemDescription: ; 0x1c8955 dec a ld c, a ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld e, [hl] inc hl ld d, [hl] diff --git a/items/item_effects.asm b/items/item_effects.asm index ef05de8fd..3c2dc2457 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -253,9 +253,8 @@ ParkBall: ; e8a2 jr z, .skip_or_return_from_ball_fn cp c jr z, .call_ball_function -rept 2 inc hl -endr + inc hl jr .get_multiplier_loop .call_ball_function @@ -288,9 +287,8 @@ endr ld h, d ld l, e -rept 2 add hl, de -endr + add hl, de ld d, h ld e, l ld a, d @@ -805,9 +803,8 @@ HeavyBallMultiplier: dec a ld e, a ld d, 0 -rept 2 add hl, de -endr + add hl, de ld a, BANK(PokedexDataPointerTable) call GetFarHalfword @@ -820,9 +817,8 @@ endr call GetPokedexEntryBank push bc -rept 2 inc hl -endr + inc hl call GetFarHalfword srl h @@ -868,9 +864,8 @@ endr ld a, c cp [hl] jr c, .heavymon -rept 2 inc hl -endr + inc hl jr .lookup .heavymon @@ -929,9 +924,8 @@ GLOBAL EvosAttacksPointers ld c, a ld b, 0 ld hl, EvosAttacksPointers -rept 2 add hl, bc -endr + add hl, bc ld a, BANK(EvosAttacksPointers) call GetFarHalfword pop bc @@ -943,9 +937,9 @@ endr pop bc ret nz -rept 3 inc hl -endr + inc hl + inc hl ; Moon Stone's constant from Pokémon Red is used. ; No Pokémon evolve with Burn Heal, @@ -2127,9 +2121,8 @@ GetHealingItemAmount: ; f395 (3:7395) jr z, .NotFound cp d jr z, .done -rept 2 inc hl -endr + inc hl jr .next .NotFound: @@ -2335,9 +2328,8 @@ XSpecial: ; f4c5 .loop cp [hl] jr z, .got_it -rept 2 inc hl -endr + inc hl jr .loop .got_it @@ -2488,20 +2480,20 @@ CoinCase: ; f59a OldRod: ; f5a5 ld e, $0 - jr Function_0xf5b1 + jr UseRod ; f5a9 GoodRod: ; f5a9 ld e, $1 - jr Function_0xf5b1 + jr UseRod ; f5ad SuperRod: ; f5ad ld e, $2 - jr Function_0xf5b1 + jr UseRod ; f5b1 -Function_0xf5b1: ; f5b1 +UseRod: ; f5b1 callba FishFunction ret ; f5b8 @@ -2523,7 +2515,7 @@ Mysteryberry: ; f5bf ld [wd002], a .loop - ; Party Screen opens to choose on which Pkmn to use the Item + ; Party Screen opens to choose on which Pkmn to use the Item ld b, PARTYMENUACTION_HEALING_ITEM call UseItem_SelectMon jp c, PPRestoreItem_Cancel @@ -2937,7 +2929,7 @@ Play_SFX_FULL_HEAL: ; f780 ret ; f789 -UseItemText ; f789 +UseItemText: ; f789 ld hl, UsedItemText call PrintText call Play_SFX_FULL_HEAL @@ -3250,11 +3242,11 @@ GetMaxPPOfMove: ; f8ec ld hl, TempMonMoves ; Wasted cycles dec a - jr z, .got_nonpartymon ; BREEDMON + jr z, .got_nonpartymon ; TEMPMON ld hl, BattleMonMoves ; WILDMON -.got_nonpartymon ; BOXMON, BREEDMON, WILDMON +.got_nonpartymon ; BOXMON, TEMPMON, WILDMON call GetMthMoveOfCurrentMon jr .gotdatmove |