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_BattlePikeRandomRoom3 | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom3')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc | 14 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 20e6cb085..61cb8ede4 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,11 +1,11 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 - coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 + coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 + coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D + coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 1d8848d23..68ca30546 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580 .4byte 0x0 .2byte MUS_B_TUBE .2byte 358 - .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 |