diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
index dc62efc38e..a54619b2f6 100644
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
@@ -144,12 +144,9 @@ GetTreeMons:
 ; Return the address of TreeMon table a in hl.
 ; Return nc if table a doesn't exist.
 
-	cp 8
+	cp NUM_TREEMON_SETS
 	jr nc, .quit
 
-	and a
-	jr z, .quit
-
 	ld e, a
 	ld d, 0
 	ld hl, TreeMons