summaryrefslogtreecommitdiff
path: root/data/maps/FallarborTown_House1
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-07-16 20:23:05 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-07-16 20:23:05 +0200
commitea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch)
treee04cbfe52909f094f9b7a0b20e927d0f5851b201 /data/maps/FallarborTown_House1
parentee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff)
parent07ef76277021d5cddf14004e37e785c31fcea69b (diff)
Merge with master
Diffstat (limited to 'data/maps/FallarborTown_House1')
-rw-r--r--data/maps/FallarborTown_House1/events.inc4
-rw-r--r--data/maps/FallarborTown_House1/header.inc8
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
index 5c2323b74..8f16a7869 100644
--- a/data/maps/FallarborTown_House1/events.inc
+++ b/data/maps/FallarborTown_House1/events.inc
@@ -1,6 +1,6 @@
FallarborTown_House1_EventObjects: @ 852E5B8
- object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
- object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
+ object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, 928
+ object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0
FallarborTown_House1_MapWarps: @ 852E5E8
warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index 443a4dc27..aa182e2ed 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -5,11 +5,11 @@ FallarborTown_House1: @ 8482E20
.4byte 0x0
.2byte MUS_TONEKUSA
.2byte 59
- .byte 4
+ .byte MAPSEC_FALLARBOR_TOWN
.byte 0
- .byte 0
- .byte 8
+ .byte WEATHER_NONE
+ .byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
- .byte 0
+ .byte MAP_BATTLE_SCENE_NORMAL