summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/map.json2
-rw-r--r--data/maps/BattleFrontier_BattleTowerLobby/scripts.inc2
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/map.json2
-rw-r--r--data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc75
-rw-r--r--data/maps/MagmaHideout_4F/scripts.inc5
-rw-r--r--data/maps/Route110_TrickHouseEntrance/scripts.inc5
-rw-r--r--data/maps/SeafloorCavern_Room9/scripts.inc5
-rw-r--r--data/maps/UnionRoom/map.json18
-rw-r--r--data/maps/UnionRoom/scripts.inc24
9 files changed, 65 insertions, 73 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
index 339b20b56..d758b365b 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.json
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -76,7 +76,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96",
+ "script": "BattleFrontier_BattleTowerLobby_EventScript_Reporter",
"flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER"
},
{
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 3d278308c..2936218d8 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
end
BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
- call BattleFrontier_BattleTowerLobby_EventScript_28CC84
+ call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
setvar VAR_0x8004, 10
special CallApprenticeFunction
compare VAR_0x8004, 0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
index 0591d3c8e..2f1de5b03 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B",
+ "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer",
"flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER"
}
],
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 09da9a00e..3645d5cab 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -496,116 +496,117 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
release
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
lock
faceplayer
- goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
- goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
+ goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed
+ goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_Interview
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
- setvar VAR_0x8005, 11
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
+ setvar VAR_0x8005, TVSHOW_FAN_CLUB_SPECIAL
special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF
+ compare VAR_RESULT, TRUE
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2
copyvar VAR_0x800A, VAR_0x8006
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281BCB, MSGBOX_DEFAULT
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0:: @ 821CDE0
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C06, MSGBOX_DEFAULT
- goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion:: @ 821CDE0
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink, MSGBOX_DEFAULT
+ goto LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE:: @ 821CDEE
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C3D, MSGBOX_YESNO
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
compare VAR_RESULT, NO
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE15:: @ 821CE15
+LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281C65, MSGBOX_DEFAULT
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2, MSGBOX_DEFAULT
setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_QUESTION
copyvar VAR_0x8005, VAR_0x800A
call Common_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 1
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDE0
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion
compare VAR_RESULT, 0
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CDEE
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D:: @ 821CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- message LilycoveCity_PokemonTrainerFanClub_Text_281C95
+ message LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer
waitmessage
setvar VAR_0x8004, SCROLL_MULTI_POKEMON_FAN_CLUB_RATER
special ShowScrollableMultichoice
waitstate
setvar VAR_0x8004, 8
switch VAR_RESULT
- case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
- case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F
+ case 11, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
+ case MULTI_B_PRESSED, LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer
setvar VAR_0x8004, 8
special BufferStreakTrainerText
copyvar VAR_0x8006, VAR_0x800A
copyvar VAR_0x8005, VAR_RESULT
special PutFanClubSpecialOnTheAir
- goto LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8
+ goto LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CE9F:: @ 821CE9F
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CCD, MSGBOX_YESNO
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2, MSGBOX_YESNO
compare VAR_RESULT, YES
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer
compare VAR_RESULT, NO
- goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21CE4D
+ goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEC6:: @ 821CEC6
+LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer:: @ 821CEC6
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281CF5, MSGBOX_DEFAULT
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer, MSGBOX_DEFAULT
release
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
+LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT
+ msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo, MSGBOX_DEFAULT
setflag FLAG_FAN_CLUB_STRENGTH_SHARED
release
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED:: @ 821CEED
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
setvar VAR_0x8004, 8
special BufferStreakTrainerText
- msgbox LilycoveCity_PokemonTrainerFanClub_Text_281DB4, MSGBOX_DEFAULT
+ msgbox LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial, MSGBOX_DEFAULT
release
end
-LilycoveCity_PokemonTrainerFanClub_EventScript_21CEFF:: @ 821CEFF
+@ Shouldnt be reached
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
end
LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 44a135368..08b59e1f0 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -9,10 +9,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
delay 20
setvar VAR_RESULT, 1
playse SE_W197
- setfieldeffectargument 0, 18
- setfieldeffectargument 1, 42
- setfieldeffectargument 2, 0
- dofieldeffect FLDEFF_SPARKLE
+ dofieldeffectsparkle 18, 42, 0
waitfieldeffect FLDEFF_SPARKLE
setvar VAR_RESULT, 1
playfanfare MUS_ME_TAMA
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 10102e956..0de4153cc 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -749,10 +749,7 @@ Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
setvar VAR_0x8006, 0
- setfieldeffectargument 0, VAR_0x8004
- setfieldeffectargument 1, VAR_0x8005
- setfieldeffectargument 2, VAR_0x8006
- dofieldeffect FLDEFF_SPARKLE
+ dofieldeffectsparkle VAR_0x8004, VAR_0x8005, VAR_0x8006
waitfieldeffect FLDEFF_SPARKLE
delay 10
return
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 68db475cd..43c503682 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -37,10 +37,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
waitstate
setvar VAR_RESULT, 1
playse SE_W197
- setfieldeffectargument 0, 16
- setfieldeffectargument 1, 42
- setfieldeffectargument 2, 0
- dofieldeffect FLDEFF_SPARKLE
+ dofieldeffectsparkle 16, 42, 0
waitfieldeffect FLDEFF_SPARKLE
closemessage
setvar VAR_RESULT, 0
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index c42cd362c..4c7b487fb 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -24,7 +24,7 @@
"movement_range_y": 0,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D236",
+ "script": "UnionRoom_EventScript_Attendant",
"flag": "0"
},
{
@@ -37,7 +37,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D204",
+ "script": "UnionRoom_EventScript_Player4",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4"
},
{
@@ -50,7 +50,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D22C",
+ "script": "UnionRoom_EventScript_Player8",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8"
},
{
@@ -63,7 +63,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D222",
+ "script": "UnionRoom_EventScript_Player7",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7"
},
{
@@ -76,7 +76,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D218",
+ "script": "UnionRoom_EventScript_Player6",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6"
},
{
@@ -89,7 +89,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D20E",
+ "script": "UnionRoom_EventScript_Player5",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5"
},
{
@@ -102,7 +102,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D1FA",
+ "script": "UnionRoom_EventScript_Player3",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3"
},
{
@@ -115,7 +115,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D1F0",
+ "script": "UnionRoom_EventScript_Player2",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2"
},
{
@@ -128,7 +128,7 @@
"movement_range_y": 1,
"trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0",
- "script": "UnionRoom_EventScript_23D1E6",
+ "script": "UnionRoom_EventScript_Player1",
"flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1"
}
],
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index c2f375e0f..eac27fb5c 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,9 +1,9 @@
UnionRoom_MapScripts:: @ 823D1A6
- map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1
+ map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
.byte 0
-UnionRoom_MapScript1_23D1B1: @ 823D1B1
+UnionRoom_OnResume: @ 823D1B1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
@@ -26,7 +26,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1
UnionRoom_OnTransition: @ 823D1E5
end
-UnionRoom_EventScript_23D1E6:: @ 823D1E6
+UnionRoom_EventScript_Player1:: @ 823D1E6
lock
faceplayer
setvar VAR_RESULT, 1
@@ -34,7 +34,7 @@ UnionRoom_EventScript_23D1E6:: @ 823D1E6
release
end
-UnionRoom_EventScript_23D1F0:: @ 823D1F0
+UnionRoom_EventScript_Player2:: @ 823D1F0
lock
faceplayer
setvar VAR_RESULT, 2
@@ -42,7 +42,7 @@ UnionRoom_EventScript_23D1F0:: @ 823D1F0
release
end
-UnionRoom_EventScript_23D1FA:: @ 823D1FA
+UnionRoom_EventScript_Player3:: @ 823D1FA
lock
faceplayer
setvar VAR_RESULT, 3
@@ -50,7 +50,7 @@ UnionRoom_EventScript_23D1FA:: @ 823D1FA
release
end
-UnionRoom_EventScript_23D204:: @ 823D204
+UnionRoom_EventScript_Player4:: @ 823D204
lock
faceplayer
setvar VAR_RESULT, 4
@@ -58,7 +58,7 @@ UnionRoom_EventScript_23D204:: @ 823D204
release
end
-UnionRoom_EventScript_23D20E:: @ 823D20E
+UnionRoom_EventScript_Player5:: @ 823D20E
lock
faceplayer
setvar VAR_RESULT, 5
@@ -66,7 +66,7 @@ UnionRoom_EventScript_23D20E:: @ 823D20E
release
end
-UnionRoom_EventScript_23D218:: @ 823D218
+UnionRoom_EventScript_Player6:: @ 823D218
lock
faceplayer
setvar VAR_RESULT, 6
@@ -74,7 +74,7 @@ UnionRoom_EventScript_23D218:: @ 823D218
release
end
-UnionRoom_EventScript_23D222:: @ 823D222
+UnionRoom_EventScript_Player7:: @ 823D222
lock
faceplayer
setvar VAR_RESULT, 7
@@ -82,7 +82,7 @@ UnionRoom_EventScript_23D222:: @ 823D222
release
end
-UnionRoom_EventScript_23D22C:: @ 823D22C
+UnionRoom_EventScript_Player8:: @ 823D22C
lock
faceplayer
setvar VAR_RESULT, 8
@@ -90,7 +90,7 @@ UnionRoom_EventScript_23D22C:: @ 823D22C
release
end
-UnionRoom_EventScript_23D236:: @ 823D236
+UnionRoom_EventScript_Attendant:: @ 823D236
lock
faceplayer
setvar VAR_RESULT, 9
@@ -98,7 +98,7 @@ UnionRoom_EventScript_23D236:: @ 823D236
release
end
-UnionRoom_EventScript_23D240:: @ 823D240
+UnionRoom_EventScript_Unused:: @ 823D240
lockall
setvar VAR_RESULT, 10
waitstate
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 16:17:28 +0000