summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattleFactoryPreBattleRoom
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
committerDiegoisawesome <diego@domoreaweso.me>2018-07-24 21:18:36 -0700
commite92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch)
treeb3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/BattleFrontier_BattleFactoryPreBattleRoom
parent156fb472e10c10751268d2339b2526c8bd07e34f (diff)
parent5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff)
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom')
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc2
-rw-r--r--data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
index b8ffbfc6d..d341250de 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
- object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0
+ object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
index eb6e06a0f..3dc5d23cc 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 347
- .byte 58
+ .byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL