diff options
Diffstat (limited to 'data/maps/BattleFrontier_BattlePyramidLobby')
4 files changed, 102 insertions, 35 deletions
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc deleted file mode 100644 index b70958fec..000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 - -BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 - warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 - -BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 - map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc deleted file mode 100644 index 91d454fbe..000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby: @ 84853F8 - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidLobby_MapEvents - .4byte BattleFrontier_BattlePyramidLobby_MapScripts - .4byte 0x0 - .2byte MUS_PYRAMID - .2byte 360 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json new file mode 100644 index 000000000..4f99b9488 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "music": "MUS_PYRAMID", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 14, + "y": 13, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 2, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" + }, + { + "type": "sign", + "x": 1, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" + } + ] +}
\ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 686a1bfb2..667c4847e 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716 - map_script 2, BattleFrontier_BattlePyramidLobby_MapScript2_250735 - map_script 4, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB + map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_250735 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidLobby_MapScript2_2497FB .byte 0 BattleFrontier_BattlePyramidLobby_MapScript2_250721: @ 8250721 @@ -200,7 +200,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5 special LoadPlayerParty closemessage delay 2 - call BattleFrontier_BattlePyramidLobby_EventScript_27134F + call Common_EventScript_SaveGame setvar VAR_TEMP_0, 255 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA @@ -260,7 +260,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250ACC:: @ 8250ACC BattleFrontier_BattlePyramidLobby_EventScript_250ACE:: @ 8250ACE lockall - applymovement 2, BattleFrontier_BattlePyramidLobby_Movement_27259E + applymovement 2, Common_Movement_FacePlayer waitmovement 0 msgbox BattleFrontier_BattlePyramidLobby_Text_251C3B, MSGBOX_DEFAULT call BattleFrontier_BattlePyramidLobby_EventScript_250AF0 |