diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /data/maps/BattleFrontier_RankingHall | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/BattleFrontier_RankingHall')
| -rw-r--r-- | data/maps/BattleFrontier_RankingHall/events.inc | 30 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_RankingHall/header.inc | 8 |
2 files changed, 19 insertions, 19 deletions
diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index 239c372c6..33069e0ca 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,25 +1,25 @@ BattleFrontier_RankingHall_EventObjects: @ 853CEB8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, 8, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, 2, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 - bg_event 26, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, 1, 0, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541 + bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA + bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 + bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 + bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE + bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA + bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A + bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516 + bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 + bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 340ba9597..6fcb187ed 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -5,11 +5,11 @@ BattleFrontier_RankingHall: @ 848559C .4byte 0x0 .2byte MUS_BIJYUTU .2byte 396 - .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 |