From 10f9559eab8c93b94abb8ae8d1083704ad4e169a Mon Sep 17 00:00:00 2001
From: dannye <33dannye@gmail.com>
Date: Wed, 20 May 2020 19:40:33 -0500
Subject: Sync with pokered

---
 engine/palettes.asm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engine/palettes.asm')

diff --git a/engine/palettes.asm b/engine/palettes.asm
index 3c25d4d2..ec9816ab 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -78,7 +78,7 @@ SetPal_StatusScreen:
 	ld bc, $10
 	call CopyData
 	ld a, [wcf91]
-	cp VICTREEBEL + 1
+	cp NUM_POKEMON_INDEXES + 1
 	jr c, .pokemon
 	ld a, $1 ; not pokemon
 .pokemon
@@ -155,7 +155,7 @@ SetPal_Overworld:
 	ld a, [wCurMap]
 	cp REDS_HOUSE_1F
 	jr c, .townOrRoute
-	cp UNKNOWN_DUNGEON_2
+	cp CERULEAN_CAVE_2F
 	jr c, .normalDungeonOrBuilding
 	cp NAME_RATERS_HOUSE
 	jr c, .caveOrBruno
@@ -401,7 +401,7 @@ GetPal_Pikachu::
 	ld a, [wCurMap]
 	cp REDS_HOUSE_1F
 	jr c, .townOrRoute
-	cp UNKNOWN_DUNGEON_2
+	cp CERULEAN_CAVE_2F
 	jr c, .normalDungeonOrBuilding
 	cp NAME_RATERS_HOUSE
 	jr c, .caveOrBruno
@@ -484,7 +484,7 @@ SendSGBPacket:
 _SendSGBPacket:
 ;check number of packets
 	ld a, [hl]
-	and a, $07
+	and $07
 	ret z
 ; store number of packets in B
 	ld b, a
-- 
cgit v1.3.1-sl0p