summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/scripts.inc12
-rw-r--r--data/maps/DewfordTown/scripts.inc4
-rw-r--r--data/maps/DoubleBattleColosseum/map.json8
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc8
-rw-r--r--data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc2
-rw-r--r--data/maps/RecordCorner/map.json8
-rw-r--r--data/maps/Route123_BerryMastersHouse/scripts.inc4
-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.json4
10 files changed, 28 insertions, 28 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 8d407ac1d..6d53a33e1 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -572,8 +572,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EEE7:: @ 823EEE7
BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
msgbox BattleFrontier_BattleTowerLobby_Text_23F969, MSGBOX_DEFAULT
- setvar VAR_0x8004, 1
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -581,8 +581,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF32:: @ 823EF32
BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
msgbox BattleFrontier_BattleTowerLobby_Text_23F9AA, MSGBOX_DEFAULT
- setvar VAR_0x8004, 2
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
@@ -590,8 +590,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EF4C:: @ 823EF4C
BattleFrontier_BattleTowerLobby_EventScript_23EF66:: @ 823EF66
msgbox BattleFrontier_BattleTowerLobby_Text_23F9D4, MSGBOX_DEFAULT
- setvar VAR_0x8004, 3
- call BattleFrontier_BattleTowerLobby_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
+ call Common_ShowEasyChatScreen
lock
faceplayer
goto BattleFrontier_BattleTowerLobby_EventScript_23EF8A
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index d1f382e36..ed8acea17 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -608,8 +608,8 @@ DewfordTown_EventScript_1E9948:: @ 81E9948
DewfordTown_EventScript_1E9952:: @ 81E9952
msgbox DewfordTown_Text_1EA242, MSGBOX_DEFAULT
- setvar VAR_0x8004, 9
- call DewfordTown_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json
index 7480e36c1..172bb3fdc 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": "EventScript_DoubleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773BE"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot2"
},
{
"type": "trigger",
@@ -70,7 +70,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773A3"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot1"
},
{
"type": "trigger",
@@ -79,7 +79,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773D9"
+ "script": "EventScript_DoubleBattleColosseum_PlayerSpot3"
}
],
"bg_events": []
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index f65d901bb..f83be42b9 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -512,9 +512,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
@@ -542,9 +542,9 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
- setvar VAR_0x8004, 14
+ setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
- call LilycoveCity_PokemonTrainerFanClub_EventScript_271E7C
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index aa570010e..41f8af97c 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 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 4777472d2..d34ad4903 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": "EventScript_RecordCenter_Spot0"
},
{
"type": "trigger",
@@ -75,7 +75,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277447"
+ "script": "EventScript_RecordCenter_Spot2"
},
{
"type": "trigger",
@@ -84,7 +84,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_08277432"
+ "script": "EventScript_RecordCenter_Spot1"
},
{
"type": "trigger",
@@ -93,7 +93,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_0827745C"
+ "script": "EventScript_RecordCenter_Spot3"
}
],
"bg_events": []
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 6d4afa30a..31158782d 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -41,8 +41,8 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0
dotimebasedevents
goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F
msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT
- setvar VAR_0x8004, 13
- call Route123_BerryMastersHouse_EventScript_271E7C
+ setvar VAR_0x8004, EASY_CHAT_TYPE_GOOD_SAYING
+ call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json
index 167344e61..a7ad50f1b 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": "EventScript_SingleBattleColosseum_PlayerSpot0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_0827737E"
+ "script": "EventScript_SingleBattleColosseum_PlayerSpot1"
}
],
"bg_events": []
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index d107037d4..c7ceb0a4f 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 ChooseHalfPartyForBattle
waitstate
return
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index 257c7d1c8..1c409132d 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -52,7 +52,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773F5"
+ "script": "EventScript_TradeCenter_Chair0"
},
{
"type": "trigger",
@@ -61,7 +61,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": "0",
- "script": "gUnknown_082773FF"
+ "script": "EventScript_TradeCenter_Chair1"
}
],
"bg_events": []