From ef6eb622c4307d4ef92ee5491503fefd1c55957c Mon Sep 17 00:00:00 2001
From: IIMarckus <iimarckus@gmail.com>
Date: Mon, 14 Nov 2011 02:48:50 -0700
Subject: [PATCH] Minor clarifications in Pallet Town scripts.

hg-commit-id: f42fc4aeadc6
---
 constants.asm | 5 +++++
 pokered.asm   | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/constants.asm b/constants.asm
index 09e97a9a..e25054a9 100644
--- a/constants.asm
+++ b/constants.asm
@@ -82,8 +82,13 @@ W_ISLINKBATTLE EQU $D12B
 
 W_CURMAP EQU $D35E
 
+W_YCOORD EQU $D361 ; player’s position on the current map
+W_XCOORD EQU $D362
+
 W_RIVALSTARTER EQU $D715
 
+W_PLAYERSTARTER EQU $D717
+
 W_GRASSRATE EQU $D887
 W_GRASSMONS EQU $D888
 W_WATERRATE EQU $D8A4 ; OVERLOADED
diff --git a/pokered.asm b/pokered.asm
index fc849d7d..bd26392d 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -3811,8 +3811,8 @@ PalletTownScript1:
 	ld a,[$D747]
 	bit 0,a
 	ret nz
-	ld a,[$D361]
-	cp 1
+	ld a,[W_YCOORD]
+	cp 1 ; is player near north exit?
 	ret nz
 	xor a
 	ld [$FFB4],a
@@ -3860,7 +3860,7 @@ PalletTownScript3:
 	call $34A6
 	call Delay3
 	ld a,1
-	ld [$D361],a
+	ld [W_YCOORD],a
 	ld a,1
 	ld [$FF9B],a
 	ld a,1
@@ -3871,7 +3871,7 @@ PalletTownScript3:
 	ld hl,$FF95
 	dec [hl]
 	ld a,$20
-	call Predef
+	call Predef ; load Oak’s movement into $CC97
 	ld de,$CC97
 	ld a,1
 	ld [$FF8C],a