diff options
Diffstat (limited to 'engine/items')
| -rwxr-xr-x | engine/items/item_effects.asm | 14 | ||||
| -rwxr-xr-x | engine/items/items.asm | 6 | ||||
| -rwxr-xr-x | engine/items/pack.asm | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e270734d..cb441179 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1509,7 +1509,7 @@ Energypowder: ; f1e2 (3:71e2) EnergyRoot: ; f1e6 (3:71e6) ld c, $10 -asm_f1e8 +asm_f1e8: push bc call Functionf1ff pop bc @@ -1671,7 +1671,7 @@ Functionf310: ; f310 (3:7310) Functionf319: ; f319 (3:7319) call GetCurHPAnimMaxHP -asm_f31c +asm_f31c: ld a, MON_HP call GetPartyParamLocation ld [hl], d @@ -1950,7 +1950,7 @@ MaxRepel: ; f4bc (3:74bc) Repel: ; f4c0 (3:74c0) ld b, 100 -asm_f4c2 +asm_f4c2: ld a, [wRepelSteps] and a ld hl, Text_RepelsEffectsStillLinger @@ -2226,11 +2226,11 @@ PPUp: ; f606 (3:7606) call Functionf7c7 ld hl, Text_PPsIncreased ; $777b call PrintText -asm_f693 +asm_f693: call ClearPalettes jp Functionf7dc -asm_f699 +asm_f699: ld a, [wBattleMode] and a jr z, .asm_f6b3 @@ -2412,7 +2412,7 @@ NormalBox: ; f7aa (3:77aa) GorgeousBox: ; f7ae (3:77ae) ld c, DECOFLAG_GOLD_TROPHY_DOLL -asm_f7b0 +asm_f7b0: farcall ReceiveDecorationC ; 9:70d5 ld hl, Text_TrophyInside ; $77bf call PrintText @@ -2591,7 +2591,7 @@ Functionf843: Functionf848: ld hl, Text_CantGetOnYourItemNow -asm_f84b +asm_f84b: xor a ld [wFieldMoveSucceeded], a jp PrintText diff --git a/engine/items/items.asm b/engine/items/items.asm index 428f652e..7cd1de67 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -76,7 +76,7 @@ RemoveKeyItem: RemoveNormalItem: ld h, d ld l, e -remove_item_from_bag_or_pc +remove_item_from_bag_or_pc: jp RemoveItemAndQuantity _CheckItem:: ; d251 (3:5251) @@ -117,7 +117,7 @@ CheckKeyItem: CheckNormalItem: ld h, d ld l, e -check_item_in_bag_or_pc +check_item_in_bag_or_pc: jp CheckItemWithQuantity CheckBagOrPC: ; d288 (3:5288) @@ -531,7 +531,7 @@ GetItemAttr: ; d46d (3:546d) pop hl ret -ItemAttr_ReturnCarry +ItemAttr_ReturnCarry: ld a, $1 ld [wItemAttributeParamBuffer], a scf diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 1f2d533d..8edd2555 100755 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -866,23 +866,23 @@ Function10a86: call Function10e5b ret -asm_10a9c +asm_10a9c: call ClearBGPalettes jr asm_10aae -Function10aa1 +Function10aa1: call DoItemEffect ld a, [wFieldMoveSucceeded] and a jr z, Function10a75 cp $2 jr z, asm_10ab4 -asm_10aae +asm_10aae: ld a, $a ld [wce63], a ret -asm_10ab4 +asm_10ab4: xor a ld [wFieldMoveSucceeded], a ret @@ -918,7 +918,7 @@ DepositSellInitPackBuffers: ; 10ad5 (4:4ad5) call Function10e5b ret -DepositSellPack +DepositSellPack: .loop call Function10af7 call Function10b9f @@ -1152,7 +1152,7 @@ TutorialBallsMenuDataHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -asm_10c8a +asm_10c8a: push hl call Function10b92 pop hl |