From 9fbd9e9a1f23ff3fe09eee2518dd752a6d2e132c Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Thu, 16 Jul 2015 22:08:34 -0700
Subject: intro stuff

---
 engine/overworld/npc_movement.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engine/overworld')

diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index aabc2de8..fcef55e0 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -74,7 +74,7 @@ PalletMovementScript_OakMoveLeft: ; 1a44c (6:644c)
 	jr .done
 ; The player is on the left tile of the northern path out of Pallet Town and
 ; Prof. Oak is below.
-; Prof. Oak is already on the right tile.
+; Prof. Oak is already where he needs to be.
 .playerOnLeftTile
 	ld a, $3
 	ld [wNPCMovementScriptFunctionNum], a
-- 
cgit v1.2.3


From 6931ce96259d366263c63e704dfaac6f241d8e4a Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Fri, 17 Jul 2015 01:21:40 -0700
Subject: money / coins hram constants

---
 engine/overworld/hidden_items.asm | 16 ++++++++--------
 engine/overworld/pokemart.asm     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'engine/overworld')

diff --git a/engine/overworld/hidden_items.asm b/engine/overworld/hidden_items.asm
index 868f118f..910fcf04 100755
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -67,9 +67,9 @@ HiddenCoins: ; 76799 (1d:6799)
 	and a
 	ret nz
 	xor a
-	ld [$ff9f], a
-	ld [$ffa0], a
-	ld [$ffa1], a
+	ld [hCoins - 1], a
+	ld [hCoins], a
+	ld [hCoins + 1], a
 	ld a, [wWhichTrade]
 	sub COIN
 	cp 10
@@ -81,22 +81,22 @@ HiddenCoins: ; 76799 (1d:6799)
 	jr .bcd100
 .bcd10
 	ld a, $10
-	ld [$ffa1], a
+	ld [hCoins + 1], a
 	jr .bcddone
 .bcd20
 	ld a, $20
-	ld [$ffa1], a
+	ld [hCoins + 1], a
 	jr .bcddone
 .bcd40 ; due to a typo, this is never used
 	ld a, $40
-	ld [$ffa1], a
+	ld [hCoins + 1], a
 	jr .bcddone
 .bcd100
 	ld a, $1
-	ld [$ffa0], a
+	ld [hCoins], a
 .bcddone
 	ld de, wPlayerCoins + 1
-	ld hl, $ffa1
+	ld hl, hCoins + 1
 	ld c, $2
 	predef AddBCDPredef
 	ld hl, wd6fe
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index 2caada1d..e6fdfc92 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -206,7 +206,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	jp .loop
 .isThereEnoughMoney
 	ld de,wPlayerMoney
-	ld hl,$ff9f ; item price
+	ld hl,hMoney
 	ld c,3 ; length of money in bytes
 	jp StringCmp
 .notEnoughMoney
-- 
cgit v1.2.3