Freeing up some event space

This commit is contained in:
MementoMartha 2022-09-28 10:57:47 +01:00
parent 91c79913fd
commit 28b5d01e08
2 changed files with 23 additions and 21 deletions

View file

@ -582,10 +582,27 @@
const EVENT_BEAT_SS_ANNE_10_TRAINER_4
const EVENT_BEAT_SS_ANNE_10_TRAINER_5
; Diglett's Cave events
const_next $650
; New static encounter events
const_next $620
const_skip
const EVENT_BEAT_CROCKY
const_skip 7
const EVENT_BEAT_CACTUS
const_skip 7
const EVENT_BEAT_MOLTRES
const_skip 7
const EVENT_BEAT_OMEGA
; Celadon University + salesman events
const_next $640
const_skip
const_skip
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_0
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_1
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3
const EVENT_BOUGHT_CUBONE
const EVENT_BOUGHT_DITTO
; Victory Road 3F events
const_next $660
@ -778,22 +795,6 @@
const_skip 8
const EVENT_BEAT_ARTICUNO
; Celadon University events
const_next $9E0
const_skip
const_skip
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_0
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_1
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3
const EVENT_BOUGHT_CUBONE
const EVENT_BOUGHT_DITTO
; Cinnabar Volcano events
const_next $9F0
const_skip
const EVENT_BEAT_MOLTRES
; End of events
const_next $A00
DEF NUM_EVENTS EQU const_value

View file

@ -237,7 +237,8 @@ DEF SHOW EQU $15
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2
const HS_ARTICUNO ; E3 X
const HS_CROCKY ; E4 X
const HS_MEW ; E5 X
const HS_MOLTRES ; E6 X
const HS_CROCKY ; E4 X
const HS_MEW ; E5 X
const HS_MOLTRES ; E6 X
const HS_CACTUS ; E7 X
DEF NUM_HS_OBJECTS EQU const_value