diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 36c4172f4..96fb8bef3 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -272,8 +272,8 @@ DEF JOHTO_POKEMON EQU const_value
 	const HO_OH      ; fa
 	const CELEBI     ; fb
 DEF NUM_POKEMON EQU const_value - 1
-	const_skip       ; fc
-	const EGG        ; fd
+
+DEF EGG EQU -3
 
 ; Unown forms
 ; indexes for:
diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm
index 10db6a4ff..6a9db2237 100644
--- a/data/pokemon/pic_pointers.asm
+++ b/data/pokemon/pic_pointers.asm
@@ -1,11 +1,13 @@
 ; Pics are defined in gfx/pics.asm
-
+:
+	table_width 3 * 2, :-
 	dba EggPic ; EGG is now -3, so it must go *above* the label
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
 	dbw -1, -1 ; unused
+	assert_table_length -EGG
 PokemonPicPointers::
 ; entries correspond to Pokémon species, two apiece (first index is 0)
 	table_width 3 * 2