dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #910 from GriffinRichards/fix-eventobj

Browse Source 
Standardize Object Event naming
This commit is contained in:
huderlem
2020-02-12 18:34:19 -06:00
committed by GitHub
parent 66c6b7a38b 6b966d20e5
commit 204c431993
1105 changed files with 14957 additions and 14957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@@ -763,7 +763,7 @@
.2byte \y
.endm
@ Copies a live event object's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
@ Copies a live object event's xy position to its template, so that if the sprite goes off screen, it'll still be there when it comes back on screen.
.macro copyobjectxytoperm index:req
.byte 0x64
.2byte \index

2
common_syms/faraway_island.txt
View File

@@ -1,3 +1,3 @@
sPlayerToMewDeltaX
sPlayerToMewDeltaY
sMewDirectionCandidates
sMewDirectionCandidates

2
common_syms/field_control_avatar.txt
View File

@@ -1 +1 @@
gSelectedEventObject
gSelectedObjectEvent

10
data/event_scripts.s
View File

@@ -19,7 +19,7 @@
#include "constants/decorations.h"
#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
#include "constants/field_poison.h"
#include "constants/field_specials.h"
@@ -785,11 +785,11 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
EventScript_UnusedBoardFerry:: @ 827222B
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
showobjectat EVENT_OBJ_ID_PLAYER, 0
showobjectat OBJ_EVENT_ID_PLAYER, 0
delay 30
applymovement EVENT_OBJ_ID_PLAYER, Movement_UnusedBoardFerry
applymovement OBJ_EVENT_ID_PLAYER, Movement_UnusedBoardFerry
waitmovement 0
delay 30
return
@@ -804,7 +804,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
compare VAR_FACING, DIR_WEST
call_if_eq Ferry_EventScript_DepartIslandWest
delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, 0
hideobjectat OBJ_EVENT_ID_PLAYER, 0
call Common_EventScript_FerryDepart
return

2
data/layouts/layouts.json
View File

@@ -4412,4 +4412,4 @@
"blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin"
}
]
}
}

4
data/map_events.s
View File

@@ -1,5 +1,5 @@
#include "constants/bg_event_constants.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_bg.h"
#include "constants/event_object_movement.h"
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/items.h"

4
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 3,
"y": 4,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 0,
"y": 6,
"elevation": 3,

6
data/maps/AbandonedShip_Corridors_1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 17,
"y": 7,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 5,
"y": 10,
"elevation": 3,
@@ -129,4 +129,4 @@
],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/AbandonedShip_Corridors_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_M",
"graphics_id": "OBJ_EVENT_GFX_TUBER_M",
"x": 2,
"y": 8,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 9,
"y": 6,
"elevation": 3,
@@ -110,4 +110,4 @@
"script": "AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor"
}
]
}
}

2
data/maps/AbandonedShip_Deck/map.json
View File

@@ -53,4 +53,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
View File

@@ -93,4 +93,4 @@
"script": "AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door"
}
]
}
}

10
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 41,
"y": 4,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 10,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 5,
"y": 11,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 31,
"y": 11,
"elevation": 3,
@@ -215,4 +215,4 @@
"script": "AbandonedShip_HiddenFloorRooms_EventScript_Trash"
}
]
}
}

4
data/maps/AbandonedShip_Room_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 4,
"elevation": 3,
@@ -46,4 +46,4 @@
],
"coord_events": [],
"bg_events": []
}
}

12
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 7,
"y": 13,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 6,
"y": 13,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 4,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 3,
"y": 2,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TUBER_F",
"graphics_id": "OBJ_EVENT_GFX_TUBER_F",
"x": 7,
"y": 2,
"elevation": 3,
@@ -105,4 +105,4 @@
],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 3,
"y": 4,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 13,
"y": 3,
"elevation": 3,
@@ -73,4 +73,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 12,
"y": 5,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 4,
"y": 5,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 10,
"y": 11,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 10,
"y": 16,
"elevation": 3,
@@ -113,4 +113,4 @@
],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 25,
"y": 6,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 6,
"y": 7,
"elevation": 3,
@@ -66,4 +66,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AbandonedShip_Underwater1/map.json
View File

@@ -32,4 +32,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AbandonedShip_Underwater2/map.json
View File

@@ -25,4 +25,4 @@
],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AlteringCave/map.json
View File

@@ -25,4 +25,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/AncientTomb/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_REGISTEEL",
"graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
"x": 8,
"y": 7,
"elevation": 3,
@@ -78,4 +78,4 @@
"script": "AncientTomb_EventScript_CaveEntranceSide"
}
]
}
}

8
data/maps/AquaHideout_1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 13,
"y": 11,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 14,
"y": 11,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 20,
"y": 4,
"elevation": 3,
@@ -79,4 +79,4 @@
],
"coord_events": [],
"bg_events": []
}
}

20
data/maps/AquaHideout_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 28,
"y": 16,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 6,
"y": 6,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 29,
"y": 12,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 20,
"y": 18,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 9,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 9,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 15,
"y": 10,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 16,
"y": 10,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 28,
"y": 21,
"elevation": 3,
@@ -311,4 +311,4 @@
],
"coord_events": [],
"bg_events": []
}
}

14
data/maps/AquaHideout_B2F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23,
"y": 19,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 23,
"y": 10,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 3,
"y": 13,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{
"graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW",
"graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW",
"x": 19,
"y": 20,
"elevation": 1,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_F",
"x": 7,
"y": 5,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS"
},
{
"graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
"graphics_id": "OBJ_EVENT_GFX_AQUA_MEMBER_M",
"x": 13,
"y": 5,
"elevation": 3,
@@ -186,4 +186,4 @@
}
],
"bg_events": []
}
}

2
data/maps/AquaHideout_UnusedRubyMap1/map.json
View File

@@ -17,4 +17,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AquaHideout_UnusedRubyMap2/map.json
View File

@@ -17,4 +17,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/AquaHideout_UnusedRubyMap3/map.json
View File

@@ -17,4 +17,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/ArtisanCave_1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 14,
"y": 5,
"elevation": 3,
@@ -46,4 +46,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/ArtisanCave_B1F/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 32,
"y": 38,
"elevation": 3,
@@ -79,4 +79,4 @@
"flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON"
}
]
}
}

4
data/maps/BattleColosseum_2P/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 9,
"y": 3,
"elevation": 3,
@@ -65,4 +65,4 @@
}
],
"bg_events": []
}
}

2
data/maps/BattleColosseum_4P/map.json
View File

@@ -83,4 +83,4 @@
}
],
"bg_events": []
}
}

20
data/maps/BattleFrontier_BattleArenaBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 5,
"y": 3,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 10,
"y": 3,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 5,
"y": 9,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 10,
"y": 9,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 4,
"y": 5,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 5,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 15,
"y": 6,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 0,
"y": 6,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 7,
"y": 4,
"elevation": 3,
@@ -135,4 +135,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
View File

@@ -26,11 +26,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
return
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2
@@ -482,7 +482,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
hideobjectat 8, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
removeobject 7
call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
setvar VAR_TEMP_1, 1
end

4
data/maps/BattleFrontier_BattleArenaCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 9,
"y": 12,
"elevation": 0,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
View File

@@ -10,14 +10,14 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
delay 16
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor
waitmovement 0
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer
waitmovement 0
msgbox BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn, MSGBOX_SIGN
applymovement 1, BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor
waitmovement 0
setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5

12
data/maps/BattleFrontier_BattleArenaLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 7,
"y": 7,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 2,
"y": 10,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_5",
"graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 14,
"y": 11,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 14,
"y": 12,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_YOUNGSTER",
"graphics_id": "OBJ_EVENT_GFX_YOUNGSTER",
"x": 14,
"y": 10,
"elevation": 3,
@@ -108,4 +108,4 @@
"script": "BattleFrontier_BattleArenaLobby_EventScript_RulesBoard"
}
]
}
}

10
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41
BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
@@ -207,12 +207,12 @@ BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003
BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor
waitmovement 0
opendoor 2, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
waitmovement 0
closedoor 2, 2
waitdooranim
@@ -256,12 +256,12 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C
BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor
waitmovement 0
opendoor 11, 2
waitdooranim
applymovement 1, BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor
waitmovement 0
closedoor 11, 2
waitdooranim

32
data/maps/BattleFrontier_BattleDomeBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_REPORTER_M",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_M",
"x": 5,
"y": 4,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 7,
"y": 2,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 9,
"y": 2,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 11,
"y": 2,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 16,
"y": 2,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_1",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 4,
"y": 2,
"elevation": 0,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 16,
"y": 1,
"elevation": 0,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 8,
"y": 1,
"elevation": 0,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_2",
"graphics_id": "OBJ_EVENT_GFX_MAN_2",
"x": 0,
"y": 4,
"elevation": 0,
@@ -132,7 +132,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 12,
"y": 1,
"elevation": 0,
@@ -145,7 +145,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 13,
"y": 2,
"elevation": 0,
@@ -158,7 +158,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_1",
"graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 10,
"y": 2,
"elevation": 0,
@@ -171,7 +171,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4,
"y": 9,
"elevation": 4,
@@ -184,7 +184,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 14,
"y": 2,
"elevation": 0,
@@ -197,7 +197,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 11,
"y": 6,
"elevation": 0,
@@ -213,4 +213,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

134
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
return
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00
@@ -481,7 +481,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
setvar VAR_TEMP_1, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, DOME_FINAL
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
@@ -522,76 +522,76 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: @ 824C52F
return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, 1
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, 1
return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
createvobject EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject EVENT_OBJ_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
return
BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773

4
data/maps/BattleFrontier_BattleDomeCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 23,
"y": 5,
"elevation": 0,
@@ -46,4 +46,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
View File

@@ -13,12 +13,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
waitmovement 0
opendoor 13, 3
waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50
waitmovement 0
closedoor 13, 3
waitdooranim
@@ -26,12 +26,12 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
waitmovement 0
opendoor 37, 3
waitdooranim
applymovement 1, BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen
waitmovement 0
closedoor 37, 3
waitdooranim

14
data/maps/BattleFrontier_BattleDomeLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5,
"y": 10,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 1,
"y": 11,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LASS",
"graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 14,
"y": 14,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 18,
"y": 14,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8,
"y": 14,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 17,
"y": 10,
"elevation": 0,
@@ -144,4 +144,4 @@
"script": "BattleFrontier_BattleDomeLobby_EventScript_RulesBoard"
}
]
}
}

6
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
View File

@@ -14,7 +14,7 @@ BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
@@ -241,7 +241,7 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor
@@ -252,7 +252,7 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor

4
data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5,
"y": 2,
"elevation": 3,
@@ -46,4 +46,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
@@ -21,7 +21,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
setvar VAR_TEMP_0, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
waitmovement 0
lockall
BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
@@ -153,11 +153,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
closemessage
applymovement 1, BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor
waitmovement 0
opendoor 5, 1
waitdooranim
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor
waitmovement 0
closedoor 5, 1
waitdooranim

18
data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0,
"y": 6,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 7,
"y": 4,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0,
"y": 4,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 0,
"y": 8,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12,
"y": 4,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12,
"y": 6,
"elevation": 0,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 12,
"y": 8,
"elevation": 0,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_F",
"graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 5,
"y": 11,
"elevation": 0,
@@ -122,4 +122,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
View File

@@ -31,7 +31,7 @@ BattleFrontier_BattleFactoryBattleRoom_OnWarp: @ 825AE00
BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A
setvar VAR_TEMP_1, 1
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
@@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: @ 825AE24
end
BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31
@@ -55,7 +55,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
closemessage
applymovement 2, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent
@@ -65,7 +65,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
applymovement 8, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
waitmovement 0
call BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle
factory_setopponentgfx

14
data/maps/BattleFrontier_BattleFactoryLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 4,
"y": 7,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_1",
"x": 3,
"y": 11,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 14,
"y": 11,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PICNICKER",
"graphics_id": "OBJ_EVENT_GFX_PICNICKER",
"x": 13,
"y": 11,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 6,
"y": 10,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 14,
"y": 7,
"elevation": 0,
@@ -136,4 +136,4 @@
"script": "BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard"
}
]
}
}

4
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_BattleFactoryLobby_OnWarp: @ 82583F3
BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
@@ -176,7 +176,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13
setvar VAR_TEMP_0, 0

4
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1",
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
"x": 8,
"y": 12,
"elevation": 0,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
View File

@@ -14,7 +14,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: @ 8259ACF
setobjectxy 1, 8, 7
turnobject 1, DIR_SOUTH
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF
@@ -26,7 +26,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom
waitmovement 0
compare VAR_0x8006, 2
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge
@@ -420,12 +420,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B
applymovement 1, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
return
BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A

12
data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 1,
"y": 9,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 13,
"y": 1,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 1,
"y": 4,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_DUSCLOPS",
"graphics_id": "OBJ_EVENT_GFX_DUSCLOPS",
"x": 13,
"y": 1,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AZURILL",
"graphics_id": "OBJ_EVENT_GFX_AZURILL",
"x": 13,
"y": 1,
"elevation": 3,
@@ -98,4 +98,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@@ -23,13 +23,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
@ The opponent's gfx are set to the players by default
BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861
@@ -309,7 +309,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
setvar VAR_TEMP_1, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
removeobject 2
applymovement 4, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
applymovement 5, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible

16
data/maps/BattleFrontier_BattlePalaceCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 8,
"y": 12,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AZURILL",
"graphics_id": "OBJ_EVENT_GFX_AZURILL",
"x": 3,
"y": 5,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_KIRLIA",
"graphics_id": "OBJ_EVENT_GFX_KIRLIA",
"x": 12,
"y": 6,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PIKACHU",
"graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"x": 15,
"y": 5,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 4,
"y": 9,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_AZUMARILL",
"graphics_id": "OBJ_EVENT_GFX_AZUMARILL",
"x": 13,
"y": 9,
"elevation": 0,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WINGULL",
"graphics_id": "OBJ_EVENT_GFX_WINGULL",
"x": 3,
"y": 10,
"elevation": 0,
@@ -138,4 +138,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceCorridor_OnFrame: @ 824F4A9
BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
delay 16
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
waitmovement 0
lockall
palace_getcomment
@@ -28,12 +28,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
compare VAR_RESULT, FRONTIER_LVL_OPEN
goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom
waitmovement 0
opendoor 6, 3
waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
waitmovement 0
closedoor 6, 3
waitdooranim
@@ -41,12 +41,12 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
waitmovement 0
opendoor 10, 3
waitdooranim
applymovement 1, BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom
waitmovement 0
closedoor 10, 3
waitdooranim

14
data/maps/BattleFrontier_BattlePalaceLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 5,
"y": 6,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 8,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 24,
"y": 5,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 18,
"y": 10,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 2,
"y": 10,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_M",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
"x": 19,
"y": 6,
"elevation": 0,
@@ -143,4 +143,4 @@
"script": "BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard"
}
]
}
}

6
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
View File

@@ -9,7 +9,7 @@ BattleFrontier_BattlePalaceLobby_OnWarp: @ 824D789
BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
@@ -251,7 +251,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor
@@ -259,7 +259,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor
waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor
waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor

4
data/maps/BattleFrontier_BattlePikeCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 6,
"y": 6,
"elevation": 3,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
View File

@@ -12,14 +12,14 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
frontier_set FRONTIER_DATA_BATTLE_NUM, 1
pike_cleartrainerids
pike_nohealing TRUE
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor
applymovement 1, BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor
waitmovement 0
lockall
msgbox BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun, MSGBOX_DEFAULT
closemessage
releaseall
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor
waitmovement 0
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -33,7 +33,7 @@ BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B

10
data/maps/BattleFrontier_BattlePikeLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 5,
"y": 5,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 10,
"y": 9,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 0,
"y": 5,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 8,
"y": 9,
"elevation": 3,
@@ -109,4 +109,4 @@
"script": "BattleFrontier_BattlePikeLobby_EventScript_RulesBoard"
}
]
}
}

4
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
View File

@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
@@ -201,7 +201,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
applymovement 1, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
waitmovement 0
return

4
data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 2,
"y": 4,
"elevation": 3,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

2
data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
View File

@@ -31,7 +31,7 @@ BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE
BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2

6
data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 4,
"y": 4,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 3,
"y": 4,
"elevation": 3,
@@ -108,4 +108,4 @@
}
],
"bg_events": []
}
}

14
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
View File

@@ -103,7 +103,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT
closemessage
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
waitmovement 0
playse SE_CURTAIN
@@ -190,7 +190,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
waitmovement 0
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
@@ -247,13 +247,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1
waitmovement 0
pike_gettrainerintro 0
msgbox gStringVar4, MSGBOX_DEFAULT
closemessage
delay 16
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
waitmovement 0
pike_gettrainerintro 1
msgbox gStringVar4, MSGBOX_DEFAULT
@@ -268,13 +268,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
end
BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
waitmovement 0
applymovement 1, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit
waitmovement 0
applymovement 2, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp
waitmovement 0
end
@@ -392,7 +392,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: @ 825D77
BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
waitmovement 0
setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE
setvar VAR_0x8005, 0

2
data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
View File

@@ -81,4 +81,4 @@
}
],
"bg_events": []
}
}

2
data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
View File

@@ -26,7 +26,7 @@ BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A

6
data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 4,
"y": 10,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST",
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
"x": 8,
"y": 5,
"elevation": 3,
@@ -126,4 +126,4 @@
}
],
"bg_events": []
}
}

2
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
View File

@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
setvar VAR_TEMP_4, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891

34
data/maps/BattleFrontier_BattlePyramidFloor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 0,
"y": 0,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 1,
"y": 0,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 2,
"y": 0,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 3,
"y": 0,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 4,
"y": 0,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 5,
"y": 0,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 6,
"y": 0,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 7,
"y": 0,
"elevation": 0,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 0,
"y": 1,
"elevation": 3,
@@ -132,7 +132,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 1,
"y": 1,
"elevation": 3,
@@ -145,7 +145,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 3,
"y": 1,
"elevation": 0,
@@ -158,7 +158,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 4,
"y": 1,
"elevation": 0,
@@ -171,7 +171,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 5,
"y": 1,
"elevation": 0,
@@ -184,7 +184,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 6,
"y": 1,
"elevation": 0,
@@ -197,7 +197,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 7,
"y": 1,
"elevation": 0,
@@ -210,7 +210,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL",
"graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL",
"x": 2,
"y": 1,
"elevation": 0,
@@ -226,4 +226,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_BattlePyramidLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 7,
"y": 12,
"elevation": 4,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 14,
"y": 13,
"elevation": 4,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 2,
"y": 15,
"elevation": 4,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 12,
"y": 16,
"elevation": 4,
@@ -95,4 +95,4 @@
"script": "BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard"
}
]
}
}

6
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
View File

@@ -10,7 +10,7 @@ BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721
BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
@@ -371,7 +371,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT
pyramid_get PYRAMID_DATA_WIN_STREAK
@@ -391,7 +391,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
closemessage
applymovement 1, BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel
waitmovement 0
return

6
data/maps/BattleFrontier_BattlePyramidTop/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 17,
"y": 11,
"elevation": 6,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BRANDON",
"graphics_id": "OBJ_EVENT_GFX_BRANDON",
"x": 17,
"y": 7,
"elevation": 0,
@@ -54,4 +54,4 @@
}
],
"bg_events": []
}
}

8
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
View File

@@ -16,7 +16,7 @@ BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
compare VAR_TEMP_C, 0
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
setobjectxyperm 2, 0, 0
@@ -79,7 +79,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
closemessage
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop
waitmovement 0
applymovement 1, BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath
waitmovement 0
@@ -116,7 +116,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure, MSGBOX_DEFAULT
closemessage
@@ -156,7 +156,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
compare VAR_RESULT, FALSE
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
special SpawnCameraObject
applymovement EVENT_OBJ_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned, MSGBOX_DEFAULT
closemessage

8
data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5,
"y": 1,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 7,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 4,
"y": 8,
"elevation": 3,
@@ -72,4 +72,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
View File

@@ -18,14 +18,14 @@ BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
setvar VAR_TEMP_0, 1
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0
setvar VAR_TEMP_2, 1
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
@@ -62,7 +62,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
waitmovement 0
msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
playfanfare MUS_ME_ASA
@@ -125,7 +125,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0
@@ -239,7 +239,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8
BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
call BattleFrontier_EventScript_SetBrainObjectGfx
closemessage
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
waitmovement 0
applymovement 2, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos
waitmovement 0

4
data/maps/BattleFrontier_BattleTowerCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 9,
"y": 2,
"elevation": 3,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
View File

@@ -24,13 +24,13 @@ BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
compare VAR_0x8006, 1
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
waitmovement 0
goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
applymovement 1, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
waitmovement 0
BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27

4
data/maps/BattleFrontier_BattleTowerElevator/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 5,
"elevation": 3,
@@ -31,4 +31,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
View File

@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
setvar VAR_TEMP_0, 1
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
waitmovement 0
special BufferBattleTowerElevatorFloors
waitse
@@ -18,7 +18,7 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
waitstate
delay 48
applymovement 1, BattleFrontier_BattleTowerElevator_Movement_AttendantExit
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerExit
waitmovement 0
call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
end
@@ -85,6 +85,6 @@ BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end

20
data/maps/BattleFrontier_BattleTowerLobby/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 6,
"y": 5,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_4",
"graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 23,
"y": 5,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 17,
"y": 8,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_1",
"graphics_id": "OBJ_EVENT_GFX_BOY_1",
"x": 15,
"y": 9,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_REPORTER_F",
"graphics_id": "OBJ_EVENT_GFX_REPORTER_F",
"x": 11,
"y": 9,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 1,
"y": 5,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_APPRENTICE"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 10,
"y": 5,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 14,
"y": 5,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 18,
"y": 5,
"elevation": 3,
@@ -198,4 +198,4 @@
"script": "BattleFrontier_BattleTowerLobby_EventScript_RulesBoard"
}
]
}
}

6
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@@ -31,7 +31,7 @@ BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
setvar VAR_TEMP_1, 1
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
@@ -629,12 +629,12 @@ BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator:: @ 823F15B
call BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo
call BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_WalkToElevator
waitmovement 0
opendoor VAR_0x8004, 1
waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator
waitmovement 0
closedoor VAR_0x8004, 1
waitdooranim

14
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 5,
"y": 1,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 4,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 5,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 4,
"y": 1,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_F",
"graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 4,
"y": 8,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_E",
"graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 5,
"y": 8,
"elevation": 3,
@@ -96,4 +96,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
View File

@@ -20,11 +20,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F
@@ -36,7 +36,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_OnWarp: @ 8248F33
.2byte 0
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
end
BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43

10
data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_VAR_F",
"graphics_id": "OBJ_EVENT_GFX_VAR_F",
"x": 1,
"y": 1,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 14,
"y": 3,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 1,
"y": 3,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_E",
"graphics_id": "OBJ_EVENT_GFX_VAR_E",
"x": 14,
"y": 1,
"elevation": 0,
@@ -70,4 +70,4 @@
"warp_events": [],
"coord_events": [],
"bg_events": []
}
}

6
data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
View File

@@ -20,11 +20,11 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
checkplayergender
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
@@ -36,7 +36,7 @@ BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
.2byte 0
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
hideobjectat 4, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
special OffsetCameraForBattle

18
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 11,
"y": 2,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_0",
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
"x": 2,
"y": 10,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_1",
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 17,
"y": 11,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_2",
"graphics_id": "OBJ_EVENT_GFX_VAR_2",
"x": 6,
"y": 9,
"elevation": 3,
@@ -67,7 +67,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_3",
"graphics_id": "OBJ_EVENT_GFX_VAR_3",
"x": 8,
"y": 13,
"elevation": 3,
@@ -80,7 +80,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_4",
"graphics_id": "OBJ_EVENT_GFX_VAR_4",
"x": 10,
"y": 11,
"elevation": 3,
@@ -93,7 +93,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_5",
"graphics_id": "OBJ_EVENT_GFX_VAR_5",
"x": 13,
"y": 10,
"elevation": 3,
@@ -106,7 +106,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_6",
"graphics_id": "OBJ_EVENT_GFX_VAR_6",
"x": 15,
"y": 13,
"elevation": 3,
@@ -119,7 +119,7 @@
"flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1"
},
{
"graphics_id": "EVENT_OBJ_GFX_VAR_7",
"graphics_id": "OBJ_EVENT_GFX_VAR_7",
"x": 4,
"y": 12,
"elevation": 3,

28
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
View File

@@ -23,14 +23,14 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
end
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_BOY_1
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_3, 1
setobjectxyperm 1, 10, 2
@@ -41,7 +41,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp: @ 8243E14
.2byte 0
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end
BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23
@@ -57,12 +57,12 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: @ 8243E35
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41
lockall
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
waitmovement 0
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit
waitmovement 0
copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT
special HealPlayerParty
@@ -113,21 +113,21 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
waitmovement 0
return
@ Unused
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
waitmovement 0
return
@ Unused
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08
applymovement 1, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
waitmovement 0
return

20
data/maps/BattleFrontier_ExchangeServiceCorner/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 4,
"y": 4,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 0,
"y": 5,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 0,
"y": 4,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 14,
"y": 6,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_5",
"graphics_id": "OBJ_EVENT_GFX_MAN_5",
"x": 1,
"y": 9,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 5,
"y": 5,
"elevation": 0,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 9,
"y": 5,
"elevation": 0,
@@ -106,7 +106,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TEALA",
"graphics_id": "OBJ_EVENT_GFX_TEALA",
"x": 10,
"y": 4,
"elevation": 0,
@@ -119,7 +119,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_1",
"graphics_id": "OBJ_EVENT_GFX_GIRL_1",
"x": 12,
"y": 10,
"elevation": 0,
@@ -157,4 +157,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_Lounge1/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 0,
"y": 6,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_3",
"graphics_id": "OBJ_EVENT_GFX_BOY_3",
"x": 7,
"y": 6,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 5,
"y": 4,
"elevation": 0,
@@ -65,4 +65,4 @@
],
"coord_events": [],
"bg_events": []
}
}

12
data/maps/BattleFrontier_Lounge2/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 8,
"y": 4,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10,
"y": 4,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10,
"y": 3,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F",
"graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F",
"x": 4,
"y": 6,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 10,
"y": 5,
"elevation": 0,
@@ -98,4 +98,4 @@
],
"coord_events": [],
"bg_events": []
}
}

12
data/maps/BattleFrontier_Lounge3/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 4,
"y": 6,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_FAT_MAN",
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
"x": 4,
"y": 4,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_2",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_2",
"x": 3,
"y": 5,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_POKEFAN_F",
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
"x": 5,
"y": 5,
"elevation": 0,
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 0,
"y": 6,
"elevation": 0,
@@ -91,4 +91,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_Lounge4/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 4,
"y": 4,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_COOK",
"graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 6,
"y": 6,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 0,
"y": 5,
"elevation": 0,
@@ -65,4 +65,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_Lounge5/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL",
"x": 12,
"y": 4,
"elevation": 4,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 0,
"y": 4,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 6,
"y": 5,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY",
"graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY",
"x": 11,
"y": 7,
"elevation": 0,
@@ -85,4 +85,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/BattleFrontier_Lounge6/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_BEAUTY",
"graphics_id": "OBJ_EVENT_GFX_BEAUTY",
"x": 2,
"y": 4,
"elevation": 0,
@@ -39,4 +39,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_Lounge7/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_SAILOR",
"graphics_id": "OBJ_EVENT_GFX_SAILOR",
"x": 0,
"y": 7,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 2,
"y": 5,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 6,
"y": 5,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 8,
"y": 3,
"elevation": 0,
@@ -78,4 +78,4 @@
],
"coord_events": [],
"bg_events": []
}
}

8
data/maps/BattleFrontier_Lounge8/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 4,
"y": 5,
"elevation": 0,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 8,
"y": 7,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 8,
"y": 4,
"elevation": 0,
@@ -65,4 +65,4 @@
],
"coord_events": [],
"bg_events": []
}
}

4
data/maps/BattleFrontier_Lounge9/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_2",
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
"x": 6,
"y": 3,
"elevation": 0,
@@ -46,4 +46,4 @@
],
"coord_events": [],
"bg_events": []
}
}

10
data/maps/BattleFrontier_Mart/map.json
View File

@@ -15,7 +15,7 @@
"connections": null,
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE",
"graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE",
"x": 1,
"y": 3,
"elevation": 3,
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 5,
"y": 4,
"elevation": 3,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_MAN",
"x": 5,
"y": 5,
"elevation": 3,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BOY_2",
"graphics_id": "OBJ_EVENT_GFX_BOY_2",
"x": 8,
"y": 4,
"elevation": 3,
@@ -85,4 +85,4 @@
],
"coord_events": [],
"bg_events": []
}
}

54
data/maps/BattleFrontier_OutsideEast/map.json
View File

@@ -21,7 +21,7 @@
],
"object_events": [
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 20,
"y": 17,
"elevation": 0,
@@ -34,7 +34,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 42,
"y": 15,
"elevation": 0,
@@ -47,7 +47,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HIKER",
"graphics_id": "OBJ_EVENT_GFX_HIKER",
"x": 53,
"y": 6,
"elevation": 0,
@@ -60,7 +60,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 54,
"y": 16,
"elevation": 0,
@@ -73,7 +73,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 37,
"y": 32,
"elevation": 0,
@@ -86,7 +86,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_COOK",
"graphics_id": "OBJ_EVENT_GFX_COOK",
"x": 41,
"y": 56,
"elevation": 3,
@@ -99,7 +99,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_EXPERT_F",
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
"x": 8,
"y": 46,
"elevation": 0,
@@ -112,7 +112,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M",
"graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M",
"x": 34,
"y": 41,
"elevation": 0,
@@ -125,7 +125,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_RICH_BOY",
"graphics_id": "OBJ_EVENT_GFX_RICH_BOY",
"x": 45,
"y": 47,
"elevation": 3,
@@ -138,7 +138,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F",
"graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F",
"x": 59,
"y": 35,
"elevation": 0,
@@ -151,7 +151,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_TWIN",
"graphics_id": "OBJ_EVENT_GFX_TWIN",
"x": 18,
"y": 40,
"elevation": 0,
@@ -164,7 +164,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_1",
"graphics_id": "OBJ_EVENT_GFX_MAN_1",
"x": 17,
"y": 40,
"elevation": 0,
@@ -177,7 +177,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 40,
"y": 56,
"elevation": 3,
@@ -190,7 +190,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_SUDOWOODO",
"graphics_id": "OBJ_EVENT_GFX_SUDOWOODO",
"x": 54,
"y": 62,
"elevation": 3,
@@ -203,7 +203,7 @@
"flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 42,
"y": 34,
"elevation": 3,
@@ -216,7 +216,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_3",
"graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 51,
"y": 53,
"elevation": 3,
@@ -229,7 +229,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
"graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 62,
"y": 18,
"elevation": 0,
@@ -242,7 +242,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MAN_3",
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
"x": 11,
"y": 21,
"elevation": 0,
@@ -255,7 +255,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 10,
"y": 21,
"elevation": 0,
@@ -268,7 +268,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_5",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
"x": 16,
"y": 30,
"elevation": 0,
@@ -281,7 +281,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_BLACK_BELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 33,
"y": 14,
"elevation": 0,
@@ -294,7 +294,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_MANIAC",
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
"x": 54,
"y": 31,
"elevation": 0,
@@ -307,7 +307,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_4",
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
"x": 54,
"y": 32,
"elevation": 0,
@@ -320,7 +320,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN",
"graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN",
"x": 58,
"y": 55,
"elevation": 3,
@@ -333,7 +333,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_GENTLEMAN",
"graphics_id": "OBJ_EVENT_GFX_GENTLEMAN",
"x": 48,
"y": 41,
"elevation": 0,
@@ -346,7 +346,7 @@
"flag": "0"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
"graphics_id": "OBJ_EVENT_GFX_CAMPER",
"x": 29,
"y": 14,
"elevation": 0,
@@ -526,4 +526,4 @@
"script": "Common_EventScript_ShowPokemonCenterSign"
}
]
}
}

Some files were not shown because too many files have changed in this diff Show More