dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use fadescreen constants

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

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