14 files changed, 48 insertions, 0 deletions
diff --git a/gfx/emotes/bolt.2bpp b/gfx/emotes/bolt.2bpp
new file mode 100644
index 000000000..019f4733c
--- /dev/null
+++ b/gfx/emotes/bolt.2bpp
diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp
new file mode 100644
index 000000000..310ec1752
--- /dev/null
+++ b/gfx/emotes/fish.2bpp
diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp
new file mode 100644
index 000000000..babc52ec6
--- /dev/null
+++ b/gfx/emotes/happy.2bpp
diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp
new file mode 100644
index 000000000..15cdc88b7
--- /dev/null
+++ b/gfx/emotes/heart.2bpp
diff --git a/gfx/emotes/question.2bpp b/gfx/emotes/question.2bpp
new file mode 100644
index 000000000..2408bbf44
--- /dev/null
+++ b/gfx/emotes/question.2bpp
diff --git a/gfx/emotes/sad.2bpp b/gfx/emotes/sad.2bpp
new file mode 100644
index 000000000..cccdcf97a
--- /dev/null
+++ b/gfx/emotes/sad.2bpp
diff --git a/gfx/emotes/shock.2bpp b/gfx/emotes/shock.2bpp
new file mode 100644
index 000000000..351921654
--- /dev/null
+++ b/gfx/emotes/shock.2bpp
diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp
new file mode 100644
index 000000000..1c9e26ec7
--- /dev/null
+++ b/gfx/emotes/sleep.2bpp
diff --git a/gfx/misc/fishing.2bpp b/gfx/misc/fishing.2bpp
new file mode 100644
index 000000000..0f7fd175d
--- /dev/null
+++ b/gfx/misc/fishing.2bpp
diff --git a/gfx/misc/pack.2bpp b/gfx/misc/pack.2bpp
index 283d04fce..22be55081 100644
--- a/gfx/misc/pack.2bpp
+++ b/gfx/misc/pack.2bpp
diff --git a/gfx/misc/pack_menu.2bpp b/gfx/misc/pack_menu.2bpp
new file mode 100644
index 000000000..484bc94cb
--- /dev/null
+++ b/gfx/misc/pack_menu.2bpp
diff --git a/gfx/ow/misc.2bpp b/gfx/ow/misc.2bpp
deleted file mode 100644
index 8f9b3b96f..000000000
--- a/gfx/ow/misc.2bpp
+++ /dev/null
diff --git a/gfx/pics/palette_pointers.asm b/gfx/pics/palette_pointers.asm
index fbac16ef7..17b586109 100644
--- a/gfx/pics/palette_pointers.asm
+++ b/gfx/pics/palette_pointers.asm
@@ -1,3 +1,5 @@
+PokemonPalettes: ; a8d6
+
 BulbasaurPalette:       INCLUDE "gfx/pics/001/normal.pal"
 BulbasaurShinyPalette:  INCLUDE "gfx/pics/001/shiny.pal"
 IvysaurPalette:         INCLUDE "gfx/pics/002/normal.pal"
@@ -500,3 +502,34 @@ HoOhPalette:            INCLUDE "gfx/pics/250/normal.pal"
 HoOhShinyPalette:       INCLUDE "gfx/pics/250/shiny.pal"
 CelebiPalette:          INCLUDE "gfx/pics/251/normal.pal"
 CelebiShinyPalette:     INCLUDE "gfx/pics/251/shiny.pal"
+
+; 252
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+; 252 shiny
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+
+; Egg
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+; Egg shiny
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+
+; 254
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+; 254 shiny
+	RGB 30, 26, 11
+	RGB 23, 16, 00
+
+; 255
+	RGB 23, 23, 23
+	RGB 17, 17, 17
+; 255 shiny
+	RGB 23, 23, 23
+	RGB 17, 17, 17
+
+; b0ce
+
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
index f96ed5143..0c8627204 100644
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainers/palette_pointers.asm
@@ -1,3 +1,16 @@
+
+TrainerPalettes: ; b0ce
+
+PlayerPalette: ; b0ce
+; The player's palette
+	RGB 25, 18, 12
+	RGB 22, 09, 05
+
+KrisPalette: ; b0d0
+; Apparently Kris uses Falkner's palette
+;	RGB 27, 17, 14
+;	RGB 07, 05, 31
+
 FalknerPalette:      INCLUDE "gfx/trainers/000.pal"
 WhitneyPalette:      INCLUDE "gfx/trainers/001.pal"
 BugsyPalette:        INCLUDE "gfx/trainers/002.pal"
@@ -65,3 +78,5 @@ BluePalette:         INCLUDE "gfx/trainers/063.pal"
 OfficerPalette:      INCLUDE "gfx/trainers/064.pal"
 GruntfPalette:       INCLUDE "gfx/trainers/065.pal"
 MysticalmanPalette:  INCLUDE "gfx/trainers/066.pal"
+; b1de
+