diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /constants/map_setup_constants.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'constants/map_setup_constants.asm')
| -rw-r--r-- | constants/map_setup_constants.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index d9abd6e9b..9c6164169 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -1,6 +1,6 @@ ; hMapEntryMethod values ; MapSetupScripts indexes (see data/maps/setup_scripts.asm) -const_value set $f1 + const_def $f1 const MAPSETUP_WARP ; f1 const MAPSETUP_CONTINUE ; f2 const MAPSETUP_RELOADMAP ; f3 @@ -44,8 +44,8 @@ const_value set $f1 const map_load_spawn ; 17 const map_load_connection ; 18 const map_load_warp ; 19 - const map_attributes ; 1a - const map_attributes_2 ; 1b + const map_load_attributes ; 1a + const map_load_attributes_2 ; 1b const map_clear_bg_palettes ; 1c const map_fade_out_palettes ; 1d const map_fade_in_palettes ; 1e @@ -67,7 +67,7 @@ const_value set $f1 map_end EQU -1 ; callback types -const_value set 1 + const_def 1 const MAPCALLBACK_TILES const MAPCALLBACK_OBJECTS const MAPCALLBACK_CMDQUEUE |