summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/event_flags.asm16
-rw-r--r--constants/phone_constants.asm2
2 files changed, 9 insertions, 9 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index ad423568..b5b9c2e8 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -660,13 +660,13 @@
const EVENT_287
const EVENT_288
const EVENT_DANA_ASKED_FOR_PHONE_NUMBER
- const EVENT_28A
+ const EVENT_DANA_READY_FOR_REMATCH
const EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
- const EVENT_28C
+ const EVENT_CHAD_READY_FOR_REMATCH
const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
- const EVENT_28E
- const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
- const EVENT_290 ; 290
+ const EVENT_DEREK_READY_FOR_REMATCH
+ const EVENT_CHRIS_ASKED_FOR_PHONE_NUMBER
+ const EVENT_CHRIS_READY_FOR_REMATCH
const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
const EVENT_BRENT_READY_FOR_REMATCH
const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
@@ -1135,7 +1135,7 @@
const EVENT_BEAT_FISHER_KYLE
const EVENT_BEAT_FISHER_HENRY
const EVENT_BEAT_FISHER_MARVIN
- const EVENT_BEAT_FISHER_TULLY
+ const EVENT_BEAT_FISHER_CHRIS
const EVENT_BEAT_FISHER_ANDRE
const EVENT_BEAT_FISHER_RAYMOND
const EVENT_BEAT_FISHER_WILTON
@@ -1146,8 +1146,8 @@
const EVENT_BEAT_FISHER_BARNEY
const EVENT_BEAT_FISHER_RALPH2
const EVENT_BEAT_FISHER_RALPH3
- const EVENT_BEAT_FISHER_TULLY2
- const EVENT_BEAT_FISHER_TULLY3
+ const EVENT_BEAT_FISHER_CHRIS2
+ const EVENT_BEAT_FISHER_CHRIS3
const EVENT_BEAT_FISHER_WILTON2
const EVENT_BEAT_FISHER_SCOTT
const EVENT_BEAT_FISHER_WILTON3
diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm
index 1eb2b2d2..9247e927 100644
--- a/constants/phone_constants.asm
+++ b/constants/phone_constants.asm
@@ -29,7 +29,7 @@
const PHONE_LASS_DANA
const PHONE_SCHOOLBOY_CHAD
const PHONE_POKEFANM_DEREK
- const PHONE_FISHER_TULLY
+ const PHONE_FISHER_CHRIS
const PHONE_POKEMANIAC_BRENT
const PHONE_PICNICKER_TIFFANY
const PHONE_BIRDKEEPER_VANCE