pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename scene and callback labels (#981)

Browse Source 
Co-authored-by: Rangi <35663410+Rangi42@users.noreply.github.com>
This commit is contained in:
vulcandth 2022-08-09 17:04:18 -05:00 committed by GitHub
parent 134f45b71d
commit c3331eb7b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
137 changed files with 650 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/event_flags.asm
View File

@ -1455,7 +1455,7 @@
const EVENT_MOUNT_MORTAR_B1F_PP_UP const EVENT_MOUNT_MORTAR_B1F_PP_UP
const EVENT_RADIO_TOWER_5F_ULTRA_BALL const EVENT_RADIO_TOWER_5F_ULTRA_BALL
const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR const EVENT_BATTLE_TOWER_OPEN_CIVILIANS
; Unused: next 48 events ; Unused: next 48 events
const_next 2048 const_next 2048

8
docs/map_event_scripts.md
View File

@ -41,7 +41,7 @@
<pre> <pre>
def_scene_scripts def_scene_scripts
scene_script <i>script</i> scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
</pre> </pre>
@ -65,9 +65,9 @@
- `MAPCALLBACK_CMDQUEUE` - `MAPCALLBACK_CMDQUEUE`
<pre> <pre>
callback MAPCALLBACK_CMDQUEUE, .Boulders callback MAPCALLBACK_CMDQUEUE, <i>MapName</i>BouldersCallback
.Boulders: <i>MapName</i>BouldersCallback:
writecmdqueue .BoulderCmdQueue writecmdqueue .BoulderCmdQueue
endcallback endcallback
@ -214,7 +214,7 @@
<i>MapName</i>_MapScripts: <i>MapName</i>_MapScripts:
def_scene_scripts def_scene_scripts
; scene_script <i>script</i> ; scene_script <i>script</i>, SCENE_<i>MAPNAME</i>_<i>SCENE_NAME</i>
def_callbacks def_callbacks
; callback <i>type</i>, <i>script</i> ; callback <i>type</i>, <i>script</i>

2
engine/events/std_scripts.asm
View File

@ -590,7 +590,7 @@ InitializeEventsScript:
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR setevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO

4
maps/AzaleaPokecenter1F.asm
View File

@ -6,11 +6,11 @@
AzaleaPokecenter1F_MapScripts: AzaleaPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; unusable scene_script AzaleaPokecenter1FNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: AzaleaPokecenter1FNoopScene:
end end
AzaleaPokecenter1FNurseScript: AzaleaPokecenter1FNurseScript:

16
maps/AzaleaTown.asm
View File

@ -14,23 +14,23 @@
AzaleaTown_MapScripts: AzaleaTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP scene_script AzaleaTownNoop1Scene, SCENE_AZALEATOWN_NOOP
scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE scene_script AzaleaTownNoop2Scene, SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL scene_script AzaleaTownNoop3Scene, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint callback MAPCALLBACK_NEWMAP, AzaleaTownFlypointCallback
.DummyScene0: AzaleaTownNoop1Scene:
end end
.DummyScene1: AzaleaTownNoop2Scene:
end end
.DummyScene2: AzaleaTownNoop3Scene:
end end
.Flypoint: AzaleaTownFlypointCallback:
setflag ENGINE_FLYPOINT_AZALEA setflag ENGINE_FLYPOINT_AZALEA
endcallback endcallback

9
maps/BattleTower1F.asm
View File

@ -7,12 +7,12 @@
BattleTower1F_MapScripts: BattleTower1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE scene_script BattleTower1FCheckStateScene, SCENE_BATTLETOWER1F_CHECKSTATE
scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP scene_script BattleTower1FNoopScene, SCENE_BATTLETOWER1F_NOOP
def_callbacks def_callbacks
.Scene0: BattleTower1FCheckStateScene:
setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS setval BATTLETOWERACTION_CHECKSAVEFILEISYOURS
special BattleTowerAction special BattleTowerAction
iffalse .SkipEverything iffalse .SkipEverything
@ -37,7 +37,8 @@ BattleTower1F_MapScripts:
special BattleTowerAction special BattleTowerAction
.SkipEverything: .SkipEverything:
setscene SCENE_BATTLETOWER1F_NOOP setscene SCENE_BATTLETOWER1F_NOOP
.Scene1: ; fallthrough
BattleTower1FNoopScene:
end end
BattleTower1FRulesSign: BattleTower1FRulesSign:

9
maps/BattleTowerBattleRoom.asm
View File

@ -4,16 +4,17 @@
BattleTowerBattleRoom_MapScripts: BattleTowerBattleRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER scene_script BattleTowerBattleRoomEnterScene, SCENE_BATTLETOWERBATTLEROOM_ENTER
scene_script .DummyScene, SCENE_BATTLETOWERBATTLEROOM_NOOP scene_script BattleTowerBattleRoomNoopScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
def_callbacks def_callbacks
.EnterBattleRoom: BattleTowerBattleRoomEnterScene:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER disappear BATTLETOWERBATTLEROOM_YOUNGSTER
sdefer Script_BattleRoom sdefer Script_BattleRoom
setscene SCENE_BATTLETOWERBATTLEROOM_NOOP setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
.DummyScene: ; fallthrough
BattleTowerBattleRoomNoopScene:
end end
Script_BattleRoom: Script_BattleRoom:

13
maps/BattleTowerElevator.asm
View File

@ -3,18 +3,19 @@
BattleTowerElevator_MapScripts: BattleTowerElevator_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER scene_script BattleTowerElevatorEnterScene, SCENE_BATTLETOWERELEVATOR_ENTER
scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP scene_script BattleTowerElevatorNoopScene, SCENE_BATTLETOWERELEVATOR_NOOP
def_callbacks def_callbacks
.Scene0: BattleTowerElevatorEnterScene:
sdefer .RideElevator sdefer BattleTowerElevatorRideElevatorScript
setscene SCENE_BATTLETOWERELEVATOR_NOOP setscene SCENE_BATTLETOWERELEVATOR_NOOP
.Scene1: ; fallthrough
BattleTowerElevatorNoopScene:
end end
.RideElevator: BattleTowerElevatorRideElevatorScript:
follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER follow BATTLETOWERELEVATOR_RECEPTIONIST, PLAYER
applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn applymovement BATTLETOWERELEVATOR_RECEPTIONIST, MovementData_BattleTowerElevatorReceptionistWalksIn
applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn applymovement PLAYER, MovementData_BattleTowerElevatorPlayerWalksIn

13
maps/BattleTowerHallway.asm
View File

@ -3,18 +3,19 @@
BattleTowerHallway_MapScripts: BattleTowerHallway_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER scene_script BattleTowerHallwayEnterScene, SCENE_BATTLETOWERHALLWAY_ENTER
scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP scene_script BattleTowerHallwayNoopScene, SCENE_BATTLETOWERHALLWAY_NOOP
def_callbacks def_callbacks
.Scene0: BattleTowerHallwayEnterScene:
sdefer .ChooseBattleRoom sdefer BattleTowerHallwayChooseBattleRoomScript
setscene SCENE_BATTLETOWERHALLWAY_NOOP setscene SCENE_BATTLETOWERHALLWAY_NOOP
.Scene1: ; fallthrough
BattleTowerHallwayNoopScene:
end end
.ChooseBattleRoom: BattleTowerHallwayChooseBattleRoomScript:
follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
callasm .asm_load_battle_room callasm .asm_load_battle_room
sjump .WalkToChosenBattleRoom sjump .WalkToChosenBattleRoom

12
maps/BattleTowerOutside.asm
View File

@ -8,14 +8,14 @@ BattleTowerOutside_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .Callback1 callback MAPCALLBACK_TILES, BattleTowerOutsideNoopCallback
callback MAPCALLBACK_OBJECTS, .Callback2 callback MAPCALLBACK_OBJECTS, BattleTowerOutsideShowCiviliansCallback
.Callback1: BattleTowerOutsideNoopCallback:
endcallback endcallback
.Callback2: BattleTowerOutsideShowCiviliansCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OPEN_CIVILIANS
endcallback endcallback
BattleTowerOutsideYoungsterScript: BattleTowerOutsideYoungsterScript:
@ -144,5 +144,5 @@ BattleTowerOutside_MapEvents:
def_object_events def_object_events
object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1 object_event 6, 12, SPRITE_STANDING_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideYoungsterScript, -1
object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1 object_event 13, 11, SPRITE_BEAUTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideBeautyScript, -1
object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR object_event 12, 18, SPRITE_SAILOR, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BattleTowerOutsideSailorScript, EVENT_BATTLE_TOWER_OPEN_CIVILIANS
object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1 object_event 12, 24, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, -1

8
maps/BlackthornCity.asm
View File

@ -13,14 +13,14 @@ BlackthornCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, BlackthornCityFlypointCallback
callback MAPCALLBACK_OBJECTS, .Santos callback MAPCALLBACK_OBJECTS, BlackthornCitySantosCallback
.FlyPoint: BlackthornCityFlypointCallback:
setflag ENGINE_FLYPOINT_BLACKTHORN setflag ENGINE_FLYPOINT_BLACKTHORN
endcallback endcallback
.Santos: BlackthornCitySantosCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SATURDAY, .SantosAppears ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS disappear BLACKTHORNCITY_SANTOS

4
maps/BlackthornGym1F.asm
View File

@ -9,9 +9,9 @@ BlackthornGym1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .Boulders callback MAPCALLBACK_TILES, BlackthornGym1FBouldersCallback
.Boulders: BlackthornGym1FBouldersCallback:
checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1 checkevent EVENT_BOULDER_IN_BLACKTHORN_GYM_1
iffalse .skip1 iffalse .skip1
changeblock 8, 2, $3b ; fallen boulder 2 changeblock 8, 2, $3b ; fallen boulder 2

4
maps/BlackthornGym2F.asm
View File

@ -12,9 +12,9 @@ BlackthornGym2F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable callback MAPCALLBACK_CMDQUEUE, BlackthornGym2FSetUpStoneTableCallback
.SetUpStoneTable: BlackthornGym2FSetUpStoneTableCallback:
writecmdqueue .CommandQueue writecmdqueue .CommandQueue
endcallback endcallback

16
maps/BrunosRoom.asm
View File

@ -3,20 +3,20 @@
BrunosRoom_MapScripts: BrunosRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor, SCENE_BRUNOSROOM_LOCK_DOOR scene_script BrunosRoomLockDoorScene, SCENE_BRUNOSROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP scene_script BrunosRoomNoopScene, SCENE_BRUNOSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors callback MAPCALLBACK_TILES, BrunosRoomDoorsCallback
.LockDoor: BrunosRoomLockDoorScene:
sdefer .BrunosDoorLocksBehindYou sdefer BrunosRoomDoorLocksBehindYouScript
end end
.DummyScene: BrunosRoomNoopScene:
end end
.BrunosRoomDoors: BrunosRoomDoorsCallback:
checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
iffalse .KeepEntranceOpen iffalse .KeepEntranceOpen
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
@ -27,7 +27,7 @@ BrunosRoom_MapScripts:
.KeepExitClosed: .KeepExitClosed:
endcallback endcallback
.BrunosDoorLocksBehindYou: BrunosRoomDoorLocksBehindYouScript:
applymovement PLAYER, BrunosRoom_EnterMovement applymovement PLAYER, BrunosRoom_EnterMovement
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH

20
maps/BurnedTower1F.asm
View File

@ -7,24 +7,24 @@
BurnedTower1F_MapScripts: BurnedTower1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE scene_script BurnedTower1FMeetEusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE scene_script BurnedTower1FNoop1Scene, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP scene_script BurnedTower1FNoop2Scene, SCENE_BURNEDTOWER1F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder callback MAPCALLBACK_TILES, BurnedTower1FHoleAndLadderCallback
.EusineScene: BurnedTower1FMeetEusineScene:
sdefer .MeetEusine sdefer BurnedTower1FMeetEusineScript
end end
.DummyScene1: BurnedTower1FNoop1Scene:
end end
.DummyScene2: BurnedTower1FNoop2Scene:
end end
.HoleAndLadder: BurnedTower1FHoleAndLadderCallback:
checkevent EVENT_HOLE_IN_BURNED_TOWER checkevent EVENT_HOLE_IN_BURNED_TOWER
iftrue .KeepHoleOpen iftrue .KeepHoleOpen
changeblock 10, 8, $32 ; floor changeblock 10, 8, $32 ; floor
@ -35,7 +35,7 @@ BurnedTower1F_MapScripts:
.HideBasement: .HideBasement:
endcallback endcallback
.MeetEusine: BurnedTower1FMeetEusineScript:
turnobject BURNEDTOWER1F_EUSINE, DOWN turnobject BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement

12
maps/BurnedTowerB1F.asm
View File

@ -11,19 +11,19 @@
BurnedTowerB1F_MapScripts: BurnedTowerB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS scene_script BurnedTowerB1FNoop1Scene, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP scene_script BurnedTowerB1FNoop2Scene, SCENE_BURNEDTOWERB1F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .LadderCallback callback MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
.DummyScene0: BurnedTowerB1FNoop1Scene:
end end
.DummyScene1: BurnedTowerB1FNoop2Scene:
end end
.LadderCallback: BurnedTowerB1FLadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS checkevent EVENT_RELEASED_THE_BEASTS
iftrue .HideLadder iftrue .HideLadder
changeblock 6, 14, $02 ; floor changeblock 6, 14, $02 ; floor

4
maps/CeladonCity.asm
View File

@ -13,9 +13,9 @@ CeladonCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, CeladonCityFlypointCallback
.FlyPoint: CeladonCityFlypointCallback:
setflag ENGINE_FLYPOINT_CELADON setflag ENGINE_FLYPOINT_CELADON
endcallback endcallback

4
maps/CeladonDeptStore6F.asm
View File

@ -10,9 +10,9 @@ CeladonDeptStore6F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HideRooftopStairs callback MAPCALLBACK_TILES, CeladonDeptStore6FHideRooftopStairsCallback
.HideRooftopStairs: CeladonDeptStore6FHideRooftopStairsCallback:
changeblock 12, 0, $03 ; wall changeblock 12, 0, $03 ; wall
endcallback endcallback

4
maps/CeruleanCity.asm
View File

@ -10,9 +10,9 @@ CeruleanCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, CeruleanCityFlypointCallback
.FlyPoint: CeruleanCityFlypointCallback:
setflag ENGINE_FLYPOINT_CERULEAN setflag ENGINE_FLYPOINT_CERULEAN
endcallback endcallback

12
maps/CeruleanGym.asm
View File

@ -8,19 +8,19 @@
CeruleanGym_MapScripts: CeruleanGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_CERULEANGYM_NOOP scene_script CeruleanGymNoopScene, SCENE_CERULEANGYM_NOOP
scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT scene_script CeruleanGymGruntRunsOutScene, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
def_callbacks def_callbacks
.DummyScene0: CeruleanGymNoopScene:
end end
.GruntRunsOut: CeruleanGymGruntRunsOutScene:
sdefer .GruntRunsOutScript sdefer CeruleanGymGruntRunsOutScript
end end
.GruntRunsOutScript: CeruleanGymGruntRunsOutScript:
applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsDownMovement
playsound SFX_TACKLE playsound SFX_TACKLE
applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement applymovement CERULEANGYM_ROCKET, CeruleanGymGruntRunsIntoYouMovement

12
maps/CherrygroveCity.asm
View File

@ -7,19 +7,19 @@
CherrygroveCity_MapScripts: CherrygroveCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_CHERRYGROVECITY_NOOP scene_script CherrygroveCityNoop1Scene, SCENE_CHERRYGROVECITY_NOOP
scene_script .DummyScene1, SCENE_CHERRYGROVECITY_MEET_RIVAL scene_script CherrygroveCityNoop2Scene, SCENE_CHERRYGROVECITY_MEET_RIVAL
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, CherrygroveCityFlypointCallback
.DummyScene0: CherrygroveCityNoop1Scene:
end end
.DummyScene1: CherrygroveCityNoop2Scene:
end end
.FlyPoint: CherrygroveCityFlypointCallback:
setflag ENGINE_FLYPOINT_CHERRYGROVE setflag ENGINE_FLYPOINT_CHERRYGROVE
endcallback endcallback

12
maps/CianwoodCity.asm
View File

@ -14,19 +14,19 @@
CianwoodCity_MapScripts: CianwoodCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_CIANWOODCITY_NOOP scene_script CianwoodCityNoop1Scene, SCENE_CIANWOODCITY_NOOP
scene_script .DummyScene1, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE scene_script CianwoodCityNoop2Scene, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune callback MAPCALLBACK_NEWMAP, CianwoodCityFlypointAndSuicuneCallback
.DummyScene0: CianwoodCityNoop1Scene:
end end
.DummyScene1: CianwoodCityNoop2Scene:
end end
.FlyPointAndSuicune: CianwoodCityFlypointAndSuicuneCallback:
setflag ENGINE_FLYPOINT_CIANWOOD setflag ENGINE_FLYPOINT_CIANWOOD
setevent EVENT_EUSINE_IN_BURNED_TOWER setevent EVENT_EUSINE_IN_BURNED_TOWER
checkevent EVENT_FOUGHT_EUSINE checkevent EVENT_FOUGHT_EUSINE

4
maps/CianwoodPharmacy.asm
View File

@ -3,11 +3,11 @@
CianwoodPharmacy_MapScripts: CianwoodPharmacy_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script CianwoodPharmacyNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: CianwoodPharmacyNoopScene:
end end
CianwoodPharmacist: CianwoodPharmacist:

4
maps/CinnabarIsland.asm
View File

@ -5,9 +5,9 @@ CinnabarIsland_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, CinnabarIslandFlypointCallback
.FlyPoint: CinnabarIslandFlypointCallback:
setflag ENGINE_FLYPOINT_CINNABAR setflag ENGINE_FLYPOINT_CINNABAR
endcallback endcallback

24
maps/Colosseum.asm
View File

@ -4,25 +4,25 @@
Colosseum_MapScripts: Colosseum_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeColosseum, SCENE_COLOSSEUM_INITIALIZE scene_script ColosseumInitializeScene, SCENE_COLOSSEUM_INITIALIZE
scene_script .DummyScene1, SCENE_COLOSSEUM_NOOP scene_script ColosseumNoop1Scene, SCENE_COLOSSEUM_NOOP
scene_script .DummyScene2 ; unused scene_script ColosseumNoop2Scene ; unused
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_OBJECTS, ColosseumSetWhichChrisCallback
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F callback MAPCALLBACK_NEWMAP, ColosseumPreparePokecenter2FCallback
.InitializeColosseum: ColosseumInitializeScene:
sdefer .InitializeAndPreparePokecenter2F sdefer ColosseumInitializeAndPreparePokecenter2FScript
end end
.DummyScene1: ColosseumNoop1Scene:
end end
.DummyScene2: ColosseumNoop2Scene:
end end
.SetWhichChris: ColosseumSetWhichChrisCallback:
special CableClubCheckWhichChris special CableClubCheckWhichChris
iffalse .Chris2 iffalse .Chris2
disappear COLOSSEUM_CHRIS2 disappear COLOSSEUM_CHRIS2
@ -34,11 +34,11 @@ Colosseum_MapScripts:
appear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS2
endcallback endcallback
.PreparePokecenter2F: ColosseumPreparePokecenter2FCallback:
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
endcallback endcallback
.InitializeAndPreparePokecenter2F: ColosseumInitializeAndPreparePokecenter2FScript:
setscene SCENE_COLOSSEUM_NOOP setscene SCENE_COLOSSEUM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end end

4
maps/CopycatsHouse2F.asm
View File

@ -10,9 +10,9 @@ CopycatsHouse2F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .Callback callback MAPCALLBACK_OBJECTS, CopycatsHouse2FWhichGenderCallback
.Callback: CopycatsHouse2FWhichGenderCallback:
checkflag ENGINE_PLAYER_IS_FEMALE checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female iftrue .Female
disappear COPYCATSHOUSE2F_COPYCAT2 disappear COPYCATSHOUSE2F_COPYCAT2

4
maps/DayCare.asm
View File

@ -6,9 +6,9 @@ DayCare_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .EggCheckCallback callback MAPCALLBACK_OBJECTS, DayCareEggCheckCallback
.EggCheckCallback: DayCareEggCheckCallback:
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
iftrue .PutDayCareManOutside iftrue .PutDayCareManOutside
clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE

12
maps/DragonShrine.asm
View File

@ -6,19 +6,19 @@
DragonShrine_MapScripts: DragonShrine_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DragonShrineTest, SCENE_DRAGONSHRINE_TAKE_TEST scene_script DragonShrineTakeTestScene, SCENE_DRAGONSHRINE_TAKE_TEST
scene_script .DummyScene, SCENE_DRAGONSHRINE_NOOP scene_script DragonShrineNoopScene, SCENE_DRAGONSHRINE_NOOP
def_callbacks def_callbacks
.DragonShrineTest: DragonShrineTakeTestScene:
sdefer .DragonShrineTestScript sdefer DragonShrineTakeTestScript
end end
.DummyScene: DragonShrineNoopScene:
end end
.DragonShrineTestScript: DragonShrineTakeTestScript:
applymovement PLAYER, DragonShrinePlayerWalkInMovement applymovement PLAYER, DragonShrinePlayerWalkInMovement
applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement applymovement DRAGONSHRINE_ELDER1, DragonShrineElderStepDownMovement
opentext opentext

12
maps/DragonsDenB1F.asm
View File

@ -11,19 +11,19 @@
DragonsDenB1F_MapScripts: DragonsDenB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_DRAGONSDENB1F_NOOP scene_script DragonsDenB1FNoop1Scene, SCENE_DRAGONSDENB1F_NOOP
scene_script .DummyScene1, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM scene_script DragonsDenB1FNoop2Scene, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver callback MAPCALLBACK_NEWMAP, DragonsDenB1FCheckSilverCallback
.DummyScene0: DragonsDenB1FNoop1Scene:
end end
.DummyScene1: DragonsDenB1FNoop2Scene:
end end
.CheckSilver: DragonsDenB1FCheckSilverCallback:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue .CheckDay iftrue .CheckDay
disappear DRAGONSDENB1F_SILVER disappear DRAGONSDENB1F_SILVER

4
maps/EcruteakCity.asm
View File

@ -11,9 +11,9 @@ EcruteakCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, EcruteakCityFlypointCallback
.FlyPoint: EcruteakCityFlypointCallback:
setflag ENGINE_FLYPOINT_ECRUTEAK setflag ENGINE_FLYPOINT_ECRUTEAK
endcallback endcallback

8
maps/EcruteakGym.asm
View File

@ -9,16 +9,16 @@
EcruteakGym_MapScripts: EcruteakGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .ForcedToLeave, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE scene_script EcruteakGymForcedToLeaveScene, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE
scene_script .DummyScene, SCENE_ECRUTEAKGYM_NOOP scene_script EcruteakGymNoopScene, SCENE_ECRUTEAKGYM_NOOP
def_callbacks def_callbacks
.ForcedToLeave: EcruteakGymForcedToLeaveScene:
sdefer EcruteakGymClosed sdefer EcruteakGymClosed
end end
.DummyScene: EcruteakGymNoopScene:
end end
EcruteakGymMortyScript: EcruteakGymMortyScript:

12
maps/EcruteakPokecenter1F.asm
View File

@ -7,19 +7,19 @@
EcruteakPokecenter1F_MapScripts: EcruteakPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetBill, SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL scene_script EcruteakPokecenter1FMeetBillScene, SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL
scene_script .DummyScene, SCENE_ECRUTEAKPOKECENTER1F_NOOP scene_script EcruteakPokecenter1FNoopScene, SCENE_ECRUTEAKPOKECENTER1F_NOOP
def_callbacks def_callbacks
.MeetBill: EcruteakPokecenter1FMeetBillScene:
sdefer .BillActivatesTimeCapsule sdefer EcruteakPokcenter1FBillActivatesTimeCapsuleScript
end end
.DummyScene: EcruteakPokecenter1FNoopScene:
end end
.BillActivatesTimeCapsule: EcruteakPokcenter1FBillActivatesTimeCapsuleScript:
pause 30 pause 30
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
appear ECRUTEAKPOKECENTER1F_BILL appear ECRUTEAKPOKECENTER1F_BILL

12
maps/EcruteakTinTowerEntrance.asm
View File

@ -6,19 +6,19 @@
EcruteakTinTowerEntrance_MapScripts: EcruteakTinTowerEntrance_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS scene_script EcruteakTinTowerEntranceNoop1Scene, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
scene_script .DummyScene1, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP scene_script EcruteakTinTowerEntranceNoop2Scene, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages callback MAPCALLBACK_OBJECTS, EcruteakTinTowerEntranceInitializeSagesCallback
.DummyScene0: EcruteakTinTowerEntranceNoop1Scene:
end end
.DummyScene1: EcruteakTinTowerEntranceNoop2Scene:
end end
.InitializeSages: EcruteakTinTowerEntranceInitializeSagesCallback:
checkevent EVENT_FOUGHT_SUICUNE checkevent EVENT_FOUGHT_SUICUNE
iftrue .DontBlockTower iftrue .DontBlockTower
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER

32
maps/ElmsLab.asm
View File

@ -8,44 +8,44 @@
ElmsLab_MapScripts: ElmsLab_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetElm, SCENE_ELMSLAB_MEET_ELM scene_script ElmsLabMeetElmScene, SCENE_ELMSLAB_MEET_ELM
scene_script .DummyScene1, SCENE_ELMSLAB_CANT_LEAVE scene_script ElmsLabNoop1Scene, SCENE_ELMSLAB_CANT_LEAVE
scene_script .DummyScene2, SCENE_ELMSLAB_NOOP scene_script ElmsLabNoop2Scene, SCENE_ELMSLAB_NOOP
scene_script .DummyScene3, SCENE_ELMSLAB_MEET_OFFICER scene_script ElmsLabNoop3Scene, SCENE_ELMSLAB_MEET_OFFICER
scene_script .DummyScene4, SCENE_ELMSLAB_UNUSED scene_script ElmsLabNoop4Scene, SCENE_ELMSLAB_UNUSED
scene_script .DummyScene5, SCENE_ELMSLAB_AIDE_GIVES_POTION scene_script ElmsLabNoop5Scene, SCENE_ELMSLAB_AIDE_GIVES_POTION
scene_const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS scene_const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback callback MAPCALLBACK_OBJECTS, ElmsLabMoveElmCallback
.MeetElm: ElmsLabMeetElmScene:
sdefer .WalkUpToElm sdefer ElmsLabWalkUpToElmScript
end end
.DummyScene1: ElmsLabNoop1Scene:
end end
.DummyScene2: ElmsLabNoop2Scene:
end end
.DummyScene3: ElmsLabNoop3Scene:
end end
.DummyScene4: ElmsLabNoop4Scene:
end end
.DummyScene5: ElmsLabNoop5Scene:
end end
.MoveElmCallback: ElmsLabMoveElmCallback:
checkscene checkscene
iftrue .Skip ; not SCENE_ELMSLAB_MEET_ELM iftrue .Skip ; not SCENE_ELMSLAB_MEET_ELM
moveobject ELMSLAB_ELM, 3, 4 moveobject ELMSLAB_ELM, 3, 4
.Skip: .Skip:
endcallback endcallback
.WalkUpToElm: ElmsLabWalkUpToElmScript:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
turnobject ELMSLAB_ELM, RIGHT turnobject ELMSLAB_ELM, RIGHT

16
maps/FastShip1F.asm
View File

@ -6,23 +6,23 @@
FastShip1F_MapScripts: FastShip1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_FASTSHIP1F_NOOP scene_script FastShip1FNoop1Scene, SCENE_FASTSHIP1F_NOOP
scene_script .EnterFastShip, SCENE_FASTSHIP1F_ENTER_SHIP scene_script FastShip1FEnterShipScene, SCENE_FASTSHIP1F_ENTER_SHIP
scene_script .DummyScene2, SCENE_FASTSHIP1F_MEET_GRANDPA scene_script FastShip1FNoop2Scene, SCENE_FASTSHIP1F_MEET_GRANDPA
def_callbacks def_callbacks
.DummyScene0: FastShip1FNoop1Scene:
end end
.EnterFastShip: FastShip1FEnterShipScene:
sdefer .EnterFastShipScript sdefer FastShip1FEnterShipScript
end end
.DummyScene2: FastShip1FNoop2Scene:
end end
.EnterFastShipScript: FastShip1FEnterShipScript:
applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideMovement applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorStepAsideMovement
applymovement PLAYER, FastShip1F_PlayerEntersShipMovement applymovement PLAYER, FastShip1F_PlayerEntersShipMovement
applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorBlocksDoorMovement applymovement FASTSHIP1F_SAILOR1, FastShip1F_SailorBlocksDoorMovement

8
maps/FastShipB1F.asm
View File

@ -14,15 +14,15 @@
FastShipB1F_MapScripts: FastShipB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_FASTSHIPB1F_SAILOR_BLOCKS scene_script FastShipB1FNoop1Scene, SCENE_FASTSHIPB1F_SAILOR_BLOCKS
scene_script .DummyScene1, SCENE_FASTSHIPB1F_NOOP scene_script FastShipB1FNoop2Scene, SCENE_FASTSHIPB1F_NOOP
def_callbacks def_callbacks
.DummyScene0: FastShipB1FNoop1Scene:
end end
.DummyScene1: FastShipB1FNoop2Scene:
end end
FastShipB1FSailorBlocksLeft: FastShipB1FSailorBlocksLeft:

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -16,7 +16,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapScripts:
def_callbacks def_callbacks
.DummyScene: ; unreferenced FastShipCabins_SE_SSE_CaptainsCabinNoopScene: ; unreferenced
end end
SSAquaCaptain: SSAquaCaptain:

4
maps/FuchsiaCity.asm
View File

@ -8,9 +8,9 @@ FuchsiaCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, FuchsiaCityFlypointCallback
.FlyPoint: FuchsiaCityFlypointCallback:
setflag ENGINE_FLYPOINT_FUCHSIA setflag ENGINE_FLYPOINT_FUCHSIA
endcallback endcallback

4
maps/FuchsiaPokecenter1F.asm
View File

@ -6,11 +6,11 @@
FuchsiaPokecenter1F_MapScripts: FuchsiaPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; unusable scene_script FuchsiaPokeCenter1FNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: FuchsiaPokeCenter1FNoopScene:
end end
FuchsiaPokecenter1FNurseScript: FuchsiaPokecenter1FNurseScript:

2
maps/GoldenrodBikeShop.asm
View File

@ -6,7 +6,7 @@ GoldenrodBikeShop_MapScripts:
def_callbacks def_callbacks
.DummyScene: ; unreferenced GoldenrodBikeShopNoopScene: ; unreferenced
end end
GoldenrodBikeShopClerkScript: GoldenrodBikeShopClerkScript:

8
maps/GoldenrodCity.asm
View File

@ -19,10 +19,10 @@ GoldenrodCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndFloria callback MAPCALLBACK_NEWMAP, GoldenrodCityFlypointAndFloriaCallback
callback MAPCALLBACK_OBJECTS, .MoveTutor callback MAPCALLBACK_OBJECTS, GoldenrodCityMoveTutorCallback
.FlyPointAndFloria: GoldenrodCityFlypointAndFloriaCallback:
setflag ENGINE_FLYPOINT_GOLDENROD setflag ENGINE_FLYPOINT_GOLDENROD
setflag ENGINE_REACHED_GOLDENROD setflag ENGINE_REACHED_GOLDENROD
checkevent EVENT_MET_FLORIA checkevent EVENT_MET_FLORIA
@ -31,7 +31,7 @@ GoldenrodCity_MapScripts:
.FloriaDone: .FloriaDone:
endcallback endcallback
.MoveTutor: GoldenrodCityMoveTutorCallback:
checkevent EVENT_BEAT_ELITE_FOUR checkevent EVENT_BEAT_ELITE_FOUR
iffalse .MoveTutorDone iffalse .MoveTutorDone
checkitem COIN_CASE checkitem COIN_CASE

4
maps/GoldenrodDeptStore5F.asm
View File

@ -10,9 +10,9 @@ GoldenrodDeptStore5F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .CheckIfSunday callback MAPCALLBACK_OBJECTS, GoldenrodDeptStore5FCheckIfSundayCallback
.CheckIfSunday: GoldenrodDeptStore5FCheckIfSundayCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SUNDAY, .yes ifequal SUNDAY, .yes
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST

8
maps/GoldenrodDeptStoreB1F.asm
View File

@ -12,10 +12,10 @@ GoldenrodDeptStoreB1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .ClearBoxes callback MAPCALLBACK_TILES, GoldenRodDeptStoreB1FClearBoxesCallback
callback MAPCALLBACK_NEWMAP, .Unblock callback MAPCALLBACK_NEWMAP, GoldenRodDeptStoreUnblockCallback
.ClearBoxes: GoldenRodDeptStoreB1FClearBoxesCallback:
checkevent EVENT_RECEIVED_CARD_KEY checkevent EVENT_RECEIVED_CARD_KEY
iftrue .GotCardKey iftrue .GotCardKey
sjump .Continue sjump .Continue
@ -40,7 +40,7 @@ GoldenrodDeptStoreB1F_MapScripts:
changeblock 10, 12, $0d ; floor changeblock 10, 12, $0d ; floor
endcallback endcallback
.Unblock: GoldenRodDeptStoreUnblockCallback:
clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
endcallback endcallback

8
maps/GoldenrodDeptStoreRoof.asm
View File

@ -12,10 +12,10 @@ GoldenrodDeptStoreRoof_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .CheckSaleChangeBlock callback MAPCALLBACK_TILES, GoldenrodDeptStoreRoofCheckSaleChangeBlockCallback
callback MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk callback MAPCALLBACK_OBJECTS, GoldenrodDeptStoreRoofCheckSaleChangeClerkCallback
.CheckSaleChangeBlock: GoldenrodDeptStoreRoofCheckSaleChangeBlockCallback:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .SaleIsOn iftrue .SaleIsOn
endcallback endcallback
@ -25,7 +25,7 @@ GoldenrodDeptStoreRoof_MapScripts:
changeblock 0, 4, $0f ; vendor booth changeblock 0, 4, $0f ; vendor booth
endcallback endcallback
.CheckSaleChangeClerk: GoldenrodDeptStoreRoofCheckSaleChangeClerkCallback:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .ChangeClerk iftrue .ChangeClerk
setevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_GOLDENROD_SALE_OFF

4
maps/GoldenrodGameCorner.asm
View File

@ -23,9 +23,9 @@ GoldenrodGameCorner_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .MoveTutor callback MAPCALLBACK_OBJECTS, GoldenrodGameCornerMoveTutorCallback
.MoveTutor: GoldenrodGameCornerMoveTutorCallback:
checkevent EVENT_BEAT_ELITE_FOUR checkevent EVENT_BEAT_ELITE_FOUR
iffalse .finish iffalse .finish
checkitem COIN_CASE checkitem COIN_CASE

8
maps/GoldenrodGym.asm
View File

@ -8,15 +8,15 @@
GoldenrodGym_MapScripts: GoldenrodGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_GOLDENRODGYM_NOOP scene_script GoldenrodGymNoop1Scene, SCENE_GOLDENRODGYM_NOOP
scene_script .DummyScene1, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING scene_script GoldenrodGymNoop2Scene, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
def_callbacks def_callbacks
.DummyScene0: GoldenrodGymNoop1Scene:
end end
.DummyScene1: GoldenrodGymNoop2Scene:
end end
GoldenrodGymWhitneyScript: GoldenrodGymWhitneyScript:

4
maps/GoldenrodMagnetTrainStation.asm
View File

@ -4,11 +4,11 @@
GoldenrodMagnetTrainStation_MapScripts: GoldenrodMagnetTrainStation_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON scene_script GoldenrodMagnetTrainStationNoopScene, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON
def_callbacks def_callbacks
.DummyScene: GoldenrodMagnetTrainStationNoopScene:
end end
GoldenrodMagnetTrainStationOfficerScript: GoldenrodMagnetTrainStationOfficerScript:

12
maps/GoldenrodUnderground.asm
View File

@ -16,11 +16,11 @@ GoldenrodUnderground_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches callback MAPCALLBACK_NEWMAP, GoldenrodUndergroundResetSwitchesCallback
callback MAPCALLBACK_TILES, .CheckBasementKey callback MAPCALLBACK_TILES, GoldenrodUndergroundCheckBasementKeyCallback
callback MAPCALLBACK_OBJECTS, .CheckDayOfWeek callback MAPCALLBACK_OBJECTS, GoldenrodUndergroundCheckDayOfWeekCallback
.ResetSwitches: GoldenrodUndergroundResetSwitchesCallback:
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3
@ -40,7 +40,7 @@ GoldenrodUnderground_MapScripts:
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
endcallback endcallback
.CheckBasementKey: GoldenrodUndergroundCheckBasementKeyCallback:
checkevent EVENT_USED_BASEMENT_KEY checkevent EVENT_USED_BASEMENT_KEY
iffalse .LockBasementDoor iffalse .LockBasementDoor
endcallback endcallback
@ -49,7 +49,7 @@ GoldenrodUnderground_MapScripts:
changeblock 18, 6, $3d ; locked door changeblock 18, 6, $3d ; locked door
endcallback endcallback
.CheckDayOfWeek: GoldenrodUndergroundCheckDayOfWeekCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal MONDAY, .Monday ifequal MONDAY, .Monday
ifequal TUESDAY, .Tuesday ifequal TUESDAY, .Tuesday

12
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -47,19 +47,19 @@ ENDM
GoldenrodUndergroundSwitchRoomEntrances_MapScripts: GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE scene_script GoldenrodUndergroundSwitchRoomEntrancesNoop1Scene, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE
scene_script .DummyScene1, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP scene_script GoldenrodUndergroundSwitchRoomEntrancesNoop2Scene, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions callback MAPCALLBACK_TILES, GoldenrodUndergroundSwitchRoomEntrancesUpdateDoorPositionsCallback
.DummyScene0: GoldenrodUndergroundSwitchRoomEntrancesNoop1Scene:
end end
.DummyScene1: GoldenrodUndergroundSwitchRoomEntrancesNoop2Scene:
end end
.UpdateDoorPositions: GoldenrodUndergroundSwitchRoomEntrancesUpdateDoorPositionsCallback:
checkevent EVENT_SWITCH_4 checkevent EVENT_SWITCH_4
iffalse .false4 iffalse .false4
doorstate 1, OPEN1 doorstate 1, OPEN1

4
maps/GoldenrodUndergroundWarehouse.asm
View File

@ -11,9 +11,9 @@ GoldenrodUndergroundWarehouse_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .ResetSwitches callback MAPCALLBACK_NEWMAP, GoldenrodUndergroundWarehouseResetSwitchesCallback
.ResetSwitches: GoldenrodUndergroundWarehouseResetSwitchesCallback:
clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_1
clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_2
clearevent EVENT_SWITCH_3 clearevent EVENT_SWITCH_3

12
maps/HallOfFame.asm
View File

@ -3,19 +3,19 @@
HallOfFame_MapScripts: HallOfFame_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EnterHallOfFame, SCENE_HALLOFFAME_ENTER scene_script HallOfFameEnterScene, SCENE_HALLOFFAME_ENTER
scene_script .DummyScene, SCENE_HALLOFFAME_NOOP scene_script HallOfFameNoopScene, SCENE_HALLOFFAME_NOOP
def_callbacks def_callbacks
.EnterHallOfFame: HallOfFameEnterScene:
sdefer .EnterHallOfFameScript sdefer HallOfFameEnterScript
end end
.DummyScene: HallOfFameNoopScene:
end end
.EnterHallOfFameScript: HallOfFameEnterScript:
follow HALLOFFAME_LANCE, PLAYER follow HALLOFFAME_LANCE, PLAYER
applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
stopfollow stopfollow

4
maps/IcePathB1F.asm
View File

@ -9,9 +9,9 @@ IcePathB1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable callback MAPCALLBACK_CMDQUEUE, IcePathB1FSetUpStoneTableCallback
.SetUpStoneTable: IcePathB1FSetUpStoneTableCallback:
writecmdqueue .CommandQueue writecmdqueue .CommandQueue
endcallback endcallback

4
maps/IlexForest.asm
View File

@ -15,9 +15,9 @@ IlexForest_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .FarfetchdCallback callback MAPCALLBACK_OBJECTS, IlexForestFarfetchdCallback
.FarfetchdCallback: IlexForestFarfetchdCallback:
checkevent EVENT_GOT_HM01_CUT checkevent EVENT_GOT_HM01_CUT
iftrue .Static iftrue .Static
readmem wFarfetchdPosition readmem wFarfetchdPosition

8
maps/IndigoPlateauPokecenter1F.asm
View File

@ -8,15 +8,15 @@
IndigoPlateauPokecenter1F_MapScripts: IndigoPlateauPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE scene_script IndigoPlateauPokecenter1FNoopScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .PrepareElite4 callback MAPCALLBACK_NEWMAP, IndigoPlateauPokecenter1FPrepareElite4Callback
.DummyScene: IndigoPlateauPokecenter1FNoopScene:
end end
.PrepareElite4: IndigoPlateauPokecenter1FPrepareElite4Callback:
setmapscene WILLS_ROOM, SCENE_WILLSROOM_LOCK_DOOR setmapscene WILLS_ROOM, SCENE_WILLSROOM_LOCK_DOOR
setmapscene KOGAS_ROOM, SCENE_KOGASROOM_LOCK_DOOR setmapscene KOGAS_ROOM, SCENE_KOGASROOM_LOCK_DOOR
setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_LOCK_DOOR setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_LOCK_DOOR

16
maps/KarensRoom.asm
View File

@ -3,20 +3,20 @@
KarensRoom_MapScripts: KarensRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor, SCENE_KARENSROOM_LOCK_DOOR scene_script KarensRoomLockDoorScene, SCENE_KARENSROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_KARENSROOM_NOOP scene_script KarensRoomNoopScene, SCENE_KARENSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .KarensRoomDoors callback MAPCALLBACK_TILES, KarensRoomDoorsCallback
.LockDoor: KarensRoomLockDoorScene:
sdefer .KarensDoorLocksBehindYou sdefer KarensRoomDoorLocksBehindYouScript
end end
.DummyScene: KarensRoomNoopScene:
end end
.KarensRoomDoors: KarensRoomDoorsCallback:
checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED checkevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
iffalse .KeepEntranceOpen iffalse .KeepEntranceOpen
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
@ -27,7 +27,7 @@ KarensRoom_MapScripts:
.KeepExitClosed: .KeepExitClosed:
endcallback endcallback
.KarensDoorLocksBehindYou: KarensRoomDoorLocksBehindYouScript:
applymovement PLAYER, KarensRoom_EnterMovement applymovement PLAYER, KarensRoom_EnterMovement
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH

16
maps/KogasRoom.asm
View File

@ -3,20 +3,20 @@
KogasRoom_MapScripts: KogasRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor, SCENE_KOGASROOM_LOCK_DOOR scene_script KogasRoomLockDoorScene, SCENE_KOGASROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_KOGASROOM_NOOP scene_script KogasRoomNoopScene, SCENE_KOGASROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .KogasRoomDoors callback MAPCALLBACK_TILES, KogasRoomDoorsCallback
.LockDoor: KogasRoomLockDoorScene:
sdefer .KogasDoorLocksBehindYou sdefer KogasRoomDoorLocksBehindYouScript
end end
.DummyScene: KogasRoomNoopScene:
end end
.KogasRoomDoors: KogasRoomDoorsCallback:
checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
iffalse .KeepEntranceOpen iffalse .KeepEntranceOpen
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
@ -27,7 +27,7 @@ KogasRoom_MapScripts:
.KeepExitClosed: .KeepExitClosed:
endcallback endcallback
.KogasDoorLocksBehindYou: KogasRoomDoorLocksBehindYouScript:
applymovement PLAYER, KogasRoom_EnterMovement applymovement PLAYER, KogasRoom_EnterMovement
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH

4
maps/KurtsHouse.asm
View File

@ -9,9 +9,9 @@ KurtsHouse_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .KurtCallback callback MAPCALLBACK_OBJECTS, KurtsHouseKurtCallback
.KurtCallback: KurtsHouseKurtCallback:
checkevent EVENT_CLEARED_SLOWPOKE_WELL checkevent EVENT_CLEARED_SLOWPOKE_WELL
iffalse .Done iffalse .Done
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS

16
maps/LakeOfRage.asm
View File

@ -14,24 +14,24 @@
LakeOfRage_MapScripts: LakeOfRage_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; unusable scene_script LakeOfRageNoop1Scene ; unusable
scene_script .DummyScene1 ; unusable scene_script LakeOfRageNoop2Scene ; unusable
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, LakeOfRageFlypointCallback
callback MAPCALLBACK_OBJECTS, .Wesley callback MAPCALLBACK_OBJECTS, LakeOfRageWesleyCallback
.DummyScene0: LakeOfRageNoop1Scene:
end end
.DummyScene1: LakeOfRageNoop2Scene:
end end
.FlyPoint: LakeOfRageFlypointCallback:
setflag ENGINE_FLYPOINT_LAKE_OF_RAGE setflag ENGINE_FLYPOINT_LAKE_OF_RAGE
endcallback endcallback
.Wesley: LakeOfRageWesleyCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal WEDNESDAY, .WesleyAppears ifequal WEDNESDAY, .WesleyAppears
disappear LAKEOFRAGE_WESLEY disappear LAKEOFRAGE_WESLEY

16
maps/LancesRoom.asm
View File

@ -5,20 +5,20 @@
LancesRoom_MapScripts: LancesRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor, SCENE_LANCESROOM_LOCK_DOOR scene_script LancesRoomLockDoorScene, SCENE_LANCESROOM_LOCK_DOOR
scene_script .DummyScene, SCENE_LANCESROOM_APPROACH_LANCE scene_script LancesRoomNoopScene, SCENE_LANCESROOM_APPROACH_LANCE
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .LancesRoomDoors callback MAPCALLBACK_TILES, LancesRoomDoorsCallback
.LockDoor: LancesRoomLockDoorScene:
sdefer .LancesDoorLocksBehindYou sdefer LancesRoomDoorLocksBehindYouScript
end end
.DummyScene: LancesRoomNoopScene:
end end
.LancesRoomDoors: LancesRoomDoorsCallback:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
iffalse .KeepEntranceOpen iffalse .KeepEntranceOpen
changeblock 4, 22, $34 ; wall changeblock 4, 22, $34 ; wall
@ -29,7 +29,7 @@ LancesRoom_MapScripts:
.KeepExitClosed: .KeepExitClosed:
endcallback endcallback
.LancesDoorLocksBehindYou: LancesRoomDoorLocksBehindYouScript:
applymovement PLAYER, LancesRoom_EnterMovement applymovement PLAYER, LancesRoom_EnterMovement
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH

4
maps/LavenderNameRater.asm
View File

@ -3,11 +3,11 @@
LavenderNameRater_MapScripts: LavenderNameRater_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; unusable scene_script LavenderNameRaterNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: LavenderNameRaterNoopScene:
end end
LavenderNameRater: LavenderNameRater:

4
maps/LavenderTown.asm
View File

@ -8,9 +8,9 @@ LavenderTown_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, LavenderTownFlypointCallback
.FlyPoint: LavenderTownFlypointCallback:
setflag ENGINE_FLYPOINT_LAVENDER setflag ENGINE_FLYPOINT_LAVENDER
endcallback endcallback

12
maps/MahoganyMart1F.asm
View File

@ -7,20 +7,20 @@
MahoganyMart1F_MapScripts: MahoganyMart1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_MAHOGANYMART1F_NOOP scene_script MahoganyMart1FNoopScene, SCENE_MAHOGANYMART1F_NOOP
scene_script .LanceUncoversStaircase, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS scene_script MahoganyMart1FLanceUncoversStairsScene, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase callback MAPCALLBACK_TILES, MahoganyMart1FStaircaseCallback
.DummyScene0: MahoganyMart1FNoopScene:
end end
.LanceUncoversStaircase: MahoganyMart1FLanceUncoversStairsScene:
sdefer MahoganyMart1FLanceUncoversStaircaseScript sdefer MahoganyMart1FLanceUncoversStaircaseScript
end end
.MahoganyMart1FStaircase: MahoganyMart1FStaircaseCallback:
checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
iftrue .ShowStairs iftrue .ShowStairs
endcallback endcallback

12
maps/MahoganyTown.asm
View File

@ -8,19 +8,19 @@ DEF MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300
MahoganyTown_MapScripts: MahoganyTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR scene_script MahoganyTownNoop1Scene, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR
scene_script .DummyScene1, SCENE_MAHOGANYTOWN_NOOP scene_script MahoganyTownNoop2Scene, SCENE_MAHOGANYTOWN_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, MahoganyTownFlypointCallback
.DummyScene0: MahoganyTownNoop1Scene:
end end
.DummyScene1: MahoganyTownNoop2Scene:
end end
.FlyPoint: MahoganyTownFlypointCallback:
setflag ENGINE_FLYPOINT_MAHOGANY setflag ENGINE_FLYPOINT_MAHOGANY
endcallback endcallback

12
maps/MobileBattleRoom.asm
View File

@ -1,18 +1,18 @@
MobileBattleRoom_MapScripts: MobileBattleRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeMobileBattleRoom, SCENE_MOBILEBATTLEROOM_INITIALIZE scene_script MobileBattleRoomInitializeScene, SCENE_MOBILEBATTLEROOM_INITIALIZE
scene_script .DummyScene, SCENE_MOBILEBATTLEROOM_NOOP scene_script MobileBattleRoomNoopScene, SCENE_MOBILEBATTLEROOM_NOOP
def_callbacks def_callbacks
.InitializeMobileBattleRoom: MobileBattleRoomInitializeScene:
sdefer .InitializeAndPreparePokecenter2F sdefer MobileBattleRoomInitializeAndPreparePokecenter2FScript
end end
.DummyScene: MobileBattleRoomNoopScene:
end end
.InitializeAndPreparePokecenter2F: MobileBattleRoomInitializeAndPreparePokecenter2FScript:
setscene SCENE_MOBILEBATTLEROOM_NOOP setscene SCENE_MOBILEBATTLEROOM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
end end

12
maps/MobileTradeRoom.asm
View File

@ -1,18 +1,18 @@
MobileTradeRoom_MapScripts: MobileTradeRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeMobileTradeRoom, SCENE_MOBILETRADEROOM_INITIALIZE scene_script MobileTradeRoomInitializeScene, SCENE_MOBILETRADEROOM_INITIALIZE
scene_script .DummyScene, SCENE_MOBILETRADEROOM_NOOP scene_script MobileTradeRoomNoopScene, SCENE_MOBILETRADEROOM_NOOP
def_callbacks def_callbacks
.InitializeMobileTradeRoom: MobileTradeRoomInitializeScene:
sdefer .InitializeAndPreparePokecenter2F sdefer MobileTradeRoomInitializeAndPreparePokecenter2FScript
end end
.DummyScene: MobileTradeRoomNoopScene:
end end
.InitializeAndPreparePokecenter2F: MobileTradeRoomInitializeAndPreparePokecenter2FScript:
setscene SCENE_MOBILETRADEROOM_NOOP setscene SCENE_MOBILETRADEROOM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
end end

12
maps/MountMoon.asm
View File

@ -3,19 +3,19 @@
MountMoon_MapScripts: MountMoon_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .RivalEncounter, SCENE_MOUNTMOON_RIVAL_BATTLE scene_script MountMoonRivalEncounterScene, SCENE_MOUNTMOON_RIVAL_BATTLE
scene_script .DummyScene, SCENE_MOUNTMOON_NOOP scene_script MountMoonNoopScene, SCENE_MOUNTMOON_NOOP
def_callbacks def_callbacks
.RivalEncounter: MountMoonRivalEncounterScene:
sdefer .RivalBattle sdefer MountMoonRivalBattleScript
end end
.DummyScene: MountMoonNoopScene:
end end
.RivalBattle: MountMoonRivalBattleScript:
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic special FadeOutMusic

12
maps/MountMoonSquare.asm
View File

@ -5,20 +5,20 @@
MountMoonSquare_MapScripts: MountMoonSquare_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE scene_script MountMoonSquareNoopScene, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_NEWMAP, MountMoonSquareDisappearMoonStoneCallback
callback MAPCALLBACK_OBJECTS, .DisappearRock callback MAPCALLBACK_OBJECTS, MountMoonSquareDisappearRockCallback
.DummyScene: MountMoonSquareNoopScene:
end end
.DisappearMoonStone: MountMoonSquareDisappearMoonStoneCallback:
setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
endcallback endcallback
.DisappearRock: MountMoonSquareDisappearRockCallback:
disappear MOUNTMOONSQUARE_ROCK disappear MOUNTMOONSQUARE_ROCK
endcallback endcallback

12
maps/MrPokemonsHouse.asm
View File

@ -4,19 +4,19 @@
MrPokemonsHouse_MapScripts: MrPokemonsHouse_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetMrPokemon, SCENE_MRPOKEMONSHOUSE_MEET_MR_POKEMON scene_script MrPokemonsHouseMeetMrPokemonScene, SCENE_MRPOKEMONSHOUSE_MEET_MR_POKEMON
scene_script .DummyScene, SCENE_MRPOKEMONSHOUSE_NOOP scene_script MrPokemonsHouseNoopScene, SCENE_MRPOKEMONSHOUSE_NOOP
def_callbacks def_callbacks
.MeetMrPokemon: MrPokemonsHouseMeetMrPokemonScene:
sdefer .MrPokemonEvent sdefer MrPokemonsHouseMrPokemonEventScript
end end
.DummyScene: MrPokemonsHouseNoopScene:
end end
.MrPokemonEvent: MrPokemonsHouseMrPokemonEventScript:
showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
opentext opentext

12
maps/NewBarkTown.asm
View File

@ -5,19 +5,19 @@
NewBarkTown_MapScripts: NewBarkTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU scene_script NewBarkTownNoop1Scene, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU
scene_script .DummyScene1, SCENE_NEWBARKTOWN_NOOP scene_script NewBarkTownNoop2Scene, SCENE_NEWBARKTOWN_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, NewBarkTownFlypointCallback
.DummyScene0: NewBarkTownNoop1Scene:
end end
.DummyScene1: NewBarkTownNoop2Scene:
end end
.FlyPoint: NewBarkTownFlypointCallback:
setflag ENGINE_FLYPOINT_NEW_BARK setflag ENGINE_FLYPOINT_NEW_BARK
clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM
endcallback endcallback

2
maps/OaksLab.asm
View File

@ -9,7 +9,7 @@ OaksLab_MapScripts:
def_callbacks def_callbacks
.DummyScene: ; unreferenced OaksLabNoopScene: ; unreferenced
end end
Oak: Oak:

12
maps/OlivineCity.asm
View File

@ -6,19 +6,19 @@
OlivineCity_MapScripts: OlivineCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_OLIVINECITY_RIVAL_ENCOUNTER scene_script OlivineCityNoop1Scene, SCENE_OLIVINECITY_RIVAL_ENCOUNTER
scene_script .DummyScene1, SCENE_OLIVINECITY_NOOP scene_script OlivineCityNoop2Scene, SCENE_OLIVINECITY_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, OlivineCityFlypointCallback
.DummyScene0: OlivineCityNoop1Scene:
end end
.DummyScene1: OlivineCityNoop2Scene:
end end
.FlyPoint: OlivineCityFlypointCallback:
setflag ENGINE_FLYPOINT_OLIVINE setflag ENGINE_FLYPOINT_OLIVINE
endcallback endcallback

12
maps/OlivinePort.asm
View File

@ -9,19 +9,19 @@
OlivinePort_MapScripts: OlivinePort_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_OLIVINEPORT_ASK_ENTER_SHIP scene_script OlivinePortNoopScene, SCENE_OLIVINEPORT_ASK_ENTER_SHIP
scene_script .LeaveFastShip, SCENE_OLIVINEPORT_LEAVE_SHIP scene_script OlivinePortLeaveShipScene, SCENE_OLIVINEPORT_LEAVE_SHIP
def_callbacks def_callbacks
.DummyScene0: OlivinePortNoopScene:
end end
.LeaveFastShip: OlivinePortLeaveShipScene:
sdefer .LeaveFastShipScript sdefer OlivinePortLeaveShipScript
end end
.LeaveFastShipScript: OlivinePortLeaveShipScript:
applymovement PLAYER, OlivinePortLeaveFastShipMovement applymovement PLAYER, OlivinePortLeaveFastShipMovement
appear OLIVINEPORT_SAILOR1 appear OLIVINEPORT_SAILOR1
setscene SCENE_OLIVINEPORT_ASK_ENTER_SHIP setscene SCENE_OLIVINEPORT_ASK_ENTER_SHIP

4
maps/PalletTown.asm
View File

@ -6,9 +6,9 @@ PalletTown_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, PalletTownFlypointCallback
.FlyPoint: PalletTownFlypointCallback:
setflag ENGINE_FLYPOINT_PALLET setflag ENGINE_FLYPOINT_PALLET
endcallback endcallback

4
maps/PewterCity.asm
View File

@ -9,9 +9,9 @@ PewterCity_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, PewterCityFlypointCallback
.FlyPoint: PewterCityFlypointCallback:
setflag ENGINE_FLYPOINT_PEWTER setflag ENGINE_FLYPOINT_PEWTER
endcallback endcallback

8
maps/PlayersHouse1F.asm
View File

@ -7,15 +7,15 @@
PlayersHouse1F_MapScripts: PlayersHouse1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_PLAYERSHOUSE1F_MEET_MOM scene_script PlayersHouse1FNoop1Scene, SCENE_PLAYERSHOUSE1F_MEET_MOM
scene_script .DummyScene1, SCENE_PLAYERSHOUSE1F_NOOP scene_script PlayersHouse1FNoop2Scene, SCENE_PLAYERSHOUSE1F_NOOP
def_callbacks def_callbacks
.DummyScene0: PlayersHouse1FNoop1Scene:
end end
.DummyScene1: PlayersHouse1FNoop2Scene:
end end
MeetMomLeftScript: MeetMomLeftScript:

10
maps/PlayersHouse2F.asm
View File

@ -8,13 +8,13 @@ PlayersHouse2F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .InitializeRoom callback MAPCALLBACK_NEWMAP, PlayersHouse2FInitializeRoomCallback
callback MAPCALLBACK_TILES, .SetUpTileDecorations callback MAPCALLBACK_TILES, PlayersHouse2FSetUpTileDecorationsCallback
.DummyScene: ; unreferenced PlayersHouse2FNoopScene: ; unreferenced
end end
.InitializeRoom: PlayersHouse2FInitializeRoomCallback:
special ToggleDecorationsVisibility special ToggleDecorationsVisibility
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
checkevent EVENT_INITIALIZED_EVENTS checkevent EVENT_INITIALIZED_EVENTS
@ -25,7 +25,7 @@ PlayersHouse2F_MapScripts:
.SkipInitialization: .SkipInitialization:
endcallback endcallback
.SetUpTileDecorations: PlayersHouse2FSetUpTileDecorationsCallback:
special ToggleMaptileDecorations special ToggleMaptileDecorations
endcallback endcallback

41
maps/Pokecenter2F.asm
View File

@ -6,43 +6,42 @@
Pokecenter2F_MapScripts: Pokecenter2F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0, SCENE_POKECENTER2F_NOOP scene_script Pokecenter2FCheckMysteryGiftScene, SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
scene_script .Scene1, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER scene_script Pokecenter2FLeaveTradeCenterScene, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
scene_script .Scene2, SCENE_POKECENTER2F_LEAVE_COLOSSEUM scene_script Pokecenter2FLeaveColosseumScene, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
scene_script .Scene3, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE scene_script Pokecenter2FLeaveTimeCapsuleScene, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
scene_script .Scene4, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM scene_script Pokecenter2FLeaveMobileTradeRoomScene, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
scene_script .Scene5, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM scene_script Pokecenter2FLeaveMobileBattleRoomScene, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
def_callbacks def_callbacks
.Scene0: Pokecenter2FCheckMysteryGiftScene:
special CheckMysteryGift special CheckMysteryGift
ifequal $0, .Scene0Done ifequal $0, .done
clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue .Scene0Done iftrue .done
sdefer Pokecenter2F_AppearMysteryGiftDeliveryGuy sdefer Pokecenter2F_AppearMysteryGiftDeliveryGuy
.done
.Scene0Done:
end end
.Scene1: Pokecenter2FLeaveTradeCenterScene:
sdefer Script_LeftCableTradeCenter sdefer Script_LeftCableTradeCenter
end end
.Scene2: Pokecenter2FLeaveColosseumScene:
sdefer Script_LeftCableColosseum sdefer Script_LeftCableColosseum
end end
.Scene3: Pokecenter2FLeaveTimeCapsuleScene:
sdefer Script_LeftTimeCapsule sdefer Script_LeftTimeCapsule
end end
.Scene4: Pokecenter2FLeaveMobileTradeRoomScene:
sdefer Script_LeftMobileTradeRoom sdefer Script_LeftMobileTradeRoom
end end
.Scene5: Pokecenter2FLeaveMobileBattleRoomScene:
sdefer Script_LeftMobileBattleRoom sdefer Script_LeftMobileBattleRoom
end end
@ -374,14 +373,14 @@ LinkReceptionistScript_TimeCapsule:
Script_LeftCableTradeCenter: Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom scall Script_WalkOutOfLinkTradeRoom
setscene SCENE_POKECENTER2F_NOOP setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene TRADE_CENTER, SCENE_TRADECENTER_INITIALIZE setmapscene TRADE_CENTER, SCENE_TRADECENTER_INITIALIZE
end end
Script_LeftMobileTradeRoom: Script_LeftMobileTradeRoom:
special Function101220 special Function101220
scall Script_WalkOutOfMobileTradeRoom scall Script_WalkOutOfMobileTradeRoom
setscene SCENE_POKECENTER2F_NOOP setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_INITIALIZE setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_INITIALIZE
end end
@ -394,14 +393,14 @@ Script_WalkOutOfMobileTradeRoom:
Script_LeftCableColosseum: Script_LeftCableColosseum:
special WaitForOtherPlayerToExit special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom scall Script_WalkOutOfLinkBattleRoom
setscene SCENE_POKECENTER2F_NOOP setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene COLOSSEUM, SCENE_COLOSSEUM_INITIALIZE setmapscene COLOSSEUM, SCENE_COLOSSEUM_INITIALIZE
end end
Script_LeftMobileBattleRoom: Script_LeftMobileBattleRoom:
special Function101220 special Function101220
scall Script_WalkOutOfMobileBattleRoom scall Script_WalkOutOfMobileBattleRoom
setscene SCENE_POKECENTER2F_NOOP setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_INITIALIZE setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_INITIALIZE
end end
@ -577,7 +576,7 @@ Script_LeftTimeCapsule:
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done: .Done:
setscene SCENE_POKECENTER2F_NOOP setscene SCENE_POKECENTER2F_CHECK_MYSTERY_GIFT
setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_INITIALIZE setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_INITIALIZE
end end

8
maps/PowerPlant.asm
View File

@ -9,15 +9,15 @@
PowerPlant_MapScripts: PowerPlant_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_POWERPLANT_NOOP scene_script PowerPlantNoop1Scene, SCENE_POWERPLANT_NOOP
scene_script .DummyScene1, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL scene_script PowerPlantNoop2Scene, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
def_callbacks def_callbacks
.DummyScene0: PowerPlantNoop1Scene:
end end
.DummyScene1: PowerPlantNoop2Scene:
end end
PowerPlantGuardPhoneScript: PowerPlantGuardPhoneScript:

2
maps/RadioTower2F.asm
View File

@ -18,7 +18,7 @@ RadioTower2F_MapScripts:
def_callbacks def_callbacks
RadioTower2FUnusedDummyScene: ; unreferenced RadioTower2FNoopScene: ; unreferenced
end end
RadioTower2FSuperNerdScript: RadioTower2FSuperNerdScript:

4
maps/RadioTower3F.asm
View File

@ -11,9 +11,9 @@ RadioTower3F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .CardKeyShutterCallback callback MAPCALLBACK_TILES, RadioTower3FCardKeyShutterCallback
.CardKeyShutterCallback: RadioTower3FCardKeyShutterCallback:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue .Change iftrue .Change
endcallback endcallback

16
maps/RadioTower5F.asm
View File

@ -7,19 +7,19 @@
RadioTower5F_MapScripts: RadioTower5F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_RADIOTOWER5F_FAKE_DIRECTOR scene_script RadioTower5FNoop1Scene, SCENE_RADIOTOWER5F_FAKE_DIRECTOR
scene_script .DummyScene1, SCENE_RADIOTOWER5F_ROCKET_BOSS scene_script RadioTower5FNoop2Scene, SCENE_RADIOTOWER5F_ROCKET_BOSS
scene_script .DummyScene2, SCENE_RADIOTOWER5F_NOOP scene_script RadioTower5FNoop3Scene, SCENE_RADIOTOWER5F_NOOP
def_callbacks def_callbacks
.DummyScene0: RadioTower5FNoop1Scene:
end end
.DummyScene1: RadioTower5FNoop2Scene:
end end
.DummyScene2: RadioTower5FNoop3Scene:
end end
FakeDirectorScript: FakeDirectorScript:
@ -76,7 +76,7 @@ TrainerExecutivef1:
closetext closetext
end end
RadioTower5FRocketBossScene: RadioTower5FRocketBossScript:
applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement applymovement PLAYER, RadioTower5FPlayerTwoStepsLeftMovement
playmusic MUSIC_ROCKET_ENCOUNTER playmusic MUSIC_ROCKET_ENCOUNTER
turnobject RADIOTOWER5F_ROCKET, RIGHT turnobject RADIOTOWER5F_ROCKET, RIGHT
@ -427,7 +427,7 @@ RadioTower5F_MapEvents:
def_coord_events def_coord_events
coord_event 0, 3, SCENE_RADIOTOWER5F_FAKE_DIRECTOR, FakeDirectorScript coord_event 0, 3, SCENE_RADIOTOWER5F_FAKE_DIRECTOR, FakeDirectorScript
coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScript
def_bg_events def_bg_events
bg_event 3, 0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign bg_event 3, 0, BGEVENT_READ, RadioTower5FDirectorsOfficeSign

4
maps/RedsHouse1F.asm
View File

@ -3,11 +3,11 @@
RedsHouse1F_MapScripts: RedsHouse1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; unusable scene_script RedHouse1FNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: RedHouse1FNoopScene:
end end
RedsMom: RedsMom:

4
maps/Route16.asm
View File

@ -2,9 +2,9 @@ Route16_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike callback MAPCALLBACK_NEWMAP, Route16AlwaysOnBikeCallback
.AlwaysOnBike: Route16AlwaysOnBikeCallback:
readvar VAR_YCOORD readvar VAR_YCOORD
ifless 5, .CanWalk ifless 5, .CanWalk
readvar VAR_XCOORD readvar VAR_XCOORD

4
maps/Route16Gate.asm
View File

@ -3,11 +3,11 @@
Route16Gate_MapScripts: Route16Gate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene, SCENE_ROUTE16GATE_BICYCLE_CHECK scene_script Route16GateNoopScene, SCENE_ROUTE16GATE_BICYCLE_CHECK
def_callbacks def_callbacks
.DummyScene: Route16GateNoopScene:
end end
Route16GateOfficerScript: Route16GateOfficerScript:

4
maps/Route17.asm
View File

@ -8,9 +8,9 @@ Route17_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .AlwaysOnBike callback MAPCALLBACK_NEWMAP, Route17AlwaysOnBikeCallback
.AlwaysOnBike: Route17AlwaysOnBikeCallback:
setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_ALWAYS_ON_BIKE
setflag ENGINE_DOWNHILL setflag ENGINE_DOWNHILL
endcallback endcallback

4
maps/Route17Route18Gate.asm
View File

@ -3,11 +3,11 @@
Route17Route18Gate_MapScripts: Route17Route18Gate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK scene_script Route17Route18GateNoopScene, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK
def_callbacks def_callbacks
.DummyScene: Route17Route18GateNoopScene:
end end
Route17Route18GateOfficerScript: Route17Route18GateOfficerScript:

4
maps/Route19.asm
View File

@ -10,9 +10,9 @@ Route19_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .ClearRocks callback MAPCALLBACK_TILES, Route19ClearRocksCallback
.ClearRocks: Route19ClearRocksCallback:
checkevent EVENT_CINNABAR_ROCKS_CLEARED checkevent EVENT_CINNABAR_ROCKS_CLEARED
iftrue .Done iftrue .Done
changeblock 6, 6, $7a ; rock changeblock 6, 6, $7a ; rock

4
maps/Route20.asm
View File

@ -7,9 +7,9 @@ Route20_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .ClearRocks callback MAPCALLBACK_NEWMAP, Route20ClearRocksCallback
.ClearRocks: Route20ClearRocksCallback:
setevent EVENT_CINNABAR_ROCKS_CLEARED setevent EVENT_CINNABAR_ROCKS_CLEARED
endcallback endcallback

4
maps/Route23.asm
View File

@ -2,9 +2,9 @@ Route23_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, Route23FlypointCallback
.FlyPoint: Route23FlypointCallback:
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
endcallback endcallback

8
maps/Route25.asm
View File

@ -13,15 +13,15 @@
Route25_MapScripts: Route25_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE25_NOOP scene_script Route25Noop1Scene, SCENE_ROUTE25_NOOP
scene_script .DummyScene1, SCENE_ROUTE25_MISTYS_DATE scene_script Route25Noop2Scene, SCENE_ROUTE25_MISTYS_DATE
def_callbacks def_callbacks
.DummyScene0: Route25Noop1Scene:
end end
.DummyScene1: Route25Noop2Scene:
end end
Route25MistyDate1Script: Route25MistyDate1Script:

8
maps/Route27.asm
View File

@ -11,15 +11,15 @@
Route27_MapScripts: Route27_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO scene_script Route27Noop1Scene, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO
scene_script .DummyScene1, SCENE_ROUTE27_NOOP scene_script Route27Noop2Scene, SCENE_ROUTE27_NOOP
def_callbacks def_callbacks
.DummyScene0: Route27Noop1Scene:
end end
.DummyScene1: Route27Noop2Scene:
end end
FirstStepIntoKantoLeftScene: FirstStepIntoKantoLeftScene:

4
maps/Route28SteelWingHouse.asm
View File

@ -4,11 +4,11 @@
Route28SteelWingHouse_MapScripts: Route28SteelWingHouse_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; unusable scene_script Route28SteelWingHouseNoopScene ; unusable
def_callbacks def_callbacks
.DummyScene: Route28SteelWingHouseNoopScene:
end end
Celebrity: Celebrity:

12
maps/Route29.asm
View File

@ -10,19 +10,19 @@
Route29_MapScripts: Route29_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE29_NOOP scene_script Route29Noop1Scene, SCENE_ROUTE29_NOOP
scene_script .DummyScene1, SCENE_ROUTE29_CATCH_TUTORIAL scene_script Route29Noop2Scene, SCENE_ROUTE29_CATCH_TUTORIAL
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .Tuscany callback MAPCALLBACK_OBJECTS, Route29TuscanyCallback
.DummyScene0: Route29Noop1Scene:
end end
.DummyScene1: Route29Noop2Scene:
end end
.Tuscany: Route29TuscanyCallback:
checkflag ENGINE_ZEPHYRBADGE checkflag ENGINE_ZEPHYRBADGE
iftrue .DoesTuscanyAppear iftrue .DoesTuscanyAppear

4
maps/Route31.asm
View File

@ -11,9 +11,9 @@ Route31_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckMomCall callback MAPCALLBACK_NEWMAP, Route31CheckMomCallCallback
.CheckMomCall: Route31CheckMomCallCallback:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iffalse .DoMomCall iffalse .DoMomCall
endcallback endcallback

16
maps/Route32.asm
View File

@ -16,23 +16,23 @@
Route32_MapScripts: Route32_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS scene_script Route32Noop1Scene, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS
scene_script .DummyScene1, SCENE_ROUTE32_OFFER_SLOWPOKETAIL scene_script Route32Noop2Scene, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
scene_script .DummyScene2, SCENE_ROUTE32_NOOP scene_script Route32Noop3Scene, SCENE_ROUTE32_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .Frieda callback MAPCALLBACK_OBJECTS, Route32FriedaCallback
.DummyScene0: Route32Noop1Scene:
end end
.DummyScene1: Route32Noop2Scene:
end end
.DummyScene2: Route32Noop3Scene:
end end
.Frieda: Route32FriedaCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal FRIDAY, .FriedaAppears ifequal FRIDAY, .FriedaAppears
disappear ROUTE32_FRIEDA disappear ROUTE32_FRIEDA

4
maps/Route34.asm
View File

@ -17,9 +17,9 @@ Route34_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .EggCheckCallback callback MAPCALLBACK_OBJECTS, Route34EggCheckCallback
.EggCheckCallback: Route34EggCheckCallback:
checkflag ENGINE_DAY_CARE_MAN_HAS_EGG checkflag ENGINE_DAY_CARE_MAN_HAS_EGG
iftrue .PutDayCareManOutside iftrue .PutDayCareManOutside
clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE

4
maps/Route34IlexForestGate.asm
View File

@ -9,9 +9,9 @@ Route34IlexForestGate_MapScripts:
scene_const SCENE_ROUTE34ILEXFORESTGATE_TEACHER_BLOCKS_IF_FOREST_IS_RESTLESS scene_const SCENE_ROUTE34ILEXFORESTGATE_TEACHER_BLOCKS_IF_FOREST_IS_RESTLESS
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .IsForestRestless callback MAPCALLBACK_OBJECTS, Route34IsForestRestlessCallback
.IsForestRestless: Route34IsForestRestlessCallback:
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS
iffalse .Normal iffalse .Normal
disappear ROUTE34ILEXFORESTGATE_TEACHER1 disappear ROUTE34ILEXFORESTGATE_TEACHER1

30
maps/Route35NationalParkGate.asm
View File

@ -5,41 +5,41 @@
Route35NationalParkGate_MapScripts: Route35NationalParkGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE35NATIONALPARKGATE_NOOP scene_script Route35NationalParkGateNoop1Scene, SCENE_ROUTE35NATIONALPARKGATE_NOOP
scene_script .DummyScene1, SCENE_ROUTE35NATIONALPARKGATE_UNUSED scene_script Route35NationalParkGateNoop2Scene, SCENE_ROUTE35NATIONALPARKGATE_UNUSED
scene_script .LeaveContestEarly, SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY scene_script Route35NationalParkGateLeaveContestEarlyScene, SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_NEWMAP, Route35NationalParkGateCheckIfContestRunningCallback
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable callback MAPCALLBACK_OBJECTS, Route35NationalParkGateCheckIfContestAvailableCallback
.DummyScene0: Route35NationalParkGateNoop1Scene:
end end
.DummyScene1: Route35NationalParkGateNoop2Scene:
end end
.LeaveContestEarly: Route35NationalParkGateLeaveContestEarlyScene:
sdefer .LeavingContestEarly sdefer Route35NationalParkGateLeavingContestEarlyScript
end end
.CheckIfContestRunning: Route35NationalParkGateCheckIfContestRunningCallback:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue Route35NationalParkBugContestIsRunningScript
setscene SCENE_ROUTE35NATIONALPARKGATE_NOOP setscene SCENE_ROUTE35NATIONALPARKGATE_NOOP
endcallback endcallback
.BugContestIsRunning: Route35NationalParkBugContestIsRunningScript:
setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
endcallback endcallback
.CheckIfContestAvailable: Route35NationalParkGateCheckIfContestAvailableCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal TUESDAY, .SetContestOfficer ifequal TUESDAY, .SetContestOfficer
ifequal THURSDAY, .SetContestOfficer ifequal THURSDAY, .SetContestOfficer
ifequal SATURDAY, .SetContestOfficer ifequal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue Route35NationalParkBugContestIsRunningScript
disappear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_OFFICER1
appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_YOUNGSTER
appear ROUTE35NATIONALPARKGATE_OFFICER2 appear ROUTE35NATIONALPARKGATE_OFFICER2
@ -51,7 +51,7 @@ Route35NationalParkGate_MapScripts:
disappear ROUTE35NATIONALPARKGATE_OFFICER2 disappear ROUTE35NATIONALPARKGATE_OFFICER2
endcallback endcallback
.LeavingContestEarly: Route35NationalParkGateLeavingContestEarlyScript:
applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement
turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext opentext

12
maps/Route36.asm
View File

@ -11,19 +11,19 @@
Route36_MapScripts: Route36_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE36_NOOP scene_script Route36Noop1Scene, SCENE_ROUTE36_NOOP
scene_script .DummyScene1, SCENE_ROUTE36_SUICUNE scene_script Route36Noop2Scene, SCENE_ROUTE36_SUICUNE
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .ArthurCallback callback MAPCALLBACK_OBJECTS, Route36ArthurCallback
.DummyScene0: Route36Noop1Scene:
end end
.DummyScene1: Route36Noop2Scene:
end end
.ArthurCallback: Route36ArthurCallback:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal THURSDAY, .ArthurAppears ifequal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR disappear ROUTE36_ARTHUR

24
maps/Route36NationalParkGate.asm
View File

@ -14,25 +14,25 @@
Route36NationalParkGate_MapScripts: Route36NationalParkGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0, SCENE_ROUTE36NATIONALPARKGATE_NOOP scene_script Route36NationalParkGateNoop1Scene, SCENE_ROUTE36NATIONALPARKGATE_NOOP
scene_script .DummyScene1, SCENE_ROUTE36NATIONALPARKGATE_UNUSED scene_script Route36NationalParkGateNoop2Scene, SCENE_ROUTE36NATIONALPARKGATE_UNUSED
scene_script .LeaveContestEarly, SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY scene_script Route36NationalParkGateLeaveContestEarlyScene, SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_NEWMAP, Route36NationalParkGateCheckIfContestRunningCallback
callback MAPCALLBACK_OBJECTS, .CheckIfContestAvailable callback MAPCALLBACK_OBJECTS, Route36NationalParkGateCheckIfContestAvailableCallback
.DummyScene0: Route36NationalParkGateNoop1Scene:
end end
.DummyScene1: Route36NationalParkGateNoop2Scene:
end end
.LeaveContestEarly: Route36NationalParkGateLeaveContestEarlyScene:
sdefer .LeavingContestEarly sdefer Route36NationalParkGateLeavingContestEarlyScript
end end
.CheckIfContestRunning: Route36NationalParkGateCheckIfContestRunningCallback:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue .BugContestIsRunning
setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
@ -42,7 +42,7 @@ Route36NationalParkGate_MapScripts:
setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
endcallback endcallback
.CheckIfContestAvailable: Route36NationalParkGateCheckIfContestAvailableCallback:
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
iftrue .Return iftrue .Return
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
@ -61,7 +61,7 @@ Route36NationalParkGate_MapScripts:
.Return: .Return:
endcallback endcallback
.LeavingContestEarly: Route36NationalParkGateLeavingContestEarlyScript:
turnobject PLAYER, UP turnobject PLAYER, UP
opentext opentext
readvar VAR_CONTESTMINUTES readvar VAR_CONTESTMINUTES

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