diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-18 16:35:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:35:15 -0400 |
| commit | 0b31d12daceb9f431387951ee275e6147285cffd (patch) | |
| tree | b91ae6167e4afa49cb70b1a163a6344f7e924a2c /engine/battle | |
| parent | b577e4e179711e96f8e059b42c7115e7103a4a69 (diff) | |
| parent | 315d6c665ea0ee4e103f6d8b9dbfb531659ae381 (diff) | |
Merge pull request #756 from mid-kid/master
Rub a dub dub, thanks for the grub
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index cf1ad1f8d..8071d475e 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0cbdd66fe..cc7ef2e37 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 |