Skip to content

Commit 537282d

Browse files
committed
Movement.asm and JesseJames Encounters
1 parent 5a142e3 commit 537282d

File tree

12 files changed

+570
-559
lines changed

12 files changed

+570
-559
lines changed

constants/event_constants.asm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@
558558
const EVENT_BEAT_MT_MOON_3_TRAINER_0
559559
const EVENT_BEAT_MT_MOON_3_TRAINER_1
560560
const EVENT_BEAT_MT_MOON_3_TRAINER_2
561-
const EVENT_57E
561+
const EVENT_MT_MOON_JESSIE_JAMES_BATTLE_IN_PROGRESS
562562
const EVENT_GOT_HELIX_FOSSIL
563563

564564
; S.S. Anne events
@@ -698,9 +698,9 @@
698698
const_skip 5
699699
const EVENT_SILPH_CO_10_UNLOCKED_DOOR
700700
const_skip 7
701-
const EVENT_780
702-
const EVENT_781
703-
const EVENT_782
701+
const EVENT_SILPH_CO_11F_JESSIE_JAMES_IN_MIDDLE
702+
const EVENT_SILPH_CO_11F_JESSIE_JAMES_ON_LEFT
703+
const EVENT_SILPH_CO_11F_JESSIE_JAMES_BATTLE_IN_PROGRESS
704704
const_skip
705705
const EVENT_BEAT_SILPH_CO_11F_JESSIE_JAMES
706706
const EVENT_BEAT_SILPH_CO_11F_TRAINER_0

constants/sprite_data_constants.asm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
const NPC_MOVEMENT_LEFT ; $80
1212
const NPC_MOVEMENT_RIGHT ; $C0
1313

14+
const_def 4
15+
const NPC_MOVEMENT_DOWN_FAST ; 4
16+
const NPC_MOVEMENT_UP_FAST ; 5
17+
const NPC_MOVEMENT_LEFT_FAST ; 6
18+
const NPC_MOVEMENT_RIGHT_FAST ; 7
19+
1420
DEF NPC_CHANGE_FACING EQU $E0
1521

1622
; player direction constants

0 commit comments

Comments
 (0)