Merge pull request #756 from mid-kid/master

Rub a dub dub, thanks for the grub
2020-08-18 16:35:15 -04:00
parent b577e4e179 315d6c665e
commit 0b31d12dac
33 changed files with 185 additions and 181 deletions
--- 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