You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Define scene constants alongside scene_scripts (#979)
Generic SCENE_DEFAULT and SCENE_FINISHED are legacy values
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
|
||||
AzaleaPokecenter1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene
|
||||
scene_script .DummyScene ; unusable
|
||||
|
||||
def_callbacks
|
||||
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
AzaleaTown_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
|
||||
scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
|
||||
scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
|
||||
scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP
|
||||
scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE
|
||||
scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_NEWMAP, .Flypoint
|
||||
@@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
|
||||
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
|
||||
playsound SFX_EXIT_BUILDING
|
||||
disappear AZALEATOWN_SILVER
|
||||
setscene SCENE_AZALEATOWN_NOTHING
|
||||
setscene SCENE_AZALEATOWN_NOOP
|
||||
waitsfx
|
||||
playmapmusic
|
||||
end
|
||||
@@ -167,7 +167,7 @@ AzaleaTownCelebiScene:
|
||||
setflag ENGINE_FOREST_IS_RESTLESS
|
||||
clearevent EVENT_ILEX_FOREST_LASS
|
||||
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
|
||||
setscene SCENE_AZALEATOWN_NOTHING
|
||||
setscene SCENE_AZALEATOWN_NOOP
|
||||
closetext
|
||||
end
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
BattleTower1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .Scene0 ; SCENE_DEFAULT
|
||||
scene_script .Scene1 ; SCENE_FINISHED
|
||||
scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE
|
||||
scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
|
||||
setval BATTLETOWERACTION_06
|
||||
special BattleTowerAction
|
||||
.SkipEverything:
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWER1F_NOOP
|
||||
.Scene1:
|
||||
end
|
||||
|
||||
@@ -79,10 +79,10 @@ Script_ChooseChallenge:
|
||||
writetext Text_SaveBeforeEnteringBattleRoom
|
||||
yesorno
|
||||
iffalse Script_Menu_ChallengeExplanationCancel
|
||||
setscene SCENE_DEFAULT
|
||||
setscene SCENE_BATTLETOWER1F_CHECKSTATE
|
||||
special TryQuickSave
|
||||
iffalse Script_Menu_ChallengeExplanationCancel
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWER1F_NOOP
|
||||
setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
|
||||
special BattleTowerAction
|
||||
special BattleTowerRoomMenu
|
||||
@@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
|
||||
special BattleTowerAction
|
||||
Script_WalkToBattleTowerElevator:
|
||||
musicfadeout MUSIC_NONE, 8
|
||||
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
|
||||
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
|
||||
setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
|
||||
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_ENTER
|
||||
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_ENTER
|
||||
setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_ENTER
|
||||
follow BATTLETOWER1F_RECEPTIONIST, PLAYER
|
||||
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
|
||||
setval BATTLETOWERACTION_0A
|
||||
@@ -206,10 +206,10 @@ Script_StartChallenge: ; unreferenced
|
||||
writetext Text_SaveBeforeReentry
|
||||
yesorno
|
||||
iffalse Script_Menu_ChallengeExplanationCancel
|
||||
setscene SCENE_DEFAULT
|
||||
setscene SCENE_BATTLETOWER1F_CHECKSTATE
|
||||
special TryQuickSave
|
||||
iffalse Script_Menu_ChallengeExplanationCancel
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWER1F_NOOP
|
||||
setval BATTLETOWERACTION_06
|
||||
special BattleTowerAction
|
||||
setval BATTLETOWERACTION_12
|
||||
|
||||
@@ -4,15 +4,15 @@
|
||||
|
||||
BattleTowerBattleRoom_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .EnterBattleRoom ; SCENE_DEFAULT
|
||||
scene_script .DummyScene ; SCENE_FINISHED
|
||||
scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER
|
||||
scene_script .DummyScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
.EnterBattleRoom:
|
||||
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
|
||||
sdefer Script_BattleRoom
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
|
||||
.DummyScene:
|
||||
end
|
||||
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
|
||||
BattleTowerElevator_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .Scene0 ; SCENE_DEFAULT
|
||||
scene_script .Scene1 ; SCENE_FINISHED
|
||||
scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER
|
||||
scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
.Scene0:
|
||||
sdefer .RideElevator
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWERELEVATOR_NOOP
|
||||
.Scene1:
|
||||
end
|
||||
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
|
||||
BattleTowerHallway_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .Scene0 ; SCENE_DEFAULT
|
||||
scene_script .Scene1 ; SCENE_FINISHED
|
||||
scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER
|
||||
scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
.Scene0:
|
||||
sdefer .ChooseBattleRoom
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BATTLETOWERHALLWAY_NOOP
|
||||
.Scene1:
|
||||
end
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
BrunosRoom_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .LockDoor ; SCENE_DEFAULT
|
||||
scene_script .DummyScene ; SCENE_FINISHED
|
||||
scene_script .LockDoor, SCENE_BRUNOSROOM_LOCK_DOOR
|
||||
scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_TILES, .BrunosRoomDoors
|
||||
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
|
||||
changeblock 4, 14, $2a ; wall
|
||||
reloadmappart
|
||||
closetext
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BRUNOSROOM_NOOP
|
||||
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
|
||||
waitsfx
|
||||
end
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
|
||||
BurnedTower1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .EusineScene ; SCENE_DEFAULT
|
||||
scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
|
||||
scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
|
||||
scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
|
||||
scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
|
||||
scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_TILES, .HoleAndLadder
|
||||
@@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
|
||||
writetext BurnedTowerSilver_AfterText1
|
||||
waitbutton
|
||||
closetext
|
||||
setscene SCENE_BURNEDTOWER1F_NOTHING
|
||||
setscene SCENE_BURNEDTOWER1F_NOOP
|
||||
setevent EVENT_RIVAL_BURNED_TOWER
|
||||
special FadeOutMusic
|
||||
pause 15
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
BurnedTowerB1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_DEFAULT
|
||||
scene_script .DummyScene1 ; SCENE_FINISHED
|
||||
scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
|
||||
scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_TILES, .LadderCallback
|
||||
@@ -79,10 +79,10 @@ ReleaseTheBeasts:
|
||||
disappear BURNEDTOWERB1F_SUICUNE1
|
||||
waitsfx
|
||||
special RestartMapMusic
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BURNEDTOWERB1F_NOOP
|
||||
setevent EVENT_RELEASED_THE_BEASTS
|
||||
special InitRoamMons
|
||||
setmapscene ECRUTEAK_GYM, SCENE_FINISHED
|
||||
setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOOP
|
||||
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
|
||||
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
|
||||
setevent EVENT_ECRUTEAK_GYM_GRAMPS
|
||||
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
|
||||
changeblock 6, 14, $1b ; ladder
|
||||
reloadmappart
|
||||
closetext
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_BURNEDTOWERB1F_NOOP
|
||||
end
|
||||
|
||||
BurnedTowerB1FEusine:
|
||||
@@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
|
||||
warp_event 7, 15, BURNED_TOWER_1F, 14
|
||||
|
||||
def_coord_events
|
||||
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
|
||||
coord_event 10, 6, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS, ReleaseTheBeasts
|
||||
|
||||
def_bg_events
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
CeruleanGym_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
|
||||
scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
|
||||
scene_script .DummyScene0, SCENE_CERULEANGYM_NOOP
|
||||
scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
|
||||
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
|
||||
clearevent EVENT_ROUTE_24_ROCKET
|
||||
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
|
||||
setscene SCENE_CERULEANGYM_NOTHING
|
||||
setscene SCENE_CERULEANGYM_NOOP
|
||||
setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
|
||||
setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
|
||||
setmapscene POWER_PLANT, SCENE_POWERPLANT_NOOP
|
||||
waitsfx
|
||||
special RestartMapMusic
|
||||
pause 15
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
CherrygroveCity_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
|
||||
scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
|
||||
scene_script .DummyScene0, SCENE_CHERRYGROVECITY_NOOP
|
||||
scene_script .DummyScene1, SCENE_CHERRYGROVECITY_MEET_RIVAL
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_NEWMAP, .FlyPoint
|
||||
@@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
|
||||
turnobject PLAYER, LEFT
|
||||
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
|
||||
disappear CHERRYGROVECITY_SILVER
|
||||
setscene SCENE_CHERRYGROVECITY_NOTHING
|
||||
setscene SCENE_CHERRYGROVECITY_NOOP
|
||||
special HealParty
|
||||
playmapmusic
|
||||
end
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
CianwoodCity_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
|
||||
scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
|
||||
scene_script .DummyScene0, SCENE_CIANWOODCITY_NOOP
|
||||
scene_script .DummyScene1, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
|
||||
@@ -47,7 +47,7 @@ CianwoodCitySuicuneAndEusine:
|
||||
applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement
|
||||
disappear CIANWOODCITY_SUICUNE
|
||||
pause 10
|
||||
setscene SCENE_CIANWOODCITY_NOTHING
|
||||
setscene SCENE_CIANWOODCITY_NOOP
|
||||
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
|
||||
setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
|
||||
checkevent EVENT_FOUGHT_EUSINE
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
Colosseum_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .InitializeColosseum ; SCENE_DEFAULT
|
||||
scene_script .DummyScene1 ; SCENE_FINISHED
|
||||
scene_script .InitializeColosseum, SCENE_COLOSSEUM_INITIALIZE
|
||||
scene_script .DummyScene1, SCENE_COLOSSEUM_NOOP
|
||||
scene_script .DummyScene2 ; unused
|
||||
|
||||
def_callbacks
|
||||
@@ -39,7 +39,7 @@ Colosseum_MapScripts:
|
||||
endcallback
|
||||
|
||||
.InitializeAndPreparePokecenter2F:
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_COLOSSEUM_NOOP
|
||||
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
|
||||
end
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
DragonShrine_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DragonShrineTest ; SCENE_DEFAULT
|
||||
scene_script .DummyScene ; SCENE_FINISHED
|
||||
scene_script .DragonShrineTest, SCENE_DRAGONSHRINE_TAKE_TEST
|
||||
scene_script .DummyScene, SCENE_DRAGONSHRINE_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -163,7 +163,7 @@ DragonShrine_MapScripts:
|
||||
waitsfx
|
||||
special RestartMapMusic
|
||||
specialphonecall SPECIALCALL_MASTERBALL
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_DRAGONSHRINE_NOOP
|
||||
setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
|
||||
writetext DragonShrinePlayerReceivedRisingBadgeText
|
||||
promptbutton
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
DragonsDenB1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING
|
||||
scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
|
||||
scene_script .DummyScene0, SCENE_DRAGONSDENB1F_NOOP
|
||||
scene_script .DummyScene1, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_NEWMAP, .CheckSilver
|
||||
@@ -79,7 +79,7 @@ DragonsDenB1F_ClairScene:
|
||||
pause 30
|
||||
special RestartMapMusic
|
||||
disappear DRAGONSDENB1F_CLAIR
|
||||
setscene SCENE_DRAGONSDENB1F_NOTHING
|
||||
setscene SCENE_DRAGONSDENB1F_NOOP
|
||||
end
|
||||
|
||||
TrainerCooltrainermDarin:
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
EcruteakGym_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .ForcedToLeave ; SCENE_DEFAULT
|
||||
scene_script .DummyScene ; SCENE_FINISHED
|
||||
scene_script .ForcedToLeave, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE
|
||||
scene_script .DummyScene, SCENE_ECRUTEAKGYM_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -41,7 +41,7 @@ EcruteakGymMortyScript:
|
||||
setflag ENGINE_FOGBADGE
|
||||
readvar VAR_BADGES
|
||||
scall EcruteakGymActivateRockets
|
||||
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED
|
||||
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
|
||||
setevent EVENT_RANG_CLEAR_BELL_1
|
||||
setevent EVENT_RANG_CLEAR_BELL_2
|
||||
.FightDone:
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
|
||||
EcruteakPokecenter1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .MeetBill ; SCENE_DEFAULT
|
||||
scene_script .DummyScene ; SCENE_FINISHED
|
||||
scene_script .MeetBill, SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL
|
||||
scene_script .DummyScene, SCENE_ECRUTEAKPOKECENTER1F_NOOP
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
|
||||
disappear ECRUTEAKPOKECENTER1F_BILL
|
||||
clearevent EVENT_MET_BILL
|
||||
setflag ENGINE_TIME_CAPSULE
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_ECRUTEAKPOKECENTER1F_NOOP
|
||||
waitsfx
|
||||
end
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
EcruteakTinTowerEntrance_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_DEFAULT
|
||||
scene_script .DummyScene1 ; SCENE_FINISHED
|
||||
scene_script .DummyScene0, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
|
||||
scene_script .DummyScene1, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_OBJECTS, .InitializeSages
|
||||
@@ -33,7 +33,7 @@ EcruteakTinTowerEntrance_MapScripts:
|
||||
setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
|
||||
checkitem CLEAR_BELL
|
||||
iftrue .NoClearBell
|
||||
setscene SCENE_DEFAULT
|
||||
setscene SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
|
||||
.NoClearBell:
|
||||
endcallback
|
||||
|
||||
@@ -98,7 +98,7 @@ EcruteakTinTowerEntranceSageScript:
|
||||
writetext EcruteakTinTowerEntranceSageText_HearsClearBell
|
||||
waitbutton
|
||||
closetext
|
||||
setscene SCENE_FINISHED
|
||||
setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
|
||||
setevent EVENT_RANG_CLEAR_BELL_2
|
||||
clearevent EVENT_RANG_CLEAR_BELL_1
|
||||
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
|
||||
@@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
|
||||
warp_event 17, 3, WISE_TRIOS_ROOM, 3
|
||||
|
||||
def_coord_events
|
||||
coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksLeft
|
||||
coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksRight
|
||||
coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS, EcruteakTinTowerEntranceSageBlocksLeft
|
||||
coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS, EcruteakTinTowerEntranceSageBlocksRight
|
||||
|
||||
def_bg_events
|
||||
|
||||
|
||||
@@ -8,12 +8,13 @@
|
||||
|
||||
ElmsLab_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .MeetElm ; SCENE_DEFAULT
|
||||
scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE
|
||||
scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING
|
||||
scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER
|
||||
scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED
|
||||
scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION
|
||||
scene_script .MeetElm, SCENE_ELMSLAB_MEET_ELM
|
||||
scene_script .DummyScene1, SCENE_ELMSLAB_CANT_LEAVE
|
||||
scene_script .DummyScene2, SCENE_ELMSLAB_NOOP
|
||||
scene_script .DummyScene3, SCENE_ELMSLAB_MEET_OFFICER
|
||||
scene_script .DummyScene4, SCENE_ELMSLAB_UNUSED
|
||||
scene_script .DummyScene5, SCENE_ELMSLAB_AIDE_GIVES_POTION
|
||||
scene_const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
|
||||
|
||||
def_callbacks
|
||||
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
|
||||
@@ -39,7 +40,7 @@ ElmsLab_MapScripts:
|
||||
|
||||
.MoveElmCallback:
|
||||
checkscene
|
||||
iftrue .Skip ; not SCENE_DEFAULT
|
||||
iftrue .Skip ; not SCENE_ELMSLAB_MEET_ELM
|
||||
moveobject ELMSLAB_ELM, 3, 4
|
||||
.Skip:
|
||||
endcallback
|
||||
@@ -273,7 +274,7 @@ ElmDirectionsScript:
|
||||
setevent EVENT_GOT_A_POKEMON_FROM_ELM
|
||||
setevent EVENT_RIVAL_CHERRYGROVE_CITY
|
||||
setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
|
||||
setmapscene NEW_BARK_TOWN, SCENE_FINISHED
|
||||
setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOOP
|
||||
end
|
||||
|
||||
ElmDescribesMrPokemonScript:
|
||||
@@ -477,7 +478,7 @@ AideScript_GivePotion:
|
||||
writetext AideText_AlwaysBusy
|
||||
waitbutton
|
||||
closetext
|
||||
setscene SCENE_ELMSLAB_NOTHING
|
||||
setscene SCENE_ELMSLAB_NOOP
|
||||
end
|
||||
|
||||
AideScript_WalkBalls1:
|
||||
@@ -505,7 +506,7 @@ AideScript_GiveYouBalls:
|
||||
promptbutton
|
||||
itemnotify
|
||||
closetext
|
||||
setscene SCENE_ELMSLAB_NOTHING
|
||||
setscene SCENE_ELMSLAB_NOOP
|
||||
end
|
||||
|
||||
AideScript_ReceiveTheBalls:
|
||||
@@ -560,7 +561,7 @@ CopScript:
|
||||
closetext
|
||||
applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
|
||||
disappear ELMSLAB_OFFICER
|
||||
setscene SCENE_ELMSLAB_NOTHING
|
||||
setscene SCENE_ELMSLAB_NOOP
|
||||
end
|
||||
|
||||
ElmsLabWindow:
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
FastShip1F_MapScripts:
|
||||
def_scene_scripts
|
||||
scene_script .DummyScene0 ; SCENE_DEFAULT
|
||||
scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP
|
||||
scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA
|
||||
scene_script .DummyScene0, SCENE_FASTSHIP1F_NOOP
|
||||
scene_script .EnterFastShip, SCENE_FASTSHIP1F_ENTER_SHIP
|
||||
scene_script .DummyScene2, SCENE_FASTSHIP1F_MEET_GRANDPA
|
||||
|
||||
def_callbacks
|
||||
|
||||
@@ -37,7 +37,7 @@ FastShip1F_MapScripts:
|
||||
end
|
||||
|
||||
.SkipGrandpa:
|
||||
setscene SCENE_DEFAULT
|
||||
setscene SCENE_FASTSHIP1F_NOOP
|
||||
end
|
||||
|
||||
FastShip1FSailor1Script:
|
||||
@@ -133,7 +133,7 @@ WorriedGrandpaSceneLeft:
|
||||
turnobject PLAYER, RIGHT
|
||||
applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaRunsOutMovement
|
||||
disappear FASTSHIP1F_GENTLEMAN
|
||||
setscene SCENE_DEFAULT
|
||||
setscene SCENE_FASTSHIP1F_NOOP
|
||||
end
|
||||
|
||||
FastShip1F_SailorStepAsideMovement:
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user