diff options
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 7444c7fbe..c2900665f 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -6,9 +6,8 @@ RunMapSetupScript:: ; 15363 ld c, a ld b, 0 ld hl, MapSetupScripts -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a @@ -33,11 +32,9 @@ MapSetupScripts: ; 15377 MapSetupScript_Teleport: ; 1538f db map_prolong_sprites - MapSetupScript_Fly: ; 15390 db map_fade_out_palettes db map_keep_roam - MapSetupScript_Warp: ; 15392 db map_lcd_off db map_sound_off @@ -61,7 +58,7 @@ MapSetupScript_Warp: ; 15392 db map_fade_in_palettes db map_animations_on db map_wildmons - db map_end_setup_script + db map_end MapSetupScript_BadWarp: ; 153a9 db map_load_spawn @@ -85,7 +82,7 @@ MapSetupScript_BadWarp: ; 153a9 db map_fade_in_palettes db map_animations_on db map_wildmons - db map_end_setup_script + db map_end MapSetupScript_Connection: ; 153bf db map_animations_off @@ -104,14 +101,12 @@ MapSetupScript_Connection: ; 153bf db map_wildmons db map_update_roam db map_animations_on - db map_end_setup_script + db map_end MapSetupScript_Fall: ; 153d0 db map_prolong_sprites - MapSetupScript_Door: ; 153d1 db map_fade_out_palettes - MapSetupScript_Train: ; 153d2 db map_load_warp db map_attributes @@ -133,7 +128,7 @@ MapSetupScript_Train: ; 153d2 db map_animations_on db map_wildmons db map_update_roam - db map_end_setup_script + db map_end MapSetupScript_ReloadMap: ; 153e7 db map_fade @@ -151,7 +146,7 @@ MapSetupScript_ReloadMap: ; 153e7 db map_fade_in_palettes db map_animations_on db map_wildmons - db map_end_setup_script + db map_end MapSetupScript_LinkReturn: ; 153f7 db map_fade @@ -170,7 +165,7 @@ MapSetupScript_LinkReturn: ; 153f7 db map_animations_on db map_wildmons db map_text_scroll_off - db map_end_setup_script + db map_end MapSetupScript_Continue: ; 15408 db map_lcd_off @@ -190,12 +185,12 @@ MapSetupScript_Continue: ; 15408 db map_fade_in_palettes db map_animations_on db map_wildmons - db map_end_setup_script + db map_end MapSetupScript_Submenu: ; 1541a db map_load_blocks db map_connection_blocks - db map_end_setup_script + db map_end ReadMapSetupScript: ; 1541d @@ -252,7 +247,7 @@ MapSetupCommands: ; 15440 dba RotatePalettesRightMapAndMusic ; 06 dba EnterMapMusic ; 07 dba ForceMapMusic ; 08 - dba RotatePalettesLeftMusic ; 09 + dba FadeInMusic ; 09 dba LoadBlockData ; 0a dba LoadNeighboringBlockData ; 0b dba SaveScreen ; 0c |