Consolidate timing of enabling overworld HUD in map setup scripts, between pals fade in and map anims commands (#15)

This commit is contained in:
xCrystal 2024-02-10 23:39:21 +01:00
parent 5005ca7bd0
commit 971c4aa2c7

View File

@ -37,7 +37,6 @@ MapSetupScript_EnterLevel:
mapsetup BufferScreen mapsetup BufferScreen
mapsetup LoadMapGraphics mapsetup LoadMapGraphics
mapsetup LoadMapTimeOfDay mapsetup LoadMapTimeOfDay
mapsetup ConstructAndEnableOverworldHUD
mapsetup LoadMapObjects mapsetup LoadMapObjects
mapsetup EnableLCD mapsetup EnableLCD
mapsetup LoadMapPalettes mapsetup LoadMapPalettes
@ -46,6 +45,7 @@ MapSetupScript_EnterLevel:
mapsetup PlayMapMusicBike mapsetup PlayMapMusicBike
mapsetup FadeInToMusic mapsetup FadeInToMusic
mapsetup FadeInPalettesFromWhite mapsetup FadeInPalettesFromWhite
mapsetup ConstructAndEnableOverworldHUD
mapsetup ActivateMapAnims mapsetup ActivateMapAnims
mapsetup LoadWildMonData mapsetup LoadWildMonData
mapsetup MapCallbackAtEndMapSetup mapsetup MapCallbackAtEndMapSetup
@ -176,12 +176,12 @@ MapSetupScript_ReloadMap:
mapsetup LoadDisabledSpaces mapsetup LoadDisabledSpaces
mapsetup LoadMapGraphics mapsetup LoadMapGraphics
mapsetup LoadMapTimeOfDay mapsetup LoadMapTimeOfDay
mapsetup EnableOverworldHUD
mapsetup EnableLCD mapsetup EnableLCD
mapsetup LoadMapPalettes mapsetup LoadMapPalettes
mapsetup RefreshMapSprites mapsetup RefreshMapSprites
mapsetup ForceMapMusic mapsetup ForceMapMusic
mapsetup FadeInPalettesFromWhite mapsetup FadeInPalettesFromWhite
mapsetup EnableOverworldHUD
mapsetup ActivateMapAnims mapsetup ActivateMapAnims
mapsetup LoadWildMonData mapsetup LoadWildMonData
mapsetup MapCallbackAtEndMapSetup mapsetup MapCallbackAtEndMapSetup
@ -200,13 +200,13 @@ MapSetupScript_ExitViewMap:
mapsetup BufferScreen mapsetup BufferScreen
mapsetup LoadMapGraphics mapsetup LoadMapGraphics
mapsetup LoadMapTimeOfDay mapsetup LoadMapTimeOfDay
mapsetup EnableOverworldHUD
mapsetup LoadMapObjects mapsetup LoadMapObjects
mapsetup EnableLCD mapsetup EnableLCD
mapsetup LoadMapPalettes mapsetup LoadMapPalettes
mapsetup SpawnInCustomFacing ; restore player's facing if in branch space mapsetup SpawnInCustomFacing ; restore player's facing if in branch space
mapsetup RefreshMapSprites mapsetup RefreshMapSprites
mapsetup FadeInPalettesFromWhite mapsetup FadeInPalettesFromWhite
mapsetup EnableOverworldHUD
mapsetup ActivateMapAnims mapsetup ActivateMapAnims
mapsetup LoadWildMonData mapsetup LoadWildMonData
mapsetup MapCallbackAtEndMapSetup mapsetup MapCallbackAtEndMapSetup
@ -245,12 +245,12 @@ MapSetupScript_Continue:
mapsetup BufferScreen mapsetup BufferScreen
mapsetup LoadMapGraphics mapsetup LoadMapGraphics
mapsetup LoadMapTimeOfDay mapsetup LoadMapTimeOfDay
mapsetup ConstructAndEnableOverworldHUD
mapsetup EnableLCD mapsetup EnableLCD
mapsetup LoadMapPalettes mapsetup LoadMapPalettes
mapsetup RefreshMapSprites mapsetup RefreshMapSprites
mapsetup PlayMapMusicBike mapsetup PlayMapMusicBike
mapsetup FadeInPalettesFromWhite mapsetup FadeInPalettesFromWhite
mapsetup ConstructAndEnableOverworldHUD
mapsetup ActivateMapAnims mapsetup ActivateMapAnims
mapsetup LoadWildMonData mapsetup LoadWildMonData
mapsetup MapCallbackAtEndMapSetup mapsetup MapCallbackAtEndMapSetup