From b56c1b6351f51742903250ee0c4eae9d22e2b6a5 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 3 Nov 2020 10:12:54 -0500 Subject: More syncing with pokecrystal --- engine/items/item_effects.asm | 2 +- engine/items/mart.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/items') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 7b43eb82..721819a7 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1304,7 +1304,7 @@ RareCandyEffect: ld a, [hl] adc b ld [hl], a - ld c, 1 + ld c, HAPPINESS_GAINLEVEL farcall ChangeHappiness ld a, PARTYMENUTEXT_LEVEL_UP diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 16bb9c33..2ab56231 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -8,7 +8,7 @@ GetMart: ld a, e - cp (Marts.End - Marts) / 2 + cp NUM_MARTS jr c, .IsAMart ld b, BANK(DefaultMart) ld de, DefaultMart -- cgit v1.2.3