Map callback constants

engine/events.asm

@@ -350,7 +350,7 @@ CheckTileEvent: ; 96874
 	call CheckCoordEventScriptFlag
 	jr z, .coord_events_disabled
 
-	call CheckCurrentNextMapXYTriggers
+	call CheckCurrentMapXYTriggers
 	jr c, .coord_event
 
 .coord_events_disabled
@@ -391,7 +391,7 @@ CheckTileEvent: ; 96874
 	ret
 
 .coord_event
-	ld hl, EngineBuffer5
+	ld hl, wCurCoordEventScriptAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a

engine/map_setup.asm

@@ -306,7 +306,7 @@ SuspendMapAnims: ; 154d3
 ; 154d7
 
 LoadObjectsRunCallback_02: ; 154d7
-	ld a, 2
+	ld a, MAPCALLBACK_OBJECTS
 	call RunMapCallback
 	callba LoadObjectMasks
 	callba InitializeVisibleSprites

engine/overworld.asm

@@ -166,7 +166,7 @@ endr
 
 
 RunCallback_04: ; 14209
-	ld a, $4
+	ld a, MAPCALLBACK_SPRITES
 	call RunMapCallback
 	call GetUsedSprites
 	call .LoadMiscTiles

engine/startmenu.asm

@@ -146,7 +146,7 @@ StartMenu:: ; 125cd
 	call .DrawBugContestStatus
 	call UpdateSprites
 	call ret_d90
-	call Function2b5c
+	call FinishExitMenu
 	ret
 ; 126d3
 

engine/warp_connection.asm

@@ -5,11 +5,11 @@ RunCallback_05_03: ; 1045b0
 	call ResetFlashIfOutOfCave
 	call GetCurrentMapTrigger
 	call ResetBikeFlags
-	ld a, $5
+	ld a, MAPCALLBACK_NEWMAP
 	call RunMapCallback
 RunCallback_03: ; 1045c4
 	callba ClearCmdQueue
-	ld a, $3
+	ld a, MAPCALLBACK_PALETTES
 	call RunMapCallback
 	call GetMapHeaderTimeOfDayNybble
 	ld [wMapTimeOfDay], a