diff options
Diffstat (limited to 'data')
52 files changed, 128 insertions, 127 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index c24ea1222..4402f5517 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -24,6 +24,7 @@ #include "constants/field_poison.h" #include "constants/field_specials.h" #include "constants/field_tasks.h" +#include "constants/field_weather.h" #include "constants/flags.h" #include "constants/frontier_util.h" #include "constants/game_stat.h" @@ -720,9 +721,9 @@ Common_EventScript_ShowPokemonCenterSign:: @ 8271E73 end Common_ShowEasyChatScreen:: @ 8271E7C - fadescreen 1 + fadescreen FADE_TO_BLACK special ShowEasyChatScreen - fadescreen 0 + fadescreen FADE_FROM_BLACK return Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84 @@ -773,17 +774,17 @@ Common_EventScript_PlayGymBadgeFanfare:: @ 827207E return Common_EventScript_OutOfCenterPartyHeal:: @ 8272083 - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty - fadescreen 0 + fadescreen FADE_FROM_BLACK return EventScript_RegionMap:: @ 827208F lockall msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special FieldShowRegionMap waitstate releaseall @@ -868,7 +869,7 @@ Common_EventScript_FerryDepartIsland:: @ 8272250 .include "data/scripts/kecleon.inc" Common_EventScript_NameReceivedPartyMon:: @ 82723DD - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate return @@ -1045,16 +1046,16 @@ Common_EventScript_DirectCornerAttendant:: @ 8273767 end Common_EventScript_RemoveStaticPokemon:: @ 827376D - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK release end Common_EventScript_LegendaryFlewAway:: @ 8273776 - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK bufferspeciesname 0, VAR_0x8004 msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT release diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index f2251165c..1764b8ffd 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -240,7 +240,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A arena_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc index d6c3a3ca5..b4879f493 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc @@ -133,7 +133,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47 goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc index 561753d0f..b4d0b3871 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc @@ -166,7 +166,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249ABF:: @ 8249ABF goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_249C15 frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleDomeLobby_Text_24A26E, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE @@ -367,7 +367,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D84:: @ 8249D84 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DDB compare VAR_RESULT, 3 call_if_eq BattleFrontier_BattleDomeLobby_EventScript_249DE4 - fadescreen 1 + fadescreen FADE_TO_BLACK dome_showresultstree waitstate end diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc index 56d8e2e64..c554922d6 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc @@ -91,20 +91,20 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3BB:: @ 824B3BB dome_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3DD:: @ 824B3DD msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B9B5, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK dome_showopponentinfo waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F BattleFrontier_BattleDomePreBattleRoom_EventScript_24B3F5:: @ 824B3F5 call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B40A - fadescreen 1 + fadescreen FADE_TO_BLACK dome_showtourneytree waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F @@ -138,7 +138,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B46D:: @ 824B46D message BattleFrontier_BattleDomePreBattleRoom_Text_24B70C waitmessage waitbuttonpress - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, 2 @ 2 of the 3 party mons are selected for battle @@ -227,7 +227,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7 waitfanfare special HealPlayerParty call BattleFrontier_BattleDomePreBattleRoom_EventScript_24B600 - fadescreen 1 + fadescreen FADE_TO_BLACK dome_showstatictourneytree waitstate goto BattleFrontier_BattleDomePreBattleRoom_EventScript_24B24F diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 11c731f24..47385a1d7 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -39,7 +39,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9 call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType call BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK factory_setswapped factory_rentmons waitstate @@ -163,7 +163,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98 case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2 - fadescreen 1 + fadescreen FADE_TO_BLACK factory_swapmons waitstate compare VAR_RESULT, 1 @@ -208,7 +208,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47 factory_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 3f635767d..fbc348797 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -168,7 +168,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F palace_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc index 64000a6ac..b50468e19 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc @@ -155,7 +155,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6 goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc index f0c7b941b..4389d0d0f 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc @@ -118,7 +118,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc index a0c7ece1d..825530806 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc @@ -125,7 +125,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD pike_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc index 7d3ddb2f1..6d6ce708a 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc @@ -131,7 +131,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904 goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 9c4012604..6bbf91708 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -146,7 +146,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241E22:: @ 8241E22 tower_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index c0c6fa900..6d7bb156f 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -219,7 +219,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_2492DB:: @ 82492DB tower_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 7694efaae..6c322f33a 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -216,7 +216,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleTowerLobby_Text_2407A6, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_PARTY_SIZE @@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleTowerLobby_Text_240A50, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE @@ -351,7 +351,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleTowerLobby_Text_240DDB, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE @@ -418,7 +418,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F02B frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT msgbox BattleFrontier_BattleTowerLobby_Text_24115E, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 97e41cd96..3dd8fc98c 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -264,7 +264,7 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696 msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT special GetBattleFrontierTutorMoveIndex - fadescreen 1 + fadescreen FADE_TO_BLACK special CloseBattlePointsWindow special CloseBattleFrontierTutorWindow special ChooseMonForMoveTutor diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index 378819f43..552f3b095 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -50,12 +50,12 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT closemessage playse SE_KAIDAN - fadescreenspeed 1, 4 + fadescreenspeed FADE_TO_BLACK, 4 setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setvar VAR_SOOTOPOLIS_CITY_STATE, 3 removeobject 1 clearflag FLAG_HIDE_SKY_PILLAR_WALLACE - fadescreen 0 + fadescreen FADE_FROM_BLACK release end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 3fe146f99..89cda0e40 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -52,7 +52,7 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850 EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - fadescreenspeed 1, 24 + fadescreenspeed FADE_TO_BLACK, 24 special GameClear waitstate releaseall @@ -60,7 +60,7 @@ EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9 EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5 setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F - fadescreenspeed 1, 24 + fadescreenspeed FADE_TO_BLACK, 24 special GameClear waitstate releaseall diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index 5bad66f01..d60b561ce 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -165,7 +165,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 8200B51 fallarbortent_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index ef5c4299c..53006f577 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -127,7 +127,7 @@ FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 820005D goto_if_eq FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT msgbox FallarborTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 2 setvar VAR_0x8005, FRONTIER_PARTY_SIZE special ChoosePartyForBattleFrontier diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 20121d500..2cdb626bd 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -190,10 +190,10 @@ FarawayIsland_Interior_EventScript_MewHideLeft:: @ 8267ED0 FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB lockall - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK setflag FLAG_HIDE_MEW removeobject 1 - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK msgbox FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded, MSGBOX_DEFAULT closemessage releaseall diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index b6874d99f..bdfce4325 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO @@ -216,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO compare VAR_RESULT, YES @@ -504,42 +504,42 @@ LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735 LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 1 releaseall end LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 2 releaseall end LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 3 releaseall end LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 4 releaseall end LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 5 releaseall end LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 6 releaseall end diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 4279d3064..f3328a979 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -182,35 +182,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1 msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN - fadescreen 1 + fadescreen FADE_TO_BLACK showcontestwinner 13 releaseall end diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 7d9e0f239..2592ccd9c 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -25,9 +25,9 @@ LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B compare VAR_RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special MoveDeleterChooseMoveToForget - fadescreen 0 + fadescreen FADE_FROM_BLACK compare VAR_0x8005, MAX_MON_MOVES goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget special BufferMoveDeleterNicknameAndMove diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 08b59e1f0..e536709b1 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -62,14 +62,14 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560 setvar VAR_SLATEPORT_CITY_STATE, 1 setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setvar VAR_SLATEPORT_HARBOR_STATE, 1 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 6 removeobject 2 removeobject 3 removeobject 4 removeobject 5 setflag FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - fadescreen 0 + fadescreen FADE_FROM_BLACK releaseall end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 46dfe025f..32fb2aa7b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -248,7 +248,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown waitmovement 0 special SavePlayerParty - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -267,7 +267,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032 special LoadPlayerParty switch VAR_RESULT case 1, MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha - fadescreen 1 + fadescreen FADE_TO_BLACK special SetCB2WhiteOut waitstate @@ -287,7 +287,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071 closemessage setvar VAR_MOSSDEEP_CITY_STATE, 3 fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_MOSSDEEP_SPACE_CENTER_STATE, 3 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA @@ -304,10 +304,10 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071 setobjectxy 1, 6, 2 turnobject 1, DIR_NORTH call MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer - fadescreen 0 + fadescreen FADE_FROM_BLACK msgbox MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN removeobject 4 @@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071 setobjectxyperm 3, 5, 6 setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND addobject 3 - fadescreen 0 + fadescreen FADE_FROM_BLACK end MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index a70d7e3ae..e57260b2a 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -47,13 +47,13 @@ MtChimney_EventScript_Maxie:: @ 822EE0B msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT closemessage delay 30 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 29 removeobject 3 removeobject 22 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - fadescreen 0 + fadescreen FADE_FROM_BLACK setobjectxyperm 1, 10, 12 addobject 1 compare VAR_FACING, DIR_EAST diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 577b87076..c13dd0da7 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -45,7 +45,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C call_if_eq MtPyre_Summit_EventScript_ArchieFacePlayer2 msgbox MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 4 removeobject 5 @@ -54,7 +54,7 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C setflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setflag FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA fadedefaultbgm - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 20 setvar VAR_MT_PYRE_STATE, 1 compare VAR_0x8008, 0 diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index dca3dc47d..56a256ca9 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -220,7 +220,7 @@ Route101_EventScript_BirchsBag:: @ 81EBE16 faceplayer setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index 30d453abd..57c5f9f57 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -206,10 +206,10 @@ Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003 Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK playse SE_SELECT delay 30 - fadescreen 0 + fadescreen FADE_FROM_BLACK msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT compare VAR_0x8009, 0 call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0433877a5..7363b1331 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -64,7 +64,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK setflag FLAG_HIDE_ROUTE_119_TEAM_AQUA setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M removeobject 1 @@ -74,7 +74,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8 removeobject 7 applymovement EVENT_OBJ_ID_PLAYER, Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition waitmovement 0 - fadescreen 0 + fadescreen FADE_FROM_BLACK applymovement 5, Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer waitmovement 0 copyobjectxytoperm 5 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index a965ff060..6018e2d95 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -225,10 +225,10 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B end Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject 30 @ Invisible Bridge Kecleon removeobject 36 @ Visible Bridge Kecleon - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK goto Route120_EventScript_StevenGiveDeconScope end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 49fdc6b9a..84d034237 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -80,12 +80,12 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304 msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT closemessage playse SE_KAIDAN - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_SOOTOPOLIS_CITY_STATE, 4 removeobject 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK releaseall end diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index e12919082..b67675d93 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -76,16 +76,16 @@ SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771 end SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK releaseall end SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785 - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK removeobject VAR_LAST_TALKED - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK bufferspeciesname 0, VAR_0x8004 msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT releaseall diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc index c786bce01..718376c4f 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc @@ -35,7 +35,7 @@ SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65 slateporttent_generaterentalmons slateporttent_generateopponentmons msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK slateporttent_rentmons waitstate SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4 @@ -98,7 +98,7 @@ SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 8208FBB case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1 - fadescreen 1 + fadescreen FADE_TO_BLACK slateporttent_swapmons waitstate compare VAR_RESULT, 1 @@ -122,7 +122,7 @@ SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022 slateporttent_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 9facd0937..38fb70e7d 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -61,11 +61,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 closemessage savebgm MUS_DUMMY fadedefaultbgm - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 2 removeobject 3 removeobject 4 - fadescreen 0 + fadescreen FADE_FROM_BLACK delay 30 setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight @@ -75,7 +75,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 call Common_EventScript_PlayerHandedOverTheItem msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT closemessage - fadescreen 1 + fadescreen FADE_TO_BLACK playfanfare MUS_ME_ASA waitfanfare special HealPlayerParty @@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00 clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1 - fadescreen 0 + fadescreen FADE_FROM_BLACK release end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index faec31717..6b80168b9 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -214,7 +214,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946 waitmovement 0 special RemoveCameraObject delay 60 - fadescreenspeed 1, 8 + fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather setvar VAR_0x8004, 0 @@ -314,7 +314,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82 waitmovement 0 special RemoveCameraObject delay 60 - fadescreenspeed 1, 8 + fadescreenspeed FADE_TO_BLACK, 8 setweather WEATHER_ABNORMAL doweather setvar VAR_0x8004, 0 @@ -505,7 +505,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E waitmovement 0 special RemoveCameraObject delay 60 - fadescreenspeed 1, 8 + fadescreenspeed FADE_TO_BLACK, 8 call SootopolisCity_EventScript_SetRoughWater removeobject 9 removeobject 10 @@ -558,7 +558,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE waitmovement 0 special RemoveCameraObject delay 60 - fadescreenspeed 1, 8 + fadescreenspeed FADE_TO_BLACK, 8 call SootopolisCity_EventScript_SetRoughWater removeobject 9 removeobject 10 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 043d9ad82..949d199d5 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -126,7 +126,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2 SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate return diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 0e8d28c1d..cde7aae2f 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -219,7 +219,7 @@ TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385 TrainerHill_Entrance_EventScript_Records:: @ 8268388 lockall - fadescreen 1 + fadescreen FADE_TO_BLACK special ShowTrainerHillRecords waitstate releaseall diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 31004fa3d..9f2b99090 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -125,7 +125,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 820251F verdanturftent_save CHALLENGE_STATUS_PAUSED playse SE_SAVE waitse - fadescreen 1 + fadescreen FADE_TO_BLACK frontier_reset end diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index 7e450dac4..882b0e887 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -128,7 +128,7 @@ VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 82018CF goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT msgbox VerdanturfTown_BattleTentLobby_Text_SelectThreeMons, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8004, 1 setvar VAR_0x8005, FRONTIER_PARTY_SIZE special ChoosePartyForBattleFrontier diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc index 9a900f315..88da0405f 100644 --- a/data/scripts/abnormal_weather.inc +++ b/data/scripts/abnormal_weather.inc @@ -179,7 +179,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 closemessage - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK setweather WEATHER_SUNNY doweather call AbnormalWeather_EventScript_CleanupMapTiles @@ -187,7 +187,7 @@ AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31 setvar VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_NONE setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 0 clearflag FLAG_HIDE_MAP_NAME_POPUP - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK releaseall end diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 53b43a1f9..b3ae904a0 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -96,7 +96,7 @@ Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM apprentice_freequestion Apprentice_EventScript_ChooseHoldItem: @ 82B6B09 - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 apprentice_openbag compare VAR_RESULT, FALSE diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc index 1d0862a65..b699c8e04 100644 --- a/data/scripts/berry_blender.inc +++ b/data/scripts/berry_blender.inc @@ -302,7 +302,7 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE @ VAR_0x8009 here is the Blender number. 1 is top right, 2 is bottom right, 3 is bottom left BerryBlender_EventScript_DoBerryBlending: @ 8293D2C copyvar VAR_0x8004, VAR_0x8009 - fadescreen 1 + fadescreen FADE_TO_BLACK special DoBerryBlending waitstate releaseall @@ -629,7 +629,7 @@ BerryBlender_EventScript_FourPlayerLink: @ 8294139 BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147 setvar VAR_0x8004, 0 - fadescreen 1 + fadescreen FADE_TO_BLACK removeobject 240 removeobject 239 removeobject 238 @@ -678,7 +678,7 @@ BerryBlender_EventScript_LinkError: @ 829419D end BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA - fadescreen 1 + fadescreen FADE_TO_BLACK specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 @@ -687,7 +687,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA end BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4 - fadescreen 0 + fadescreen FADE_FROM_BLACK switch VAR_0x8008 case 2, BerryBlender_EventScript_TwoPlayerLink case 3, BerryBlender_EventScript_ThreePlayerLink diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6b2da5ccb..f4b592b69 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -39,7 +39,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374 end BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393 - fadescreen 1 + fadescreen FADE_TO_BLACK closemessage special Bag_ChooseBerry waitstate diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index f37596961..2da5fa6b6 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -723,7 +723,7 @@ EventScript_BattleColosseum2P_PlayerSpot1:: @ 827737E end EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -734,7 +734,7 @@ EventScript_BattleColosseum4P_PlayerSpot0:: @ 8277388 end EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -745,7 +745,7 @@ EventScript_BattleColosseum4P_PlayerSpot1:: @ 82773A3 end EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -756,7 +756,7 @@ EventScript_BattleColosseum4P_PlayerSpot2:: @ 82773BE end EventScript_BattleColosseum4P_PlayerSpot3:: @ 82773D9 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate compare VAR_RESULT, 0 @@ -838,14 +838,14 @@ RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471 CableClub_EventScript_ReadTrainerCard:: @ 827747E msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special Script_ShowLinkTrainerCard waitstate end CableClub_EventScript_ReadTrainerCardColored:: @ 827748D msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special Script_ShowLinkTrainerCard waitstate end @@ -1309,7 +1309,7 @@ EventScript_WirelessBoxResults:: @ 8277B8A specialvar VAR_RESULT, IsWirelessAdapterConnected compare VAR_RESULT, FALSE goto_if_eq CableClub_EventScript_AdapterNotConnected - fadescreen 1 + fadescreen FADE_TO_BLACK special sub_801A42C waitstate msgbox CableClub_Text_ParticipantsStepUpToCounter, MSGBOX_DEFAULT @@ -1408,7 +1408,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9 compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8005, 0 special ChooseMonForWirelessMinigame waitstate @@ -1427,7 +1427,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35 compare VAR_RESULT, FALSE goto_if_eq MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon msgbox MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_0x8005, 1 special ChooseMonForWirelessMinigame waitstate diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 968464f9d..6506897ee 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -102,7 +102,7 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56 compare VAR_RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons msgbox Route117_PokemonDayCare_Text_WhichMonShouldWeRaise, MSGBOX_DEFAULT - fadescreen 1 + fadescreen FADE_TO_BLACK special ChooseSendDaycareMon waitstate compare VAR_0x8004, 255 diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index ccdebd5cd..3ce36b384 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -15,7 +15,7 @@ EventScript_FieldWhiteOut:: @ 82736D9 waitbuttonpress special Script_FadeOutMapMusic waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, EventScript_SetRespawnLavaridgePkmnCenter special SetCB2WhiteOut waitstate @@ -42,7 +42,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq TrainerHill_1F_EventScript_Lost special Script_FadeOutMapMusic waitstate - fadescreen 1 + fadescreen FADE_TO_BLACK special SetCB2WhiteOut waitstate end diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc index f553ea0ad..c2ff593cf 100644 --- a/data/scripts/lilycove_lady.inc +++ b/data/scripts/lilycove_lady.inc @@ -73,7 +73,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E end LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 special Script_FavorLadyOpenBagMenu waitstate @@ -326,7 +326,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778 LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785 msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D - fadescreen 1 + fadescreen FADE_TO_BLACK setvar VAR_RESULT, 0 special Script_QuizLadyOpenBagMenu waitstate @@ -350,7 +350,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE special ClearQuizLadyPlayerAnswer setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1 - fadescreen 1 + fadescreen FADE_TO_BLACK special QuizLadySetCustomQuestion waitstate compare VAR_RESULT, 0 @@ -418,7 +418,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0 end LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA - fadescreen 1 + fadescreen FADE_TO_BLACK special OpenPokeblockCaseForContestLady waitstate compare VAR_RESULT, 0xFFFF diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index cc583022d..ec58b26f1 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -6,7 +6,7 @@ Common_EventScript_GetGiftMonPartySlot:: @ 827378B return Common_EventScript_NameReceivedBoxMon:: @ 8273797 - fadescreen 1 + fadescreen FADE_TO_BLACK special ChangeBoxPokemonNickname waitstate lock diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 1b706e603..58618efe7 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -101,14 +101,14 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F incrementgamestat GAME_STAT_CHECKED_CLOCK - fadescreen 1 + fadescreen FADE_TO_BLACK special Special_ViewWallClock waitstate releaseall end PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849 - fadescreen 1 + fadescreen FADE_TO_BLACK special StartWallClock waitstate return diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 72d1d3c92..6a811d935 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -52,7 +52,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC end SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0 - fadescreen 1 + fadescreen FADE_TO_BLACK special OpenPokeblockCaseOnFeeder waitstate compare VAR_RESULT, 0xFFFF diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 617b19b42..0f2ad02b1 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -214,10 +214,10 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8 msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance - fadescreenswapbuffers 1 + fadescreenswapbuffers FADE_TO_BLACK special MoveOutOfSecretBaseFromOutside closemessage - fadescreenswapbuffers 0 + fadescreenswapbuffers FADE_FROM_BLACK msgbox SecretBase_Text_MovingCompletedUseSecretPower, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SecretBase_EventScript_CancelOnEntrance |