From 971c4aa2c72a53bab89eaa441e8a0c49317fb92e Mon Sep 17 00:00:00 2001 From: xCrystal Date: Sat, 10 Feb 2024 23:39:21 +0100 Subject: [PATCH] Consolidate timing of enabling overworld HUD in map setup scripts, between pals fade in and map anims commands (#15) --- data/maps/setup_scripts.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 8293a5ecf..d53de86ac 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -37,7 +37,6 @@ MapSetupScript_EnterLevel: mapsetup BufferScreen mapsetup LoadMapGraphics mapsetup LoadMapTimeOfDay - mapsetup ConstructAndEnableOverworldHUD mapsetup LoadMapObjects mapsetup EnableLCD mapsetup LoadMapPalettes @@ -46,6 +45,7 @@ MapSetupScript_EnterLevel: mapsetup PlayMapMusicBike mapsetup FadeInToMusic mapsetup FadeInPalettesFromWhite + mapsetup ConstructAndEnableOverworldHUD mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup MapCallbackAtEndMapSetup @@ -176,12 +176,12 @@ MapSetupScript_ReloadMap: mapsetup LoadDisabledSpaces mapsetup LoadMapGraphics mapsetup LoadMapTimeOfDay - mapsetup EnableOverworldHUD mapsetup EnableLCD mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup ForceMapMusic mapsetup FadeInPalettesFromWhite + mapsetup EnableOverworldHUD mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup MapCallbackAtEndMapSetup @@ -200,13 +200,13 @@ MapSetupScript_ExitViewMap: mapsetup BufferScreen mapsetup LoadMapGraphics mapsetup LoadMapTimeOfDay - mapsetup EnableOverworldHUD mapsetup LoadMapObjects mapsetup EnableLCD mapsetup LoadMapPalettes mapsetup SpawnInCustomFacing ; restore player's facing if in branch space mapsetup RefreshMapSprites mapsetup FadeInPalettesFromWhite + mapsetup EnableOverworldHUD mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup MapCallbackAtEndMapSetup @@ -245,12 +245,12 @@ MapSetupScript_Continue: mapsetup BufferScreen mapsetup LoadMapGraphics mapsetup LoadMapTimeOfDay - mapsetup ConstructAndEnableOverworldHUD mapsetup EnableLCD mapsetup LoadMapPalettes mapsetup RefreshMapSprites mapsetup PlayMapMusicBike mapsetup FadeInPalettesFromWhite + mapsetup ConstructAndEnableOverworldHUD mapsetup ActivateMapAnims mapsetup LoadWildMonData mapsetup MapCallbackAtEndMapSetup