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.
This commit is contained in:
mid-kid
2019-11-18 18:16:50 +01:00
parent 1c41b2e579
commit 739a60b33c
13 changed files with 208 additions and 210 deletions

View File

@@ -6,7 +6,7 @@ HandleNewMap:
call ResetBikeFlags
ld a, MAPCALLBACK_NEWMAP
call RunMapCallback
InitCommandQueue:
HandleContinueMap:
farcall ClearCmdQueue
ld a, MAPCALLBACK_CMDQUEUE
call RunMapCallback
@@ -149,7 +149,7 @@ EnterMapConnection:
scf
ret
LoadWarpData:
EnterMapWarp:
call .SaveDigWarp
call .SetSpawn
ld a, [wNextWarp]
@@ -295,8 +295,8 @@ LoadMapTimeOfDay:
ldh [rVBK], a
ret
LoadGraphics:
call LoadTileset
LoadMapGraphics:
call LoadMapTileset
call LoadTilesetGFX
xor a
ldh [hMapAnims], a
@@ -313,7 +313,7 @@ LoadMapPalettes:
RefreshMapSprites:
call ClearSprites
farcall ReturnFromMapSetupScript
farcall InitMapNameSign
call GetMovementPermissions
farcall RefreshPlayerSprite
farcall CheckReplaceKrisSprite
@@ -325,7 +325,7 @@ RefreshMapSprites:
call SafeUpdateSprites
.skip
ld a, [wPlayerSpriteSetupFlags]
and %00011100
and (1 << PLAYERSPRITESETUP_FEMALE_TO_MALE_F) | (1 << 3) | (1 << 4)
ld [wPlayerSpriteSetupFlags], a
ret
@@ -386,7 +386,7 @@ CheckMovingOffEdgeOfMap::
scf
ret
GetCoordOfUpperLeftCorner::
GetMapScreenCoords::
ld hl, wOverworldMapBlocks
ld a, [wXCoord]
bit 0, a