Define more palette constants

2 files changed, 30 insertions, 8 deletions

diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm
index 8802cd579..21247a87f 100644
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -824,13 +824,24 @@ const_value SET 1
 	const BG_EFFECT_STRUCT_BATTLE_TURN
 	const BG_EFFECT_STRUCT_03
 
+; battle palettes
+	const_def
+	const PAL_BATTLE_BG_PLAYER    ; 0
+	const PAL_BATTLE_BG_ENEMY     ; 1
+	const PAL_BATTLE_BG_PLAYER_HP ; 2
+	const PAL_BATTLE_BG_ENEMY_HP  ; 3
+	const PAL_BATTLE_BG_EXP       ; 4
+	const PAL_BATTLE_BG_5         ; 5
+	const PAL_BATTLE_BG_6         ; 6
+	const PAL_BATTLE_BG_TEXT      ; 7
+
 ; animation object palettes
 	const_def
-	const PAL_BATTLE_ENEMY  ; 0
-	const PAL_BATTLE_PLAYER ; 1
-	const PAL_BATTLE_GRAY   ; 2
-	const PAL_BATTLE_YELLOW ; 3
-	const PAL_BATTLE_RED    ; 4
-	const PAL_BATTLE_GREEN  ; 5
-	const PAL_BATTLE_BLUE   ; 6
-	const PAL_BATTLE_BROWN  ; 7
+	const PAL_BATTLE_OB_ENEMY  ; 0
+	const PAL_BATTLE_OB_PLAYER ; 1
+	const PAL_BATTLE_OB_GRAY   ; 2
+	const PAL_BATTLE_OB_YELLOW ; 3
+	const PAL_BATTLE_OB_RED    ; 4
+	const PAL_BATTLE_OB_GREEN  ; 5
+	const PAL_BATTLE_OB_BLUE   ; 6
+	const PAL_BATTLE_OB_BROWN  ; 7
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index b0e20fd15..1a716f51b 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -193,6 +193,17 @@ const_value SET 1
 	const PAL_OW_TREE   ; 6
 	const PAL_OW_ROCK   ; 7
 
+; person_events set bit 3 so as not to use the sprite's default palette
+const_value set (1 << 3)
+	const PAL_NPC_RED    ; 8
+	const PAL_NPC_BLUE   ; 9
+	const PAL_NPC_GREEN  ; a
+	const PAL_NPC_BROWN  ; b
+	const PAL_NPC_PINK   ; c
+	const PAL_NPC_SILVER ; d
+	const PAL_NPC_TREE   ; e
+	const PAL_NPC_ROCK   ; f
+
 ; SpriteMovementData indexes (see data/map_objects.asm)
 	const_def
 	const SPRITEMOVEDATA_00                   ; 00