diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-13 20:44:16 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-13 20:44:16 -0400 |
| commit | eca33ef190d3dfcb15e24f1e7e9dac4de9ac3437 (patch) | |
| tree | d3f611f9074fdca4253e6ff51d0bb5a992192103 /engine | |
| parent | d626a0dc3b0ba5d3c4f9984321a5a26941e8ec61 (diff) | |
Define map setup commands as macros like other script commands
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/map_setup.asm | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 08ea00493..e80e382c5 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 map_end + cp map_end_command ret z push hl @@ -58,54 +58,7 @@ ReadMapSetupScript: pop hl jr .loop -MapSetupCommands: -; entries correspond to command indexes in constants/map_setup_constants.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 +INCLUDE "data/maps/setup_script_pointers.asm" EnableTextAcceleration: xor a |