diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-11-18 18:16:50 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-11-18 18:21:57 +0100 |
| commit | 739a60b33c54021c975f22d627e4b5e40206fe37 (patch) | |
| tree | b451d2dc8e34a5b40a5c8316223c3cc4a7c8600d /engine/events | |
| parent | 1c41b2e579315ca582157fb3c824bda8ce4ecbbe (diff) | |
Make the map setup commands match the actual function names better
These functions used as map setup commands are used in other places,
too, so I can't prefix them under the same. The names should match
except I won't repeat "map" in a map setup command name.
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 |