summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/abnormal_weather.inc4
-rw-r--r--data/scripts/apprentice.inc2
-rw-r--r--data/scripts/berry_blender.inc8
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/scripts/cable_club.inc18
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/field_poison.inc4
-rw-r--r--data/scripts/lilycove_lady.inc8
-rw-r--r--data/scripts/mevent_altering_cave.inc2
-rw-r--r--data/scripts/mevent_aurora_ticket.inc4
-rw-r--r--data/scripts/mevent_battle_card.inc2
-rw-r--r--data/scripts/mevent_mystic_ticket.inc4
-rw-r--r--data/scripts/mevent_old_sea_map.inc4
-rw-r--r--data/scripts/mevent_pichu.inc12
-rw-r--r--data/scripts/mevent_trainer.inc2
-rw-r--r--data/scripts/pc_transfer.inc2
-rw-r--r--data/scripts/players_house.inc4
-rw-r--r--data/scripts/safari_zone.inc2
-rw-r--r--data/scripts/secret_base.inc4
19 files changed, 45 insertions, 45 deletions
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 8b4259151..f27692448 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/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc
index 072005934..499907edd 100644
--- a/data/scripts/mevent_altering_cave.inc
+++ b/data/scripts/mevent_altering_cave.inc
@@ -1,7 +1,7 @@
MysteryEventScript_AlteringCave:: @ 86756E3
setvaddress MysteryEventScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1
- compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+ compare VAR_ALTERING_CAVE_WILD_SET, 10
vgoto_if_ne MysteryEventScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0
MysteryEventScript_AlteringCave_: @ 86756FD
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
index 811c840aa..177d69681 100644
--- a/data/scripts/mevent_aurora_ticket.inc
+++ b/data/scripts/mevent_aurora_ticket.inc
@@ -7,13 +7,13 @@ MysteryEventScript_AuroraTicket:: @ 867533C
checkflag FLAG_BATTLED_DEOXYS
vgoto_if_eq AuroraTicket_Obtained
checkitem ITEM_AURORA_TICKET, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq AuroraTicket_Obtained
vmessage sText_AuroraTicketForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_AURORA_TICKET, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq AuroraTicket_NoBagSpace
giveitem_std ITEM_AURORA_TICKET
setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc
index 8c36ed63a..77f9a9b24 100644
--- a/data/scripts/mevent_battle_card.inc
+++ b/data/scripts/mevent_battle_card.inc
@@ -4,7 +4,7 @@ MysteryEventScript_BattleCard:: @ 867513C
vgoto_if_eq MysteryEventScript_BattleCardInfo
setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
specialvar VAR_0x8008, GetMysteryEventCardVal
- compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES
+ compare VAR_0x8008, REQUIRED_CARD_BATTLES
vgoto_if_ne MysteryEventScript_BattleCardInfo
lock
faceplayer
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
index 0264fb77f..9d532b043 100644
--- a/data/scripts/mevent_mystic_ticket.inc
+++ b/data/scripts/mevent_mystic_ticket.inc
@@ -9,13 +9,13 @@ MysteryEventScript_MysticTicket:: @ 867550B
checkflag FLAG_CAUGHT_HO_OH
vgoto_if_eq MysticTicket_Obtained
checkitem ITEM_MYSTIC_TICKET, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq MysticTicket_Obtained
vmessage sText_MysticTicketForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_MYSTIC_TICKET, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq MysticTicket_NoBagSpace
giveitem_std ITEM_MYSTIC_TICKET
setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
index dffb56caa..45c5f6728 100644
--- a/data/scripts/mevent_old_sea_map.inc
+++ b/data/scripts/mevent_old_sea_map.inc
@@ -7,13 +7,13 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
checkflag FLAG_CAUGHT_MEW
vgoto_if_eq OldSeaMap_Obtained
checkitem ITEM_OLD_SEA_MAP, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq OldSeaMap_Obtained
vmessage sText_MysteryGiftOldSeaMapForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_OLD_SEA_MAP, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq OldSeaMap_NoBagSpace
giveitem_std ITEM_OLD_SEA_MAP
setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index 4df317564..4f5c739af 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -6,7 +6,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D
SurfPichu_GiveIfPossible: @ 8674D4C
specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
- compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE
+ compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
vgoto_if_eq SurfPichu_FullParty
setflag FLAG_MYSTERY_EVENT_DONE
vcall SurfPichu_GiveEgg
@@ -33,15 +33,15 @@ SurfPichu_GiveEgg: @ 8674D7E
giveegg SPECIES_PICHU
setmonobedient VAR_EVENT_PICHU_SLOT
setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+ compare VAR_EVENT_PICHU_SLOT, 1
vgoto_if_eq SurfPichu_Slot1
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+ compare VAR_EVENT_PICHU_SLOT, 2
vgoto_if_eq SurfPichu_Slot2
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+ compare VAR_EVENT_PICHU_SLOT, 3
vgoto_if_eq SurfPichu_Slot3
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+ compare VAR_EVENT_PICHU_SLOT, 4
vgoto_if_eq SurfPichu_Slot4
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+ compare VAR_EVENT_PICHU_SLOT, 5
vgoto_if_eq SurfPichu_Slot5
return
diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc
index 1b0117078..4114750d8 100644
--- a/data/scripts/mevent_trainer.inc
+++ b/data/scripts/mevent_trainer.inc
@@ -1,7 +1,7 @@
MysteryEventScript_VisitingTrainer:: @ 8674EC1
setvaddress MysteryEventScript_VisitingTrainer
special ValidateEReaderTrainer
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
lock
faceplayer
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 18:35:10 +0000