2 files changed, 81 insertions, 0 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index e5793239..8333837d 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -108,6 +108,11 @@ PARTY_TO_DAYCARE EQU 3
 EXCLAMATION_BUBBLE EQU 0
 QUESTION_BUBBLE    EQU 1
 SMILE_BUBBLE       EQU 2
+SKULL_BUBBLE       EQU 3
+HEART_BUBBLE       EQU 4
+BOLT_BUBBLE        EQU 5
+ZZZ_BUBBLE         EQU 6
+FISH_BUBBLE        EQU 7
 
 ; slot symbols
 SLOTS7		EQU $0200
diff --git a/constants/pikachu_emotion_constants.asm b/constants/pikachu_emotion_constants.asm
new file mode 100644
index 00000000..bce84eb7
--- /dev/null
+++ b/constants/pikachu_emotion_constants.asm
@@ -0,0 +1,76 @@
+; Starter Pikachu emotion commands constants
+	
+const_value = 0
+	const PIKAEMOTION_DUMMY1
+	const PIKAEMOTION_PRINTTEXT
+	const PIKAEMOTION_PLAYPCMSOUNDCLIP
+	const PIKAEMOTION_DOEMOTIONBUBBLE
+	const PIKAEMOTION_4
+	const PIKAEMOTION_5
+	const PIKAEMOTION_SUBCMD
+	const PIKAEMOTION_DELAYFRAMES
+	const PIKAEMOTION_DUMMY2
+	const PIKAEMOTION_9
+	const PIKAEMOTION_DUMMY3
+	
+const_value = 0
+	const PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
+	const PIKAEMOTION_SUBCMD_LOADFONT
+	const PIKAEMOTION_SUBCMD_SHOWMAPVIEW
+	const PIKAEMOTION_SUBCMD_WAITBUTTONPRESS
+	const PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER
+	const PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER
+	const PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE
+
+
+; Macros for commands
+pikaemotion_dummy1: MACRO
+	db PIKAEMOTION_DUMMY1
+ENDM
+
+pikaemotion_printtext: MACRO
+	db PIKAEMOTION_PRINTTEXT
+	dw \1
+ENDM
+
+pikaemotion_pcm: MACRO
+	db PIKAEMOTION_PLAYPCMSOUNDCLIP
+	db \1
+ENDM
+
+pikaemotion_emotebubble: MACRO
+	db PIKAEMOTION_DOEMOTIONBUBBLE
+	db \1
+ENDM
+
+pikaemotion_4: MACRO
+	db PIKAEMOTION_4
+	dw \1
+ENDM
+
+pikaemotion_5: MACRO
+	db PIKAEMOTION_5
+	db \1
+ENDM
+
+pikaemotion_subcmd: MACRO
+	db PIKAEMOTION_SUBCMD
+	db \1
+ENDM
+
+pikaemotion_delay: MACRO
+	db PIKAEMOTION_DELAYFRAMES
+	db \1
+ENDM
+
+pikaemotion_dummy2: MACRO
+	db PIKAEMOTION_DUMMY2
+ENDM
+
+pikaemotion_9: MACRO
+	db PIKAEMOTION_9
+ENDM
+
+pikaemotion_dummy3: MACRO
+	db PIKAEMOTION_DUMMY3
+ENDM
+\ No newline at end of file