summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/scripts/cable_club.inc12
-rw-r--r--data/scripts/day_care.inc2
-rw-r--r--data/scripts/gabby_and_ty.inc2
-rw-r--r--data/scripts/magma_chimney.inc4
-rw-r--r--data/scripts/mauville_man.inc2
-rw-r--r--data/scripts/mystery_event_club.inc4
-rw-r--r--data/scripts/players_house.inc4
-rw-r--r--data/scripts/pokeblocks.inc8
-rw-r--r--data/scripts/safari_zone.inc2
10 files changed, 21 insertions, 21 deletions
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index c47cb9bee..f7952540c 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -39,7 +39,7 @@ BerryTree_EventScript_1A1558:: @ 81A1558
end
BerryTree_EventScript_1A1577:: @ 81A1577
- fadescreen 1
+ fadescreen FADE_TO_BLACK
closemessage
special Berry_FadeAndGoToBerryBagMenu
waitstate
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index e700547da..0d84f3972 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -613,7 +613,7 @@ SingleBattleColosseum_EventScript_1A4379:: @ 81A4379
end
DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_80C5568
waitstate
compare VAR_RESULT, 0
@@ -624,7 +624,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
end
DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_80C5568
waitstate
compare VAR_RESULT, 0
@@ -635,7 +635,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
end
DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_80C5568
waitstate
compare VAR_RESULT, 0
@@ -646,7 +646,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
end
DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_80C5568
waitstate
compare VAR_RESULT, 0
@@ -727,7 +727,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479
message CableClub_LookAtTrainerCard1
waitmessage
waitbuttonpress
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_8083BDC
waitstate
end
@@ -736,7 +736,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487
message CableClub_LookAtTrainerCard2
waitmessage
waitbuttonpress
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special sub_8083BDC
waitstate
end
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 7c12343d4..2eb32cc71 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -100,7 +100,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
compare VAR_RESULT, 1
goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3
msgbox Route117_PokemonDayCare_Text_1B2947, MSGBOX_DEFAULT
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special ChooseSendDaycareMon
waitstate
compare VAR_0x8004, 255
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 60852bf2f..cb5e230b9 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -302,7 +302,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3
goto_if_eq Route111_EventScript_1AE72D
msgbox Route111_Text_1AC40F, MSGBOX_DEFAULT
setvar VAR_0x8004, 10
- call Route111_EventScript_1A00F3
+ call Common_EventScript_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, 0
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index a5b0c77bf..70e91f09b 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -57,12 +57,12 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
.endif
closemessage
delay 30
- fadescreen 1
+ fadescreen FADE_TO_BLACK
removeobject 2
removeobject 3
removeobject 22
setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
- fadescreen 0
+ fadescreen FADE_FROM_BLACK
setobjectxyperm 1, 10, 12
addobject 1
compare VAR_FACING, 4
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index cadab787d..b3a91702b 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -53,7 +53,7 @@ prompt_write_lyrics:
write_lyrics:
setvar VAR_0x8004, 6
- call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
+ call Common_EventScript_ShowEasyChatScreen
lock
faceplayer
compare VAR_RESULT, NO
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 2aef98d27..0577cad57 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -25,7 +25,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A
msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
+ call Common_EventScript_ShowEasyChatScreen
lock
faceplayer
compare VAR_0x8004, 1
@@ -79,7 +79,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36
msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, MSGBOX_DEFAULT
closemessage
setvar VAR_0x8004, 0
- call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
+ call Common_EventScript_ShowEasyChatScreen
lock
faceplayer
compare VAR_0x8004, 1
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 473db0e30..63cfd18dc 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -105,14 +105,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
incrementgamestat GAME_STAT_CHECKED_CLOCK
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special ScrSpecial_ViewWallClock
waitstate
releaseall
end
LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special StartWallClock
waitstate
return
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index b764a2274..8d4a92cf4 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734
FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742
copyvar VAR_0x8004, VAR_0x8009
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special DoBerryBlending
waitstate
releaseall
@@ -269,7 +269,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F
FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D
setvar VAR_0x8004, 0
- fadescreen 1
+ fadescreen FADE_TO_BLACK
removeobject 240
removeobject 239
removeobject 238
@@ -318,7 +318,7 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973
end
FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
- fadescreen 1
+ fadescreen FADE_TO_BLACK
specialvar VAR_RESULT, GetLinkPartnerNames
copyvar VAR_0x8008, VAR_RESULT
copyvar VAR_0x8004, VAR_0x8008
@@ -327,7 +327,7 @@ FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
end
FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A
- fadescreen 0
+ fadescreen FADE_FROM_BLACK
switch VAR_0x8008
case 2, FallarborTown_ContestLobby_EventScript_1B78F3
case 3, FallarborTown_ContestLobby_EventScript_1B7901
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index aad2e3237..68efec328 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -52,7 +52,7 @@ gUnknown_081C346A:: @ 81C346A
end
EventScript_1C348E:
- fadescreen 1
+ fadescreen FADE_TO_BLACK
special OpenPokeblockCaseOnFeeder
waitstate
compare VAR_RESULT, 0xFFFF
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 00:47:31 +0000