aboutsummaryrefslogtreecommitdiffstats
path: root/constants
diff options
context:
space:
mode:
authorRangi42 <remy.oukaour+rangi42@gmail.com>2024-07-24 11:16:39 -0400
committerRangi42 <remy.oukaour+rangi42@gmail.com>2024-07-24 11:16:39 -0400
commitc1d65106807e899637058365986157c6a0b10855 (patch)
tree7c8f11f8f9b17354fad7ec0621af6cc8db4fe821 /constants
parentBuild with RGBDS 0.8.0, though it is not yet required (diff)
downloadpokeyellow-c1d65106807e899637058365986157c6a0b10855.tar.gz
pokeyellow-c1d65106807e899637058365986157c6a0b10855.tar.xz
pokeyellow-c1d65106807e899637058365986157c6a0b10855.zip
Rename event constants for Jessie/James battles
Diffstat (limited to 'constants')
-rw-r--r--constants/event_constants.asm15
1 files changed, 7 insertions, 8 deletions
diff --git a/constants/event_constants.asm b/constants/event_constants.asm
index 3e0e5b47..82fb1018 100644
--- a/constants/event_constants.asm
+++ b/constants/event_constants.asm
@@ -96,10 +96,9 @@
const_skip 3
const EVENT_BEAT_GHOST_MAROWAK
const_skip
- const EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
- const EVENT_BEAT_POKEMONTOWER_7_TRAINER_1
- const EVENT_BEAT_POKEMONTOWER_7_TRAINER_2
- const_skip 3
+ const EVENT_BEAT_POKEMONTOWER_7_JESSIE_JAMES
+ const EVENT_POKEMONTOWER_7_JESSIE_JAMES_ON_LEFT
+ const_skip 4
const EVENT_RESCUED_MR_FUJI_2
const_skip 16
const EVENT_GOT_POKE_FLUTE
@@ -555,10 +554,10 @@
const EVENT_BEAT_MT_MOON_1_TRAINER_6
const EVENT_GOT_DOME_FOSSIL
const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
+ const EVENT_BEAT_MT_MOON_3_JESSIE_JAMES
const EVENT_BEAT_MT_MOON_3_TRAINER_0
const EVENT_BEAT_MT_MOON_3_TRAINER_1
const EVENT_BEAT_MT_MOON_3_TRAINER_2
- const EVENT_BEAT_MT_MOON_3_TRAINER_3
const EVENT_57E
const EVENT_GOT_HELIX_FOSSIL
@@ -622,8 +621,8 @@
const_skip 13
const EVENT_6A0
const_skip
- const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
- const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
+ const EVENT_BEAT_ROCKET_HIDEOUT_4_JESSIE_JAMES
+ const EVENT_ROCKET_HIDEOUT_4_JESSIE_JAMES_ON_LEFT
const EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
const EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED
const EVENT_ROCKET_DROPPED_LIFT_KEY
@@ -703,8 +702,8 @@
const EVENT_781
const EVENT_782
const_skip
+ const EVENT_BEAT_SILPH_CO_11F_JESSIE_JAMES
const EVENT_BEAT_SILPH_CO_11F_TRAINER_0
- const EVENT_BEAT_SILPH_CO_11F_TRAINER_1
const_skip 2
const EVENT_SILPH_CO_11_UNLOCKED_DOOR
const_skip 4