diff options
| author | FrenchOrange <64930003+FrenchOrange@users.noreply.github.com> | 2022-03-08 02:48:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-07 20:48:59 -0500 |
| commit | 7d17d3ce8fc4b20901fec96417d91b9eb996df04 (patch) | |
| tree | 0fc7b6f678bf58598d2c9886ed34487968d31f53 /constants | |
| parent | e90799266323b5df3eacfbe37a59c433309202ec (diff) | |
Miscellaneous tweaks (#72)
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 2 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c1588e0f..f522c5e4 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -916,7 +916,7 @@ const EVENT_BEAT_SAILOR_HUEY2 const EVENT_BEAT_SAILOR_HUEY3 ; Super Nerd - const EVENT_BEAT_SUPER_NERD_STAN + const EVENT_BEAT_SUPER_NERD_ERIC_UNUSED const EVENT_BEAT_SUPER_NERD_ERIC const EVENT_BEAT_SUPER_NERD_GREGG const EVENT_BEAT_SUPER_NERD_JAY diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 682708b4..a302b006 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -139,12 +139,6 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1 const ALAN3 const CHAD2 const CHAD3 - const JACK4 ; unused - const JACK5 ; unused - const ALAN4 ; unused - const ALAN5 ; unused - const CHAD4 ; unused - const CHAD5 ; unused trainerclass BIRD_KEEPER ; 18 const ROD @@ -320,7 +314,7 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1 const ROB const ED const WADE1 - const BUG_CATCHER_BENNY + const BENNY const AL const JOSH const ARNIE1 @@ -414,7 +408,7 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1 const HUEY3 trainerclass SUPER_NERD ; 29 - const STAN + const ERIC_UNUSED const ERIC const GREGG ; unused const JAY ; unused |