From ef452ccbc7e448a490d1d081c63088cce7b73b0b Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jul 2020 08:37:03 -0400 Subject: [PATCH] =?UTF-8?q?return=20=E2=86=92=20endcallback,=20reloadandre?= =?UTF-8?q?turn=20=E2=86=92=20reloadend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/event_commands.md | 4 ++-- docs/map_event_scripts.md | 2 +- engine/events/poisonstep.asm | 2 +- engine/events/std_scripts.asm | 2 +- engine/events/whiteout.asm | 2 +- engine/overworld/events.asm | 24 +++++++++---------- engine/overworld/scripting.asm | 8 +++---- engine/phone/phone.asm | 4 ++-- macros/legacy.asm | 2 ++ macros/scripts/events.asm | 12 +++++----- maps/AzaleaTown.asm | 2 +- maps/BattleTowerOutside.asm | 4 ++-- maps/BlackthornCity.asm | 6 ++--- maps/BlackthornGym1F.asm | 2 +- maps/BlackthornGym2F.asm | 2 +- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCity.asm | 2 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeruleanCity.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodCity.asm | 2 +- maps/CinnabarIsland.asm | 2 +- maps/Colosseum.asm | 6 ++--- maps/CopycatsHouse2F.asm | 2 +- maps/DayCare.asm | 4 ++-- maps/DragonsDenB1F.asm | 6 ++--- maps/EcruteakCity.asm | 2 +- maps/EcruteakTinTowerEntrance.asm | 6 ++--- maps/ElmsLab.asm | 2 +- maps/FuchsiaCity.asm | 2 +- maps/GoldenrodCity.asm | 6 ++--- maps/GoldenrodDeptStore5F.asm | 4 ++-- maps/GoldenrodDeptStoreB1F.asm | 8 +++---- maps/GoldenrodDeptStoreRoof.asm | 8 +++---- maps/GoldenrodGameCorner.asm | 4 ++-- maps/GoldenrodUnderground.asm | 20 ++++++++-------- ...oldenrodUndergroundSwitchRoomEntrances.asm | 2 +- maps/GoldenrodUndergroundWarehouse.asm | 2 +- maps/IcePathB1F.asm | 2 +- maps/IlexForest.asm | 22 ++++++++--------- maps/IndigoPlateauPokecenter1F.asm | 2 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 2 +- maps/KurtsHouse.asm | 4 ++-- maps/LakeOfRage.asm | 6 ++--- maps/LancesRoom.asm | 2 +- maps/LavenderTown.asm | 2 +- maps/MahoganyMart1F.asm | 4 ++-- maps/MahoganyTown.asm | 2 +- maps/MountMoonSquare.asm | 4 ++-- maps/NewBarkTown.asm | 2 +- maps/OlivineCity.asm | 2 +- maps/PalletTown.asm | 2 +- maps/PewterCity.asm | 2 +- maps/PlayersHouse2F.asm | 6 ++--- maps/RadioTower3F.asm | 4 ++-- maps/Route16.asm | 4 ++-- maps/Route17.asm | 2 +- maps/Route19.asm | 2 +- maps/Route20.asm | 2 +- maps/Route23.asm | 2 +- maps/Route29.asm | 4 ++-- maps/Route31.asm | 4 ++-- maps/Route32.asm | 4 ++-- maps/Route34.asm | 4 ++-- maps/Route34IlexForestGate.asm | 4 ++-- maps/Route35NationalParkGate.asm | 8 +++---- maps/Route36.asm | 4 ++-- maps/Route36NationalParkGate.asm | 8 +++---- maps/Route37.asm | 4 ++-- maps/Route40.asm | 4 ++-- maps/Route40BattleTowerGate.asm | 2 +- maps/Route43.asm | 4 ++-- maps/Route43Gate.asm | 4 ++-- maps/RuinsOfAlphAerodactylChamber.asm | 4 ++-- maps/RuinsOfAlphHoOhChamber.asm | 4 ++-- maps/RuinsOfAlphKabutoChamber.asm | 4 ++-- maps/RuinsOfAlphOmanyteChamber.asm | 4 ++-- maps/RuinsOfAlphOutside.asm | 4 ++-- maps/RuinsOfAlphResearchCenter.asm | 4 ++-- maps/SaffronCity.asm | 2 +- maps/SilverCaveOutside.asm | 2 +- maps/TeamRocketBaseB1F.asm | 2 +- maps/TeamRocketBaseB2F.asm | 4 ++-- maps/TeamRocketBaseB3F.asm | 4 ++-- maps/TimeCapsule.asm | 4 ++-- maps/TinTower1F.asm | 8 +++---- maps/TinTowerRoof.asm | 4 ++-- maps/TradeCenter.asm | 4 ++-- maps/UnionCaveB2F.asm | 4 ++-- maps/VermilionCity.asm | 2 +- maps/VermilionPort.asm | 2 +- maps/VioletCity.asm | 2 +- maps/ViridianCity.asm | 2 +- maps/WhirlIslandLugiaChamber.asm | 4 ++-- maps/WillsRoom.asm | 2 +- maps/WiseTriosRoom.asm | 6 ++--- 99 files changed, 203 insertions(+), 201 deletions(-) diff --git a/docs/event_commands.md b/docs/event_commands.md index 63f2819ab..60dacf421 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -479,13 +479,13 @@ If item_id = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i ## `$8F`: stopandsjump script -## `$90`: `return` +## `$90`: `endcallback` ## `$91`: `end` -## `$92`: reloadandreturn which_method +## `$92`: reloadend which_method ## `$93`: `endall` diff --git a/docs/map_event_scripts.md b/docs/map_event_scripts.md index b748adefb..f85d6a9fc 100644 --- a/docs/map_event_scripts.md +++ b/docs/map_event_scripts.md @@ -68,7 +68,7 @@ .Boulders: writecmdqueue .BoulderCmdQueue - return + endcallback .BoulderCmdQueue: cmdqueue CMDQUEUE_STONETABLE, .BoulderTable diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 98a6e25a1..e6de6f19f 100644 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -115,7 +115,7 @@ DoPoisonStep:: end .whiteout - farsjump Script_OverworldWhiteout + farsjump OverworldWhiteoutScript .CheckWhitedOut: xor a diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index edd596a24..53465e0de 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -614,7 +614,7 @@ InitializeEventsScript: setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_INITIALIZED_EVENTS - return + endcallback AskNumber1MScript: special RandomPhoneMon diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 6daa8075d..02f60f0e0 100644 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -2,7 +2,7 @@ Script_BattleWhiteout:: callasm BattleBGMap sjump Script_Whiteout -Script_OverworldWhiteout:: +OverworldWhiteoutScript:: refreshscreen callasm OverworldBGMap diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 0606f64b1..d599ffc5c 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -975,17 +975,17 @@ DoPlayerEvent: PlayerEventScriptPointers: ; entries correspond to PLAYEREVENT_* constants - dba Invalid_0x96c2d ; PLAYEREVENT_NONE - dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER - dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER - dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL - dba EdgeWarpScript ; PLAYEREVENT_CONNECTION - dba WarpToNewMapScript ; PLAYEREVENT_WARP - dba FallIntoMapScript ; PLAYEREVENT_FALL - dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT - dba HatchEggScript ; PLAYEREVENT_HATCH - dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING - dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) + dba Invalid_0x96c2d ; PLAYEREVENT_NONE + dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER + dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER + dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL + dba EdgeWarpScript ; PLAYEREVENT_CONNECTION + dba WarpToNewMapScript ; PLAYEREVENT_WARP + dba FallIntoMapScript ; PLAYEREVENT_FALL + dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT + dba HatchEggScript ; PLAYEREVENT_HATCH + dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING + dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) Invalid_0x96c2d: end @@ -1019,7 +1019,7 @@ LandAfterPitfallScript: end EdgeWarpScript: ; 4 - reloadandreturn MAPSETUP_CONNECTION + reloadend MAPSETUP_CONNECTION ChangeDirectionScript: ; 9 deactivatefacing 3 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 708dedf50..ded6a0ad1 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -207,9 +207,9 @@ ScriptCommandTable: dw Script_prioritysjump ; 8d dw Script_warpcheck ; 8e dw Script_stopandsjump ; 8f - dw Script_return ; 90 + dw Script_endcallback ; 90 dw Script_end ; 91 - dw Script_reloadandreturn ; 92 + dw Script_reloadend ; 92 dw Script_endall ; 93 dw Script_pokemart ; 94 dw Script_elevator ; 95 @@ -2186,7 +2186,7 @@ Script_newloadmap: call StopScript ret -Script_reloadandreturn: +Script_reloadend: call Script_newloadmap jp Script_end @@ -2265,7 +2265,7 @@ Script_end: call StopScript ret -Script_return: +Script_endcallback: call ExitScriptSubroutine jr c, .dummy .dummy diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index 042fe38f3..5156ca911 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -380,11 +380,11 @@ Function90199: LoadPhoneScriptBank: memcall wPhoneScriptBank - return + endcallback LoadOutOfAreaScript: scall PhoneOutOfAreaScript - return + endcallback LoadCallerScript: nop diff --git a/macros/legacy.asm b/macros/legacy.asm index c85016bbf..6ff29fc5f 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -113,6 +113,8 @@ if_not_equal EQUS "ifnotequal" if_greater_than EQUS "ifgreater" if_less_than EQUS "ifless" end_all EQUS "endall" +return EQUS "endcallback" +reloadandreturn EQUS "reloadend" checkmaptriggers EQUS "checkmapscene" domaptrigger EQUS "setmapscene" diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index ee3e75be8..f3e2acf4d 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -900,9 +900,9 @@ stopandsjump: MACRO dw \1 ; pointer ENDM - const return_command ; $90 -return: MACRO - db return_command + const endcallback_command ; $90 +endcallback: MACRO + db endcallback_command ENDM const end_command ; $91 @@ -910,9 +910,9 @@ end: MACRO db end_command ENDM - const reloadandreturn_command ; $92 -reloadandreturn: MACRO - db reloadandreturn_command + const reloadend_command ; $92 +reloadend: MACRO + db reloadend_command db \1 ; which_method ENDM diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 827426bed..da84cf04e 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -32,7 +32,7 @@ AzaleaTown_MapScripts: .Flypoint: setflag ENGINE_FLYPOINT_AZALEA - return + endcallback AzaleaTownRivalBattleScene1: moveobject AZALEATOWN_SILVER, 11, 11 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index b490276b7..f4d7e24a9 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -12,11 +12,11 @@ BattleTowerOutside_MapScripts: callback MAPCALLBACK_OBJECTS, .Callback2 .Callback1: - return + endcallback .Callback2: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - return + endcallback BattleTowerOutsideYoungsterScript: jumptextfaceplayer BattleTowerOutsideYoungsterText diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index e68bed88d..c51dba341 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -18,17 +18,17 @@ BlackthornCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_BLACKTHORN - return + endcallback .Santos: readvar VAR_WEEKDAY ifequal SATURDAY, .SantosAppears disappear BLACKTHORNCITY_SANTOS - return + endcallback .SantosAppears: appear BLACKTHORNCITY_SANTOS - return + endcallback BlackthornSuperNerdScript: faceplayer diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 9dbf9955a..de1a6d1e5 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -24,7 +24,7 @@ BlackthornGym1F_MapScripts: iffalse .skip3 changeblock 8, 6, $3b ; fallen boulder 2 .skip3 - return + endcallback BlackthornGymClairScript: faceplayer diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 0a23d5f18..af0e431f7 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -16,7 +16,7 @@ BlackthornGym2F_MapScripts: .SetUpStoneTable: writecmdqueue .CommandQueue - return + endcallback .CommandQueue: cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 7eeec6b8d..cc92d175e 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -25,7 +25,7 @@ BrunosRoom_MapScripts: iffalse .KeepExitClosed changeblock 4, 2, $16 ; open door .KeepExitClosed: - return + endcallback .BrunosDoorLocksBehindYou: applymovement PLAYER, BrunosRoom_EnterMovement diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index cb5daee2c..be25ab339 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -33,7 +33,7 @@ BurnedTower1F_MapScripts: iftrue .HideBasement changeblock 6, 14, $09 ; ladder .HideBasement: - return + endcallback .MeetEusine: turnobject BURNEDTOWER1F_EUSINE, DOWN diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index c8675f73b..747ae6730 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -28,7 +28,7 @@ BurnedTowerB1F_MapScripts: iftrue .HideLadder changeblock 6, 14, $02 ; floor .HideLadder: - return + endcallback ReleaseTheBeasts: playmusic MUSIC_NONE diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 9c74a04c6..691b8b8b4 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -17,7 +17,7 @@ CeladonCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_CELADON - return + endcallback CeladonCityFisherScript: jumptextfaceplayer CeladonCityFisherText diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index 3ea9b97eb..dc5e4e5c0 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -14,7 +14,7 @@ CeladonDeptStore6F_MapScripts: .HideRooftopStairs: changeblock 12, 0, $03 ; wall - return + endcallback CeladonDeptStore6FSuperNerdScript: jumptextfaceplayer CeladonDeptStore6FSuperNerdText diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 7fcc8b9ff..52c03d273 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -14,7 +14,7 @@ CeruleanCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_CERULEAN - return + endcallback CeruleanCityCooltrainerMScript: faceplayer diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 8be938f8f..e68d3ee82 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -21,7 +21,7 @@ CherrygroveCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_CHERRYGROVE - return + endcallback CherrygroveCityGuideGent: faceplayer diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 93f97402f..753242a53 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -33,7 +33,7 @@ CianwoodCity_MapScripts: iffalse .Done disappear CIANWOODCITY_EUSINE .Done: - return + endcallback CianwoodCitySuicuneAndEusine: turnobject PLAYER, UP diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 79e9a5cb1..8284266d7 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -9,7 +9,7 @@ CinnabarIsland_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_CINNABAR - return + endcallback CinnabarIslandBlue: faceplayer diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 3eac0765b..a26dcec34 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -27,16 +27,16 @@ Colosseum_MapScripts: iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 - return + endcallback .Chris2: disappear COLOSSEUM_CHRIS1 appear COLOSSEUM_CHRIS2 - return + endcallback .PreparePokecenter2F: setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM - return + endcallback .InitializeAndPreparePokecenter2F: setscene SCENE_FINISHED diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index fc9153d49..18393892f 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -22,7 +22,7 @@ CopycatsHouse2F_MapScripts: disappear COPYCATSHOUSE2F_COPYCAT1 appear COPYCATSHOUSE2F_COPYCAT2 .Done: - return + endcallback Copycat: faceplayer diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 5fba0a541..0f7b22f6b 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -13,12 +13,12 @@ DayCare_MapScripts: iftrue .PutDayCareManOutside clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 - return + endcallback .PutDayCareManOutside: setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 - return + endcallback DayCareManScript_Inside: faceplayer diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index bb35d8c74..00a8c149f 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -27,18 +27,18 @@ DragonsDenB1F_MapScripts: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON iftrue .CheckDay disappear DRAGONSDENB1F_SILVER - return + endcallback .CheckDay: readvar VAR_WEEKDAY ifequal TUESDAY, .AppearSilver ifequal THURSDAY, .AppearSilver disappear DRAGONSDENB1F_SILVER - return + endcallback .AppearSilver: appear DRAGONSDENB1F_SILVER - return + endcallback DragonsDenB1F_ClairScene: appear DRAGONSDENB1F_CLAIR diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index e942638bc..44795e43a 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -15,7 +15,7 @@ EcruteakCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_ECRUTEAK - return + endcallback EcruteakCityGramps1Script: jumptextfaceplayer EcruteakCityGramps1Text diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 812313d58..1bcb066ac 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -25,7 +25,7 @@ EcruteakTinTowerEntrance_MapScripts: iftrue .DontBlockTower checkevent EVENT_CLEARED_RADIO_TOWER iftrue .BlockTower - return + endcallback .BlockTower: clearevent EVENT_RANG_CLEAR_BELL_1 @@ -35,11 +35,11 @@ EcruteakTinTowerEntrance_MapScripts: iftrue .NoClearBell setscene SCENE_DEFAULT .NoClearBell: - return + endcallback .DontBlockTower: clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE - return + endcallback EcruteakTinTowerEntrance_CoordEvent1: checkevent EVENT_RANG_CLEAR_BELL_2 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index cd6211c5c..53eb11006 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -42,7 +42,7 @@ ElmsLab_MapScripts: iftrue .Skip ; not SCENE_DEFAULT moveobject ELMSLAB_ELM, 3, 4 .Skip: - return + endcallback .WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 79c9125c9..f3a2dfb2a 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -12,7 +12,7 @@ FuchsiaCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_FUCHSIA - return + endcallback FuchsiaCityYoungster: jumptextfaceplayer FuchsiaCityYoungsterText diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 382bbbef1..1fcb8130d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -29,7 +29,7 @@ GoldenrodCity_MapScripts: iftrue .FloriaDone clearevent EVENT_FLORIA_AT_SUDOWOODO .FloriaDone: - return + endcallback .MoveTutor: checkevent EVENT_BEAT_ELITE_FOUR @@ -41,14 +41,14 @@ GoldenrodCity_MapScripts: ifequal SATURDAY, .MoveTutorAppear .MoveTutorDisappear: disappear GOLDENRODCITY_MOVETUTOR - return + endcallback .MoveTutorAppear: checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone appear GOLDENRODCITY_MOVETUTOR .MoveTutorDone: - return + endcallback MoveTutorScript: faceplayer diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index d07e6e48a..a398243a1 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -16,11 +16,11 @@ GoldenrodDeptStore5F_MapScripts: readvar VAR_WEEKDAY ifequal SUNDAY, .yes disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST - return + endcallback .yes appear GOLDENRODDEPTSTORE5F_RECEPTIONIST - return + endcallback GoldenrodDeptStore5FClerkScript: faceplayer diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 29b394414..5584a8734 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -30,19 +30,19 @@ GoldenrodDeptStoreB1F_MapScripts: checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 changeblock 10, 8, $0d ; floor - return + endcallback .Layout2: changeblock 4, 10, $0d ; floor - return + endcallback .Layout3: changeblock 10, 12, $0d ; floor - return + endcallback .Unblock: clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF - return + endcallback GoldenrodDeptStoreB1FBlackBelt1Script: jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 26fd331c4..5acb53312 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -18,24 +18,24 @@ GoldenrodDeptStoreRoof_MapScripts: .CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue .SaleIsOn - return + endcallback .SaleIsOn: changeblock 0, 2, $3f ; cardboard boxes changeblock 0, 4, $0f ; vendor booth - return + endcallback .CheckSaleChangeClerk: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON iftrue .ChangeClerk setevent EVENT_GOLDENROD_SALE_OFF clearevent EVENT_GOLDENROD_SALE_ON - return + endcallback .ChangeClerk: clearevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_GOLDENROD_SALE_ON - return + endcallback GoldenrodDeptStoreRoofClerkScript: opentext diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ff7f3c633..482cfd792 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -35,14 +35,14 @@ GoldenrodGameCorner_MapScripts: ifequal SATURDAY, .move_tutor_outside .move_tutor_inside appear GOLDENRODGAMECORNER_MOVETUTOR - return + endcallback .move_tutor_outside checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .finish disappear GOLDENRODGAMECORNER_MOVETUTOR .finish - return + endcallback MoveTutorInsideScript: faceplayer diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm index f15bf977c..04f5dbd87 100644 --- a/maps/GoldenrodUnderground.asm +++ b/maps/GoldenrodUnderground.asm @@ -38,16 +38,16 @@ GoldenrodUnderground_MapScripts: clearevent EVENT_SWITCH_14 setval 0 writemem wUndergroundSwitchPositions - return + endcallback .CheckBasementKey: checkevent EVENT_USED_BASEMENT_KEY iffalse .LockBasementDoor - return + endcallback .LockBasementDoor: changeblock 18, 6, $3d ; locked door - return + endcallback .CheckDayOfWeek: readvar VAR_WEEKDAY @@ -63,7 +63,7 @@ GoldenrodUnderground_MapScripts: disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Monday: disappear GOLDENRODUNDERGROUND_GRAMPS @@ -74,42 +74,42 @@ GoldenrodUnderground_MapScripts: disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Tuesday: disappear GOLDENRODUNDERGROUND_GRAMPS appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Wednesday: disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Thursday: disappear GOLDENRODUNDERGROUND_GRAMPS appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Friday: disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_GRANNY - return + endcallback .Saturday: disappear GOLDENRODUNDERGROUND_GRAMPS appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_GRANNY - return + endcallback TrainerSupernerdEric: trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm index 4365e0de7..bc7a35f4a 100644 --- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm +++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm @@ -108,7 +108,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScripts: doorstate 15, CLOSED1 doorstate 16, OPEN1 .false14 - return + endcallback GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript: jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm index 10e508a90..0a5cbe2a2 100644 --- a/maps/GoldenrodUndergroundWarehouse.asm +++ b/maps/GoldenrodUndergroundWarehouse.asm @@ -31,7 +31,7 @@ GoldenrodUndergroundWarehouse_MapScripts: clearevent EVENT_SWITCH_14 setval 0 writemem wUndergroundSwitchPositions - return + endcallback TrainerGruntM24: trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 9c3951a99..71f1c6b07 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -13,7 +13,7 @@ IcePathB1F_MapScripts: .SetUpStoneTable: writecmdqueue .CommandQueue - return + endcallback .CommandQueue: cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index d5bf0888b..9e07bac1b 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -32,57 +32,57 @@ IlexForest_MapScripts: ifequal 9, .PositionNine ifequal 10, .PositionTen .Static: - return + endcallback .PositionOne: moveobject ILEXFOREST_FARFETCHD, 14, 31 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionTwo: moveobject ILEXFOREST_FARFETCHD, 15, 25 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionThree: moveobject ILEXFOREST_FARFETCHD, 20, 24 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionFour: moveobject ILEXFOREST_FARFETCHD, 29, 22 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionFive: moveobject ILEXFOREST_FARFETCHD, 28, 31 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionSix: moveobject ILEXFOREST_FARFETCHD, 24, 35 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionSeven: moveobject ILEXFOREST_FARFETCHD, 22, 31 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionEight: moveobject ILEXFOREST_FARFETCHD, 15, 29 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionNine: moveobject ILEXFOREST_FARFETCHD, 10, 35 appear ILEXFOREST_FARFETCHD - return + endcallback .PositionTen: moveobject ILEXFOREST_FARFETCHD, 6, 28 appear ILEXFOREST_FARFETCHD - return + endcallback IlexForestCharcoalApprenticeScript: faceplayer diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm index 6594aee5e..7a745462d 100644 --- a/maps/IndigoPlateauPokecenter1F.asm +++ b/maps/IndigoPlateauPokecenter1F.asm @@ -39,7 +39,7 @@ IndigoPlateauPokecenter1F_MapScripts: clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_CHAMPION_LANCE setevent EVENT_LANCES_ROOM_OAK_AND_MARY - return + endcallback PlateauRivalBattle1: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 2586fc91a..dbfa9824e 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -25,7 +25,7 @@ KarensRoom_MapScripts: iffalse .KeepExitClosed changeblock 4, 2, $16 ; open door .KeepExitClosed: - return + endcallback .KarensDoorLocksBehindYou: applymovement PLAYER, KarensRoom_EnterMovement diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 866ac9b7b..5dd900337 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -25,7 +25,7 @@ KogasRoom_MapScripts: iffalse .KeepExitClosed changeblock 4, 2, $16 ; open door .KeepExitClosed: - return + endcallback .KogasDoorLocksBehindYou: applymovement PLAYER, KogasRoom_EnterMovement diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index e55b49f5a..3b522a19b 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -22,7 +22,7 @@ KurtsHouse_MapScripts: appear KURTSHOUSE_KURT1 disappear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN1 - return + endcallback .MakingBalls: disappear KURTSHOUSE_KURT1 @@ -30,7 +30,7 @@ KurtsHouse_MapScripts: disappear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN2 .Done: - return + endcallback Kurt1: faceplayer diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index bb246d1b0..38cc24060 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -29,17 +29,17 @@ LakeOfRage_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_LAKE_OF_RAGE - return + endcallback .Wesley: readvar VAR_WEEKDAY ifequal WEDNESDAY, .WesleyAppears disappear LAKEOFRAGE_WESLEY - return + endcallback .WesleyAppears: appear LAKEOFRAGE_WESLEY - return + endcallback LakeOfRageLanceScript: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e09c60763..5f58da8e5 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -27,7 +27,7 @@ LancesRoom_MapScripts: iffalse .KeepExitClosed changeblock 4, 0, $0b ; open door .KeepExitClosed: - return + endcallback .LancesDoorLocksBehindYou: applymovement PLAYER, LancesRoom_EnterMovement diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index a1eda99c8..a5ee59269 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -12,7 +12,7 @@ LavenderTown_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_LAVENDER - return + endcallback LavenderTownPokefanMScript: jumptextfaceplayer LavenderTownPokefanMText diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index e3d8a19cb..75036f2d0 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -23,11 +23,11 @@ MahoganyMart1F_MapScripts: .MahoganyMart1FStaircase: checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART iftrue .ShowStairs - return + endcallback .ShowStairs: changeblock 6, 2, $1e ; stairs - return + endcallback MahoganyMart1FPharmacistScript: faceplayer diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index f02f059df..275697b07 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -22,7 +22,7 @@ MahoganyTown_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_MAHOGANY - return + endcallback MahoganyTownTryARageCandyBarScript: showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 0e49c0a0f..f30358597 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -16,11 +16,11 @@ MountMoonSquare_MapScripts: .DisappearMoonStone: setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE - return + endcallback .DisappearRock: disappear MOUNTMOONSQUARE_ROCK - return + endcallback ClefairyDance: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 994c5ee6e..c728fb9ae 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -20,7 +20,7 @@ NewBarkTown_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_NEW_BARK clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM - return + endcallback NewBarkTown_TeacherStopsYouScene1: playmusic MUSIC_MOM diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 114442af7..9a9ddefd9 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -20,7 +20,7 @@ OlivineCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_OLIVINE - return + endcallback OlivineCityRivalSceneTop: turnobject PLAYER, LEFT diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 9907e719b..edf67d2a5 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -10,7 +10,7 @@ PalletTown_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_PALLET - return + endcallback PalletTownTeacherScript: jumptextfaceplayer PalletTownTeacherText diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index c507f6e16..fed0ef4b9 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -13,7 +13,7 @@ PewterCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_PEWTER - return + endcallback PewterCityCooltrainerFScript: jumptextfaceplayer PewterCityCooltrainerFText diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 4768b5ace..4791d9c43 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -21,14 +21,14 @@ PlayersHouse2F_MapScripts: checkevent EVENT_INITIALIZED_EVENTS iftrue .SkipInitialization jumpstd InitializeEventsScript - return + endcallback .SkipInitialization: - return + endcallback .SetUpTileDecorations: special ToggleMaptileDecorations - return + endcallback db 0, 0, 0 ; filler diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index b61529caf..2a9d0ea9b 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -16,12 +16,12 @@ RadioTower3F_MapScripts: .CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .Change - return + endcallback .Change: changeblock 14, 2, $2a ; open shutter changeblock 14, 4, $01 ; floor - return + endcallback RadioTower3FSuperNerdScript: jumptextfaceplayer RadioTower3FSuperNerdText diff --git a/maps/Route16.asm b/maps/Route16.asm index bbe877245..76ab15dae 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -10,11 +10,11 @@ Route16_MapScripts: readvar VAR_XCOORD ifgreater 13, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE - return + endcallback .CanWalk: clearflag ENGINE_ALWAYS_ON_BIKE - return + endcallback CyclingRoadSign: jumptext CyclingRoadSignText diff --git a/maps/Route17.asm b/maps/Route17.asm index 31b9d55c6..fae28f684 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -13,7 +13,7 @@ Route17_MapScripts: .AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_DOWNHILL - return + endcallback TrainerBikerCharles: trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script diff --git a/maps/Route19.asm b/maps/Route19.asm index 597494808..11e669603 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -22,7 +22,7 @@ Route19_MapScripts: changeblock 4, 8, $7a ; rock changeblock 10, 10, $7a ; rock .Done: - return + endcallback TrainerSwimmerfDawn: trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script diff --git a/maps/Route20.asm b/maps/Route20.asm index 9169212e4..d04bc01cf 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -11,7 +11,7 @@ Route20_MapScripts: .ClearRocks: setevent EVENT_CINNABAR_ROCKS_CLEARED - return + endcallback TrainerSwimmerfNicole: trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script diff --git a/maps/Route23.asm b/maps/Route23.asm index 86e5935f3..267accbe1 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -6,7 +6,7 @@ Route23_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_INDIGO_PLATEAU - return + endcallback IndigoPlateauSign: jumptext IndigoPlateauSignText diff --git a/maps/Route29.asm b/maps/Route29.asm index fe5a82576..8273a4fc9 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -28,13 +28,13 @@ Route29_MapScripts: .TuscanyDisappears: disappear ROUTE29_TUSCANY - return + endcallback .DoesTuscanyAppear: readvar VAR_WEEKDAY ifnotequal TUESDAY, .TuscanyDisappears appear ROUTE29_TUSCANY - return + endcallback Route29Tutorial1: turnobject ROUTE29_COOLTRAINER_M1, UP diff --git a/maps/Route31.asm b/maps/Route31.asm index eec8c976c..f95485af9 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -16,11 +16,11 @@ Route31_MapScripts: .CheckMomCall: checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iffalse .DoMomCall - return + endcallback .DoMomCall: specialphonecall SPECIALCALL_WORRIED - return + endcallback TrainerBugCatcherWade1: trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script diff --git a/maps/Route32.asm b/maps/Route32.asm index 33219612e..ab94162cf 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -36,11 +36,11 @@ Route32_MapScripts: readvar VAR_WEEKDAY ifequal FRIDAY, .FriedaAppears disappear ROUTE32_FRIEDA - return + endcallback .FriedaAppears: appear ROUTE32_FRIEDA - return + endcallback Route32CooltrainerMScript: faceplayer diff --git a/maps/Route34.asm b/maps/Route34.asm index b8639a91a..84c70d1a8 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -45,11 +45,11 @@ Route34_MapScripts: checkflag ENGINE_DAY_CARE_LADY_HAS_MON iffalse .HideMon2 clearevent EVENT_DAY_CARE_MON_2 - return + endcallback .HideMon2: setevent EVENT_DAY_CARE_MON_2 - return + endcallback DayCareManScript_Outside: faceplayer diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 526a8c212..f018dc650 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -15,12 +15,12 @@ Route34IlexForestGate_MapScripts: iffalse .Normal disappear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER2 - return + endcallback .Normal: disappear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER1 - return + endcallback Route34IlexForestGateCelebiEvent: checkevent EVENT_FOREST_IS_RESTLESS diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index 52d7d8dde..05588b51c 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -27,11 +27,11 @@ Route35NationalParkGate_MapScripts: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING - return + endcallback .BugContestIsRunning: setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY - return + endcallback .CheckIfContestAvailable: readvar VAR_WEEKDAY @@ -43,13 +43,13 @@ Route35NationalParkGate_MapScripts: disappear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_OFFICER2 - return + endcallback .SetContestOfficer: appear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_OFFICER2 - return + endcallback .LeavingContestEarly: applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement diff --git a/maps/Route36.asm b/maps/Route36.asm index d2be19fcd..68132ef83 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -27,11 +27,11 @@ Route36_MapScripts: readvar VAR_WEEKDAY ifequal THURSDAY, .ArthurAppears disappear ROUTE36_ARTHUR - return + endcallback .ArthurAppears: appear ROUTE36_ARTHUR - return + endcallback Route36SuicuneScript: showemote EMOTE_SHOCK, PLAYER, 15 diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index 58641c92c..adf57ce0d 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -36,11 +36,11 @@ Route36NationalParkGate_MapScripts: checkflag ENGINE_BUG_CONTEST_TIMER iftrue .BugContestIsRunning setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING - return + endcallback .BugContestIsRunning: setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY - return + endcallback .CheckIfContestAvailable: checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE @@ -53,13 +53,13 @@ Route36NationalParkGate_MapScripts: iftrue .SetContestOfficer disappear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER2 - return + endcallback .SetContestOfficer: appear ROUTE36NATIONALPARKGATE_OFFICER1 disappear ROUTE36NATIONALPARKGATE_OFFICER2 .Return: - return + endcallback .LeavingContestEarly: turnobject PLAYER, UP diff --git a/maps/Route37.asm b/maps/Route37.asm index 0459da742..257007dc6 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -17,11 +17,11 @@ Route37_MapScripts: readvar VAR_WEEKDAY ifequal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY - return + endcallback .SunnyAppears: appear ROUTE37_SUNNY - return + endcallback TrainerTwinsAnnandanne1: trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script diff --git a/maps/Route40.asm b/maps/Route40.asm index 2c5ebc49c..7f0563f60 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -23,11 +23,11 @@ Route40_MapScripts: readvar VAR_WEEKDAY ifequal MONDAY, .MonicaAppears disappear ROUTE40_MONICA - return + endcallback .MonicaAppears: appear ROUTE40_MONICA - return + endcallback TrainerSwimmerfElaine: trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index e08c9cc97..e37ad9bc0 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScripts: .ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR - return + endcallback Route40BattleTowerGateRockerScript: jumptextfaceplayer Route40BattleTowerGateRockerText diff --git a/maps/Route43.asm b/maps/Route43.asm index ae4dd5176..712e9fcc6 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -18,11 +18,11 @@ Route43_MapScripts: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets setmapscene ROUTE_43_GATE, SCENE_DEFAULT - return + endcallback .NoRockets: setmapscene ROUTE_43_GATE, SCENE_FINISHED - return + endcallback TrainerCamperSpencer: trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 51cf10417..747dd3f45 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -24,11 +24,11 @@ Route43Gate_MapScripts: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable - return + endcallback .NoRockets: setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable - return + endcallback .RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index 1c036a978..610a28bf6 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -25,12 +25,12 @@ RuinsOfAlphAerodactylChamber_MapScripts: .WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE iffalse .FloorClosed - return + endcallback .FloorClosed: changeblock 2, 2, $01 ; left floor changeblock 4, 2, $02 ; right floor - return + endcallback .WallOpenScript: pause 30 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 1ddc0302f..6b4218608 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -26,12 +26,12 @@ RuinsOfAlphHoOhChamber_MapScripts: .WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE iffalse .FloorClosed - return + endcallback .FloorClosed: changeblock 2, 2, $01 ; left floor changeblock 4, 2, $02 ; right floor - return + endcallback .WallOpenScript: pause 30 diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index 5d899daed..d95b4f66e 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -29,12 +29,12 @@ RuinsOfAlphKabutoChamber_MapScripts: .WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE iffalse .FloorClosed - return + endcallback .FloorClosed: changeblock 2, 2, $01 ; left floor changeblock 4, 2, $02 ; right floor - return + endcallback .WallOpenScript: pause 30 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index cd94ea1b4..5d2958c4c 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -26,12 +26,12 @@ RuinsOfAlphOmanyteChamber_MapScripts: .WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE iffalse .FloorClosed - return + endcallback .FloorClosed: changeblock 2, 2, $01 ; left floor changeblock 4, 2, $02 ; right floor - return + endcallback .WallOpenScript: pause 30 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 684d8d1e0..5b98b0a41 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -34,12 +34,12 @@ RuinsOfAlphOutside_MapScripts: .YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX - return + endcallback .NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING - return + endcallback RuinsOfAlphOutsideScientistScene1: turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index 016e51580..b05fee90c 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -21,12 +21,12 @@ RuinsOfAlphResearchCenter_MapScripts: .ScientistCallback: checkscene ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist - return + endcallback .ShowScientist: moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 - return + endcallback .GetUnownDexScript: applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 3914d4d25..d88284716 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -16,7 +16,7 @@ SaffronCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_SAFFRON - return + endcallback SaffronCityLass1Script: faceplayer diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 171468e08..a578b0261 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -6,7 +6,7 @@ SilverCaveOutside_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_SILVER_CAVE - return + endcallback MtSilverPokecenterSign: jumpstd PokecenterSignScript diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ba1370f9f..8f29f4c1a 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -18,7 +18,7 @@ TeamRocketBaseB1F_MapScripts: .HideSecurityGrunt: disappear TEAMROCKETBASEB1F_ROCKET1 - return + endcallback SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index fdd24306a..9f8beea70 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -39,11 +39,11 @@ TeamRocketBaseB2F_MapScripts: .TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue .OpenDoor - return + endcallback .OpenDoor: changeblock 14, 12, $07 ; floor - return + endcallback RocketBaseBossFLeft: moveobject TEAMROCKETBASEB2F_LANCE, 9, 13 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 100a3a539..15ea71c94 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -40,11 +40,11 @@ TeamRocketBaseB3F_MapScripts: .CheckGiovanniDoor: checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE iftrue .OpenSesame - return + endcallback .OpenSesame: changeblock 10, 8, $07 ; floor - return + endcallback LanceGetPasswordScript: turnobject PLAYER, LEFT diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 7edc4499e..ca6c897ef 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -22,12 +22,12 @@ TimeCapsule_MapScripts: iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS1 - return + endcallback .Chris2: disappear TIMECAPSULE_CHRIS1 appear TIMECAPSULE_CHRIS2 - return + endcallback .InitializeAndPreparePokecenter2F: setscene SCENE_FINISHED diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index b2ac94059..5acfea1fb 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -40,7 +40,7 @@ TinTower1F_MapScripts: iffalse .Done appear TINTOWER1F_EUSINE .Done: - return + endcallback .FaceBeasts: checkevent EVENT_FOUGHT_SUICUNE @@ -64,7 +64,7 @@ TinTower1F_MapScripts: .NoEntei: disappear TINTOWER1F_ENTEI .BeastsDone: - return + endcallback .FoughtSuicune: disappear TINTOWER1F_SUICUNE @@ -72,14 +72,14 @@ TinTower1F_MapScripts: disappear TINTOWER1F_ENTEI clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 - return + endcallback .StairsCallback: checkevent EVENT_GOT_RAINBOW_WING iftrue .DontHideStairs changeblock 10, 2, $09 ; floor .DontHideStairs: - return + endcallback .SuicuneBattle: applymovement PLAYER, TinTowerPlayerMovement1 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index ea86a9189..ec41f2072 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -16,11 +16,11 @@ TinTowerRoof_MapScripts: .Appear: appear TINTOWERROOF_HO_OH - return + endcallback .NoAppear: disappear TINTOWERROOF_HO_OH - return + endcallback TinTowerHoOh: faceplayer diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index b7b708973..4ac5ad2af 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -22,12 +22,12 @@ TradeCenter_MapScripts: iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 - return + endcallback .Chris2: disappear TRADECENTER_CHRIS1 appear TRADECENTER_CHRIS2 - return + endcallback .InitializeAndPreparePokecenter2F: setscene SCENE_FINISHED diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 4c19854b3..2e431ba4d 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -19,11 +19,11 @@ UnionCaveB2F_MapScripts: ifequal FRIDAY, .Appear .NoAppear: disappear UNIONCAVEB2F_LAPRAS - return + endcallback .Appear: appear UNIONCAVEB2F_LAPRAS - return + endcallback UnionCaveLapras: faceplayer diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 46d70be67..63dd15bee 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -14,7 +14,7 @@ VermilionCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION - return + endcallback VermilionCityTeacherScript: jumptextfaceplayer VermilionCityTeacherText diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f5a66b5dd..12930be18 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -20,7 +20,7 @@ VermilionPort_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION - return + endcallback .LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 0c97b0442..a0b311e77 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -16,7 +16,7 @@ VioletCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_VIOLET - return + endcallback VioletCityEarlScript: applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 27a6ad39f..3b8a56ac4 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -12,7 +12,7 @@ ViridianCity_MapScripts: .FlyPoint: setflag ENGINE_FLYPOINT_VIRIDIAN - return + endcallback ViridianCityCoffeeGramps: faceplayer diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 1dcdc90c4..45308af81 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -16,11 +16,11 @@ WhirlIslandLugiaChamber_MapScripts: .Appear: appear WHIRLISLANDLUGIACHAMBER_LUGIA - return + endcallback .NoAppear: disappear WHIRLISLANDLUGIACHAMBER_LUGIA - return + endcallback Lugia: faceplayer diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index a2af398b0..7cb76b35d 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -25,7 +25,7 @@ WillsRoom_MapScripts: iffalse .KeepExitClosed changeblock 4, 2, $16 ; open door .KeepExitClosed: - return + endcallback .WillsDoorLocksBehindYou: applymovement PLAYER, WillsRoom_EnterMovement diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 61370613a..42ee77e57 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -29,17 +29,17 @@ WiseTriosRoom_MapScripts: iftrue .WiseTrio2 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - return + endcallback .WiseTrio2: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - return + endcallback .NoWiseTrio: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 - return + endcallback WiseTriosRoomSage1Script: jumptextfaceplayer WiseTriosRoomSage1Text