Merge pull request #660 from mid-kid/master

Make the map setup commands match the actual function names better

7 files changed, 39 insertions, 39 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
diff --git a/engine/link/link.asm b/engine/link/link.asm
index 0ddff205f..077b3a9f0 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -2088,7 +2088,7 @@ EnterTimeCapsule:
 	call DelayFrames
 	xor a
 	ldh [hVBlank], a
-	inc a
+	inc a ; LINK_TIMECAPSULE
 	ld [wLinkMode], a
 	ret
 
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm
index 45f9c7076..a1b28e544 100644
--- a/engine/overworld/map_setup.asm
+++ b/engine/overworld/map_setup.asm
@@ -18,7 +18,7 @@ INCLUDE "data/maps/setup_scripts.asm"
 ReadMapSetupScript:
 .loop
 	ld a, [hli]
-	cp -1
+	cp map_end
 	ret z
 
 	push hl
@@ -62,52 +62,52 @@ MapSetupCommands:
 ; entries correspond to command indexes in constants/map_setup_constants.asm
 	dba EnableLCD ; 00
 	dba DisableLCD ; 01
-	dba MapSetup_Sound_Off ; 02
+	dba InitSound ; 02
 	dba PlayMapMusic ; 03
 	dba RestartMapMusic ; 04
 	dba FadeToMapMusic ; 05
-	dba RotatePalettesRightMapAndMusic ; 06
-	dba EnterMapMusic ; 07
+	dba FadeMapMusicAndPalettes ; 06
+	dba PlayMapMusicBike ; 07
 	dba ForceMapMusic ; 08
 	dba FadeInMusic ; 09
 	dba LoadBlockData ; 0a (callback 1)
-	dba LoadNeighboringBlockData ; 0b
+	dba LoadConnectionBlockData ; 0b
 	dba SaveScreen ; 0c
 	dba BufferScreen ; 0d
-	dba LoadGraphics ; 0e
-	dba LoadTileset ; 0f
+	dba LoadMapGraphics ; 0e
+	dba LoadMapTileset ; 0f
 	dba LoadMapTimeOfDay ; 10
 	dba LoadMapPalettes ; 11
 	dba LoadWildMonData ; 12
 	dba RefreshMapSprites ; 13
 	dba HandleNewMap ; 14
-	dba InitCommandQueue ; 15
-	dba LoadObjectsRunCallback_02 ; 16
-	dba LoadSpawnPoint ; 17
+	dba HandleContinueMap ; 15
+	dba LoadMapObjects ; 16
+	dba EnterMapSpawnPoint ; 17
 	dba EnterMapConnection ; 18
-	dba LoadWarpData ; 19
+	dba EnterMapWarp ; 19
 	dba LoadMapAttributes ; 1a
-	dba LoadMapAttributes_SkipPeople ; 1b
+	dba LoadMapAttributes_SkipObjects ; 1b
 	dba ClearBGPalettes ; 1c
 	dba FadeOutPalettes ; 1d
 	dba FadeInPalettes ; 1e
-	dba GetCoordOfUpperLeftCorner ; 1f
-	dba RestoreFacingAfterWarp ; 20
+	dba GetMapScreenCoords ; 1f
+	dba GetWarpDestCoords ; 20
 	dba SpawnInFacingDown ; 21
 	dba SpawnPlayer ; 22
 	dba RefreshPlayerCoords ; 23
-	dba DelayClearingOldSprites ; 24
-	dba DelayLoadingNewSprites ; 25
+	dba ResetPlayerObjectAction ; 24
+	dba SkipUpdateMapSprites ; 25
 	dba UpdateRoamMons ; 26
 	dba JumpRoamMons ; 27
-	dba FadeOldMapMusic ; 28
+	dba FadeOutMapMusic ; 28
 	dba ActivateMapAnims ; 29
 	dba SuspendMapAnims ; 2a
-	dba RetainOldPalettes ; 2b
-	dba DontScrollText ; 2c
-	dba ReturnFromMapSetupScript ; 2d
+	dba ApplyMapPalettes ; 2b
+	dba EnableTextAcceleration ; 2c
+	dba InitMapNameSign ; 2d
 
-DontScrollText:
+EnableTextAcceleration:
 	xor a
 	ld [wDisableTextAcceleration], a
 	ret
@@ -122,7 +122,7 @@ SuspendMapAnims:
 	ldh [hMapAnims], a
 	ret
 
-LoadObjectsRunCallback_02:
+LoadMapObjects:
 	ld a, MAPCALLBACK_OBJECTS
 	call RunMapCallback
 	farcall LoadObjectMasks
@@ -132,12 +132,12 @@ LoadObjectsRunCallback_02:
 ; unused
 	ret
 
-DelayClearingOldSprites:
+ResetPlayerObjectAction:
 	ld hl, wPlayerSpriteSetupFlags
 	set PLAYERSPRITESETUP_RESET_ACTION_F, [hl]
 	ret
 
-DelayLoadingNewSprites:
+SkipUpdateMapSprites:
 	ld hl, wPlayerSpriteSetupFlags
 	set PLAYERSPRITESETUP_SKIP_RELOAD_GFX_F, [hl]
 	ret
@@ -216,16 +216,16 @@ CheckReplaceKrisSprite:
 	and a
 	ret
 
-FadeOldMapMusic:
+FadeOutMapMusic:
 	ld a, 6
 	call SkipMusic
 	ret
 
-RetainOldPalettes:
+ApplyMapPalettes:
 	farcall _UpdateTimePals
 	ret
 
-RotatePalettesRightMapAndMusic:
+FadeMapMusicAndPalettes:
 	ld e, 0
 	ld a, [wMusicFadeID]
 	ld d, 0
diff --git a/engine/overworld/spawn_points.asm b/engine/overworld/spawn_points.asm
index 6b4476f2b..33e4c96b3 100644
--- a/engine/overworld/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
@@ -1,6 +1,6 @@
 INCLUDE "data/maps/spawn_points.asm"
 
-LoadSpawnPoint:
+EnterMapSpawnPoint:
 	; loads the spawn point in wDefaultSpawnpoint
 	push hl
 	push de
diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm
index bf28ab35e..ed3b26ef5 100644
--- a/engine/overworld/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
@@ -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
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index b383ed860..a4262bf02 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -1309,7 +1309,7 @@ ExitPokegearRadio_HandleMusic:
 	cp RESTART_MAP_MUSIC
 	jr z, .restart_map_music
 	cp ENTER_MAP_MUSIC
-	call z, EnterMapMusic
+	call z, PlayMapMusicBike
 	xor a
 	ld [wPokegearRadioMusicPlaying], a
 	ret