From 6c25592b8c43afe9780968da88f9b06cbb526e72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 19 Oct 2015 16:49:29 -0400 Subject: So very jumb --- constants/trainer_constants.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'constants/trainer_constants.asm') diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 807eb74ee..9da19e44e 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,5 +1,7 @@ ; trainer groups - enum_start 1 + enum_start + trainerclass PHONE ; 0 + trainerclass FALKNER ; 1 trainerclass WHITNEY ; 2 -- cgit v1.2.3 From 97cc513f54b6213a31070b0875fd85e920a2109b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 21 Oct 2015 10:43:42 -0400 Subject: Plus 4 on person events; feeble attempt to annotate color functions --- constants/trainer_constants.asm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'constants/trainer_constants.asm') diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 9da19e44e..7113e3dec 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,6 +1,11 @@ ; trainer groups enum_start trainerclass PHONE ; 0 + const MOM_PHONE + const OAK_PHONE + const BILL_PHONE + const ELM_PHONE + const BUENA_PHONE trainerclass FALKNER ; 1 -- cgit v1.2.3 From 119d6b411922eb7b375691b81fc97c9b334f4167 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 10:34:19 -0400 Subject: About time I got to these functions --- constants/trainer_constants.asm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'constants/trainer_constants.asm') diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 7113e3dec..be46783e5 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -614,3 +614,33 @@ const EUSINE NUM_TRAINER_CLASSES EQU __enum__ + + const_def + const NO_AI +const_value = 0 + shift_const AI_BASIC + shift_const AI_SETUP + shift_const AI_TYPES + shift_const AI_OFFENSIVE + shift_const AI_SMART + shift_const AI_OPPORTUNIST + shift_const AI_AGGRESSIVE + shift_const AI_CAUTIOUS + shift_const AI_STATUS + shift_const AI_RISKY + shift_const AI_10 + shift_const AI_11 + shift_const AI_12 + shift_const AI_13 + shift_const AI_14 + shift_const AI_15 + + const_def + const TRNATTR_ITEM1 + const TRNATTR_ITEM2 + const TRNATTR_BASEMONEY + const TRNATTR_AI1 + const TRNATTR_AI2 + const TRNATTR_AI3 + const TRNATTR_AI4 +NUM_TRAINER_ATTRIBUTES EQU const_value -- cgit v1.2.3 From 4d17f6e1f6d41b91f5a5de71984a7c6f2bd0041c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 24 Oct 2015 19:49:19 -0400 Subject: Address comments on PR 322 --- constants/trainer_constants.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'constants/trainer_constants.asm') diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index be46783e5..e53c201b2 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,11 +1,11 @@ ; trainer groups enum_start - trainerclass PHONE ; 0 - const MOM_PHONE - const OAK_PHONE - const BILL_PHONE - const ELM_PHONE - const BUENA_PHONE + trainerclass TRAINER_NONE ; 0 + const PHONECONTACT_MOM + const PHONECONTACT_BIKESHOP + const PHONECONTACT_BILL + const PHONECONTACT_ELM + const PHONECONTACT_BUENA trainerclass FALKNER ; 1 -- cgit v1.2.3