From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- engine/fruit_trees.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/fruit_trees.asm') diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 26002641a..2dd43eda1 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041 ; 4404c TryResetFruitTrees: ; 4404c - ld hl, wdc1e + ld hl, DailyFlags bit 4, [hl] ret nz jp ResetFruitTrees @@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a ld [hli], a ld [hli], a ld [hl], a - ld hl, wdc1e + ld hl, DailyFlags set 4, [hl] ret ; 44078 -- cgit v1.2.3 From 471492b775fc2a0f5162f3d1c13c5472359beb14 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 22:18:18 -0400 Subject: Reverted ld_hl_pointer macro --- engine/fruit_trees.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/fruit_trees.asm') diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 2dd43eda1..9404a5564 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -66,9 +66,9 @@ PickedFruitTree: ; 4405f ResetFruitTrees: ; 4406a xor a ld hl, FruitTreeFlags +rept 3 ld [hli], a - ld [hli], a - ld [hli], a +endr ld [hl], a ld hl, DailyFlags set 4, [hl] -- cgit v1.2.3