Trainer data structure and field move functions

Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.

1 files changed, 39 insertions, 30 deletions

diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm
index eadfa7d78..d49afb253 100644
--- a/constants/phone_constants.asm
+++ b/constants/phone_constants.asm
@@ -1,34 +1,43 @@
 
-PHONE_SCHOOLBOY_JACK EQU $05
-PHONE_POKEFAN_BEVERLY EQU $06
-PHONE_SAILOR_HUEY EQU $07
-
-PHONE_COOLTRAINERM_GAVEN EQU $0b
-PHONE_COOLTRAINERF_BETH EQU $0c
-PHONE_BIRDKEEPER_JOSE EQU $0d
-PHONE_COOLTRAINERF_REENA EQU $0e
-PHONE_YOUNGSTER_JOEY EQU $0f
-PHONE_BUG_CATCHER_WADE EQU $10
-PHONE_FISHER_RALPH EQU $11
-PHONE_PICNICKER_LIZ EQU $12
-PHONE_HIKER_ANTHONY EQU $13
-PHONE_CAMPER_TODD EQU $14
-PHONE_PICNICKER_GINA EQU $15
-PHONE_JUGGLER_IRWIN EQU $16
-PHONE_BUG_CATCHER_ARNIE EQU $17
-PHONE_SCHOOLBOY_ALAN EQU $18
-
-PHONE_LASS_DANA EQU $1a
-PHONE_SCHOOLBOY_CHAD EQU $1b
-PHONE_POKEFANM_DEREK EQU $1c
-PHONE_FISHER_TULLY EQU $1d
-PHONE_POKEMANIAC_BRENT EQU $1e
-PHONE_PICNICKER_TIFFANY EQU $1f
-PHONE_BIRDKEEPER_VANCE EQU $20
-PHONE_FISHER_WILTON EQU $21
-PHONE_BLACKBELT_KENJI EQU $22
-PHONE_HIKER_PARRY EQU $23
-PHONE_PICNICKER_ERIN EQU $24
+	const_def
+	const PHONE_00
+	const PHONE_MOM
+	const PHONE_OAK
+	const PHONE_BILL
+	const PHONE_ELM
+	const PHONE_SCHOOLBOY_JACK
+	const PHONE_POKEFAN_BEVERLY
+	const PHONE_SAILOR_HUEY
+	const PHONE_08
+	const PHONE_09
+	const PHONE_0A
+	const PHONE_COOLTRAINERM_GAVEN
+	const PHONE_COOLTRAINERF_BETH
+	const PHONE_BIRDKEEPER_JOSE
+	const PHONE_COOLTRAINERF_REENA
+	const PHONE_YOUNGSTER_JOEY
+	const PHONE_BUG_CATCHER_WADE
+	const PHONE_FISHER_RALPH
+	const PHONE_PICNICKER_LIZ
+	const PHONE_HIKER_ANTHONY
+	const PHONE_CAMPER_TODD
+	const PHONE_PICNICKER_GINA
+	const PHONE_JUGGLER_IRWIN
+	const PHONE_BUG_CATCHER_ARNIE
+	const PHONE_SCHOOLBOY_ALAN
+	const PHONE_19
+	const PHONE_LASS_DANA
+	const PHONE_SCHOOLBOY_CHAD
+	const PHONE_POKEFANM_DEREK
+	const PHONE_FISHER_TULLY
+	const PHONE_POKEMANIAC_BRENT
+	const PHONE_PICNICKER_TIFFANY
+	const PHONE_BIRDKEEPER_VANCE
+	const PHONE_FISHER_WILTON
+	const PHONE_BLACKBELT_KENJI
+	const PHONE_HIKER_PARRY
+	const PHONE_PICNICKER_ERIN
+	const PHONE_BUENA
 
 	const_def
 	const ELMCALL_NONE