Merge pull request #660 from mid-kid/master

Make the map setup commands match the actual function names better
This commit is contained in:
Rangi
2020-01-04 20:08:43 -05:00
committed by GitHub
24 changed files with 233 additions and 225 deletions

View File

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

View File

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