Retain mask/form palette when accessing OW map

Masks/mask_routines.asm

@@ -18,9 +18,6 @@ macro CheckNewR_ButtonPress()
   LDA.b $F6 : BIT.b #$10
 endmacro
 
-; org $02A560
-;   JSL ForceResetWorldMap
-
 ; GameOver_DelayBeforeIris
 org $09F347
   JSL ForceResetMask_GameOver
@@ -70,24 +67,6 @@ StartupMasks:
   RTL
 }
 
-ForceResetWorldMap:
-{
-  LDA $7EF280 : BNE .openMap
-  PLA : PLA : PLA ; Pop the RTL
-  JML $02A571 ; check select button 
-
-  .openMap
-  LDA $02B2 : BEQ .still_link
-  LDY.b #$04 : LDA.b #$23
-  JSL   AddTransformationCloud
-  %ResetToLinkGraphics()
-  
-.still_link
-  STZ.w $0200
-  LDA #$07
-  RTL
-}
-
 ForceResetMask_GameOver:
 {
   LDA $02B2 : BEQ .still_link

Overworld/world_map.asm

@@ -39,6 +39,7 @@ org $3E8000
 
 DMAOwMap:
 {
+  JSL Palette_ArmorAndGloves
     LDA $8A : AND #$40 : BEQ .LWMAP
         JMP .DWMAP
         
@@ -400,7 +401,20 @@ HandleMapDrawIcon:
     RTS
 }
 
-warnpc $0AC387
+FixMaskPaletteOnExit:
+{
+  JSL Palette_ArmorAndGloves
+  LDA.l $7EC229
+  RTL
+}
+
+org $0ABC76
+  JSL FixMaskPaletteOnExit
+
+; warnpc $0AC387
+
+org $0AC589
+  RTS
 
 org $0AC38A
 {