Phone data 0/7 are time masks

2024-09-09 09:51:34 -07:00 · 2018-01-15 22:00:56 -05:00 · 2018-01-15 22:00:56 -05:00 · 2b82338920
commit 2b82338920
parent 9fb74161e5
3 changed files with 45 additions and 43 deletions
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@ -80,6 +80,8 @@ DAY      EQU 1 << DAY_F
 NITE     EQU 1 << NITE_F
 DARKNESS EQU 1 << DARKNESS_F

+ANYTIME EQU MORN | DAY | NITE
+
 ; ScriptFlags: ; d434
 SCRIPT_RUNNING EQU 2

--- a/data/phone/phone_contacts.asm
+++ b/data/phone/phone_contacts.asm
@ -1,51 +1,51 @@
 phone: MACRO
-; trainer class, trainer id, map, ?, script 1, ?, script 2
-	db  \1, \2
+; trainer class, trainer id, map, time 1, script 1, time 2, script 2
+	db \1, \2
 	map \3
-	db  \4
+	db \4
 	dba \5
-	db  \6
+	db \6
 	dba \7
 ENDM

 PhoneContacts: ; 9045f
 ; entries correspond to PHONE_* constants
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_MOM,      KRISS_HOUSE_1F,            7, MomPhoneScript,      0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,                  0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONECONTACT_BILL,     N_A,                       7, BillPhoneScript1,    0, BillPhoneScript2
-	phone TRAINER_NONE, PHONECONTACT_ELM,      ELMS_LAB,                  7, ElmPhoneScript1,     0, ElmPhoneScript2
-	phone SCHOOLBOY,    JACK1,                 NATIONAL_PARK,             7, JackPhoneScript1,    7, JackPhoneScript2
-	phone POKEFANF,     BEVERLY1,              NATIONAL_PARK,             7, BeverlyPhoneScript1, 7, BeverlyPhoneScript2
-	phone SAILOR,       HUEY1,                 OLIVINE_LIGHTHOUSE_2F,     7, HueyPhoneScript1,    7, HueyPhoneScript2
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone COOLTRAINERM, GAVEN3,                ROUTE_26,                  7, GavenPhoneScript1,   7, GavenPhoneScript2
-	phone COOLTRAINERF, BETH1,                 ROUTE_26,                  7, BethPhoneScript1,    7, BethPhoneScript2
-	phone BIRD_KEEPER,  JOSE2,                 ROUTE_27,                  7, JosePhoneScript1,    7, JosePhoneScript2
-	phone COOLTRAINERF, REENA1,                ROUTE_27,                  7, ReenaPhoneScript1,   7, ReenaPhoneScript2
-	phone YOUNGSTER,    JOEY1,                 ROUTE_30,                  7, JoeyPhoneScript1,    7, JoeyPhoneScript2
-	phone BUG_CATCHER,  WADE1,                 ROUTE_31,                  7, WadePhoneScript1,    7, WadePhoneScript2
-	phone FISHER,       RALPH1,                ROUTE_32,                  7, RalphPhoneScript1,   7, RalphPhoneScript2
-	phone PICNICKER,    LIZ1,                  ROUTE_32,                  7, LizPhoneScript1,     7, LizPhoneScript2
-	phone HIKER,        ANTHONY2,              ROUTE_33,                  7, AnthonyPhoneScript1, 7, AnthonyPhoneScript2
-	phone CAMPER,       TODD1,                 ROUTE_34,                  7, ToddPhoneScript1,    7, ToddPhoneScript2
-	phone PICNICKER,    GINA1,                 ROUTE_34,                  7, GinaPhoneScript1,    7, GinaPhoneScript2
-	phone JUGGLER,      IRWIN1,                ROUTE_35,                  7, IrwinPhoneScript1,   7, IrwinPhoneScript2
-	phone BUG_CATCHER,  ARNIE1,                ROUTE_35,                  7, ArniePhoneScript1,   7, ArniePhoneScript2
-	phone SCHOOLBOY,    ALAN1,                 ROUTE_36,                  7, AlanPhoneScript1,    7, AlanPhoneScript2
-	phone TRAINER_NONE, PHONE_00,              N_A,                       0, UnusedPhoneScript,   0, UnusedPhoneScript
-	phone LASS,         DANA1,                 ROUTE_38,                  7, DanaPhoneScript1,    7, DanaPhoneScript2
-	phone SCHOOLBOY,    CHAD1,                 ROUTE_38,                  7, ChadPhoneScript1,    7, ChadPhoneScript2
-	phone POKEFANM,     DEREK1,                ROUTE_39,                  7, DerekPhoneScript1,   7, DerekPhoneScript2
-	phone FISHER,       TULLY1,                ROUTE_42,                  7, TullyPhoneScript1,   7, TullyPhoneScript2
-	phone POKEMANIAC,   BRENT1,                ROUTE_43,                  7, BrentPhoneScript1,   7, BrentPhoneScript2
-	phone PICNICKER,    TIFFANY3,              ROUTE_43,                  7, TiffanyPhoneScript1, 7, TiffanyPhoneScript2
-	phone BIRD_KEEPER,  VANCE1,                ROUTE_44,                  7, VancePhoneScript1,   7, VancePhoneScript2
-	phone FISHER,       WILTON1,               ROUTE_44,                  7, WiltonPhoneScript1,  7, WiltonPhoneScript2
-	phone BLACKBELT_T,  KENJI3,                ROUTE_45,                  7, KenjiPhoneScript1,   7, KenjiPhoneScript2
-	phone HIKER,        PARRY1,                ROUTE_45,                  7, ParryPhoneScript1,   7, ParryPhoneScript2
-	phone PICNICKER,    ERIN1,                 ROUTE_46,                  7, ErinPhoneScript1,    7, ErinPhoneScript2
-	phone TRAINER_NONE, PHONECONTACT_BUENA,    GOLDENROD_DEPT_STORE_ROOF, 7, BuenaPhoneScript1,   7, BuenaPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_MOM,   KRISS_HOUSE_1F, ANYTIME, MomPhoneScript,      0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB,    0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONECONTACT_BILL,  N_A,            ANYTIME, BillPhoneScript1,    0,       BillPhoneScript2
+	phone TRAINER_NONE, PHONECONTACT_ELM,   ELMS_LAB,       ANYTIME, ElmPhoneScript1,     0,       ElmPhoneScript2
+	phone SCHOOLBOY,    JACK1,              NATIONAL_PARK,  ANYTIME, JackPhoneScript1,    ANYTIME, JackPhoneScript2
+	phone POKEFANF,     BEVERLY1,           NATIONAL_PARK,  ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2
+	phone SAILOR,       HUEY1,              OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone COOLTRAINERM, GAVEN3,             ROUTE_26,       ANYTIME, GavenPhoneScript1,   ANYTIME, GavenPhoneScript2
+	phone COOLTRAINERF, BETH1,              ROUTE_26,       ANYTIME, BethPhoneScript1,    ANYTIME, BethPhoneScript2
+	phone BIRD_KEEPER,  JOSE2,              ROUTE_27,       ANYTIME, JosePhoneScript1,    ANYTIME, JosePhoneScript2
+	phone COOLTRAINERF, REENA1,             ROUTE_27,       ANYTIME, ReenaPhoneScript1,   ANYTIME, ReenaPhoneScript2
+	phone YOUNGSTER,    JOEY1,              ROUTE_30,       ANYTIME, JoeyPhoneScript1,    ANYTIME, JoeyPhoneScript2
+	phone BUG_CATCHER,  WADE1,              ROUTE_31,       ANYTIME, WadePhoneScript1,    ANYTIME, WadePhoneScript2
+	phone FISHER,       RALPH1,             ROUTE_32,       ANYTIME, RalphPhoneScript1,   ANYTIME, RalphPhoneScript2
+	phone PICNICKER,    LIZ1,               ROUTE_32,       ANYTIME, LizPhoneScript1,     ANYTIME, LizPhoneScript2
+	phone HIKER,        ANTHONY2,           ROUTE_33,       ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2
+	phone CAMPER,       TODD1,              ROUTE_34,       ANYTIME, ToddPhoneScript1,    ANYTIME, ToddPhoneScript2
+	phone PICNICKER,    GINA1,              ROUTE_34,       ANYTIME, GinaPhoneScript1,    ANYTIME, GinaPhoneScript2
+	phone JUGGLER,      IRWIN1,             ROUTE_35,       ANYTIME, IrwinPhoneScript1,   ANYTIME, IrwinPhoneScript2
+	phone BUG_CATCHER,  ARNIE1,             ROUTE_35,       ANYTIME, ArniePhoneScript1,   ANYTIME, ArniePhoneScript2
+	phone SCHOOLBOY,    ALAN1,              ROUTE_36,       ANYTIME, AlanPhoneScript1,    ANYTIME, AlanPhoneScript2
+	phone TRAINER_NONE, PHONE_00,           N_A,            0,       UnusedPhoneScript,   0,       UnusedPhoneScript
+	phone LASS,         DANA1,              ROUTE_38,       ANYTIME, DanaPhoneScript1,    ANYTIME, DanaPhoneScript2
+	phone SCHOOLBOY,    CHAD1,              ROUTE_38,       ANYTIME, ChadPhoneScript1,    ANYTIME, ChadPhoneScript2
+	phone POKEFANM,     DEREK1,             ROUTE_39,       ANYTIME, DerekPhoneScript1,   ANYTIME, DerekPhoneScript2
+	phone FISHER,       TULLY1,             ROUTE_42,       ANYTIME, TullyPhoneScript1,   ANYTIME, TullyPhoneScript2
+	phone POKEMANIAC,   BRENT1,             ROUTE_43,       ANYTIME, BrentPhoneScript1,   ANYTIME, BrentPhoneScript2
+	phone PICNICKER,    TIFFANY3,           ROUTE_43,       ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2
+	phone BIRD_KEEPER,  VANCE1,             ROUTE_44,       ANYTIME, VancePhoneScript1,   ANYTIME, VancePhoneScript2
+	phone FISHER,       WILTON1,            ROUTE_44,       ANYTIME, WiltonPhoneScript1,  ANYTIME, WiltonPhoneScript2
+	phone BLACKBELT_T,  KENJI3,             ROUTE_45,       ANYTIME, KenjiPhoneScript1,   ANYTIME, KenjiPhoneScript2
+	phone HIKER,        PARRY1,             ROUTE_45,       ANYTIME, ParryPhoneScript1,   ANYTIME, ParryPhoneScript2
+	phone PICNICKER,    ERIN1,              ROUTE_46,       ANYTIME, ErinPhoneScript1,    ANYTIME, ErinPhoneScript2
+	phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2
 ; 90627
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@ -163,7 +163,7 @@ CheckPhoneContactTimeOfDay: ; 900ad (24:40ad)

 	farcall CheckTime
 	pop af
-	and MORN | DAY | NITE
+	and ANYTIME
 	and c

 	pop de