Use fadescreen constants

This commit is contained in:
GriffinR
2019-12-15 11:42:50 -05:00
parent 6967caefb2
commit 96ec5e1b84
69 changed files with 188 additions and 187 deletions

View File

@@ -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