Merge pull request #756 from mid-kid/master

Rub a dub dub, thanks for the grub
This commit is contained in:
Rangi
2020-08-18 16:35:15 -04:00
committed by GitHub
33 changed files with 185 additions and 181 deletions

View File

@@ -673,7 +673,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
call CopyBytes
pop af
ldh [rSVBK], a
ld a, 1
ld a, TRUE
ldh [hCGBPalUpdate], a
call DelayFrame
call BattleStart_CopyTilemapAtOnce

View File

@@ -4920,7 +4920,7 @@ LoadBattleMenu2:
ret
.mobile
farcall Function100b12
farcall Mobile_LoadBattleMenu
ld a, [wcd2b]
and a
ret z
@@ -5311,7 +5311,7 @@ CheckAmuletCoin:
MoveSelectionScreen:
call IsMobileBattle
jr nz, .not_mobile
farcall MobileMoveSelectionScreen
farcall Mobile_MoveSelectionScreen
ret
.not_mobile