From 7a532435bf5782d89d09f2f4e0985cf3e90d890f Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 1 Feb 2018 23:35:28 -0500 Subject: Missed some SCENE constants --- maps/Route34IlexForestGate.asm | 2 +- maps/TeamRocketBaseB1F.asm | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 73a1dec20..8d600639e 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -143,7 +143,7 @@ Route34IlexForestGate_MapEvents: warp_event 5, 7, ILEX_FOREST, 1 db 1 ; coord events - coord_event 4, 7, 0, UnknownScript_0x62d3d + coord_event 4, 7, SCENE_DEFAULT, UnknownScript_0x62d3d db 0 ; bg events diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index c82fcb37c..bac4c2b94 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -736,14 +736,14 @@ TeamRocketBaseB1F_MapEvents: db 30 ; coord events ; There are five security cameras in the base. ; Walking in front of one triggers two Rocket Grunts. - coord_event 24, 2, 0, SecurityCamera1a - coord_event 24, 3, 0, SecurityCamera1b - coord_event 6, 2, 0, SecurityCamera2a - coord_event 6, 3, 0, SecurityCamera2b - coord_event 24, 6, 0, SecurityCamera3a - coord_event 24, 7, 0, SecurityCamera3b - coord_event 22, 16, 0, SecurityCamera4 - coord_event 8, 16, 0, SecurityCamera5 + coord_event 24, 2, SCENE_DEFAULT, SecurityCamera1a + coord_event 24, 3, SCENE_DEFAULT, SecurityCamera1b + coord_event 6, 2, SCENE_DEFAULT, SecurityCamera2a + coord_event 6, 3, SCENE_DEFAULT, SecurityCamera2b + coord_event 24, 6, SCENE_DEFAULT, SecurityCamera3a + coord_event 24, 7, SCENE_DEFAULT, SecurityCamera3b + coord_event 22, 16, SCENE_DEFAULT, SecurityCamera4 + coord_event 8, 16, SCENE_DEFAULT, 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_DEFAULT, ExplodingTrap1 -- cgit v1.2.3