summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-10 20:42:50 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-10 20:42:50 -0500
commite75f45dbcfcd65901035fbc7e3793332670eb306 (patch)
tree68b8a0144067b5da0d057094e14b9ae7827357df /data/maps
parentf2f1b1978ba3423a519df66d4f382dd68ac8b185 (diff)
Reverse engineered many of the multiplayer events
Some corrections to the way events are handled and identified.
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/DoubleBattleColosseum/map.json8
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc2
-rw-r--r--data/maps/RecordCorner/map.json8
-rw-r--r--data/maps/SingleBattleColosseum/map.json4
-rw-r--r--data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc2
-rw-r--r--data/maps/TradeCenter/map.json6
6 files changed, 16 insertions, 14 deletions
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json
index c0cd88761..b46c8fa3e 100644
--- a/data/maps/DoubleBattleColosseum/map.json
+++ b/data/maps/DoubleBattleColosseum/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_08277388"
+ "script": "gEventScript_DoubleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_082773BE"
+ "script": "gEventScript_DoubleBattleColosseum_PlayerSpot2"
},
{
"type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_082773A3"
+ "script": "gEventScript_DoubleBattleColosseum_PlayerSpot1"
},
{
"type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_082773D9"
+ "script": "gEventScript_DoubleBattleColosseum_PlayerSpot3"
}
],
"bg_events": []
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 0602c9dad..d2e5dded1 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
waitmovement 0
special SavePlayerParty
fadescreen 1
- special sub_80F9438
+ special EventScript_ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
goto_if_ne MossdeepCity_SpaceCenter_2F_EventScript_224032
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
index 98bcc0201..9bf870a52 100644
--- a/data/maps/RecordCorner/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -66,7 +66,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_0827741D"
+ "script": "gEventScript_RecordCenter_Spot0"
},
{
"type": "trigger",
@@ -75,7 +75,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_08277447"
+ "script": "gEventScript_RecordCenter_Spot2"
},
{
"type": "trigger",
@@ -84,7 +84,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_08277432"
+ "script": "gEventScript_RecordCenter_Spot1"
},
{
"type": "trigger",
@@ -93,7 +93,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_0827745C"
+ "script": "gEventScript_RecordCenter_Spot3"
}
],
"bg_events": []
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json
index a2cc78b2f..4576bc042 100644
--- a/data/maps/SingleBattleColosseum/map.json
+++ b/data/maps/SingleBattleColosseum/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_08277374"
+ "script": "gEventScript_SingleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_0827737E"
+ "script": "gEventScript_SingleBattleColosseum_PlayerSpot1"
}
],
"bg_events": []
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 5db204293..2d8de4bb4 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -129,7 +129,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
fadescreen 1
- special sub_80F9438
+ special EventScript_ChooseHalfPartyForBattle
waitstate
return
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index f7511a753..6ab2bdbe1 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -46,22 +46,24 @@
],
"coord_events": [
{
+ "comment": "This is trade seat #1.",
"type": "trigger",
"x": 4,
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_082773F5"
+ "script": "gEventScript_TradeCenter_Chair0"
},
{
+ "comment": "This is trade seat #2.",
"type": "trigger",
"x": 7,
"y": 5,
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "gUnknown_082773FF"
+ "script": "gEventScript_TradeCenter_Chair1"
}
],
"bg_events": []