You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
return → endcallback, reloadandreturn → reloadend
This commit is contained in:
@@ -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`
|
||||||
|
@@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
.Boulders:
|
.Boulders:
|
||||||
writecmdqueue .BoulderCmdQueue
|
writecmdqueue .BoulderCmdQueue
|
||||||
return
|
endcallback
|
||||||
|
|
||||||
.BoulderCmdQueue:
|
.BoulderCmdQueue:
|
||||||
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable
|
cmdqueue CMDQUEUE_STONETABLE, .BoulderTable
|
||||||
|
@@ -115,7 +115,7 @@ DoPoisonStep::
|
|||||||
end
|
end
|
||||||
|
|
||||||
.whiteout
|
.whiteout
|
||||||
farsjump Script_OverworldWhiteout
|
farsjump OverworldWhiteoutScript
|
||||||
|
|
||||||
.CheckWhitedOut:
|
.CheckWhitedOut:
|
||||||
xor a
|
xor a
|
||||||
|
@@ -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,7 +2,7 @@ Script_BattleWhiteout::
|
|||||||
callasm BattleBGMap
|
callasm BattleBGMap
|
||||||
sjump Script_Whiteout
|
sjump Script_Whiteout
|
||||||
|
|
||||||
Script_OverworldWhiteout::
|
OverworldWhiteoutScript::
|
||||||
refreshscreen
|
refreshscreen
|
||||||
callasm OverworldBGMap
|
callasm OverworldBGMap
|
||||||
|
|
||||||
|
@@ -982,7 +982,7 @@ PlayerEventScriptPointers:
|
|||||||
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)
|
||||||
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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"
|
||||||
|
@@ -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
|
||||||
|
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -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
|
||||||
|
@@ -17,7 +17,7 @@ CeladonCity_MapScripts:
|
|||||||
|
|
||||||
.FlyPoint:
|
.FlyPoint:
|
||||||
setflag ENGINE_FLYPOINT_CELADON
|
setflag ENGINE_FLYPOINT_CELADON
|
||||||
return
|
endcallback
|
||||||
|
|
||||||
CeladonCityFisherScript:
|
CeladonCityFisherScript:
|
||||||
jumptextfaceplayer CeladonCityFisherText
|
jumptextfaceplayer CeladonCityFisherText
|
||||||
|
@@ -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
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user