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

return → endcallback, reloadandreturn → reloadend

Browse Source
This commit is contained in:
Rangi 2020-07-17 08:37:03 -04:00
parent 2e8b4836b0
commit ef452ccbc7
99 changed files with 203 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/event_commands.md
View File

@ -479,13 +479,13 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$8F`: <code>stopandsjump <i>script</i></code> ## `$8F`: <code>stopandsjump <i>script</i></code>
## `$90`: `return` ## `$90`: `endcallback`
## `$91`: `end` ## `$91`: `end`
## `$92`: <code>reloadandreturn <i>which_method</i></code> ## `$92`: <code>reloadend <i>which_method</i></code>
## `$93`: `endall` ## `$93`: `endall`

2
docs/map_event_scripts.md
View File

@ -68,7 +68,7 @@
.Boulders: .Boulders:
writecmdqueue .BoulderCmdQueue writecmdqueue .BoulderCmdQueue
return endcallback
.BoulderCmdQueue: .BoulderCmdQueue:
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable cmdqueue CMDQUEUE_STONETABLE, .BoulderTable

2
engine/events/poisonstep.asm
View File

@ -115,7 +115,7 @@ DoPoisonStep::
end end
.whiteout .whiteout
farsjump Script_OverworldWhiteout farsjump OverworldWhiteoutScript
.CheckWhitedOut: .CheckWhitedOut:
xor a xor a

2
engine/events/std_scripts.asm
View File

@ -614,7 +614,7 @@ InitializeEventsScript:
setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
setevent EVENT_INITIALIZED_EVENTS setevent EVENT_INITIALIZED_EVENTS
return endcallback
AskNumber1MScript: AskNumber1MScript:
special RandomPhoneMon special RandomPhoneMon

2
engine/events/whiteout.asm
View File

@ -2,7 +2,7 @@ Script_BattleWhiteout::
callasm BattleBGMap callasm BattleBGMap
sjump Script_Whiteout sjump Script_Whiteout
Script_OverworldWhiteout:: OverworldWhiteoutScript::
refreshscreen refreshscreen
callasm OverworldBGMap callasm OverworldBGMap

24
engine/overworld/events.asm
View File

@ -975,17 +975,17 @@ DoPlayerEvent:
PlayerEventScriptPointers: PlayerEventScriptPointers:
; entries correspond to PLAYEREVENT_* constants ; entries correspond to PLAYEREVENT_* constants
dba Invalid_0x96c2d ; PLAYEREVENT_NONE dba Invalid_0x96c2d ; PLAYEREVENT_NONE
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER
dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL dba FindItemInBallScript ; PLAYEREVENT_ITEMBALL
dba EdgeWarpScript ; PLAYEREVENT_CONNECTION dba EdgeWarpScript ; PLAYEREVENT_CONNECTION
dba WarpToNewMapScript ; PLAYEREVENT_WARP dba WarpToNewMapScript ; PLAYEREVENT_WARP
dba FallIntoMapScript ; PLAYEREVENT_FALL dba FallIntoMapScript ; PLAYEREVENT_FALL
dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
dba HatchEggScript ; PLAYEREVENT_HATCH dba HatchEggScript ; PLAYEREVENT_HATCH
dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING dba ChangeDirectionScript ; PLAYEREVENT_JOYCHANGEFACING
dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS) dba Invalid_0x96c2d ; (NUM_PLAYER_EVENTS)
Invalid_0x96c2d: Invalid_0x96c2d:
end end
@ -1019,7 +1019,7 @@ LandAfterPitfallScript:
end end
EdgeWarpScript: ; 4 EdgeWarpScript: ; 4
reloadandreturn MAPSETUP_CONNECTION reloadend MAPSETUP_CONNECTION
ChangeDirectionScript: ; 9 ChangeDirectionScript: ; 9
deactivatefacing 3 deactivatefacing 3

8
engine/overworld/scripting.asm
View File

@ -207,9 +207,9 @@ ScriptCommandTable:
dw Script_prioritysjump ; 8d dw Script_prioritysjump ; 8d
dw Script_warpcheck ; 8e dw Script_warpcheck ; 8e
dw Script_stopandsjump ; 8f dw Script_stopandsjump ; 8f
dw Script_return ; 90 dw Script_endcallback ; 90
dw Script_end ; 91 dw Script_end ; 91
dw Script_reloadandreturn ; 92 dw Script_reloadend ; 92
dw Script_endall ; 93 dw Script_endall ; 93
dw Script_pokemart ; 94 dw Script_pokemart ; 94
dw Script_elevator ; 95 dw Script_elevator ; 95
@ -2186,7 +2186,7 @@ Script_newloadmap:
call StopScript call StopScript
ret ret
Script_reloadandreturn: Script_reloadend:
call Script_newloadmap call Script_newloadmap
jp Script_end jp Script_end
@ -2265,7 +2265,7 @@ Script_end:
call StopScript call StopScript
ret ret
Script_return: Script_endcallback:
call ExitScriptSubroutine call ExitScriptSubroutine
jr c, .dummy jr c, .dummy
.dummy .dummy

4
engine/phone/phone.asm
View File

@ -380,11 +380,11 @@ Function90199:
LoadPhoneScriptBank: LoadPhoneScriptBank:
memcall wPhoneScriptBank memcall wPhoneScriptBank
return endcallback
LoadOutOfAreaScript: LoadOutOfAreaScript:
scall PhoneOutOfAreaScript scall PhoneOutOfAreaScript
return endcallback
LoadCallerScript: LoadCallerScript:
nop nop

2
macros/legacy.asm
View File

@ -113,6 +113,8 @@ if_not_equal EQUS "ifnotequal"
if_greater_than EQUS "ifgreater" if_greater_than EQUS "ifgreater"
if_less_than EQUS "ifless" if_less_than EQUS "ifless"
end_all EQUS "endall" end_all EQUS "endall"
return EQUS "endcallback"
reloadandreturn EQUS "reloadend"
checkmaptriggers EQUS "checkmapscene" checkmaptriggers EQUS "checkmapscene"
domaptrigger EQUS "setmapscene" domaptrigger EQUS "setmapscene"

12
macros/scripts/events.asm
View File

@ -900,9 +900,9 @@ stopandsjump: MACRO
dw \1 ; pointer dw \1 ; pointer
ENDM ENDM
const return_command ; $90 const endcallback_command ; $90
return: MACRO endcallback: MACRO
db return_command db endcallback_command
ENDM ENDM
const end_command ; $91 const end_command ; $91
@ -910,9 +910,9 @@ end: MACRO
db end_command db end_command
ENDM ENDM
const reloadandreturn_command ; $92 const reloadend_command ; $92
reloadandreturn: MACRO reloadend: MACRO
db reloadandreturn_command db reloadend_command
db \1 ; which_method db \1 ; which_method
ENDM ENDM

2
maps/AzaleaTown.asm
View File

@ -32,7 +32,7 @@ AzaleaTown_MapScripts:
.Flypoint: .Flypoint:
setflag ENGINE_FLYPOINT_AZALEA setflag ENGINE_FLYPOINT_AZALEA
return endcallback
AzaleaTownRivalBattleScene1: AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11 moveobject AZALEATOWN_SILVER, 11, 11

4
maps/BattleTowerOutside.asm
View File

@ -12,11 +12,11 @@ BattleTowerOutside_MapScripts:
callback MAPCALLBACK_OBJECTS, .Callback2 callback MAPCALLBACK_OBJECTS, .Callback2
.Callback1: .Callback1:
return endcallback
.Callback2: .Callback2:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return endcallback
BattleTowerOutsideYoungsterScript: BattleTowerOutsideYoungsterScript:
jumptextfaceplayer BattleTowerOutsideYoungsterText jumptextfaceplayer BattleTowerOutsideYoungsterText

6
maps/BlackthornCity.asm
View File

@ -18,17 +18,17 @@ BlackthornCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_BLACKTHORN setflag ENGINE_FLYPOINT_BLACKTHORN
return endcallback
.Santos: .Santos:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SATURDAY, .SantosAppears ifequal SATURDAY, .SantosAppears
disappear BLACKTHORNCITY_SANTOS disappear BLACKTHORNCITY_SANTOS
return endcallback
.SantosAppears: .SantosAppears:
appear BLACKTHORNCITY_SANTOS appear BLACKTHORNCITY_SANTOS
return endcallback
BlackthornSuperNerdScript: BlackthornSuperNerdScript:
faceplayer faceplayer

2
maps/BlackthornGym1F.asm
View File

@ -24,7 +24,7 @@ BlackthornGym1F_MapScripts:
iffalse .skip3 iffalse .skip3
changeblock 8, 6, $3b ; fallen boulder 2 changeblock 8, 6, $3b ; fallen boulder 2
.skip3 .skip3
return endcallback
BlackthornGymClairScript: BlackthornGymClairScript:
faceplayer faceplayer

2
maps/BlackthornGym2F.asm
View File

@ -16,7 +16,7 @@ BlackthornGym2F_MapScripts:
.SetUpStoneTable: .SetUpStoneTable:
writecmdqueue .CommandQueue writecmdqueue .CommandQueue
return endcallback
.CommandQueue: .CommandQueue:
cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp

2
maps/BrunosRoom.asm
View File

@ -25,7 +25,7 @@ BrunosRoom_MapScripts:
iffalse .KeepExitClosed iffalse .KeepExitClosed
changeblock 4, 2, $16 ; open door changeblock 4, 2, $16 ; open door
.KeepExitClosed: .KeepExitClosed:
return endcallback
.BrunosDoorLocksBehindYou: .BrunosDoorLocksBehindYou:
applymovement PLAYER, BrunosRoom_EnterMovement applymovement PLAYER, BrunosRoom_EnterMovement

2
maps/BurnedTower1F.asm
View File

@ -33,7 +33,7 @@ BurnedTower1F_MapScripts:
iftrue .HideBasement iftrue .HideBasement
changeblock 6, 14, $09 ; ladder changeblock 6, 14, $09 ; ladder
.HideBasement: .HideBasement:
return endcallback
.MeetEusine: .MeetEusine:
turnobject BURNEDTOWER1F_EUSINE, DOWN turnobject BURNEDTOWER1F_EUSINE, DOWN

2
maps/BurnedTowerB1F.asm
View File

@ -28,7 +28,7 @@ BurnedTowerB1F_MapScripts:
iftrue .HideLadder iftrue .HideLadder
changeblock 6, 14, $02 ; floor changeblock 6, 14, $02 ; floor
.HideLadder: .HideLadder:
return endcallback
ReleaseTheBeasts: ReleaseTheBeasts:
playmusic MUSIC_NONE playmusic MUSIC_NONE

2
maps/CeladonCity.asm
View File

@ -17,7 +17,7 @@ CeladonCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_CELADON setflag ENGINE_FLYPOINT_CELADON
return endcallback
CeladonCityFisherScript: CeladonCityFisherScript:
jumptextfaceplayer CeladonCityFisherText jumptextfaceplayer CeladonCityFisherText

2
maps/CeladonDeptStore6F.asm
View File

@ -14,7 +14,7 @@ CeladonDeptStore6F_MapScripts:
.HideRooftopStairs: .HideRooftopStairs:
changeblock 12, 0, $03 ; wall changeblock 12, 0, $03 ; wall
return endcallback
CeladonDeptStore6FSuperNerdScript: CeladonDeptStore6FSuperNerdScript:
jumptextfaceplayer CeladonDeptStore6FSuperNerdText jumptextfaceplayer CeladonDeptStore6FSuperNerdText

2
maps/CeruleanCity.asm
View File

@ -14,7 +14,7 @@ CeruleanCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_CERULEAN setflag ENGINE_FLYPOINT_CERULEAN
return endcallback
CeruleanCityCooltrainerMScript: CeruleanCityCooltrainerMScript:
faceplayer faceplayer

2
maps/CherrygroveCity.asm
View File

@ -21,7 +21,7 @@ CherrygroveCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_CHERRYGROVE setflag ENGINE_FLYPOINT_CHERRYGROVE
return endcallback
CherrygroveCityGuideGent: CherrygroveCityGuideGent:
faceplayer faceplayer

2
maps/CianwoodCity.asm
View File

@ -33,7 +33,7 @@ CianwoodCity_MapScripts:
iffalse .Done iffalse .Done
disappear CIANWOODCITY_EUSINE disappear CIANWOODCITY_EUSINE
.Done: .Done:
return endcallback
CianwoodCitySuicuneAndEusine: CianwoodCitySuicuneAndEusine:
turnobject PLAYER, UP turnobject PLAYER, UP

2
maps/CinnabarIsland.asm
View File

@ -9,7 +9,7 @@ CinnabarIsland_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_CINNABAR setflag ENGINE_FLYPOINT_CINNABAR
return endcallback
CinnabarIslandBlue: CinnabarIslandBlue:
faceplayer faceplayer

6
maps/Colosseum.asm
View File

@ -27,16 +27,16 @@ Colosseum_MapScripts:
iffalse .Chris2 iffalse .Chris2
disappear COLOSSEUM_CHRIS2 disappear COLOSSEUM_CHRIS2
appear COLOSSEUM_CHRIS1 appear COLOSSEUM_CHRIS1
return endcallback
.Chris2: .Chris2:
disappear COLOSSEUM_CHRIS1 disappear COLOSSEUM_CHRIS1
appear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS2
return endcallback
.PreparePokecenter2F: .PreparePokecenter2F:
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
return endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_FINISHED

2
maps/CopycatsHouse2F.asm
View File

@ -22,7 +22,7 @@ CopycatsHouse2F_MapScripts:
disappear COPYCATSHOUSE2F_COPYCAT1 disappear COPYCATSHOUSE2F_COPYCAT1
appear COPYCATSHOUSE2F_COPYCAT2 appear COPYCATSHOUSE2F_COPYCAT2
.Done: .Done:
return endcallback
Copycat: Copycat:
faceplayer faceplayer

4
maps/DayCare.asm
View File

@ -13,12 +13,12 @@ DayCare_MapScripts:
iftrue .PutDayCareManOutside iftrue .PutDayCareManOutside
clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
return endcallback
.PutDayCareManOutside: .PutDayCareManOutside:
setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34 clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
return endcallback
DayCareManScript_Inside: DayCareManScript_Inside:
faceplayer faceplayer

6
maps/DragonsDenB1F.asm
View File

@ -27,18 +27,18 @@ DragonsDenB1F_MapScripts:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue .CheckDay iftrue .CheckDay
disappear DRAGONSDENB1F_SILVER disappear DRAGONSDENB1F_SILVER
return endcallback
.CheckDay: .CheckDay:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal TUESDAY, .AppearSilver ifequal TUESDAY, .AppearSilver
ifequal THURSDAY, .AppearSilver ifequal THURSDAY, .AppearSilver
disappear DRAGONSDENB1F_SILVER disappear DRAGONSDENB1F_SILVER
return endcallback
.AppearSilver: .AppearSilver:
appear DRAGONSDENB1F_SILVER appear DRAGONSDENB1F_SILVER
return endcallback
DragonsDenB1F_ClairScene: DragonsDenB1F_ClairScene:
appear DRAGONSDENB1F_CLAIR appear DRAGONSDENB1F_CLAIR

2
maps/EcruteakCity.asm
View File

@ -15,7 +15,7 @@ EcruteakCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_ECRUTEAK setflag ENGINE_FLYPOINT_ECRUTEAK
return endcallback
EcruteakCityGramps1Script: EcruteakCityGramps1Script:
jumptextfaceplayer EcruteakCityGramps1Text jumptextfaceplayer EcruteakCityGramps1Text

6
maps/EcruteakTinTowerEntrance.asm
View File

@ -25,7 +25,7 @@ EcruteakTinTowerEntrance_MapScripts:
iftrue .DontBlockTower iftrue .DontBlockTower
checkevent EVENT_CLEARED_RADIO_TOWER checkevent EVENT_CLEARED_RADIO_TOWER
iftrue .BlockTower iftrue .BlockTower
return endcallback
.BlockTower: .BlockTower:
clearevent EVENT_RANG_CLEAR_BELL_1 clearevent EVENT_RANG_CLEAR_BELL_1
@ -35,11 +35,11 @@ EcruteakTinTowerEntrance_MapScripts:
iftrue .NoClearBell iftrue .NoClearBell
setscene SCENE_DEFAULT setscene SCENE_DEFAULT
.NoClearBell: .NoClearBell:
return endcallback
.DontBlockTower: .DontBlockTower:
clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
return endcallback
EcruteakTinTowerEntrance_CoordEvent1: EcruteakTinTowerEntrance_CoordEvent1:
checkevent EVENT_RANG_CLEAR_BELL_2 checkevent EVENT_RANG_CLEAR_BELL_2

2
maps/ElmsLab.asm
View File

@ -42,7 +42,7 @@ ElmsLab_MapScripts:
iftrue .Skip ; not SCENE_DEFAULT iftrue .Skip ; not SCENE_DEFAULT
moveobject ELMSLAB_ELM, 3, 4 moveobject ELMSLAB_ELM, 3, 4
.Skip: .Skip:
return endcallback
.WalkUpToElm: .WalkUpToElm:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement applymovement PLAYER, ElmsLab_WalkUpToElmMovement

2
maps/FuchsiaCity.asm
View File

@ -12,7 +12,7 @@ FuchsiaCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_FUCHSIA setflag ENGINE_FLYPOINT_FUCHSIA
return endcallback
FuchsiaCityYoungster: FuchsiaCityYoungster:
jumptextfaceplayer FuchsiaCityYoungsterText jumptextfaceplayer FuchsiaCityYoungsterText

6
maps/GoldenrodCity.asm
View File

@ -29,7 +29,7 @@ GoldenrodCity_MapScripts:
iftrue .FloriaDone iftrue .FloriaDone
clearevent EVENT_FLORIA_AT_SUDOWOODO clearevent EVENT_FLORIA_AT_SUDOWOODO
.FloriaDone: .FloriaDone:
return endcallback
.MoveTutor: .MoveTutor:
checkevent EVENT_BEAT_ELITE_FOUR checkevent EVENT_BEAT_ELITE_FOUR
@ -41,14 +41,14 @@ GoldenrodCity_MapScripts:
ifequal SATURDAY, .MoveTutorAppear ifequal SATURDAY, .MoveTutorAppear
.MoveTutorDisappear: .MoveTutorDisappear:
disappear GOLDENRODCITY_MOVETUTOR disappear GOLDENRODCITY_MOVETUTOR
return endcallback
.MoveTutorAppear: .MoveTutorAppear:
checkflag ENGINE_DAILY_MOVE_TUTOR checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .MoveTutorDone iftrue .MoveTutorDone
appear GOLDENRODCITY_MOVETUTOR appear GOLDENRODCITY_MOVETUTOR
.MoveTutorDone: .MoveTutorDone:
return endcallback
MoveTutorScript: MoveTutorScript:
faceplayer faceplayer

4
maps/GoldenrodDeptStore5F.asm
View File

@ -16,11 +16,11 @@ GoldenrodDeptStore5F_MapScripts:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SUNDAY, .yes ifequal SUNDAY, .yes
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return endcallback
.yes .yes
appear GOLDENRODDEPTSTORE5F_RECEPTIONIST appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return endcallback
GoldenrodDeptStore5FClerkScript: GoldenrodDeptStore5FClerkScript:
faceplayer faceplayer

8
maps/GoldenrodDeptStoreB1F.asm
View File

@ -30,19 +30,19 @@ GoldenrodDeptStoreB1F_MapScripts:
checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
iftrue .Layout3 iftrue .Layout3
changeblock 10, 8, $0d ; floor changeblock 10, 8, $0d ; floor
return endcallback
.Layout2: .Layout2:
changeblock 4, 10, $0d ; floor changeblock 4, 10, $0d ; floor
return endcallback
.Layout3: .Layout3:
changeblock 10, 12, $0d ; floor changeblock 10, 12, $0d ; floor
return endcallback
.Unblock: .Unblock:
clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
return endcallback
GoldenrodDeptStoreB1FBlackBelt1Script: GoldenrodDeptStoreB1FBlackBelt1Script:
jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text

8
maps/GoldenrodDeptStoreRoof.asm
View File

@ -18,24 +18,24 @@ GoldenrodDeptStoreRoof_MapScripts:
.CheckSaleChangeBlock: .CheckSaleChangeBlock:
checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
iftrue .SaleIsOn iftrue .SaleIsOn
return endcallback
.SaleIsOn: .SaleIsOn:
changeblock 0, 2, $3f ; cardboard boxes changeblock 0, 2, $3f ; cardboard boxes
changeblock 0, 4, $0f ; vendor booth changeblock 0, 4, $0f ; vendor booth
return endcallback
.CheckSaleChangeClerk: .CheckSaleChangeClerk:
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
clearevent EVENT_GOLDENROD_SALE_ON clearevent EVENT_GOLDENROD_SALE_ON
return endcallback
.ChangeClerk: .ChangeClerk:
clearevent EVENT_GOLDENROD_SALE_OFF clearevent EVENT_GOLDENROD_SALE_OFF
setevent EVENT_GOLDENROD_SALE_ON setevent EVENT_GOLDENROD_SALE_ON
return endcallback
GoldenrodDeptStoreRoofClerkScript: GoldenrodDeptStoreRoofClerkScript:
opentext opentext

4
maps/GoldenrodGameCorner.asm
View File

@ -35,14 +35,14 @@ GoldenrodGameCorner_MapScripts:
ifequal SATURDAY, .move_tutor_outside ifequal SATURDAY, .move_tutor_outside
.move_tutor_inside .move_tutor_inside
appear GOLDENRODGAMECORNER_MOVETUTOR appear GOLDENRODGAMECORNER_MOVETUTOR
return endcallback
.move_tutor_outside .move_tutor_outside
checkflag ENGINE_DAILY_MOVE_TUTOR checkflag ENGINE_DAILY_MOVE_TUTOR
iftrue .finish iftrue .finish
disappear GOLDENRODGAMECORNER_MOVETUTOR disappear GOLDENRODGAMECORNER_MOVETUTOR
.finish .finish
return endcallback
MoveTutorInsideScript: MoveTutorInsideScript:
faceplayer faceplayer

20
maps/GoldenrodUnderground.asm
View File

@ -38,16 +38,16 @@ GoldenrodUnderground_MapScripts:
clearevent EVENT_SWITCH_14 clearevent EVENT_SWITCH_14
setval 0 setval 0
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
return endcallback
.CheckBasementKey: .CheckBasementKey:
checkevent EVENT_USED_BASEMENT_KEY checkevent EVENT_USED_BASEMENT_KEY
iffalse .LockBasementDoor iffalse .LockBasementDoor
return endcallback
.LockBasementDoor: .LockBasementDoor:
changeblock 18, 6, $3d ; locked door changeblock 18, 6, $3d ; locked door
return endcallback
.CheckDayOfWeek: .CheckDayOfWeek:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
@ -63,7 +63,7 @@ GoldenrodUnderground_MapScripts:
disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
appear GOLDENRODUNDERGROUND_GRANNY appear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Monday: .Monday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
@ -74,42 +74,42 @@ GoldenrodUnderground_MapScripts:
disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Tuesday: .Tuesday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Wednesday: .Wednesday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Thursday: .Thursday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Friday: .Friday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_GRANNY disappear GOLDENRODUNDERGROUND_GRANNY
return endcallback
.Saturday: .Saturday:
disappear GOLDENRODUNDERGROUND_GRAMPS disappear GOLDENRODUNDERGROUND_GRAMPS
appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
appear GOLDENRODUNDERGROUND_GRANNY appear GOLDENRODUNDERGROUND_GRANNY
return endcallback
TrainerSupernerdEric: TrainerSupernerdEric:
trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script

2
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -108,7 +108,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
doorstate 15, CLOSED1 doorstate 15, CLOSED1
doorstate 16, OPEN1 doorstate 16, OPEN1
.false14 .false14
return endcallback
GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript: GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText

2
maps/GoldenrodUndergroundWarehouse.asm
View File

@ -31,7 +31,7 @@ GoldenrodUndergroundWarehouse_MapScripts:
clearevent EVENT_SWITCH_14 clearevent EVENT_SWITCH_14
setval 0 setval 0
writemem wUndergroundSwitchPositions writemem wUndergroundSwitchPositions
return endcallback
TrainerGruntM24: TrainerGruntM24:
trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script

2
maps/IcePathB1F.asm
View File

@ -13,7 +13,7 @@ IcePathB1F_MapScripts:
.SetUpStoneTable: .SetUpStoneTable:
writecmdqueue .CommandQueue writecmdqueue .CommandQueue
return endcallback
.CommandQueue: .CommandQueue:
cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp

22
maps/IlexForest.asm
View File

@ -32,57 +32,57 @@ IlexForest_MapScripts:
ifequal 9, .PositionNine ifequal 9, .PositionNine
ifequal 10, .PositionTen ifequal 10, .PositionTen
.Static: .Static:
return endcallback
.PositionOne: .PositionOne:
moveobject ILEXFOREST_FARFETCHD, 14, 31 moveobject ILEXFOREST_FARFETCHD, 14, 31
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionTwo: .PositionTwo:
moveobject ILEXFOREST_FARFETCHD, 15, 25 moveobject ILEXFOREST_FARFETCHD, 15, 25
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionThree: .PositionThree:
moveobject ILEXFOREST_FARFETCHD, 20, 24 moveobject ILEXFOREST_FARFETCHD, 20, 24
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionFour: .PositionFour:
moveobject ILEXFOREST_FARFETCHD, 29, 22 moveobject ILEXFOREST_FARFETCHD, 29, 22
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionFive: .PositionFive:
moveobject ILEXFOREST_FARFETCHD, 28, 31 moveobject ILEXFOREST_FARFETCHD, 28, 31
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionSix: .PositionSix:
moveobject ILEXFOREST_FARFETCHD, 24, 35 moveobject ILEXFOREST_FARFETCHD, 24, 35
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionSeven: .PositionSeven:
moveobject ILEXFOREST_FARFETCHD, 22, 31 moveobject ILEXFOREST_FARFETCHD, 22, 31
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionEight: .PositionEight:
moveobject ILEXFOREST_FARFETCHD, 15, 29 moveobject ILEXFOREST_FARFETCHD, 15, 29
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionNine: .PositionNine:
moveobject ILEXFOREST_FARFETCHD, 10, 35 moveobject ILEXFOREST_FARFETCHD, 10, 35
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
.PositionTen: .PositionTen:
moveobject ILEXFOREST_FARFETCHD, 6, 28 moveobject ILEXFOREST_FARFETCHD, 6, 28
appear ILEXFOREST_FARFETCHD appear ILEXFOREST_FARFETCHD
return endcallback
IlexForestCharcoalApprenticeScript: IlexForestCharcoalApprenticeScript:
faceplayer faceplayer

2
maps/IndigoPlateauPokecenter1F.asm
View File

@ -39,7 +39,7 @@ IndigoPlateauPokecenter1F_MapScripts:
clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_ELITE_4_KAREN
clearevent EVENT_BEAT_CHAMPION_LANCE clearevent EVENT_BEAT_CHAMPION_LANCE
setevent EVENT_LANCES_ROOM_OAK_AND_MARY setevent EVENT_LANCES_ROOM_OAK_AND_MARY
return endcallback
PlateauRivalBattle1: PlateauRivalBattle1:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON checkevent EVENT_BEAT_RIVAL_IN_MT_MOON

2
maps/KarensRoom.asm
View File

@ -25,7 +25,7 @@ KarensRoom_MapScripts:
iffalse .KeepExitClosed iffalse .KeepExitClosed
changeblock 4, 2, $16 ; open door changeblock 4, 2, $16 ; open door
.KeepExitClosed: .KeepExitClosed:
return endcallback
.KarensDoorLocksBehindYou: .KarensDoorLocksBehindYou:
applymovement PLAYER, KarensRoom_EnterMovement applymovement PLAYER, KarensRoom_EnterMovement

2
maps/KogasRoom.asm
View File

@ -25,7 +25,7 @@ KogasRoom_MapScripts:
iffalse .KeepExitClosed iffalse .KeepExitClosed
changeblock 4, 2, $16 ; open door changeblock 4, 2, $16 ; open door
.KeepExitClosed: .KeepExitClosed:
return endcallback
.KogasDoorLocksBehindYou: .KogasDoorLocksBehindYou:
applymovement PLAYER, KogasRoom_EnterMovement applymovement PLAYER, KogasRoom_EnterMovement

4
maps/KurtsHouse.asm
View File

@ -22,7 +22,7 @@ KurtsHouse_MapScripts:
appear KURTSHOUSE_KURT1 appear KURTSHOUSE_KURT1
disappear KURTSHOUSE_TWIN2 disappear KURTSHOUSE_TWIN2
appear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN1
return endcallback
.MakingBalls: .MakingBalls:
disappear KURTSHOUSE_KURT1 disappear KURTSHOUSE_KURT1
@ -30,7 +30,7 @@ KurtsHouse_MapScripts:
disappear KURTSHOUSE_TWIN1 disappear KURTSHOUSE_TWIN1
appear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN2
.Done: .Done:
return endcallback
Kurt1: Kurt1:
faceplayer faceplayer

6
maps/LakeOfRage.asm
View File

@ -29,17 +29,17 @@ LakeOfRage_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_LAKE_OF_RAGE setflag ENGINE_FLYPOINT_LAKE_OF_RAGE
return endcallback
.Wesley: .Wesley:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal WEDNESDAY, .WesleyAppears ifequal WEDNESDAY, .WesleyAppears
disappear LAKEOFRAGE_WESLEY disappear LAKEOFRAGE_WESLEY
return endcallback
.WesleyAppears: .WesleyAppears:
appear LAKEOFRAGE_WESLEY appear LAKEOFRAGE_WESLEY
return endcallback
LakeOfRageLanceScript: LakeOfRageLanceScript:
checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE

2
maps/LancesRoom.asm
View File

@ -27,7 +27,7 @@ LancesRoom_MapScripts:
iffalse .KeepExitClosed iffalse .KeepExitClosed
changeblock 4, 0, $0b ; open door changeblock 4, 0, $0b ; open door
.KeepExitClosed: .KeepExitClosed:
return endcallback
.LancesDoorLocksBehindYou: .LancesDoorLocksBehindYou:
applymovement PLAYER, LancesRoom_EnterMovement applymovement PLAYER, LancesRoom_EnterMovement

2
maps/LavenderTown.asm
View File

@ -12,7 +12,7 @@ LavenderTown_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_LAVENDER setflag ENGINE_FLYPOINT_LAVENDER
return endcallback
LavenderTownPokefanMScript: LavenderTownPokefanMScript:
jumptextfaceplayer LavenderTownPokefanMText jumptextfaceplayer LavenderTownPokefanMText

4
maps/MahoganyMart1F.asm
View File

@ -23,11 +23,11 @@ MahoganyMart1F_MapScripts:
.MahoganyMart1FStaircase: .MahoganyMart1FStaircase:
checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
iftrue .ShowStairs iftrue .ShowStairs
return endcallback
.ShowStairs: .ShowStairs:
changeblock 6, 2, $1e ; stairs changeblock 6, 2, $1e ; stairs
return endcallback
MahoganyMart1FPharmacistScript: MahoganyMart1FPharmacistScript:
faceplayer faceplayer

2
maps/MahoganyTown.asm
View File

@ -22,7 +22,7 @@ MahoganyTown_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_MAHOGANY setflag ENGINE_FLYPOINT_MAHOGANY
return endcallback
MahoganyTownTryARageCandyBarScript: MahoganyTownTryARageCandyBarScript:
showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15 showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15

4
maps/MountMoonSquare.asm
View File

@ -16,11 +16,11 @@ MountMoonSquare_MapScripts:
.DisappearMoonStone: .DisappearMoonStone:
setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
return endcallback
.DisappearRock: .DisappearRock:
disappear MOUNTMOONSQUARE_ROCK disappear MOUNTMOONSQUARE_ROCK
return endcallback
ClefairyDance: ClefairyDance:
checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY

2
maps/NewBarkTown.asm
View File

@ -20,7 +20,7 @@ NewBarkTown_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_NEW_BARK setflag ENGINE_FLYPOINT_NEW_BARK
clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM
return endcallback
NewBarkTown_TeacherStopsYouScene1: NewBarkTown_TeacherStopsYouScene1:
playmusic MUSIC_MOM playmusic MUSIC_MOM

2
maps/OlivineCity.asm
View File

@ -20,7 +20,7 @@ OlivineCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_OLIVINE setflag ENGINE_FLYPOINT_OLIVINE
return endcallback
OlivineCityRivalSceneTop: OlivineCityRivalSceneTop:
turnobject PLAYER, LEFT turnobject PLAYER, LEFT

2
maps/PalletTown.asm
View File

@ -10,7 +10,7 @@ PalletTown_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_PALLET setflag ENGINE_FLYPOINT_PALLET
return endcallback
PalletTownTeacherScript: PalletTownTeacherScript:
jumptextfaceplayer PalletTownTeacherText jumptextfaceplayer PalletTownTeacherText

2
maps/PewterCity.asm
View File

@ -13,7 +13,7 @@ PewterCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_PEWTER setflag ENGINE_FLYPOINT_PEWTER
return endcallback
PewterCityCooltrainerFScript: PewterCityCooltrainerFScript:
jumptextfaceplayer PewterCityCooltrainerFText jumptextfaceplayer PewterCityCooltrainerFText

6
maps/PlayersHouse2F.asm
View File

@ -21,14 +21,14 @@ PlayersHouse2F_MapScripts:
checkevent EVENT_INITIALIZED_EVENTS checkevent EVENT_INITIALIZED_EVENTS
iftrue .SkipInitialization iftrue .SkipInitialization
jumpstd InitializeEventsScript jumpstd InitializeEventsScript
return endcallback
.SkipInitialization: .SkipInitialization:
return endcallback
.SetUpTileDecorations: .SetUpTileDecorations:
special ToggleMaptileDecorations special ToggleMaptileDecorations
return endcallback
db 0, 0, 0 ; filler db 0, 0, 0 ; filler

4
maps/RadioTower3F.asm
View File

@ -16,12 +16,12 @@ RadioTower3F_MapScripts:
.CardKeyShutterCallback: .CardKeyShutterCallback:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue .Change iftrue .Change
return endcallback
.Change: .Change:
changeblock 14, 2, $2a ; open shutter changeblock 14, 2, $2a ; open shutter
changeblock 14, 4, $01 ; floor changeblock 14, 4, $01 ; floor
return endcallback
RadioTower3FSuperNerdScript: RadioTower3FSuperNerdScript:
jumptextfaceplayer RadioTower3FSuperNerdText jumptextfaceplayer RadioTower3FSuperNerdText

4
maps/Route16.asm
View File

@ -10,11 +10,11 @@ Route16_MapScripts:
readvar VAR_XCOORD readvar VAR_XCOORD
ifgreater 13, .CanWalk ifgreater 13, .CanWalk
setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_ALWAYS_ON_BIKE
return endcallback
.CanWalk: .CanWalk:
clearflag ENGINE_ALWAYS_ON_BIKE clearflag ENGINE_ALWAYS_ON_BIKE
return endcallback
CyclingRoadSign: CyclingRoadSign:
jumptext CyclingRoadSignText jumptext CyclingRoadSignText

2
maps/Route17.asm
View File

@ -13,7 +13,7 @@ Route17_MapScripts:
.AlwaysOnBike: .AlwaysOnBike:
setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_ALWAYS_ON_BIKE
setflag ENGINE_DOWNHILL setflag ENGINE_DOWNHILL
return endcallback
TrainerBikerCharles: TrainerBikerCharles:
trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script

2
maps/Route19.asm
View File

@ -22,7 +22,7 @@ Route19_MapScripts:
changeblock 4, 8, $7a ; rock changeblock 4, 8, $7a ; rock
changeblock 10, 10, $7a ; rock changeblock 10, 10, $7a ; rock
.Done: .Done:
return endcallback
TrainerSwimmerfDawn: TrainerSwimmerfDawn:
trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script

2
maps/Route20.asm
View File

@ -11,7 +11,7 @@ Route20_MapScripts:
.ClearRocks: .ClearRocks:
setevent EVENT_CINNABAR_ROCKS_CLEARED setevent EVENT_CINNABAR_ROCKS_CLEARED
return endcallback
TrainerSwimmerfNicole: TrainerSwimmerfNicole:
trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script

2
maps/Route23.asm
View File

@ -6,7 +6,7 @@ Route23_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_INDIGO_PLATEAU setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
return endcallback
IndigoPlateauSign: IndigoPlateauSign:
jumptext IndigoPlateauSignText jumptext IndigoPlateauSignText

4
maps/Route29.asm
View File

@ -28,13 +28,13 @@ Route29_MapScripts:
.TuscanyDisappears: .TuscanyDisappears:
disappear ROUTE29_TUSCANY disappear ROUTE29_TUSCANY
return endcallback
.DoesTuscanyAppear: .DoesTuscanyAppear:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifnotequal TUESDAY, .TuscanyDisappears ifnotequal TUESDAY, .TuscanyDisappears
appear ROUTE29_TUSCANY appear ROUTE29_TUSCANY
return endcallback
Route29Tutorial1: Route29Tutorial1:
turnobject ROUTE29_COOLTRAINER_M1, UP turnobject ROUTE29_COOLTRAINER_M1, UP

4
maps/Route31.asm
View File

@ -16,11 +16,11 @@ Route31_MapScripts:
.CheckMomCall: .CheckMomCall:
checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
iffalse .DoMomCall iffalse .DoMomCall
return endcallback
.DoMomCall: .DoMomCall:
specialphonecall SPECIALCALL_WORRIED specialphonecall SPECIALCALL_WORRIED
return endcallback
TrainerBugCatcherWade1: TrainerBugCatcherWade1:
trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script

4
maps/Route32.asm
View File

@ -36,11 +36,11 @@ Route32_MapScripts:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal FRIDAY, .FriedaAppears ifequal FRIDAY, .FriedaAppears
disappear ROUTE32_FRIEDA disappear ROUTE32_FRIEDA
return endcallback
.FriedaAppears: .FriedaAppears:
appear ROUTE32_FRIEDA appear ROUTE32_FRIEDA
return endcallback
Route32CooltrainerMScript: Route32CooltrainerMScript:
faceplayer faceplayer

4
maps/Route34.asm
View File

@ -45,11 +45,11 @@ Route34_MapScripts:
checkflag ENGINE_DAY_CARE_LADY_HAS_MON checkflag ENGINE_DAY_CARE_LADY_HAS_MON
iffalse .HideMon2 iffalse .HideMon2
clearevent EVENT_DAY_CARE_MON_2 clearevent EVENT_DAY_CARE_MON_2
return endcallback
.HideMon2: .HideMon2:
setevent EVENT_DAY_CARE_MON_2 setevent EVENT_DAY_CARE_MON_2
return endcallback
DayCareManScript_Outside: DayCareManScript_Outside:
faceplayer faceplayer

4
maps/Route34IlexForestGate.asm
View File

@ -15,12 +15,12 @@ Route34IlexForestGate_MapScripts:
iffalse .Normal iffalse .Normal
disappear ROUTE34ILEXFORESTGATE_TEACHER1 disappear ROUTE34ILEXFORESTGATE_TEACHER1
appear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER2
return endcallback
.Normal: .Normal:
disappear ROUTE34ILEXFORESTGATE_TEACHER2 disappear ROUTE34ILEXFORESTGATE_TEACHER2
appear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER1
return endcallback
Route34IlexForestGateCelebiEvent: Route34IlexForestGateCelebiEvent:
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS

8
maps/Route35NationalParkGate.asm
View File

@ -27,11 +27,11 @@ Route35NationalParkGate_MapScripts:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue .BugContestIsRunning
setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING
return endcallback
.BugContestIsRunning: .BugContestIsRunning:
setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
return endcallback
.CheckIfContestAvailable: .CheckIfContestAvailable:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
@ -43,13 +43,13 @@ Route35NationalParkGate_MapScripts:
disappear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_OFFICER1
appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_YOUNGSTER
appear ROUTE35NATIONALPARKGATE_OFFICER2 appear ROUTE35NATIONALPARKGATE_OFFICER2
return endcallback
.SetContestOfficer: .SetContestOfficer:
appear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_OFFICER1
disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_YOUNGSTER
disappear ROUTE35NATIONALPARKGATE_OFFICER2 disappear ROUTE35NATIONALPARKGATE_OFFICER2
return endcallback
.LeavingContestEarly: .LeavingContestEarly:
applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement

4
maps/Route36.asm
View File

@ -27,11 +27,11 @@ Route36_MapScripts:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal THURSDAY, .ArthurAppears ifequal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR disappear ROUTE36_ARTHUR
return endcallback
.ArthurAppears: .ArthurAppears:
appear ROUTE36_ARTHUR appear ROUTE36_ARTHUR
return endcallback
Route36SuicuneScript: Route36SuicuneScript:
showemote EMOTE_SHOCK, PLAYER, 15 showemote EMOTE_SHOCK, PLAYER, 15

8
maps/Route36NationalParkGate.asm
View File

@ -36,11 +36,11 @@ Route36NationalParkGate_MapScripts:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue .BugContestIsRunning
setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
return endcallback
.BugContestIsRunning: .BugContestIsRunning:
setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
return endcallback
.CheckIfContestAvailable: .CheckIfContestAvailable:
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
@ -53,13 +53,13 @@ Route36NationalParkGate_MapScripts:
iftrue .SetContestOfficer iftrue .SetContestOfficer
disappear ROUTE36NATIONALPARKGATE_OFFICER1 disappear ROUTE36NATIONALPARKGATE_OFFICER1
appear ROUTE36NATIONALPARKGATE_OFFICER2 appear ROUTE36NATIONALPARKGATE_OFFICER2
return endcallback
.SetContestOfficer: .SetContestOfficer:
appear ROUTE36NATIONALPARKGATE_OFFICER1 appear ROUTE36NATIONALPARKGATE_OFFICER1
disappear ROUTE36NATIONALPARKGATE_OFFICER2 disappear ROUTE36NATIONALPARKGATE_OFFICER2
.Return: .Return:
return endcallback
.LeavingContestEarly: .LeavingContestEarly:
turnobject PLAYER, UP turnobject PLAYER, UP

4
maps/Route37.asm
View File

@ -17,11 +17,11 @@ Route37_MapScripts:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal SUNDAY, .SunnyAppears ifequal SUNDAY, .SunnyAppears
disappear ROUTE37_SUNNY disappear ROUTE37_SUNNY
return endcallback
.SunnyAppears: .SunnyAppears:
appear ROUTE37_SUNNY appear ROUTE37_SUNNY
return endcallback
TrainerTwinsAnnandanne1: TrainerTwinsAnnandanne1:
trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script

4
maps/Route40.asm
View File

@ -23,11 +23,11 @@ Route40_MapScripts:
readvar VAR_WEEKDAY readvar VAR_WEEKDAY
ifequal MONDAY, .MonicaAppears ifequal MONDAY, .MonicaAppears
disappear ROUTE40_MONICA disappear ROUTE40_MONICA
return endcallback
.MonicaAppears: .MonicaAppears:
appear ROUTE40_MONICA appear ROUTE40_MONICA
return endcallback
TrainerSwimmerfElaine: TrainerSwimmerfElaine:
trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script

2
maps/Route40BattleTowerGate.asm
View File

@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScripts:
.ShowSailor: .ShowSailor:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return endcallback
Route40BattleTowerGateRockerScript: Route40BattleTowerGateRockerScript:
jumptextfaceplayer Route40BattleTowerGateRockerText jumptextfaceplayer Route40BattleTowerGateRockerText

4
maps/Route43.asm
View File

@ -18,11 +18,11 @@ Route43_MapScripts:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue .NoRockets iftrue .NoRockets
setmapscene ROUTE_43_GATE, SCENE_DEFAULT setmapscene ROUTE_43_GATE, SCENE_DEFAULT
return endcallback
.NoRockets: .NoRockets:
setmapscene ROUTE_43_GATE, SCENE_FINISHED setmapscene ROUTE_43_GATE, SCENE_FINISHED
return endcallback
TrainerCamperSpencer: TrainerCamperSpencer:
trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script

4
maps/Route43Gate.asm
View File

@ -24,11 +24,11 @@ Route43Gate_MapScripts:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue .NoRockets iftrue .NoRockets
setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
return endcallback
.NoRockets: .NoRockets:
setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
return endcallback
.RocketTakeover: .RocketTakeover:
playmusic MUSIC_ROCKET_ENCOUNTER playmusic MUSIC_ROCKET_ENCOUNTER

4
maps/RuinsOfAlphAerodactylChamber.asm
View File

@ -25,12 +25,12 @@ RuinsOfAlphAerodactylChamber_MapScripts:
.WallOpen: .WallOpen:
checkevent EVENT_SOLVED_AERODACTYL_PUZZLE checkevent EVENT_SOLVED_AERODACTYL_PUZZLE
iffalse .FloorClosed iffalse .FloorClosed
return endcallback
.FloorClosed: .FloorClosed:
changeblock 2, 2, $01 ; left floor changeblock 2, 2, $01 ; left floor
changeblock 4, 2, $02 ; right floor changeblock 4, 2, $02 ; right floor
return endcallback
.WallOpenScript: .WallOpenScript:
pause 30 pause 30

4
maps/RuinsOfAlphHoOhChamber.asm
View File

@ -26,12 +26,12 @@ RuinsOfAlphHoOhChamber_MapScripts:
.WallOpen: .WallOpen:
checkevent EVENT_SOLVED_HO_OH_PUZZLE checkevent EVENT_SOLVED_HO_OH_PUZZLE
iffalse .FloorClosed iffalse .FloorClosed
return endcallback
.FloorClosed: .FloorClosed:
changeblock 2, 2, $01 ; left floor changeblock 2, 2, $01 ; left floor
changeblock 4, 2, $02 ; right floor changeblock 4, 2, $02 ; right floor
return endcallback
.WallOpenScript: .WallOpenScript:
pause 30 pause 30

4
maps/RuinsOfAlphKabutoChamber.asm
View File

@ -29,12 +29,12 @@ RuinsOfAlphKabutoChamber_MapScripts:
.WallOpen: .WallOpen:
checkevent EVENT_SOLVED_KABUTO_PUZZLE checkevent EVENT_SOLVED_KABUTO_PUZZLE
iffalse .FloorClosed iffalse .FloorClosed
return endcallback
.FloorClosed: .FloorClosed:
changeblock 2, 2, $01 ; left floor changeblock 2, 2, $01 ; left floor
changeblock 4, 2, $02 ; right floor changeblock 4, 2, $02 ; right floor
return endcallback
.WallOpenScript: .WallOpenScript:
pause 30 pause 30

4
maps/RuinsOfAlphOmanyteChamber.asm
View File

@ -26,12 +26,12 @@ RuinsOfAlphOmanyteChamber_MapScripts:
.WallOpen: .WallOpen:
checkevent EVENT_SOLVED_OMANYTE_PUZZLE checkevent EVENT_SOLVED_OMANYTE_PUZZLE
iffalse .FloorClosed iffalse .FloorClosed
return endcallback
.FloorClosed: .FloorClosed:
changeblock 2, 2, $01 ; left floor changeblock 2, 2, $01 ; left floor
changeblock 4, 2, $02 ; right floor changeblock 4, 2, $02 ; right floor
return endcallback
.WallOpenScript: .WallOpenScript:
pause 30 pause 30

4
maps/RuinsOfAlphOutside.asm
View File

@ -34,12 +34,12 @@ RuinsOfAlphOutside_MapScripts:
.YesScientist: .YesScientist:
appear RUINSOFALPHOUTSIDE_SCIENTIST appear RUINSOFALPHOUTSIDE_SCIENTIST
setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
return endcallback
.NoScientist: .NoScientist:
disappear RUINSOFALPHOUTSIDE_SCIENTIST disappear RUINSOFALPHOUTSIDE_SCIENTIST
setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING
return endcallback
RuinsOfAlphOutsideScientistScene1: RuinsOfAlphOutsideScientistScene1:
turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP

4
maps/RuinsOfAlphResearchCenter.asm
View File

@ -21,12 +21,12 @@ RuinsOfAlphResearchCenter_MapScripts:
.ScientistCallback: .ScientistCallback:
checkscene checkscene
ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
return endcallback
.ShowScientist: .ShowScientist:
moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7 moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7
appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3
return endcallback
.GetUnownDexScript: .GetUnownDexScript:
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f

2
maps/SaffronCity.asm
View File

@ -16,7 +16,7 @@ SaffronCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_SAFFRON setflag ENGINE_FLYPOINT_SAFFRON
return endcallback
SaffronCityLass1Script: SaffronCityLass1Script:
faceplayer faceplayer

2
maps/SilverCaveOutside.asm
View File

@ -6,7 +6,7 @@ SilverCaveOutside_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_SILVER_CAVE setflag ENGINE_FLYPOINT_SILVER_CAVE
return endcallback
MtSilverPokecenterSign: MtSilverPokecenterSign:
jumpstd PokecenterSignScript jumpstd PokecenterSignScript

2
maps/TeamRocketBaseB1F.asm
View File

@ -18,7 +18,7 @@ TeamRocketBaseB1F_MapScripts:
.HideSecurityGrunt: .HideSecurityGrunt:
disappear TEAMROCKETBASEB1F_ROCKET1 disappear TEAMROCKETBASEB1F_ROCKET1
return endcallback
SecurityCamera1a: SecurityCamera1a:
checkevent EVENT_SECURITY_CAMERA_1 checkevent EVENT_SECURITY_CAMERA_1

4
maps/TeamRocketBaseB2F.asm
View File

@ -39,11 +39,11 @@ TeamRocketBaseB2F_MapScripts:
.TransmitterDoorCallback: .TransmitterDoorCallback:
checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
iftrue .OpenDoor iftrue .OpenDoor
return endcallback
.OpenDoor: .OpenDoor:
changeblock 14, 12, $07 ; floor changeblock 14, 12, $07 ; floor
return endcallback
RocketBaseBossFLeft: RocketBaseBossFLeft:
moveobject TEAMROCKETBASEB2F_LANCE, 9, 13 moveobject TEAMROCKETBASEB2F_LANCE, 9, 13

4
maps/TeamRocketBaseB3F.asm
View File

@ -40,11 +40,11 @@ TeamRocketBaseB3F_MapScripts:
.CheckGiovanniDoor: .CheckGiovanniDoor:
checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
iftrue .OpenSesame iftrue .OpenSesame
return endcallback
.OpenSesame: .OpenSesame:
changeblock 10, 8, $07 ; floor changeblock 10, 8, $07 ; floor
return endcallback
LanceGetPasswordScript: LanceGetPasswordScript:
turnobject PLAYER, LEFT turnobject PLAYER, LEFT

4
maps/TimeCapsule.asm
View File

@ -22,12 +22,12 @@ TimeCapsule_MapScripts:
iffalse .Chris2 iffalse .Chris2
disappear TIMECAPSULE_CHRIS2 disappear TIMECAPSULE_CHRIS2
appear TIMECAPSULE_CHRIS1 appear TIMECAPSULE_CHRIS1
return endcallback
.Chris2: .Chris2:
disappear TIMECAPSULE_CHRIS1 disappear TIMECAPSULE_CHRIS1
appear TIMECAPSULE_CHRIS2 appear TIMECAPSULE_CHRIS2
return endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_FINISHED

8
maps/TinTower1F.asm
View File

@ -40,7 +40,7 @@ TinTower1F_MapScripts:
iffalse .Done iffalse .Done
appear TINTOWER1F_EUSINE appear TINTOWER1F_EUSINE
.Done: .Done:
return endcallback
.FaceBeasts: .FaceBeasts:
checkevent EVENT_FOUGHT_SUICUNE checkevent EVENT_FOUGHT_SUICUNE
@ -64,7 +64,7 @@ TinTower1F_MapScripts:
.NoEntei: .NoEntei:
disappear TINTOWER1F_ENTEI disappear TINTOWER1F_ENTEI
.BeastsDone: .BeastsDone:
return endcallback
.FoughtSuicune: .FoughtSuicune:
disappear TINTOWER1F_SUICUNE disappear TINTOWER1F_SUICUNE
@ -72,14 +72,14 @@ TinTower1F_MapScripts:
disappear TINTOWER1F_ENTEI disappear TINTOWER1F_ENTEI
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
return endcallback
.StairsCallback: .StairsCallback:
checkevent EVENT_GOT_RAINBOW_WING checkevent EVENT_GOT_RAINBOW_WING
iftrue .DontHideStairs iftrue .DontHideStairs
changeblock 10, 2, $09 ; floor changeblock 10, 2, $09 ; floor
.DontHideStairs: .DontHideStairs:
return endcallback
.SuicuneBattle: .SuicuneBattle:
applymovement PLAYER, TinTowerPlayerMovement1 applymovement PLAYER, TinTowerPlayerMovement1

4
maps/TinTowerRoof.asm
View File

@ -16,11 +16,11 @@ TinTowerRoof_MapScripts:
.Appear: .Appear:
appear TINTOWERROOF_HO_OH appear TINTOWERROOF_HO_OH
return endcallback
.NoAppear: .NoAppear:
disappear TINTOWERROOF_HO_OH disappear TINTOWERROOF_HO_OH
return endcallback
TinTowerHoOh: TinTowerHoOh:
faceplayer faceplayer

4
maps/TradeCenter.asm
View File

@ -22,12 +22,12 @@ TradeCenter_MapScripts:
iffalse .Chris2 iffalse .Chris2
disappear TRADECENTER_CHRIS2 disappear TRADECENTER_CHRIS2
appear TRADECENTER_CHRIS1 appear TRADECENTER_CHRIS1
return endcallback
.Chris2: .Chris2:
disappear TRADECENTER_CHRIS1 disappear TRADECENTER_CHRIS1
appear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS2
return endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_FINISHED

4
maps/UnionCaveB2F.asm
View File

@ -19,11 +19,11 @@ UnionCaveB2F_MapScripts:
ifequal FRIDAY, .Appear ifequal FRIDAY, .Appear
.NoAppear: .NoAppear:
disappear UNIONCAVEB2F_LAPRAS disappear UNIONCAVEB2F_LAPRAS
return endcallback
.Appear: .Appear:
appear UNIONCAVEB2F_LAPRAS appear UNIONCAVEB2F_LAPRAS
return endcallback
UnionCaveLapras: UnionCaveLapras:
faceplayer faceplayer

2
maps/VermilionCity.asm
View File

@ -14,7 +14,7 @@ VermilionCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_VERMILION setflag ENGINE_FLYPOINT_VERMILION
return endcallback
VermilionCityTeacherScript: VermilionCityTeacherScript:
jumptextfaceplayer VermilionCityTeacherText jumptextfaceplayer VermilionCityTeacherText

2
maps/VermilionPort.asm
View File

@ -20,7 +20,7 @@ VermilionPort_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_VERMILION setflag ENGINE_FLYPOINT_VERMILION
return endcallback
.LeaveFastShipScript: .LeaveFastShipScript:
applymovement PLAYER, MovementData_0x74ef3 applymovement PLAYER, MovementData_0x74ef3

2
maps/VioletCity.asm
View File

@ -16,7 +16,7 @@ VioletCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_VIOLET setflag ENGINE_FLYPOINT_VIOLET
return endcallback
VioletCityEarlScript: VioletCityEarlScript:
applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData

2
maps/ViridianCity.asm
View File

@ -12,7 +12,7 @@ ViridianCity_MapScripts:
.FlyPoint: .FlyPoint:
setflag ENGINE_FLYPOINT_VIRIDIAN setflag ENGINE_FLYPOINT_VIRIDIAN
return endcallback
ViridianCityCoffeeGramps: ViridianCityCoffeeGramps:
faceplayer faceplayer

4
maps/WhirlIslandLugiaChamber.asm
View File

@ -16,11 +16,11 @@ WhirlIslandLugiaChamber_MapScripts:
.Appear: .Appear:
appear WHIRLISLANDLUGIACHAMBER_LUGIA appear WHIRLISLANDLUGIACHAMBER_LUGIA
return endcallback
.NoAppear: .NoAppear:
disappear WHIRLISLANDLUGIACHAMBER_LUGIA disappear WHIRLISLANDLUGIACHAMBER_LUGIA
return endcallback
Lugia: Lugia:
faceplayer faceplayer

2
maps/WillsRoom.asm
View File

@ -25,7 +25,7 @@ WillsRoom_MapScripts:
iffalse .KeepExitClosed iffalse .KeepExitClosed
changeblock 4, 2, $16 ; open door changeblock 4, 2, $16 ; open door
.KeepExitClosed: .KeepExitClosed:
return endcallback
.WillsDoorLocksBehindYou: .WillsDoorLocksBehindYou:
applymovement PLAYER, WillsRoom_EnterMovement applymovement PLAYER, WillsRoom_EnterMovement

6
maps/WiseTriosRoom.asm
View File

@ -29,17 +29,17 @@ WiseTriosRoom_MapScripts:
iftrue .WiseTrio2 iftrue .WiseTrio2
clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return endcallback
.WiseTrio2: .WiseTrio2:
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return endcallback
.NoWiseTrio: .NoWiseTrio:
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return endcallback
WiseTriosRoomSage1Script: WiseTriosRoomSage1Script:
jumptextfaceplayer WiseTriosRoomSage1Text jumptextfaceplayer WiseTriosRoomSage1Text