diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:25 -0400 |
| commit | 6f0a4b22152bcefac4bcd5f2532d8452583973d0 (patch) | |
| tree | ab26c0a41eb010d12d96e15b1982b707f337041b /data/scripts/pokeblocks.inc | |
| parent | 788dc307d403794f5e6eda65ebcc5d864827145d (diff) | |
Use fadescreen constants, sync common scripts after pc.inc
Diffstat (limited to 'data/scripts/pokeblocks.inc')
| -rw-r--r-- | data/scripts/pokeblocks.inc | 8 |
1 files changed, 4 insertions, 4 deletions
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 |