summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/LilycoveCity_ContestHall/map.json76
-rw-r--r--data/maps/LilycoveCity_ContestHall/scripts.inc214
-rw-r--r--data/maps/LilycoveCity_ContestLobby/map.json86
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc96
4 files changed, 237 insertions, 235 deletions
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json
index 3522c7963..456c7eec8 100644
--- a/data/maps/LilycoveCity_ContestHall/map.json
+++ b/data/maps/LilycoveCity_ContestHall/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 4,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B485",
+ "script": "LilycoveCity_ContestHall_EventScript_Boy1",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 3,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B48E",
+ "script": "LilycoveCity_ContestHall_EventScript_Boy2",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B497",
+ "script": "LilycoveCity_ContestHall_EventScript_Girl",
"flag": "0"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B4A9",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestMC",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B4C0",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestJudge",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B4D7",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestant1",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B4EE",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestant2",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B505",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestant3",
"flag": "0"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B51C",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestant4",
"flag": "0"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B533",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience1",
"flag": "0"
},
{
@@ -154,7 +154,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B56A",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience4",
"flag": "0"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B53C",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience2",
"flag": "0"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B581",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestMC",
"flag": "0"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B598",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestJudge",
"flag": "0"
},
{
@@ -206,7 +206,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B5AF",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant1",
"flag": "0"
},
{
@@ -219,7 +219,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B5C6",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant2",
"flag": "0"
},
{
@@ -232,7 +232,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B5DD",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant3",
"flag": "0"
},
{
@@ -245,7 +245,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B5F4",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestant4",
"flag": "0"
},
{
@@ -258,7 +258,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B60B",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience1",
"flag": "0"
},
{
@@ -271,7 +271,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B639",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience3",
"flag": "0"
},
{
@@ -284,7 +284,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B622",
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyContestAudience2",
"flag": "0"
},
{
@@ -297,7 +297,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B553",
+ "script": "LilycoveCity_ContestHall_EventScript_SmartContestAudience3",
"flag": "0"
},
{
@@ -310,7 +310,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B650",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestMC",
"flag": "0"
},
{
@@ -323,7 +323,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B667",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestJudge",
"flag": "0"
},
{
@@ -336,7 +336,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B67E",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestant1",
"flag": "0"
},
{
@@ -349,7 +349,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B695",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestant2",
"flag": "0"
},
{
@@ -362,7 +362,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B6AC",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestant3",
"flag": "0"
},
{
@@ -375,7 +375,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B6C3",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestant4",
"flag": "0"
},
{
@@ -388,7 +388,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B6DA",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience1",
"flag": "0"
},
{
@@ -401,7 +401,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B71C",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience3",
"flag": "0"
},
{
@@ -414,7 +414,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B705",
+ "script": "LilycoveCity_ContestHall_EventScript_CuteContestAudience2",
"flag": "0"
},
{
@@ -427,7 +427,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestHall_EventScript_21B4A0",
+ "script": "LilycoveCity_ContestHall_EventScript_Sailor",
"flag": "0"
}
],
@@ -469,7 +469,7 @@
"y": 16,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B733"
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
},
{
"type": "sign",
@@ -477,7 +477,7 @@
"y": 28,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+ "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
},
{
"type": "sign",
@@ -485,7 +485,7 @@
"y": 28,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B745"
+ "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
},
{
"type": "sign",
@@ -493,7 +493,7 @@
"y": 28,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B745"
+ "script": "LilycoveCity_ContestHall_EventScript_SmartStageSign"
},
{
"type": "sign",
@@ -501,7 +501,7 @@
"y": 16,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B733"
+ "script": "LilycoveCity_ContestHall_EventScript_BeautyStageSign"
},
{
"type": "sign",
@@ -509,7 +509,7 @@
"y": 28,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestHall_EventScript_21B73C"
+ "script": "LilycoveCity_ContestHall_EventScript_CuteStageSign"
}
]
} \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 5823b6da4..fb98c72f6 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -1,319 +1,319 @@
LilycoveCity_ContestHall_MapScripts:: @ 821B484
.byte 0
-LilycoveCity_ContestHall_EventScript_21B485:: @ 821B485
- msgbox LilycoveCity_ContestHall_Text_21B74E, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy1:: @ 821B485
+ msgbox LilycoveCity_ContestHall_Text_TodayWonSmartnessContest, MSGBOX_NPC
end
-LilycoveCity_ContestHall_EventScript_21B48E:: @ 821B48E
- msgbox LilycoveCity_ContestHall_Text_21B7D7, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Boy2:: @ 821B48E
+ msgbox LilycoveCity_ContestHall_Text_EnteredBunchOfContests, MSGBOX_NPC
end
-LilycoveCity_ContestHall_EventScript_21B497:: @ 821B497
- msgbox LilycoveCity_ContestHall_Text_21B899, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Girl:: @ 821B497
+ msgbox LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks, MSGBOX_NPC
end
-LilycoveCity_ContestHall_EventScript_21B4A0:: @ 821B4A0
- msgbox LilycoveCity_ContestHall_Text_21B911, MSGBOX_NPC
+LilycoveCity_ContestHall_EventScript_Sailor:: @ 821B4A0
+ msgbox LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous, MSGBOX_NPC
end
-LilycoveCity_ContestHall_EventScript_21B4A9:: @ 821B4A9
+LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21B977, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT
closemessage
applymovement 4, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B4C0:: @ 821B4C0
+LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21B9DC, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT
closemessage
applymovement 5, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B4D7:: @ 821B4D7
+LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BA44, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT
closemessage
applymovement 6, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B4EE:: @ 821B4EE
+LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BAD5, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT
closemessage
applymovement 7, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B505:: @ 821B505
+LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BB84, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT
closemessage
applymovement 8, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B51C:: @ 821B51C
+LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BBDD, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT
closemessage
applymovement 9, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B533:: @ 821B533
- msgbox LilycoveCity_ContestHall_Text_21BC65, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartContestAudience1:: @ 821B533
+ msgbox LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa, MSGBOX_SIGN
end
-LilycoveCity_ContestHall_EventScript_21B53C:: @ 821B53C
+LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BC89, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT
closemessage
applymovement 12, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B553:: @ 821B553
+LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BD30, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT
closemessage
applymovement 22, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B56A:: @ 821B56A
+LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BD70, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT
closemessage
applymovement 11, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B581:: @ 821B581
+LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BDDD, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT
closemessage
applymovement 13, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B598:: @ 821B598
+LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BE16, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT
closemessage
applymovement 14, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B5AF:: @ 821B5AF
+LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BE77, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT
closemessage
applymovement 15, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B5C6:: @ 821B5C6
+LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BEDE, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT
closemessage
applymovement 16, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B5DD:: @ 821B5DD
+LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BF6E, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT
closemessage
applymovement 17, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B5F4:: @ 821B5F4
+LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21BFE3, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT
closemessage
applymovement 18, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B60B:: @ 821B60B
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C07F, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT
closemessage
applymovement 19, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B622:: @ 821B622
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C0D8, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT
closemessage
applymovement 21, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B639:: @ 821B639
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C137, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT
closemessage
applymovement 20, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B650:: @ 821B650
+LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C1A4, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT
closemessage
applymovement 23, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B667:: @ 821B667
+LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C215, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT
closemessage
applymovement 24, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B67E:: @ 821B67E
+LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C27F, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT
closemessage
applymovement 25, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B695:: @ 821B695
+LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C2BB, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT
closemessage
applymovement 26, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B6AC:: @ 821B6AC
+LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C307, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT
closemessage
applymovement 27, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B6C3:: @ 821B6C3
+LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C365, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT
closemessage
applymovement 28, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B6DA:: @ 821B6DA
+LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA
lockall
applymovement 29, Common_Movement_FacePlayer
waitmovement 0
- msgbox LilycoveCity_ContestHall_Text_21C3F4, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_MyChildIsInContest, MSGBOX_DEFAULT
closemessage
applymovement 29, Common_Movement_FaceOriginalDirection
waitmovement 0
delay 25
- msgbox LilycoveCity_ContestHall_Text_21C411, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_ComeOnDear, MSGBOX_DEFAULT
releaseall
end
-LilycoveCity_ContestHall_EventScript_21B705:: @ 821B705
+LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C4B1, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT
closemessage
applymovement 31, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B71C:: @ 821B71C
+LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C
lock
faceplayer
- msgbox LilycoveCity_ContestHall_Text_21C445, MSGBOX_DEFAULT
+ msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT
closemessage
applymovement 30, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestHall_EventScript_21B733:: @ 821B733
- msgbox LilycoveCity_ContestHall_Text_21C512, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_BeautyStageSign:: @ 821B733
+ msgbox LilycoveCity_ContestHall_Text_BeautyContestStage, MSGBOX_SIGN
end
-LilycoveCity_ContestHall_EventScript_21B73C:: @ 821B73C
- msgbox LilycoveCity_ContestHall_Text_21C548, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_CuteStageSign:: @ 821B73C
+ msgbox LilycoveCity_ContestHall_Text_CuteContestStage, MSGBOX_SIGN
end
-LilycoveCity_ContestHall_EventScript_21B745:: @ 821B745
- msgbox LilycoveCity_ContestHall_Text_21C57B, MSGBOX_SIGN
+LilycoveCity_ContestHall_EventScript_SmartStageSign:: @ 821B745
+ msgbox LilycoveCity_ContestHall_Text_SmartContestStage, MSGBOX_SIGN
end
-LilycoveCity_ContestHall_Text_21B74E: @ 821B74E
+LilycoveCity_ContestHall_Text_TodayWonSmartnessContest: @ 821B74E
.string "This POKéMON won the BEAUTY CONTEST\n"
.string "here before.\p"
.string "Well, guess what? Today, I made it\n"
.string "win a SMARTNESS CONTEST!\p"
.string "My abilities scare even me…$"
-LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
+LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7
.string "I've entered a bunch of CONTESTS,\n"
.string "so I'm seeing how things work.\p"
.string "If you're in a COOLNESS CONTEST,\n"
@@ -321,29 +321,29 @@ LilycoveCity_ContestHall_Text_21B7D7: @ 821B7D7
.string "But smart moves and cute moves\n"
.string "don't go over well, for instance.$"
-LilycoveCity_ContestHall_Text_21B899: @ 821B899
+LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks: @ 821B899
.string "That young man who won earlier had\n"
.string "a whole bunch of different {POKEBLOCK}S.\p"
.string "Can you win if you had that many\n"
.string "of those things?$"
-LilycoveCity_ContestHall_Text_21B911: @ 821B911
+LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous: @ 821B911
.string "Whoa, isn't this place humongous!\p"
.string "The tension in the air… It's not\n"
.string "like a CONTEST hall in the sticks.$"
-LilycoveCity_ContestHall_Text_21B977: @ 821B977
+LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal: @ 821B977
.string "MC: Okay, SMART POKéMON and their\n"
.string "TRAINERS, are you ready?!\p"
.string "Give it your best showing!\n"
.string "Let's appeal!$"
-LilycoveCity_ContestHall_Text_21B9DC: @ 821B9DC
+LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest: @ 821B9DC
.string "JUDGE: Are you enjoying this CONTEST?\p"
.string "Come back with three friends, and\n"
.string "all of you may enter a CONTEST!$"
-LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
+LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44
.string "Ayayayay…\n"
.string "I entered the wrong CONTEST.\p"
.string "I entered this tough POKéMON in\n"
@@ -351,7 +351,7 @@ LilycoveCity_ContestHall_Text_21BA44: @ 821BA44
.string "Come on, wow them with a smart-looking\n"
.string "ROCK SMASH.$"
-LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
+LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5
.string "I've spent many a year, and all my\n"
.string "wisdom besides, raising this POKéMON\l"
.string "to be smart.\p"
@@ -359,54 +359,54 @@ LilycoveCity_ContestHall_Text_21BAD5: @ 821BAD5
.string "young pup's POKéMON.\p"
.string "My dear wife, are you seeing this?$"
-LilycoveCity_ContestHall_Text_21BB84: @ 821BB84
+LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext: @ 821BB84
.string "There it is!\p"
.string "If my POKéMON pulls a smart move next,\n"
.string "the audience's excitement will peak!$"
-LilycoveCity_ContestHall_Text_21BBDD: @ 821BBDD
+LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife: @ 821BBDD
.string "Oh, dear, no!\p"
.string "My darling ZUBAT's LEECH LIFE is so\n"
.string "cute I kept using it over and over!\p"
.string "But these mean people don't appreciate\n"
.string "it at all!$"
-LilycoveCity_ContestHall_Text_21BC65: @ 821BC65
+LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa: @ 821BC65
.string "Kiyaaah! You're beautiful, Grandpa!$"
-LilycoveCity_ContestHall_Text_21BC89: @ 821BC89
+LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves: @ 821BC89
.string "Even when TRAINERS enter the same\n"
.string "kind of POKéMON, they all seem to use\l"
.string "different moves for appeals.\p"
.string "It's just like the way people have\n"
.string "different styles for battling.$"
-LilycoveCity_ContestHall_Text_21BD30: @ 821BD30
+LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers: @ 821BD30
.string "I think the POKéMON look smarter\n"
.string "than their TRAINERS. By a lot.$"
-LilycoveCity_ContestHall_Text_21BD70: @ 821BD70
+LilycoveCity_ContestHall_Text_StillLoveSmartnessContests: @ 821BD70
.string "When all's said and done, I still love\n"
.string "SMARTNESS CONTESTS.\p"
.string "That intellectual green color…\n"
.string "It's so… So… Cool.$"
-LilycoveCity_ContestHall_Text_21BDDD: @ 821BDDD
+LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest: @ 821BDDD
.string "MC: Are you entering the BEAUTY\n"
.string "CONTEST, too? Good luck!$"
-LilycoveCity_ContestHall_Text_21BE16: @ 821BE16
+LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty: @ 821BE16
.string "JUDGE: Ah, every POKéMON here is\n"
.string "a model of pristine beauty!\p"
.string "Why, I almost forgot to score them!$"
-LilycoveCity_ContestHall_Text_21BE77: @ 821BE77
+LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty: @ 821BE77
.string "A POKéMON this beautiful…\n"
.string "There isn't another one like it.\p"
.string "Everyone's eyes will be glued to\n"
.string "my beauty.$"
-LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
+LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE
.string "Waaaah!\p"
.string "I brushed and groomed my POKéMON\n"
.string "carefully for this CONTEST…\p"
@@ -414,96 +414,96 @@ LilycoveCity_ContestHall_Text_21BEDE: @ 821BEDE
.string "My POKéMON's coat turned all scraggly…\p"
.string "What should I do?$"
-LilycoveCity_ContestHall_Text_21BF6E: @ 821BF6E
+LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam: @ 821BF6E
.string "This AURORA BEAM is so dazzling,\n"
.string "the JUDGE won't be able to see it.\p"
.string "Uh, wait a second…\n"
.string "That'll be meaningless, then!$"
-LilycoveCity_ContestHall_Text_21BFE3: @ 821BFE3
+LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe: @ 821BFE3
.string "This pretty POKéMON looks just like\n"
.string "me when I was younger.\p"
.string "Right when I said that, my husband\n"
.string "spewed the coffee he was drinking.\p"
.string "Did I say something funny?$"
-LilycoveCity_ContestHall_Text_21C07F: @ 821C07F
+LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy: @ 821C07F
.string "You know, if I win at a BEAUTY\n"
.string "CONTEST, sure it makes me\l"
.string "happy. More than usual, anyway.$"
-LilycoveCity_ContestHall_Text_21C0D8: @ 821C0D8
+LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon: @ 821C0D8
.string "Wahahahah!\p"
.string "Will you take a gander at all those\n"
.string "pretty POKéMON!\l"
.string "I just love this sort of glitz!$"
-LilycoveCity_ContestHall_Text_21C137: @ 821C137
+LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone: @ 821C137
.string "You can't always win on just beauty\n"
.string "alone.\p"
.string "You have to groom your POKéMON so\n"
.string "it's nice and glossy like mine.$"
-LilycoveCity_ContestHall_Text_21C1A4: @ 821C1A4
+LilycoveCity_ContestHall_Text_InTheMiddleOfContest: @ 821C1A4
.string "MC: Uh-oh! Hello!\n"
.string "We're in the middle of a CONTEST!\p"
.string "Please enter at our registration\n"
.string "counter and come out, okay?$"
-LilycoveCity_ContestHall_Text_21C215: @ 821C215
+LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals: @ 821C215
.string "JUDGE: Oh, such charming and cute\n"
.string "appeals!\p"
.string "Oh, my goodness! What a perfectly\n"
.string "adorable WATER SPORT appeal!$"
-LilycoveCity_ContestHall_Text_21C27F: @ 821C27F
+LilycoveCity_ContestHall_Text_MyAzurillWasDistracted: @ 821C27F
.string "Oh, no… My sweet AZURILL was\n"
.string "distracted by another POKéMON.$"
-LilycoveCity_ContestHall_Text_21C2BB: @ 821C2BB
+LilycoveCity_ContestHall_Text_NeverWonBattleButContest: @ 821C2BB
.string "My POKéMON has never won in a battle,\n"
.string "but put it in a CONTEST and look out!$"
-LilycoveCity_ContestHall_Text_21C307: @ 821C307
+LilycoveCity_ContestHall_Text_PetalDanceIsMarvel: @ 821C307
.string "My POKéMON's PETAL DANCE is a marvel\n"
.string "of elegance.\p"
.string "I won't let anyone disturb its\n"
.string "performance.$"
-LilycoveCity_ContestHall_Text_21C365: @ 821C365
+LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter: @ 821C365
.string "Everyone's POKéMON are very cute.\p"
.string "However, if my POKéMON were to make\n"
.string "a cute appeal…\p"
.string "I'm sure that it would be so much \n"
.string "cuter than the others.$"
-LilycoveCity_ContestHall_Text_21C3F4: @ 821C3F4
+LilycoveCity_ContestHall_Text_MyChildIsInContest: @ 821C3F4
.string "My child is in this CONTEST.$"
-LilycoveCity_ContestHall_Text_21C411: @ 821C411
+LilycoveCity_ContestHall_Text_ComeOnDear: @ 821C411
.string "Come on, dear. Go for it!\n"
.string "Your POKéMON is the best!$"
-LilycoveCity_ContestHall_Text_21C445: @ 821C445
+LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest: @ 821C445
.string "I think that girl over there is\n"
.string "the cutest of the lot.\p"
.string "What's that? They're judging\n"
.string "POKéMON by their looks?$"
-LilycoveCity_ContestHall_Text_21C4B1: @ 821C4B1
+LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn: @ 821C4B1
.string "Ohh, seeing all these cute POKéMON,\n"
.string "they make we want to get my own!\p"
.string "I'm going to go catch some!$"
-LilycoveCity_ContestHall_Text_21C512: @ 821C512
+LilycoveCity_ContestHall_Text_BeautyContestStage: @ 821C512
.string "BEAUTY CONTEST STAGE\n"
.string "BE ALLURED BY BEAUTIFUL POKéMON!$"
-LilycoveCity_ContestHall_Text_21C548: @ 821C548
+LilycoveCity_ContestHall_Text_CuteContestStage: @ 821C548
.string "CUTENESS CONTEST STAGE\n"
.string "BE CHARMED BY CUTE POKéMON!$"
-LilycoveCity_ContestHall_Text_21C57B: @ 821C57B
+LilycoveCity_ContestHall_Text_SmartContestStage: @ 821C57B
.string "SMARTNESS CONTEST STAGE\n"
.string "BE IMPRESSED BY SMART POKéMON!$"
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
index 3cbb48f21..a76bba10d 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.json
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A554",
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestReceptionist",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A806",
+ "script": "LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist",
"flag": "0"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_293FA2",
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender2Man",
"flag": "0"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A708",
+ "script": "LilycoveCity_ContestLobby_EventScript_BlackBelt",
"flag": "0"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A711",
+ "script": "LilycoveCity_ContestLobby_EventScript_Girl",
"flag": "0"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A71A",
+ "script": "LilycoveCity_ContestLobby_EventScript_Artist",
"flag": "0"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_28CA59",
+ "script": "LilycoveCity_ContestLobby_EventScript_Reporter",
"flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A768",
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender3Boy",
"flag": "0"
},
{
@@ -141,7 +141,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_293FB4",
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender2Twin",
"flag": "0"
},
{
@@ -167,7 +167,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A72C",
+ "script": "LilycoveCity_ContestLobby_EventScript_Fisherman",
"flag": "0"
},
{
@@ -180,7 +180,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A723",
+ "script": "LilycoveCity_ContestLobby_EventScript_FatMan",
"flag": "0"
},
{
@@ -193,7 +193,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A735",
+ "script": "LilycoveCity_ContestLobby_EventScript_NinjaBoy",
"flag": "0"
},
{
@@ -206,7 +206,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_293FAB",
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender3PokefanF",
"flag": "0"
},
{
@@ -219,8 +219,8 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_293FBD",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT"
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender1ExpertM",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT"
},
{
"graphics_id": "EVENT_OBJ_GFX_GIRL_1",
@@ -232,7 +232,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A771",
+ "script": "LilycoveCity_ContestLobby_EventScript_Blender3Girl",
"flag": "0"
},
{
@@ -245,8 +245,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7B3",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_CAMPER",
@@ -258,8 +258,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7BE",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -271,8 +271,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7C9",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2",
@@ -284,8 +284,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7D9",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_WOMAN_1",
@@ -297,8 +297,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7E9",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_NINJA_BOY",
@@ -310,8 +310,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A7A8",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_OLD_MAN",
@@ -323,8 +323,8 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21A798",
- "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS"
+ "script": "LilycoveCity_ContestLobby_EventScript_BlendMaster",
+ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER"
},
{
"graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL",
@@ -336,7 +336,7 @@
"movement_range_y": 2,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_ContestLobby_EventScript_21ACF1",
+ "script": "LilycoveCity_ContestLobby_EventScript_LittleGirl",
"flag": "0"
}
],
@@ -378,7 +378,7 @@
"y": 5,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "EventScript_PblockLink"
+ "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderLink"
},
{
"type": "sign",
@@ -386,7 +386,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_293E1E"
+ "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender3"
},
{
"type": "sign",
@@ -394,7 +394,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A753"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner4"
},
{
"type": "sign",
@@ -402,7 +402,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A75A"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner5"
},
{
"type": "sign",
@@ -410,7 +410,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A761"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner6"
},
{
"type": "sign",
@@ -418,7 +418,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A77A"
+ "script": "LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords"
},
{
"type": "sign",
@@ -426,7 +426,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A73E"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner1"
},
{
"type": "sign",
@@ -434,7 +434,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A745"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner2"
},
{
"type": "sign",
@@ -442,7 +442,7 @@
"y": 1,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A74C"
+ "script": "LilycoveCity_ContestLobby_EventScript_ContestWinner3"
},
{
"type": "sign",
@@ -450,7 +450,7 @@
"y": 5,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "EventScript_Pblock1_Ask"
+ "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender1"
},
{
"type": "sign",
@@ -458,7 +458,7 @@
"y": 9,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_293D4D"
+ "script": "LilycoveCity_ContestLobby_EventScript_BerryBlender2"
},
{
"type": "sign",
@@ -466,7 +466,7 @@
"y": 3,
"elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
- "script": "LilycoveCity_ContestLobby_EventScript_21A784"
+ "script": "LilycoveCity_ContestLobby_EventScript_LinkContestResults"
}
]
} \ No newline at end of file
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 54364eaf3..4c44ced89 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -3,6 +3,8 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211
map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243
.byte 0
+@ Some scripts for this room are split into data/scripts/contest_hall and data/scripts/berry_blender
+
LilycoveCity_ContestLobby_OnTransition: @ 821A21C
call LilycoveCity_ContestLobby_EventScript_28CB2B
call LilycoveCity_ContestLobby_EventScript_21A227
@@ -12,13 +14,13 @@ LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227
getpricereduction POKENEWS_BLENDMASTER
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C
- clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
- setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+ clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
+ setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
return
LilycoveCity_ContestLobby_EventScript_21A23C:: @ 821A23C
- setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT
- clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
+ setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
+ clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
return
LilycoveCity_ContestLobby_MapScript2_21A243: @ 821A243
@@ -41,7 +43,7 @@ LilycoveCity_ContestLobby_EventScript_21A264:: @ 821A264
msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
lockall
fadescreen 1
- drawcontestwinner 0
+ showcontestwinner 0
lockall
msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
compare VAR_RESULT, YES
@@ -215,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_21A436:: @ 821A436
msgbox LilycoveCity_ContestLobby_Text_21ADB9, MSGBOX_DEFAULT
lockall
fadescreen 1
- drawcontestwinner 0
+ showcontestwinner 0
msgbox LilycoveCity_ContestLobby_Text_21AE78, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq LilycoveCity_ContestLobby_EventScript_21A47A
@@ -315,7 +317,7 @@ LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B
walk_in_place_fastest_left
step_end
-LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554
+LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
special sub_80F9154
specialvar VAR_RESULT, sub_80F8D24
compare VAR_RESULT, 1
@@ -355,7 +357,7 @@ LilycoveCity_ContestLobby_EventScript_21A5C9:: @ 821A5C9
LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
- copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+ copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
giveitem ITEM_CONTEST_PASS, 1
setvar VAR_0x800B, 8
setvar VAR_CONTEST_RANK, 3
@@ -474,81 +476,81 @@ LilycoveCity_ContestLobby_Movement_21A706: @ 821A706
walk_in_place_fastest_right
step_end
-LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708
+LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708
msgbox LilycoveCity_ContestLobby_Text_21B1B1, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A711:: @ 821A711
+LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711
msgbox LilycoveCity_ContestLobby_Text_21B24D, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A71A:: @ 821A71A
+LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A
msgbox LilycoveCity_ContestLobby_Text_21B2BA, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A723:: @ 821A723
+LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723
msgbox LilycoveCity_ContestLobby_Text_21B334, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A72C:: @ 821A72C
+LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C
msgbox LilycoveCity_ContestLobby_Text_21B392, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A735:: @ 821A735
+LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
msgbox LilycoveCity_ContestLobby_Text_21B3FC, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A73E:: @ 821A73E
+LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
lockall
fadescreen 1
- drawcontestwinner 1
+ showcontestwinner 1
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A745:: @ 821A745
+LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
lockall
fadescreen 1
- drawcontestwinner 2
+ showcontestwinner 2
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A74C:: @ 821A74C
+LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
lockall
fadescreen 1
- drawcontestwinner 3
+ showcontestwinner 3
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A753:: @ 821A753
+LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
lockall
fadescreen 1
- drawcontestwinner 4
+ showcontestwinner 4
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A75A:: @ 821A75A
+LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
lockall
fadescreen 1
- drawcontestwinner 5
+ showcontestwinner 5
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A761:: @ 821A761
+LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
lockall
fadescreen 1
- drawcontestwinner 6
+ showcontestwinner 6
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A768:: @ 821A768
- msgbox LilycoveCity_ContestLobby_Text_2931AA, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768
+ msgbox LilycoveCity_ContestLobby_Text_LetsGetBlendingAlready, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A771:: @ 821A771
- msgbox LilycoveCity_ContestLobby_Text_2931C6, MSGBOX_NPC
+LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771
+ msgbox LilycoveCity_ContestLobby_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
end
-LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
+LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
lockall
special ShowBerryBlenderRecordWindow
waitbuttonpress
@@ -556,7 +558,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
+LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
lockall
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_RESULTS_WINDOW
setvar VAR_0x8005, 7
@@ -566,60 +568,60 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
releaseall
end
-LilycoveCity_ContestLobby_EventScript_21A798:: @ 821A798
+LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798
lock
faceplayer
- msgbox LilycoveCity_ContestLobby_Text_2C427C, MSGBOX_DEFAULT
- goto LilycoveCity_ContestLobby_EventScript_21A7F9
+ msgbox LilycoveCity_ContestLobby_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
+ goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
end
-LilycoveCity_ContestLobby_EventScript_21A7A8:: @ 821A7A8
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8
lock
msgbox LilycoveCity_ContestLobby_Text_2C464B, MSGBOX_DEFAULT
release
end
-LilycoveCity_ContestLobby_EventScript_21A7B3:: @ 821A7B3
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3
lock
msgbox LilycoveCity_ContestLobby_Text_2C465A, MSGBOX_DEFAULT
release
end
-LilycoveCity_ContestLobby_EventScript_21A7BE:: @ 821A7BE
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE
lock
msgbox LilycoveCity_ContestLobby_Text_2C4669, MSGBOX_DEFAULT
release
end
-LilycoveCity_ContestLobby_EventScript_21A7C9:: @ 821A7C9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9
lock
faceplayer
msgbox LilycoveCity_ContestLobby_Text_2C4679, MSGBOX_DEFAULT
- goto LilycoveCity_ContestLobby_EventScript_21A7F9
+ goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
end
-LilycoveCity_ContestLobby_EventScript_21A7D9:: @ 821A7D9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9
lock
faceplayer
msgbox LilycoveCity_ContestLobby_Text_2C46B1, MSGBOX_DEFAULT
- goto LilycoveCity_ContestLobby_EventScript_21A7F9
+ goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
end
-LilycoveCity_ContestLobby_EventScript_21A7E9:: @ 821A7E9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9
lock
faceplayer
msgbox LilycoveCity_ContestLobby_Text_2C4763, MSGBOX_DEFAULT
- goto LilycoveCity_ContestLobby_EventScript_21A7F9
+ goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
end
-LilycoveCity_ContestLobby_EventScript_21A7F9:: @ 821A7F9
+LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9
closemessage
applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
-LilycoveCity_ContestLobby_EventScript_21A806:: @ 821A806
+LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
special sub_80F9154
lock
faceplayer
@@ -1001,7 +1003,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
walk_in_place_fastest_left
step_end
-LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
+LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1
lock
faceplayer
goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 19:00:57 +0000