diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-01-04 20:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 20:08:43 -0500 |
| commit | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (patch) | |
| tree | a3b0d23a7501a337fb150ffb9253b3d5a301c657 /engine/events | |
| parent | 9aeb0ab522ad36796b2ace55cca17e7314a3bc9a (diff) | |
| parent | 739a60b33c54021c975f22d627e4b5e40206fe37 (diff) | |
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/map_name_sign.asm | 2 | ||||
| -rw-r--r-- | engine/events/overworld.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 0cb8ce97a..b2edcb990 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -1,6 +1,6 @@ MAP_NAME_SIGN_START EQU $60 -ReturnFromMapSetupScript:: +InitMapNameSign:: xor a ldh [hBGMapMode], a farcall .inefficient_farcall ; this is a waste of 6 ROM bytes and 6 stack bytes diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 055a5ca9d..cf393ca92 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -617,7 +617,7 @@ FlyFunction: callasm FlyFromAnim farscall Script_AbortBugContest special WarpToSpawnPoint - callasm DelayLoadingNewSprites + callasm SkipUpdateMapSprites loadvar VAR_MOVEMENT, PLAYER_NORMAL newloadmap MAPSETUP_FLY callasm FlyToAnim |