summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-12 14:54:00 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-12 14:54:00 -0500
commitf1e1b26138daabc15b83f5a8ce7f6e513749f5a8 (patch)
tree958ec227e911836c1a497f4586105dc721f71dca /engine/battle
parent31caeeba3c85821fa733c3e714ede2f62ed89517 (diff)
More gfx/**/*.pal files
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/battle_transition.asm11
1 files changed, 3 insertions, 8 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
index 4c05112ac..16c9df2c1 100644
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -691,17 +691,12 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
; 8c6a1 (23:46a1)
.daypals ; 8c6a1
- RGB 31, 18, 29
- RGB 31, 11, 15
- RGB 31, 05, 05
- RGB 07, 07, 07
+INCLUDE "gfx/overworld/trainer_battle_day.pal"
; 8c6a9
.nightpals ; 8c6a9
- RGB 31, 18, 29
- RGB 31, 05, 05
- RGB 31, 05, 05
- RGB 31, 05, 05
+INCLUDE "gfx/overworld/trainer_battle_nite.pal"
+; 8c6b1
.loadpokeballgfx
ld a, [OtherTrainerClass]