summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
-rw-r--r--maps/TeamRocketBaseB2F.asm76
1 files changed, 38 insertions, 38 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 67130dd45..1b3d536f6 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -910,60 +910,60 @@ TeamRocketBaseB2F_MapEvents:
db 0, 0 ; filler
db 5 ; warp events
- warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
- warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
- warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
- warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
+ warp_event 3, 14, TEAM_ROCKET_BASE_B1F, 2
+ warp_event 3, 2, TEAM_ROCKET_BASE_B3F, 1
+ warp_event 27, 2, TEAM_ROCKET_BASE_B3F, 2
+ warp_event 3, 6, TEAM_ROCKET_BASE_B3F, 3
warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
db 9 ; coord events
- coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
- coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
+ coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1
+ coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2
coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf95
coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, UnknownScript_0x6cf9c
coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
coord_event 15, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d075
- coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
+ coord_event 12, 3, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
coord_event 12, 10, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
coord_event 12, 11, SCENE_TEAMROCKETBASEB2F_ELECTRODES, UnknownScript_0x6d07a
db 23 ; bg events
bg_event 14, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
bg_event 15, 12, BGEVENT_IFNOTSET, TeamRocketBaseB2FLockedDoor
- bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
- bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
+ bg_event 17, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 16, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 15, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 14, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 13, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 9, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 12, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 13, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 14, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 15, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 16, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 17, 4, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 17, 5, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 17, 6, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 17, 7, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 17, 8, BGEVENT_READ, TeamRocketBaseB2FTransmitterScript
+ bg_event 26, 7, BGEVENT_ITEM, TeamRocketBaseB2FHiddenFullHeal
db 14 ; object events
object_event 20, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
object_event 20, 16, SPRITE_ROCKET_GIRL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
- object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
- object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
- object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
- object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
- object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
- object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
- object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
- object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+ object_event 5, 13, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE
+ object_event 9, 13, SPRITE_DRAGON, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE
+ object_event 7, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode1, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+ object_event 7, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode2, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+ object_event 7, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, RocketElectrode3, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
+ object_event 22, 5, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
+ object_event 22, 7, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
+ object_event 22, 9, SPRITE_VOLTORB, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
object_event 25, 13, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION
- object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
+ object_event 4, 1, SPRITE_ROCKET, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 21, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION
- object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF
+ object_event 3, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB2FTMThief, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF