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 /data/maps/setup_scripts.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 'data/maps/setup_scripts.asm')
| -rw-r--r-- | data/maps/setup_scripts.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 47895b609..00b059865 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -23,7 +23,7 @@ MapSetupScript_Warp: ; 15392 db map_lcd_off db map_sound_off db map_load_spawn - db map_attributes + db map_load_attributes db map_change_callback db map_spawn_coord db map_player_coord @@ -46,7 +46,7 @@ MapSetupScript_Warp: ; 15392 MapSetupScript_BadWarp: ; 153a9 db map_load_spawn - db map_attributes + db map_load_attributes db map_change_callback db map_spawn_coord db map_player_coord @@ -71,7 +71,7 @@ MapSetupScript_BadWarp: ; 153a9 MapSetupScript_Connection: ; 153bf db map_animations_off db map_load_connection - db map_attributes + db map_load_attributes db map_change_callback db map_player_coord db map_load_blocks @@ -93,7 +93,7 @@ MapSetupScript_Door: ; 153d1 db map_fade_out_palettes MapSetupScript_Train: ; 153d2 db map_load_warp - db map_attributes + db map_load_attributes db map_warp_face db map_change_callback db map_player_coord @@ -154,7 +154,7 @@ MapSetupScript_LinkReturn: ; 153f7 MapSetupScript_Continue: ; 15408 db map_lcd_off db map_sound_off - db map_attributes_2 + db map_load_attributes_2 db map_anchor_screen db map_start_callback db map_load_blocks |