Treat map setup commands like trade script commands

Fixes #736
2020-07-22 13:37:43 -04:00
parent b17255fe3f
commit 212846af57
5 changed files with 199 additions and 247 deletions
--- a/data/maps/setup_script_pointers.asm
+++ b/data/maps/setup_script_pointers.asm
@@ -1,48 +1,52 @@
+add_mapsetup: MACRO
+\1_MapSetupCmd:
+	dba \1
+ENDM
+
 MapSetupCommands:
-; entries correspond to map_*_command constants (see macros/scripts/map_setup.asm)
-	dba EnableLCD ; 00
-	dba DisableLCD ; 01
-	dba InitSound ; 02
-	dba PlayMapMusic ; 03
-	dba RestartMapMusic ; 04
-	dba FadeToMapMusic ; 05
-	dba FadeMapMusicAndPalettes ; 06
-	dba PlayMapMusicBike ; 07
-	dba ForceMapMusic ; 08
-	dba FadeInToMusic ; 09
-	dba LoadBlockData ; 0a (callback 1)
-	dba LoadConnectionBlockData ; 0b
-	dba SaveScreen ; 0c
-	dba BufferScreen ; 0d
-	dba LoadMapGraphics ; 0e
-	dba LoadMapTileset ; 0f
-	dba LoadMapTimeOfDay ; 10
-	dba LoadMapPalettes ; 11
-	dba LoadWildMonData ; 12
-	dba RefreshMapSprites ; 13
-	dba HandleNewMap ; 14
-	dba HandleContinueMap ; 15
-	dba LoadMapObjects ; 16
-	dba EnterMapSpawnPoint ; 17
-	dba EnterMapConnection ; 18
-	dba EnterMapWarp ; 19
-	dba LoadMapAttributes ; 1a
-	dba LoadMapAttributes_SkipObjects ; 1b
-	dba ClearBGPalettes ; 1c
-	dba FadeOutPalettes ; 1d
-	dba FadeInPalettes ; 1e
-	dba GetMapScreenCoords ; 1f
-	dba GetWarpDestCoords ; 20
-	dba SpawnInFacingDown ; 21
-	dba SpawnPlayer ; 22
-	dba RefreshPlayerCoords ; 23
-	dba ResetPlayerObjectAction ; 24
-	dba SkipUpdateMapSprites ; 25
-	dba UpdateRoamMons ; 26
-	dba JumpRoamMons ; 27
-	dba FadeOutMapMusic ; 28
-	dba ActivateMapAnims ; 29
-	dba SuspendMapAnims ; 2a
-	dba ApplyMapPalettes ; 2b
-	dba EnableTextAcceleration ; 2c
-	dba InitMapNameSign ; 2d
+	add_mapsetup EnableLCD ; 00
+	add_mapsetup DisableLCD ; 01
+	add_mapsetup InitSound ; 02
+	add_mapsetup PlayMapMusic ; 03
+	add_mapsetup RestartMapMusic ; 04
+	add_mapsetup FadeToMapMusic ; 05
+	add_mapsetup FadeMapMusicAndPalettes ; 06
+	add_mapsetup PlayMapMusicBike ; 07
+	add_mapsetup ForceMapMusic ; 08
+	add_mapsetup FadeInToMusic ; 09
+	add_mapsetup LoadBlockData ; 0a (callback 1)
+	add_mapsetup LoadConnectionBlockData ; 0b
+	add_mapsetup SaveScreen ; 0c
+	add_mapsetup BufferScreen ; 0d
+	add_mapsetup LoadMapGraphics ; 0e
+	add_mapsetup LoadMapTileset ; 0f
+	add_mapsetup LoadMapTimeOfDay ; 10
+	add_mapsetup LoadMapPalettes ; 11
+	add_mapsetup LoadWildMonData ; 12
+	add_mapsetup RefreshMapSprites ; 13
+	add_mapsetup HandleNewMap ; 14
+	add_mapsetup HandleContinueMap ; 15
+	add_mapsetup LoadMapObjects ; 16
+	add_mapsetup EnterMapSpawnPoint ; 17
+	add_mapsetup EnterMapConnection ; 18
+	add_mapsetup EnterMapWarp ; 19
+	add_mapsetup LoadMapAttributes ; 1a
+	add_mapsetup LoadMapAttributes_SkipObjects ; 1b
+	add_mapsetup ClearBGPalettes ; 1c
+	add_mapsetup FadeOutPalettes ; 1d
+	add_mapsetup FadeInPalettes ; 1e
+	add_mapsetup GetMapScreenCoords ; 1f
+	add_mapsetup GetWarpDestCoords ; 20
+	add_mapsetup SpawnInFacingDown ; 21
+	add_mapsetup SpawnPlayer ; 22
+	add_mapsetup RefreshPlayerCoords ; 23
+	add_mapsetup ResetPlayerObjectAction ; 24
+	add_mapsetup SkipUpdateMapSprites ; 25
+	add_mapsetup UpdateRoamMons ; 26
+	add_mapsetup JumpRoamMons ; 27
+	add_mapsetup FadeOutMapMusic ; 28
+	add_mapsetup ActivateMapAnims ; 29
+	add_mapsetup SuspendMapAnims ; 2a
+	add_mapsetup ApplyMapPalettes ; 2b
+	add_mapsetup EnableTextAcceleration ; 2c
+	add_mapsetup InitMapNameSign ; 2d