summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/battle_pike.inc2
-rw-r--r--data/scripts/berry_blender.inc2
-rw-r--r--data/scripts/cable_club.inc32
-rw-r--r--data/scripts/cave_of_origin.inc2
-rw-r--r--data/scripts/contest_hall.inc10
-rw-r--r--data/scripts/gabby_and_ty.inc19
-rw-r--r--data/scripts/hall_of_fame.inc2
-rw-r--r--data/scripts/interview.inc15
-rw-r--r--data/scripts/mevent_pichu.inc2
-rw-r--r--data/scripts/mystery_event_club.inc4
-rw-r--r--data/scripts/new_game.inc168
-rw-r--r--data/scripts/pkmn_center_nurse.inc8
-rw-r--r--data/scripts/players_house.inc6
-rw-r--r--data/scripts/record_mix.inc7
-rw-r--r--data/scripts/secret_base.inc4
-rw-r--r--data/scripts/shared_secret_base.inc6
-rw-r--r--data/scripts/trainer_battle.inc43
-rw-r--r--data/scripts/trainer_hill.inc4
-rw-r--r--data/scripts/tv.inc8
19 files changed, 175 insertions, 169 deletions
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 67eb19011..7ba25321d 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -1,5 +1,5 @@
@ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal
-BattleFrontier_BattlePikeRoomNormal_MapScripts_2C3E1B: @ 82C3E1B
+BattleFrontier_BattlePikeRoom_MapScripts: @ 82C3E1B
map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 7ad8e9e3a..d8dbe80bd 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -711,7 +711,7 @@ BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
waitmessage
- multichoice 16, 6, MULTI_LINK_LEADER, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, BerryBlender_EventScript_TryJoinGroup
case 1, BerryBlender_EventScript_TryLeadGroup
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index b81fbb4d5..c17f77c0a 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -277,7 +277,7 @@ CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22
CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
setvar VAR_0x8004, 0
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner
- multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, 0
+ multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TradeCenter
case 1, CableClub_EventScript_Colosseum
@@ -286,7 +286,7 @@ CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
end
CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75
- multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, 0
+ multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TradeCenter
case 1, CableClub_EventScript_Colosseum
@@ -303,7 +303,7 @@ CableClub_EventScript_Colosseum:: @ 8276EB7
CableClub_EventScript_SelectBattleMode:: @ 8276EC2
message CableClub_Text_PlayWhichBattleMode
waitmessage
- multichoice 0, 0, MULTI_BATTLE_MODE, 0
+ multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_SingleBattleMode
case 1, CableClub_EventScript_DoubleBattleMode
@@ -889,7 +889,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
closemessage
end
-EventScript_ConfirmLeaveTradeRoom:: @ 82774EF
+EventScript_ConfirmLeaveCableClubRoom:: @ 82774EF
msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq EventScript_TerminateLink
@@ -927,7 +927,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 827751B
end
CableClub_EventScript_UnionRoomSelect:: @ 827755C
- multichoice 17, 6, MULTI_YESNOINFO, 0
+ multichoice 17, 6, MULTI_YESNOINFO, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_EnterUnionRoom
case 1, CableClub_EventScript_AbortLink
@@ -1039,7 +1039,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_DirectCornerNoBerry
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices
- multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_RECORD, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1049,7 +1049,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
end
CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
- multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, 0
+ multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1061,7 +1061,7 @@ CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix
- multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1070,7 +1070,7 @@ CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
end
CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
- multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, 0
+ multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessTrade
case 1, CableClub_EventScript_WirelessBattleSelect
@@ -1093,7 +1093,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
CableClub_EventScript_WirelessBattleSelect:: @ 827783B
message CableClub_Text_PlayWhichBattleMode
waitmessage
- multichoice 0, 0, MULTI_BATTLE_MODE, 0
+ multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_WirelessSingleBattle
case 1, CableClub_EventScript_WirelessDoubleBattle
@@ -1171,7 +1171,7 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
message CableClub_Text_ChooseGroupLeaderOfTwo
waitmessage
- multichoice 16, 6, MULTI_LINK_LEADER, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup2Players
case 1, CableClub_EventScript_TryLeadGroup2Players
@@ -1204,7 +1204,7 @@ CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE
CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16
message CableClub_Text_ChooseGroupLeaderOfFour
waitmessage
- multichoice 16, 6, MULTI_LINK_LEADER, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroup4Players
case 1, CableClub_EventScript_TryLeadGroup4Players
@@ -1237,7 +1237,7 @@ CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B
CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3
message CableClub_Text_ChooseGroupLeader
waitmessage
- multichoice 16, 6, MULTI_LINK_LEADER, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, CableClub_EventScript_TryJoinGroupXPlayers
case 1, CableClub_EventScript_TryLeadGroupXPlayers
@@ -1360,7 +1360,7 @@ MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34
faceplayer
message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame
waitmessage
- multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
+ multichoice 0, 0, MULTI_WIRELESS_MINIGAME, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo
case 1, MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo
@@ -1394,7 +1394,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
delay 60
message MossdeepCity_GameCorner_1F_Text_PlayWhichGame
waitmessage
- multichoice 0, 0, MULTI_WIRELESS_MINIGAME, 0
+ multichoice 0, 0, MULTI_WIRELESS_MINIGAME, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump
case 1, MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking
@@ -1443,7 +1443,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81
message CableClub_Text_ChooseGroupLeader
waitmessage
- multichoice 16, 6, MULTI_LINK_LEADER, 0
+ multichoice 16, 6, MULTI_LINK_LEADER, FALSE
switch VAR_RESULT
case 0, MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup
case 1, MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index 52a1da84f..579efdb89 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -36,7 +36,7 @@ CaveOfOrigin_EventScript_Shake:: @ 82722A7
releaseall
end
-CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1
+CaveOfOrigin_EventScript_DisableTriggers:: @ 82722C1
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_2, 1
setvar VAR_TEMP_3, 1
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 1ef723c37..db43dfdd0 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -60,7 +60,7 @@ LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
message LilycoveCity_ContestLobby_Text_EnterContest1
waitmessage
- multichoice 0, 0, MULTI_ENTERINFO, 0
+ multichoice 0, 0, MULTI_ENTERINFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ChooseContestRank
case 1, LilycoveCity_ContestLobby_EventScript_ContestInfo
@@ -71,7 +71,7 @@ LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
message LilycoveCity_ContestLobby_Text_WhichTopic1
waitmessage
- multichoice 0, 0, MULTI_CONTEST_INFO, 0
+ multichoice 0, 0, MULTI_CONTEST_INFO, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_ExplainContests
case 1, LilycoveCity_ContestLobby_EventScript_ExplainContestTypes
@@ -121,7 +121,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
message LilycoveCity_ContestLobby_Text_EnterWhichRank
waitmessage
- multichoice 0, 0, MULTI_CONTEST_RANK, 0
+ multichoice 0, 0, MULTI_CONTEST_RANK, FALSE
switch VAR_RESULT
case 0, LilycoveCity_ContestLobby_EventScript_EnterNormalRank
case 1, LilycoveCity_ContestLobby_EventScript_EnterSuperRank
@@ -156,7 +156,7 @@ LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
message LilycoveCity_ContestLobby_Text_EnterWhichContest1
waitmessage
- multichoice 0, 0, MULTI_CONTEST_TYPE, 0
+ multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
switch VAR_RESULT
case 5, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
setvar VAR_TEMP_9, 1
showcontestresults
setvar VAR_TEMP_9, 0
- playbgm MUS_CONTEST_WINNER, 0
+ playbgm MUS_CONTEST_WINNER, FALSE
return
ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 84cd315f7..60854a801 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,19 +1,6 @@
-@ Unused
-EventScript_28CCAA:: @ 828CCAA
- setvar VAR_0x8005, 8
- special InterviewBefore
- compare VAR_RESULT, 1
- goto_if_eq EventScript_UnusedRet
- setvar VAR_0x8005, 8
- special InterviewAfter
- return
-
-EventScript_UnusedRet:: @ 828CCC6
- return
-
@ Gabby and Ty always move to the same spots for the first 5 battles
@ From the 6th battle onwards, they move randomly between locations 6-8
-@ Note: The local IDs of Gabby and Ty are hard-coded in GabbyAndTySetScriptVarsToObjectEventLocalIds
+@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
cleartrainerflag TRAINER_GABBY_AND_TY_6
specialvar VAR_RESULT, GabbyAndTyGetBattleNum
@@ -211,7 +198,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToObjectEventLocalIds
+ special GetGabbyAndTyLocalIds
compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH
@@ -242,7 +229,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
special GabbyAndTyBeforeInterview
- special GabbyAndTySetScriptVarsToObjectEventLocalIds
+ special GetGabbyAndTyLocalIds
compare VAR_FACING, DIR_NORTH
call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
compare VAR_FACING, DIR_SOUTH
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
index 91a88f348..021784f81 100644
--- a/data/scripts/hall_of_fame.inc
+++ b/data/scripts/hall_of_fame.inc
@@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady
- clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+ clearflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index f968577f3..2d1c08196 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -278,7 +278,7 @@ BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
waitmessage
- multichoice 20, 8, MULTI_SATISFACTION, 1
+ multichoice 20, 8, MULTI_SATISFACTION, TRUE
copyvar VAR_0x8008, VAR_RESULT
compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_Satisfied
@@ -342,3 +342,16 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
return
+
+@ Unused
+EventScript_ContestLiveInterview:: @ 828CCAA
+ setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
+ special InterviewBefore
+ compare VAR_RESULT, TRUE
+ goto_if_eq EventScript_ContestLiveInterviewEnd
+ setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
+ special InterviewAfter
+ return
+
+EventScript_ContestLiveInterviewEnd:: @ 828CCC6
+ return
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index c51558e9e..2b9e09df9 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -30,7 +30,7 @@ SurfPichu_FullParty: @ 8674D73
SurfPichu_GiveEgg: @ 8674D7E
giveegg SPECIES_PICHU
- setmonobedient VAR_EVENT_PICHU_SLOT
+ setmoneventlegal VAR_EVENT_PICHU_SLOT
setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
compare VAR_EVENT_PICHU_SLOT, 1
vgoto_if_eq SurfPichu_Slot1
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 16e9a657f..77d24adf6 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -8,7 +8,7 @@ MysteryEventClub_EventScript_Man:: @ 8291539
MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
- multichoice 17, 6, MULTI_YESNOINFO_2, 0
+ multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateProfile
case 1, MysteryEventClub_EventScript_DeclineShowProfile
@@ -60,7 +60,7 @@ MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5
MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
- multichoice 17, 6, MULTI_YESNOINFO_2, 0
+ multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
switch VAR_RESULT
case 0, MysteryEventClub_EventScript_CreateNewProfile
case 1, MysteryEventClub_EventScript_DeclineNewProfile
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 77102a001..2a314b3d1 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -1,115 +1,115 @@
EventScript_ResetAllBerries:: @ 827149D
@ Route 102
- setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
- setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_102_ORAN, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@ Route 104
- setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
- setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
- setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
- setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
- setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_ORAN_1, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_104_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 116
- setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
- setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
- setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
- setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_116_PINAP_1, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_116_CHESTO_1, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_116_CHESTO_2, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_116_PINAP_2, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
@ Route 115
- setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
- setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
- setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
- setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
- setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_115_KELPSY_1, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_115_KELPSY_2, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_115_KELPSY_3, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_115_BLUK_1, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_115_BLUK_2, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
@ Route 103
- setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
- setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_103_CHERI_1, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_103_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_103_CHERI_2, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
@ Route 110
- setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
- setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
- setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_110_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_110_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_110_NANAB_3, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 117
- setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_117_WEPEAR_3, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_117_WEPEAR_2, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_117_WEPEAR_1, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
@ Route 112
- setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
- setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_112_RAWST_2, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_112_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_112_PECHA_1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_112_RAWST_1, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Route 111
- setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
- setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
- setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
- setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_111_RAZZ_1, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_111_RAZZ_2, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_111_ORAN_1, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_111_ORAN_2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
@ Route 114
- setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
- setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
- setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_114_PERSIM_2, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_114_PERSIM_3, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_114_PERSIM_1, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
@ Route 118
- setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
- setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_118_SITRUS_1, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_118_SITRUS_2, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
@ Route 119
- setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
- setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
- setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
- setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_POMEG_1, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_POMEG_2, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_POMEG_3, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_HONDEW_1, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_HONDEW_2, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_SITRUS, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_119_LEPPA, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
@ Route 120
- setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
- setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
- setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_ASPEAR_1, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_ASPEAR_2, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_ASPEAR_3, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_PECHA_1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_PECHA_2, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_PECHA_3, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_WEPEAR, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_PINAP, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_NANAB, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_120_RAZZ, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
@ Route 121
- setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
- setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
- setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
- setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
- setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
- setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_PERSIM, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_ASPEAR, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_RAWST, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_CHESTO, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_NANAB_1, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_121_NANAB_2, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
@ Route 123
- setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
- setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
- setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
- setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
- setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
- setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
- setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
- setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_LEPPA_1, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_LEPPA_2, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_POMEG_3, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_POMEG_4, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_GREPA_1, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_GREPA_2, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_QUALOT_4, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_QUALOT_1, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_POMEG_1, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_POMEG_2, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_GREPA_3, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_GREPA_4, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_QUALOT_2, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_QUALOT_3, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_SITRUS, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_123_RAWST, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
@ Mirage Island
- setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
+ setberrytree BERRY_TREE_ROUTE_130_LIECHI, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
return
EventScript_ResetAllMapFlags:: @ 82715DE
@@ -179,8 +179,8 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
- setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
- setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1
+ setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE
+ setflag FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE
@@ -229,7 +229,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_ROUTE_110_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE
setflag FLAG_HIDE_ROUTE_104_RIVAL
- setflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
+ setflag FLAG_HIDE_LILYCOVE_MOTEL_GAME_DESIGNERS
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
setflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE
setflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
@@ -271,6 +271,6 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
- setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT
+ setflag FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL
call EventScript_ResetAllBerries
end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index a26e9e22a..6b4bbe2ef 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2
message gText_RestoredPkmnToFullHealth
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain
return
@@ -73,7 +73,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03
message gText_ThankYouForWaiting
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain2
return
@@ -84,7 +84,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
setflag FLAG_NURSE_UNION_ROOM_REMINDER
message CableClub_Text_PlayerIsWaiting
waitmessage
- applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow
+ applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
waitmovement 0
message gText_WeHopeToSeeYouAgain
return
@@ -129,7 +129,7 @@ EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5
goto EventScript_PkmnCenterNurse_HealPkmn
end
-EventScript_PkmnCenterNurse_Bow: @ 8271AD0
+Movement_PkmnCenterNurse_Bow: @ 8271AD0
nurse_joy_bow
delay_4
step_end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 684b27e71..427355332 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
waitmovement 0
- playbgm MUS_ENCOUNTER_INTERVIEWER, 0
+ playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
@@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
waitmovement 0
- playbgm MUS_ENCOUNTER_INTERVIEWER, 0
+ playbgm MUS_ENCOUNTER_INTERVIEWER, FALSE
msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
closemessage
applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
@@ -501,7 +501,7 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
compare VAR_0x8008, FEMALE
call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale
msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT
- multichoice 22, 8, MULTI_TV_LATI, 1
+ multichoice 22, 8, MULTI_TV_LATI, TRUE
copyvar VAR_0x8004, VAR_RESULT
special InitRoamer
copyvar VAR_ROAMER_POKEMON, VAR_RESULT
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
index 23f224ae4..e058816ab 100644
--- a/data/scripts/record_mix.inc
+++ b/data/scripts/record_mix.inc
@@ -6,16 +6,15 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
compare VAR_RESULT, YES
goto_if_eq EventScript_MixRecords
compare VAR_RESULT, NO
- goto_if_eq EventScript_DeclineMixRecords
- goto EventScript_DeclineMixRecords
+ goto_if_eq EventScript_EndMixRecords
+ goto EventScript_EndMixRecords
EventScript_MixRecords:: @ 8271D83
special RecordMixingPlayerSpotTriggered
waitstate
lock
faceplayer
-
-EventScript_DeclineMixRecords:: @ 8271D89
+EventScript_EndMixRecords:: @ 8271D89
message Text_WeHopeToSeeYouAgain
waitmessage
waitbuttonpress
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 4a20de9a6..9e7a60e15 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -157,7 +157,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B
end
SecretBase_EventScript_FirstEntrance:: @ 8275B81
- applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_275BB4
+ applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_EnterBase
waitmovement 0
setvar VAR_INIT_SECRET_BASE, 1
msgbox SecretBase_Text_WantToMakeYourSecretBaseHere, MSGBOX_YESNO
@@ -175,7 +175,7 @@ SecretBase_EventScript_SetAsBase:: @ 8275BAB
waitstate
end
-SecretBase_Movement_275BB4: @ 8275BB4
+SecretBase_Movement_EnterBase: @ 8275BB4
walk_up
walk_up
step_end
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index 0fa61a214..9e1759872 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -48,7 +48,7 @@ SecretBase_EventScript_PCCancel:: @ 823B4E8
end
SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
- multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, 0
+ multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp
@@ -58,7 +58,7 @@ SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
end
SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
- multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, 0
+ multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCDecorationMenu
case 1, SecretBase_EventScript_PCPackUp
@@ -98,7 +98,7 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589
SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1
message SecretBase_Text_WhatWouldYouLikeToDo
waitmessage
- multichoice 0, 0, MULTI_REGISTER_MENU, 0
+ multichoice 0, 0, MULTI_REGISTER_MENU, FALSE
switch VAR_RESULT
case 0, SecretBase_EventScript_PCRegister
case 1, SecretBase_EventScript_PCRegistryMenu
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index aa96e7b35..0b5c1118b 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -1,10 +1,9 @@
-EventScript_271354:: @ 8271354
- cmdD8
- cmdD9
-
-EventScript_ShowSecondTrainerIntro:: @ 8271356
- special SetUpTrainerEncounterMusic
- special EndTrainerApproach
+EventScript_StartTrainerApproach:: @ 8271354
+ selectapproachingtrainer
+ lockfortrainer
+EventScript_TrainerApproach:: @ 8271356
+ special PlayTrainerEncounterMusic
+ special DoTrainerApproach
waitstate
goto EventScript_ShowTrainerIntroMsg
@@ -14,11 +13,12 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
specialvar VAR_RESULT, GetTrainerFlag
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoNormalTrainerBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
goto EventScript_ShowTrainerIntroMsg
+
EventScript_NoNormalTrainerBattle:: @ 8271389
gotopostbattlescript
@@ -27,27 +27,29 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
faceplayer
call EventScript_RevealTrainer
specialvar VAR_RESULT, GetTrainerFlag
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
goto EventScript_ShowTrainerIntroMsg
+
EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA
special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
+
EventScript_NoDoubleTrainerBattle:: @ 82713C1
gotopostbattlescript
EventScript_DoNoIntroTrainerBattle:: @ 82713C2
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
- special SetUpTrainerEncounterMusic
+ special PlayTrainerEncounterMusic
trainerbattlebegin
gotopostbattlescript
@@ -56,8 +58,8 @@ EventScript_TryDoRematchBattle:: @ 82713D1
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, FALSE
goto_if_eq EventScript_NoRematchTrainerBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
@@ -65,6 +67,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1
waitstate
releaseall
end
+
EventScript_NoRematchTrainerBattle:: @ 82713F7
gotopostbattlescript
@@ -75,8 +78,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
@@ -84,8 +87,10 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
waitstate
releaseall
end
+
EventScript_NoDoubleRematchTrainerBattle:: @ 8271427
gotopostbattlescript
+
EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428
special ShowTrainerCantBattleSpeech
waitmessage
@@ -108,7 +113,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C
waitbuttonpress
special TryPrepareSecondApproachingTrainer
compare VAR_RESULT, TRUE
- goto_if_eq EventScript_ShowSecondTrainerIntro
+ goto_if_eq EventScript_TrainerApproach
goto EventScript_DoTrainerBattle
EventScript_DoTrainerBattle:: @ 8271454
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index 34d0462bb..e4e453228 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -16,7 +16,9 @@ TrainerHill_OnWarp: @ 82C8372
TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
setvar VAR_TEMP_3, 1
-@ forced stop
+.ifdef BUGFIX
+ end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
+.endif
TrainerHill_OnFrame: @ 82C8381
map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index a2d5473b1..1dfc1884b 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -2,14 +2,14 @@ EventScript_TV:: @ 827EE0B
lockall
incrementgamestat GAME_STAT_WATCHED_TV
special ResetTVShowState
- specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV
- compare VAR_RESULT, 2
+ specialvar VAR_RESULT, CheckForPlayersHouseNews
+ compare VAR_RESULT, PLAYERS_HOUSE_TV_MOVIE
goto_if_eq EventScript_PlayersHouseMovie
- compare VAR_RESULT, 1
+ compare VAR_RESULT, PLAYERS_HOUSE_TV_LATI
goto_if_eq EventScript_PlayersHouseLatiNewsFlash
goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
- specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
+ specialvar VAR_RESULT, IsGabbyAndTyShowOnTheAir
compare VAR_RESULT, TRUE
goto_if_eq EventScript_DoInSearchOfTrainers
goto EventScript_TryDoPokeNews
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 02:03:37 +0000