diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /data/maps/BattleFrontier_Lounge2 | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'data/maps/BattleFrontier_Lounge2')
| -rw-r--r-- | data/maps/BattleFrontier_Lounge2/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_Lounge2/header.inc | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index 0616573bd..cc32ddf42 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,9 +1,9 @@ BattleFrontier_Lounge2_EventObjects: @ 853D11C - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, 10, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, 2, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, 9, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index 69a6dba30..c363d54bf 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -5,11 +5,11 @@ BattleFrontier_Lounge2: @ 84855F0 .4byte 0x0 .2byte MUS_B_TOWER .2byte 397 - .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 |