summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 12:40:58 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-01 13:03:21 -0500
commitfcfe77bc3db73afd2001c21ec9cc1cfb1beca20e (patch)
tree2fe20a614851089b0e22cc2dc0164ee40447ebb6 /maps/TeamRocketBaseB1F.asm
parent936a170e0da19cb5bb2ccc325a43a28690230098 (diff)
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
Diffstat (limited to 'maps/TeamRocketBaseB1F.asm')
-rw-r--r--maps/TeamRocketBaseB1F.asm46
1 files changed, 23 insertions, 23 deletions
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 67cf4ded8..9bc3365f8 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -8,7 +8,7 @@
TeamRocketBaseB1F_MapScripts:
db 1 ; scene scripts
- scene_script .DummyScene ; SCENE_TEAMROCKETBASEB1F_0
+ scene_script .DummyScene ; SCENE_DEFAULT
db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
@@ -746,28 +746,28 @@ TeamRocketBaseB1F_MapEvents:
coord_event 8, 16, 0, SecurityCamera5
; There are spots on the floor that trigger a Pokémon battle.
; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
- coord_event 2, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap1
- coord_event 3, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap2
- coord_event 4, 7, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap3
- coord_event 1, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap4
- coord_event 3, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap5
- coord_event 5, 8, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap6
- coord_event 3, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap7
- coord_event 4, 9, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap8
- coord_event 1, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap9
- coord_event 2, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap10
- coord_event 3, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap11
- coord_event 5, 10, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap12
- coord_event 2, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap13
- coord_event 4, 11, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap14
- coord_event 1, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap15
- coord_event 2, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap16
- coord_event 4, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap17
- coord_event 5, 12, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap18
- coord_event 1, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap19
- coord_event 3, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap20
- coord_event 4, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap21
- coord_event 5, 13, SCENE_TEAMROCKETBASEB1F_0, ExplodingTrap22
+ coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1
+ coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2
+ coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3
+ coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4
+ coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5
+ coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6
+ coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7
+ coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8
+ coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9
+ coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10
+ coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11
+ coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12
+ coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13
+ coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14
+ coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15
+ coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16
+ coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17
+ coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18
+ coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19
+ coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20
+ coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21
+ coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
db 9 ; bg events
bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script