pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Meaningful scene constant names

Browse Source 
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
This commit is contained in:
Rangi
2018-02-01 12:40:58 -05:00
parent 936a170e0d
commit fcfe77bc3d
85 changed files with 596 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

395
constants/scene_constants.asm
View File

File diff suppressed because it is too large Load Diff

6
engine/events/std_scripts.asm
View File

@@ -298,7 +298,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, 1 setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOTHING
end end
BugContestResultsWarpScript: BugContestResultsWarpScript:
@@ -356,8 +356,8 @@ BugContestResults_DidNotLeaveMons
waitbutton waitbutton
BugContestResults_CleanUp BugContestResults_CleanUp
closetext closetext
setscene SCENE_ROUTE36NATIONALPARKGATE_0 setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
setmapscene ROUTE_35_NATIONAL_PARK_GATE, 0 setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING
setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A setevent EVENT_BUG_CATCHING_CONTESTANT_3A

16
maps/AzaleaTown.asm
View File

@@ -14,9 +14,9 @@
AzaleaTown_MapScripts: AzaleaTown_MapScripts:
db 3 ; scene scripts db 3 ; scene scripts
scene_script .DummyScene0 ; SCENE_AZALEATOWN_0 scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING
scene_script .DummyScene1 ; SCENE_AZALEATOWN_1 scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_AZALEATOWN_2 scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint callback MAPCALLBACK_NEWMAP, .Flypoint
@@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER disappear AZALEATOWN_SILVER
setscene SCENE_AZALEATOWN_0 setscene SCENE_AZALEATOWN_NOTHING
waitsfx waitsfx
playmapmusic playmapmusic
end end
@@ -168,7 +168,7 @@ AzaleaTownCelebiScene:
setflag ENGINE_FOREST_IS_RESTLESS setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
setscene SCENE_AZALEATOWN_0 setscene SCENE_AZALEATOWN_NOTHING
closetext closetext
end end
@@ -467,9 +467,9 @@ AzaleaTown_MapEvents:
warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE warp_event 2, 11, 4, ILEX_FOREST_AZALEA_GATE
db 3 ; coord events db 3 ; coord events
coord_event 5, 10, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene1 coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1
coord_event 5, 11, SCENE_AZALEATOWN_1, AzaleaTownRivalBattleScene2 coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2
coord_event 9, 6, SCENE_AZALEATOWN_2, AzaleaTownCelebiScene coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene
db 9 ; bg events db 9 ; bg events
bg_event 19, 9, BGEVENT_READ, AzaleaTownSign bg_event 19, 9, BGEVENT_READ, AzaleaTownSign

20
maps/BattleTower1F.asm
View File

@@ -7,8 +7,8 @@
BattleTower1F_MapScripts: BattleTower1F_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .Scene0 ; SCENE_BATTLETOWER1F_0 scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_BATTLETOWER1F_1 scene_script .Scene1 ; SCENE_BATTLETOWER1F_NOTHING
db 0 ; callbacks db 0 ; callbacks
@@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
.SkipEverything: .SkipEverything:
setscene SCENE_BATTLETOWER1F_1 setscene SCENE_BATTLETOWER1F_NOTHING
.Scene1: .Scene1:
end end
@@ -79,10 +79,10 @@ Script_ChooseChallenge: ; 0x9e40f
writetext Text_SaveBeforeEnteringBattleRoom writetext Text_SaveBeforeEnteringBattleRoom
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_0 setscene SCENE_DEFAULT
special TryQuickSave special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_1 setscene SCENE_BATTLETOWER1F_NOTHING
writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction special BattleTowerAction
special BattleTowerRoomMenu special BattleTowerRoomMenu
@@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
special BattleTowerAction special BattleTowerAction
Script_WalkToBattleTowerElevator: Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8 musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_0 setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_0 setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT
setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_0 setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT
follow BATTLETOWER1F_RECEPTIONIST, PLAYER follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
writebyte BATTLETOWERACTION_0A writebyte BATTLETOWERACTION_0A
@@ -206,10 +206,10 @@ continue:
writetext Text_SaveBeforeReentry writetext Text_SaveBeforeReentry
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_0 setscene SCENE_DEFAULT
special TryQuickSave special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_BATTLETOWER1F_1 setscene SCENE_BATTLETOWER1F_NOTHING
writebyte BATTLETOWERACTION_06 writebyte BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
writebyte BATTLETOWERACTION_12 writebyte BATTLETOWERACTION_12

6
maps/BattleTowerBattleRoom.asm
View File

@@ -4,15 +4,15 @@
BattleTowerBattleRoom_MapScripts: BattleTowerBattleRoom_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .EnterBattleRoom ; SCENE_BATTLETOWERBATTLEROOM_0 scene_script .EnterBattleRoom ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_1 scene_script .DummyScene ; SCENE_BATTLETOWERBATTLEROOM_NOTHING
db 0 ; callbacks db 0 ; callbacks
.EnterBattleRoom: ; 0x9f419 .EnterBattleRoom: ; 0x9f419
disappear BATTLETOWERBATTLEROOM_YOUNGSTER disappear BATTLETOWERBATTLEROOM_YOUNGSTER
priorityjump Script_BattleRoom priorityjump Script_BattleRoom
setscene SCENE_BATTLETOWERBATTLEROOM_1 setscene SCENE_BATTLETOWERBATTLEROOM_NOTHING
.DummyScene: .DummyScene:
end end

7
maps/BattleTowerElevator.asm
View File

@@ -3,15 +3,14 @@
BattleTowerElevator_MapScripts: BattleTowerElevator_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .Scene0 ; SCENE_BATTLETOWERELEVATOR_0 scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_1 scene_script .Scene1 ; SCENE_BATTLETOWERELEVATOR_NOTHING
db 0 ; callbacks db 0 ; callbacks
.Scene0: .Scene0:
priorityjump .RideElevator priorityjump .RideElevator
setscene SCENE_BATTLETOWERELEVATOR_1 setscene SCENE_BATTLETOWERELEVATOR_NOTHING
.Scene1: .Scene1:
end end

6
maps/BattleTowerHallway.asm
View File

@@ -3,14 +3,14 @@
BattleTowerHallway_MapScripts: BattleTowerHallway_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .Scene0 ; SCENE_BATTLETOWERHALLWAY_0 scene_script .Scene0 ; SCENE_DEFAULT
scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_1 scene_script .Scene1 ; SCENE_BATTLETOWERHALLWAY_NOTHING
db 0 ; callbacks db 0 ; callbacks
.Scene0: .Scene0:
priorityjump .ChooseBattleRoom priorityjump .ChooseBattleRoom
setscene SCENE_BATTLETOWERHALLWAY_1 setscene SCENE_BATTLETOWERHALLWAY_NOTHING
.Scene1: .Scene1:
end end

6
maps/BrunosRoom.asm
View File

@@ -3,8 +3,8 @@
BrunosRoom_MapScripts: BrunosRoom_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .LockDoor ; SCENE_BRUNOSROOM_0 scene_script .LockDoor ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_BRUNOSROOM_1 scene_script .DummyScene ; SCENE_BRUNOSROOM_NOTHING
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors callback MAPCALLBACK_TILES, .BrunosRoomDoors
@@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
reloadmappart reloadmappart
closetext closetext
setscene SCENE_BRUNOSROOM_1 setscene SCENE_BRUNOSROOM_NOTHING
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx waitsfx
end end

12
maps/BurnedTower1F.asm
View File

@@ -7,9 +7,9 @@
BurnedTower1F_MapScripts: BurnedTower1F_MapScripts:
db 3 ; scene scripts db 3 ; scene scripts
scene_script .EusineScene ; SCENE_BURNEDTOWER1F_0 scene_script .EusineScene ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_1 scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_2 scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder callback MAPCALLBACK_TILES, .HoleAndLadder
@@ -44,7 +44,7 @@ BurnedTower1F_MapScripts:
waitbutton waitbutton
closetext closetext
moveobject BURNEDTOWER1F_EUSINE, 9, 14 moveobject BURNEDTOWER1F_EUSINE, 9, 14
setscene SCENE_BURNEDTOWER1F_1 setscene SCENE_BURNEDTOWER1F_RIVAL_BATTLE
end end
BurnedTowerRivalBattleScript: BurnedTowerRivalBattleScript:
@@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1 writetext BurnedTowerSilver_AfterText1
waitbutton waitbutton
closetext closetext
setscene SCENE_BURNEDTOWER1F_2 setscene SCENE_BURNEDTOWER1F_NOTHING
setevent EVENT_RIVAL_BURNED_TOWER setevent EVENT_RIVAL_BURNED_TOWER
special FadeOutMusic special FadeOutMusic
pause 15 pause 15
@@ -295,7 +295,7 @@ BurnedTower1F_MapEvents:
warp_event 7, 15, 6, BURNED_TOWER_B1F warp_event 7, 15, 6, BURNED_TOWER_B1F
db 1 ; coord events db 1 ; coord events
coord_event 11, 9, SCENE_BURNEDTOWER1F_1, BurnedTowerRivalBattleScript coord_event 11, 9, SCENE_BURNEDTOWER1F_RIVAL_BATTLE, BurnedTowerRivalBattleScript
db 2 ; bg events db 2 ; bg events
bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther bg_event 8, 7, BGEVENT_ITEM, BurnedTower1FHiddenEther

14
maps/BurnedTowerB1F.asm
View File

@@ -11,8 +11,8 @@
BurnedTowerB1F_MapScripts: BurnedTowerB1F_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_BURNEDTOWERB1F_0 scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_1 scene_script .DummyScene1 ; SCENE_BURNEDTOWERB1F_NOTHING
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_TILES, .LadderCallback callback MAPCALLBACK_TILES, .LadderCallback
@@ -79,11 +79,11 @@ ReleaseTheBeasts:
disappear BURNEDTOWERB1F_SUICUNE1 disappear BURNEDTOWERB1F_SUICUNE1
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
setscene SCENE_BURNEDTOWERB1F_1 setscene SCENE_BURNEDTOWERB1F_NOTHING
setevent EVENT_RELEASED_THE_BEASTS setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons special InitRoamMons
setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_1 setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOTHING
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_1 setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS setevent EVENT_ECRUTEAK_GYM_GRAMPS
clearevent EVENT_ECRUTEAK_CITY_GRAMPS clearevent EVENT_ECRUTEAK_CITY_GRAMPS
@@ -94,7 +94,7 @@ ReleaseTheBeasts:
changeblock 6, 14, $1b ; ladder changeblock 6, 14, $1b ; ladder
reloadmappart reloadmappart
closetext closetext
setscene SCENE_BURNEDTOWERB1F_1 setscene SCENE_BURNEDTOWERB1F_NOTHING
end end
BurnedTowerB1FEusine: BurnedTowerB1FEusine:
@@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
warp_event 7, 15, 14, BURNED_TOWER_1F warp_event 7, 15, 14, BURNED_TOWER_1F
db 1 ; coord events db 1 ; coord events
coord_event 10, 6, SCENE_BURNEDTOWERB1F_0, ReleaseTheBeasts coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts
db 0 ; bg events db 0 ; bg events

10
maps/CeruleanGym.asm
View File

@@ -8,8 +8,8 @@
CeruleanGym_MapScripts: CeruleanGym_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_CERULEANGYM_0 scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING
scene_script .GruntRunsOut ; SCENE_CERULEANGYM_1 scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT
db 0 ; callbacks db 0 ; callbacks
@@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setscene SCENE_CERULEANGYM_0 setscene SCENE_CERULEANGYM_NOTHING
setmapscene ROUTE_25, SCENE_ROUTE25_1 setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
setmapscene POWER_PLANT, SCENE_POWERPLANT_0 setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
pause 15 pause 15

10
maps/CherrygroveCity.asm
View File

@@ -7,8 +7,8 @@
CherrygroveCity_MapScripts: CherrygroveCity_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_0 scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING
scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_1 scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
spriteface PLAYER, LEFT spriteface PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER disappear CHERRYGROVECITY_SILVER
setscene SCENE_CHERRYGROVECITY_0 setscene SCENE_CHERRYGROVECITY_NOTHING
special HealParty special HealParty
playmapmusic playmapmusic
end end
@@ -555,8 +555,8 @@ CherrygroveCity_MapEvents:
warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE warp_event 31, 11, 1, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE
db 2 ; coord events db 2 ; coord events
coord_event 33, 6, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneNorth coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
coord_event 33, 7, SCENE_CHERRYGROVECITY_1, CherrygroveSilverSceneSouth coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
db 4 ; bg events db 4 ; bg events
bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign

10
maps/CianwoodCity.asm
View File

@@ -14,8 +14,8 @@
CianwoodCity_MapScripts: CianwoodCity_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_CIANWOODCITY_0 scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING
scene_script .DummyScene1 ; SCENE_CIANWOODCITY_1 scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@@ -47,9 +47,9 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0 applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
disappear CIANWOODCITY_SUICUNE disappear CIANWOODCITY_SUICUNE
pause 10 pause 10
setscene SCENE_CIANWOODCITY_0 setscene SCENE_CIANWOODCITY_NOTHING
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, SCENE_ROUTE42_1 setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
checkevent EVENT_FOUGHT_EUSINE checkevent EVENT_FOUGHT_EUSINE
iftrue .Done iftrue .Done
setevent EVENT_FOUGHT_EUSINE setevent EVENT_FOUGHT_EUSINE
@@ -391,7 +391,7 @@ CianwoodCity_MapEvents:
warp_event 5, 17, 1, POKE_SEERS_HOUSE warp_event 5, 17, 1, POKE_SEERS_HOUSE
db 1 ; coord events db 1 ; coord events
coord_event 11, 16, SCENE_CIANWOODCITY_1, CianwoodCitySuicuneAndEusine coord_event 11, 16, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE, CianwoodCitySuicuneAndEusine
db 8 ; bg events db 8 ; bg events
bg_event 20, 34, BGEVENT_READ, CianwoodCitySign bg_event 20, 34, BGEVENT_READ, CianwoodCitySign

12
maps/Colosseum.asm
View File

@@ -4,9 +4,9 @@
Colosseum_MapScripts: Colosseum_MapScripts:
db 3 ; scene scripts db 3 ; scene scripts
scene_script .InitializeColosseum ; SCENE_COLOSSEUM_0 scene_script .InitializeColosseum ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_COLOSSEUM_1 scene_script .DummyScene1 ; SCENE_COLOSSEUM_NOTHING
scene_script .DummyScene2 ; SCENE_COLOSSEUM_2 scene_script .DummyScene2 ; SCENE_COLOSSEUM_UNUSED
db 2 ; callbacks db 2 ; callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_OBJECTS, .SetWhichChris
@@ -35,12 +35,12 @@ Colosseum_MapScripts:
return return
.PreparePokecenter2F: .PreparePokecenter2F:
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2 setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
return return
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_COLOSSEUM_1 setscene SCENE_COLOSSEUM_NOTHING
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_2 setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end end
MapColosseumSignpost1Script: MapColosseumSignpost1Script:

8
maps/DragonShrine.asm
View File

@@ -6,8 +6,8 @@
DragonShrine_MapScripts: DragonShrine_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DragonShrineTest ; SCENE_DRAGONSHRINE_0 scene_script .DragonShrineTest ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_DRAGONSHRINE_1 scene_script .DummyScene ; SCENE_DRAGONSHRINE_NOTHING
db 0 ; callbacks db 0 ; callbacks
@@ -163,8 +163,8 @@ DragonShrine_MapScripts:
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL specialphonecall SPECIALCALL_MASTERBALL
setscene SCENE_DRAGONSHRINE_1 setscene SCENE_DRAGONSHRINE_NOTHING
setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_1 setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
writetext DragonShrinePlayerReceivedRisingBadgeText writetext DragonShrinePlayerReceivedRisingBadgeText
buttonsound buttonsound
writetext DragonShrineRisingBadgeExplanationText writetext DragonShrineRisingBadgeExplanationText

8
maps/DragonsDenB1F.asm
View File

@@ -11,8 +11,8 @@
DragonsDenB1F_MapScripts: DragonsDenB1F_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_0 scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING
scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_1 scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver callback MAPCALLBACK_NEWMAP, .CheckSilver
@@ -78,7 +78,7 @@ DragonsDenB1F_ClairScene:
pause 30 pause 30
special RestartMapMusic special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR disappear DRAGONSDENB1F_CLAIR
setscene SCENE_DRAGONSDENB1F_0 setscene SCENE_DRAGONSDENB1F_NOTHING
end end
TrainerCooltrainermDarin: TrainerCooltrainermDarin:
@@ -412,7 +412,7 @@ DragonsDenB1F_MapEvents:
warp_event 19, 29, 1, DRAGON_SHRINE warp_event 19, 29, 1, DRAGON_SHRINE
db 1 ; coord events db 1 ; coord events
coord_event 19, 30, SCENE_DRAGONSDENB1F_1, DragonsDenB1F_ClairScene coord_event 19, 30, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM, DragonsDenB1F_ClairScene
db 4 ; bg events db 4 ; bg events
bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script bg_event 18, 24, BGEVENT_READ, MapDragonsDenB1FSignpost0Script

6
maps/EcruteakGym.asm
View File

@@ -9,8 +9,8 @@
EcruteakGym_MapScripts: EcruteakGym_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .ForcedToLeave ; SCENE_ECRUTEAKGYM_0 scene_script .ForcedToLeave ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_ECRUTEAKGYM_1 scene_script .DummyScene ; SCENE_ECRUTEAKGYM_NOTHING
db 0 ; callbacks db 0 ; callbacks
@@ -41,7 +41,7 @@ MortyScript_0x99d58:
setflag ENGINE_FOGBADGE setflag ENGINE_FOGBADGE
checkcode VAR_BADGES checkcode VAR_BADGES
scall EcruteakGymActivateRockets scall EcruteakGymActivateRockets
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_1 setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
.FightDone: .FightDone:

6
maps/EcruteakPokecenter1F.asm
View File

@@ -7,8 +7,8 @@
EcruteakPokecenter1F_MapScripts: EcruteakPokecenter1F_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .MeetBill ; SCENE_ECRUTEAKPOKECENTER1F_0 scene_script .MeetBill ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_1 scene_script .DummyScene ; SCENE_ECRUTEAKPOKECENTER1F_NOTHING
db 0 ; callbacks db 0 ; callbacks
@@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
disappear ECRUTEAKPOKECENTER1F_BILL disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE setflag ENGINE_TIME_CAPSULE
setscene SCENE_ECRUTEAKPOKECENTER1F_1 setscene SCENE_ECRUTEAKPOKECENTER1F_NOTHING
waitsfx waitsfx
end end

12
maps/EcruteakTinTowerEntrance.asm
View File

@@ -6,8 +6,8 @@
EcruteakTinTowerEntrance_MapScripts: EcruteakTinTowerEntrance_MapScripts:
db 2 ; scene scripts db 2 ; scene scripts
scene_script .DummyScene0 ; SCENE_ECRUTEAKTINTOWERENTRANCE_0 scene_script .DummyScene0 ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_1 scene_script .DummyScene1 ; SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages callback MAPCALLBACK_OBJECTS, .InitializeSages
@@ -33,7 +33,7 @@ EcruteakTinTowerEntrance_MapScripts:
setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
checkitem CLEAR_BELL checkitem CLEAR_BELL
iftrue .NoClearBell iftrue .NoClearBell
setscene SCENE_ECRUTEAKTINTOWERENTRANCE_0 setscene SCENE_DEFAULT
.NoClearBell: .NoClearBell:
return return
@@ -98,7 +98,7 @@ SageScript_0x98062:
writetext UnknownText_0x98250 writetext UnknownText_0x98250
waitbutton waitbutton
closetext closetext
setscene SCENE_ECRUTEAKTINTOWERENTRANCE_1 setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOTHING
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1 clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
warp_event 17, 3, 3, WISE_TRIOS_ROOM warp_event 17, 3, 3, WISE_TRIOS_ROOM
db 2 ; coord events db 2 ; coord events
coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent1 coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1
coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_0, EcruteakTinTowerEntrance_CoordEvent2 coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent2
db 0 ; bg events db 0 ; bg events

60
maps/ElmsLab.asm
View File

@@ -8,12 +8,12 @@
ElmsLab_MapScripts: ElmsLab_MapScripts:
db 6 ; scene scripts db 6 ; scene scripts
scene_script .MeetElm ; SCENE_ELMSLAB_0 scene_script .MeetElm ; SCENE_DEFAULT
scene_script .DummyScene1 ; SCENE_ELMSLAB_1 scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE
scene_script .DummyScene2 ; SCENE_ELMSLAB_2 scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING
scene_script .DummyScene3 ; SCENE_ELMSLAB_3 scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER
scene_script .DummyScene4 ; SCENE_ELMSLAB_4 scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED
scene_script .DummyScene5 ; SCENE_ELMSLAB_5 scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION
db 1 ; callbacks db 1 ; callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback callback MAPCALLBACK_OBJECTS, .MoveElmCallback
@@ -39,7 +39,7 @@ ElmsLab_MapScripts:
.MoveElmCallback: .MoveElmCallback:
checkscene checkscene
iftrue .Skip ; not SCENE_ELMSLAB_0 iftrue .Skip ; not SCENE_DEFAULT
moveobject ELMSLAB_ELM, 3, 4 moveobject ELMSLAB_ELM, 3, 4
.Skip: .Skip:
return return
@@ -82,7 +82,7 @@ ElmsLab_MapScripts:
opentext opentext
writetext ElmText_ChooseAPokemon writetext ElmText_ChooseAPokemon
waitbutton waitbutton
setscene SCENE_ELMSLAB_1 setscene SCENE_ELMSLAB_CANT_LEAVE
closetext closetext
end end
@@ -272,8 +272,8 @@ ElmDirectionsScript:
closetext closetext
setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_GOT_A_POKEMON_FROM_ELM
setevent EVENT_RIVAL_CHERRYGROVE_CITY setevent EVENT_RIVAL_CHERRYGROVE_CITY
setscene SCENE_ELMSLAB_5 setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_1 setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOTHING
end end
ElmDescribesMrPokemonScript: ElmDescribesMrPokemonScript:
@@ -339,13 +339,13 @@ ElmAfterTheftScript:
buttonsound buttonsound
setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
setflag ENGINE_BUG_CONTEST_ON setflag ENGINE_BUG_CONTEST_ON
setmapscene ROUTE_29, SCENE_ROUTE29_1 setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL
clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY
setevent EVENT_ROUTE_30_BATTLE setevent EVENT_ROUTE_30_BATTLE
writetext ElmAfterTheftText6 writetext ElmAfterTheftText6
waitbutton waitbutton
closetext closetext
setscene SCENE_ELMSLAB_6 setscene SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
end end
ElmStudyingEggScript: ElmStudyingEggScript:
@@ -455,29 +455,29 @@ ElmJumpRightScript:
opentext opentext
end end
AideScript_WalkPotions1: AideScript_WalkPotion1:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1 applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
spriteface PLAYER, DOWN spriteface PLAYER, DOWN
scall AideScript_GivePotions scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1 applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
end end
AideScript_WalkPotions2: AideScript_WalkPotion2:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2 applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
spriteface PLAYER, DOWN spriteface PLAYER, DOWN
scall AideScript_GivePotions scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2 applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
end end
AideScript_GivePotions: AideScript_GivePotion:
opentext opentext
writetext AideText_GiveYouPotions writetext AideText_GiveYouPotion
buttonsound buttonsound
verbosegiveitem POTION verbosegiveitem POTION
writetext AideText_AlwaysBusy writetext AideText_AlwaysBusy
waitbutton waitbutton
closetext closetext
setscene SCENE_ELMSLAB_2 setscene SCENE_ELMSLAB_NOTHING
end end
AideScript_WalkBalls1: AideScript_WalkBalls1:
@@ -505,7 +505,7 @@ AideScript_GiveYouBalls:
buttonsound buttonsound
itemnotify itemnotify
closetext closetext
setscene SCENE_ELMSLAB_2 setscene SCENE_ELMSLAB_NOTHING
end end
AideScript_ReceiveTheBalls: AideScript_ReceiveTheBalls:
@@ -560,7 +560,7 @@ CopScript:
closetext closetext
applymovement ELMSLAB_OFFICER, OfficerLeavesMovement applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
disappear ELMSLAB_OFFICER disappear ELMSLAB_OFFICER
setscene SCENE_ELMSLAB_2 setscene SCENE_ELMSLAB_NOTHING
end end
ElmsLabWindow: ElmsLabWindow:
@@ -1215,7 +1215,7 @@ ElmsLabSignpostText_Egg:
cont "by PROF.ELM." cont "by PROF.ELM."
done done
AideText_GiveYouPotions: AideText_GiveYouPotion:
text "<PLAY_G>, I want" text "<PLAY_G>, I want"
line "you to have this" line "you to have this"
cont "for your errand." cont "for your errand."
@@ -1376,14 +1376,14 @@ ElmsLab_MapEvents:
warp_event 5, 11, 1, NEW_BARK_TOWN warp_event 5, 11, 1, NEW_BARK_TOWN
db 8 ; coord events db 8 ; coord events
coord_event 4, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript coord_event 4, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
coord_event 5, 6, SCENE_ELMSLAB_1, LabTryToLeaveScript coord_event 5, 6, SCENE_ELMSLAB_CANT_LEAVE, LabTryToLeaveScript
coord_event 4, 5, SCENE_ELMSLAB_3, MeetCopScript coord_event 4, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript
coord_event 5, 5, SCENE_ELMSLAB_3, MeetCopScript2 coord_event 5, 5, SCENE_ELMSLAB_MEET_OFFICER, MeetCopScript2
coord_event 4, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions1 coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion1
coord_event 5, 8, SCENE_ELMSLAB_5, AideScript_WalkPotions2 coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POTION, AideScript_WalkPotion2
coord_event 4, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls1 coord_event 4, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls1
coord_event 5, 8, SCENE_ELMSLAB_6, AideScript_WalkBalls2 coord_event 5, 8, SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS, AideScript_WalkBalls2
db 16 ; bg events db 16 ; bg events
bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine bg_event 2, 1, BGEVENT_READ, ElmsLabHealingMachine

Some files were not shown because too many files have changed in this diff Show More