Adding Cinnabar Volcano, editing a few encounters

This commit is contained in:
MementoMartha 2022-09-27 12:09:22 +01:00
parent 0b65243c75
commit 4eaae2ab9d
35 changed files with 215 additions and 120 deletions

View file

@ -488,7 +488,7 @@
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
const EVENT_BEAT_MOLTRES
const EVENT_BEAT_GYAOON
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
; Route 24 events
@ -787,6 +787,11 @@
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_2
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3
; 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

@ -100,7 +100,7 @@ DEF SHOW EQU $15
const HS_POWER_PLANT_ITEM_3 ; 58 X
const HS_POWER_PLANT_ITEM_4 ; 59 X
const HS_POWER_PLANT_ITEM_5 ; 5A X
const HS_MOLTRES ; 5B X
const HS_GYAOON ; 5B X
const HS_VICTORY_ROAD_2F_ITEM_1 ; 5C X
const HS_VICTORY_ROAD_2F_ITEM_2 ; 5D X
const HS_VICTORY_ROAD_2F_ITEM_3 ; 5E X
@ -239,4 +239,5 @@ DEF SHOW EQU $15
const HS_ARTICUNO ; E3 X
const HS_CROCKY ; E4 X
const HS_MEW ; E5 X
const HS_MOLTRES ; E6 X
DEF NUM_HS_OBJECTS EQU const_value

View file

@ -250,7 +250,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4
mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5
mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6
mapconst UNUSED_MAP_E7, 0, 0 ; $E7
mapconst CINNABAR_VOLCANO, 12, 14 ; $E7 - was UNUSED_MAP_E7
mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8
mapconst SILPH_CO_9F, 9, 13 ; $E9
mapconst SILPH_CO_10F, 9, 8 ; $EA