summaryrefslogtreecommitdiff
path: root/data/maps/BattleFrontier_BattlePikeRandomRoom2
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-13 18:53:27 -0700
committerGitHub <noreply@github.com>2018-07-13 18:53:27 -0700
commit24f6484643ed3d7115fd4ebd92f254f224f1ca97 (patch)
treefab2a2a4bf5a338be050b24e59994d47d1d89e9d /data/maps/BattleFrontier_BattlePikeRandomRoom2
parentabc1905caba10eadcbcb271d8188e5d16444a655 (diff)
parent94650495c669f673c59f4912b805b51360c0797a (diff)
Merge pull request #274 from huderlem/movement_constants
Move and use movement constants
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom2')
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc2
-rw-r--r--data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
index 9cff20517..3ce444a53 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc
@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
- object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
+ object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
index 5dde0fc15..1ee69c077 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 353
- .byte 58
+ .byte MAPSEC_BATTLE_FRONTIER
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL