From 8c7ee460650e07248bf28414c987e415624a9987 Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Mon, 2 Oct 2023 17:39:10 +0200
Subject: [PATCH] Fix map anims not disabled outside of overworld (#17)

---
 engine/link/link.asm                  | 2 +-
 engine/menus/game_menu.asm            | 2 ++
 engine/menus/level_selection_menu.asm | 1 +
 engine/menus/main_menu.asm            | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engine/link/link.asm b/engine/link/link.asm
index 3e74c8e9a..1d8d9d1b7 100644
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -461,7 +461,7 @@ endc
 	call ReturnToMapFromSubmenu
 	ld a, [wDisableTextAcceleration]
 	push af
-	ld a, 1
+	ld a, TRUE
 	ld [wDisableTextAcceleration], a
 	ldh a, [rIE]
 	push af
diff --git a/engine/menus/game_menu.asm b/engine/menus/game_menu.asm
index ddf71be9d..12138881f 100755
--- a/engine/menus/game_menu.asm
+++ b/engine/menus/game_menu.asm
@@ -12,6 +12,8 @@ GameMenu:
 	; fallthrough
 
 GameMenu_KeepMusic:
+	xor a
+	ldh [hMapAnims], a
 	call ClearTilemap
 	call LoadFrame
 	call LoadStandardFont
diff --git a/engine/menus/level_selection_menu.asm b/engine/menus/level_selection_menu.asm
index 4c648db40..03646d084 100755
--- a/engine/menus/level_selection_menu.asm
+++ b/engine/menus/level_selection_menu.asm
@@ -1,6 +1,7 @@
 LevelSelectionMenu::
 	xor a
 	ldh [hInMenu], a
+	ldh [hMapAnims], a
 	ld a, 1 << 2 ; do not clear wShadowOAM during DoNextFrameForAllSprites
 	ld [wVramState], a
 	ld a, -1
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index df01ffa94..185ca625c 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -13,7 +13,6 @@
 MainMenu:
 .loop
 	xor a
-	ld [wDisableTextAcceleration], a
 	ldh [hMapAnims], a
 	call ClearTilemap
 	call LoadFrame