Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/overworld/events.asm
View File

@@ -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