mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Fix map anims not disabled outside of overworld (#17)
This commit is contained in:
parent
63912e8bef
commit
8c7ee46065
@ -461,7 +461,7 @@ endc
|
|||||||
call ReturnToMapFromSubmenu
|
call ReturnToMapFromSubmenu
|
||||||
ld a, [wDisableTextAcceleration]
|
ld a, [wDisableTextAcceleration]
|
||||||
push af
|
push af
|
||||||
ld a, 1
|
ld a, TRUE
|
||||||
ld [wDisableTextAcceleration], a
|
ld [wDisableTextAcceleration], a
|
||||||
ldh a, [rIE]
|
ldh a, [rIE]
|
||||||
push af
|
push af
|
||||||
|
@ -12,6 +12,8 @@ GameMenu:
|
|||||||
; fallthrough
|
; fallthrough
|
||||||
|
|
||||||
GameMenu_KeepMusic:
|
GameMenu_KeepMusic:
|
||||||
|
xor a
|
||||||
|
ldh [hMapAnims], a
|
||||||
call ClearTilemap
|
call ClearTilemap
|
||||||
call LoadFrame
|
call LoadFrame
|
||||||
call LoadStandardFont
|
call LoadStandardFont
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
LevelSelectionMenu::
|
LevelSelectionMenu::
|
||||||
xor a
|
xor a
|
||||||
ldh [hInMenu], a
|
ldh [hInMenu], a
|
||||||
|
ldh [hMapAnims], a
|
||||||
ld a, 1 << 2 ; do not clear wShadowOAM during DoNextFrameForAllSprites
|
ld a, 1 << 2 ; do not clear wShadowOAM during DoNextFrameForAllSprites
|
||||||
ld [wVramState], a
|
ld [wVramState], a
|
||||||
ld a, -1
|
ld a, -1
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
MainMenu:
|
MainMenu:
|
||||||
.loop
|
.loop
|
||||||
xor a
|
xor a
|
||||||
ld [wDisableTextAcceleration], a
|
|
||||||
ldh [hMapAnims], a
|
ldh [hMapAnims], a
|
||||||
call ClearTilemap
|
call ClearTilemap
|
||||||
call LoadFrame
|
call LoadFrame
|
||||||
|
Loading…
Reference in New Issue
Block a user