From a55c6ac26e50bd0dc911c816cae20abe9ff7a194 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Fri, 28 Feb 2014 01:31:52 -0500
Subject: [PATCH] Split up emote images and dump emote pointers.

---
 gfx/emotes/bolt.2bpp     | Bin 0 -> 64 bytes
 gfx/emotes/fish.2bpp     | Bin 0 -> 64 bytes
 gfx/emotes/happy.2bpp    | Bin 0 -> 64 bytes
 gfx/emotes/heart.2bpp    | Bin 0 -> 64 bytes
 gfx/emotes/question.2bpp | Bin 0 -> 64 bytes
 gfx/emotes/sad.2bpp      | Bin 0 -> 64 bytes
 gfx/emotes/shock.2bpp    | Bin 0 -> 64 bytes
 gfx/emotes/sleep.2bpp    | Bin 0 -> 64 bytes
 gfx/misc/fishing.2bpp    | Bin 0 -> 96 bytes
 gfx/ow/misc.2bpp         | Bin 608 -> 0 bytes
 main.asm                 |  61 +++++++++++++++++++++++++++++++++++++--
 11 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 gfx/emotes/bolt.2bpp
 create mode 100644 gfx/emotes/fish.2bpp
 create mode 100644 gfx/emotes/happy.2bpp
 create mode 100644 gfx/emotes/heart.2bpp
 create mode 100644 gfx/emotes/question.2bpp
 create mode 100644 gfx/emotes/sad.2bpp
 create mode 100644 gfx/emotes/shock.2bpp
 create mode 100644 gfx/emotes/sleep.2bpp
 create mode 100644 gfx/misc/fishing.2bpp
 delete mode 100644 gfx/ow/misc.2bpp

diff --git a/gfx/emotes/bolt.2bpp b/gfx/emotes/bolt.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..019f4733c453e56f477ce3a8c8e5285d7e3784a3
GIT binary patch
literal 64
zcmb1Vu$Qk_`0w!F`M>*r|Njm@82<eD$MXNs|EB*;|3CeI^xqLE<5sU=FE7u)2!s%s
Pe=L7~{5Wu+p@9JaYE>f&

literal 0
HcmV?d00001

diff --git a/gfx/emotes/fish.2bpp b/gfx/emotes/fish.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..310ec175201053e6fc2c5f7921dfd53f1b6b1a40
GIT binary patch
literal 64
zcmWN_!3_Wq5Cp&@UYa<a@Kc6TPHE~;$wkE4%x_exT0x_Z0du+j5+Y@699~DWQdK1o
MFC)Hm-Pf8^K1ORH+5i9m

literal 0
HcmV?d00001

diff --git a/gfx/emotes/happy.2bpp b/gfx/emotes/happy.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..babc52ec60ac2a45e33862bd5f174d7aae45d7ad
GIT binary patch
literal 64
zcmb1Vu$Qk_`0w!F=YJ3oI{aYx^Wz`Of2RLN|Gj{a2`J<8-??7FUS6Jo5eR`IO8*c2
OWBK#r$AJS44GaJhksxjW

literal 0
HcmV?d00001

diff --git a/gfx/emotes/heart.2bpp b/gfx/emotes/heart.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..15cdc88b7172d9e00c3368497cff3b265a9ffdda
GIT binary patch
literal 64
zcmb1Vu$Qk_`0w*S?teTG`u||~^Wz`O|Dyl5{=fSF>;I?!?*E<tJJu`M%gZw`0^$Eh
T{}26d`p5F;$BzRC8X6b?t?(sL

literal 0
HcmV?d00001

diff --git a/gfx/emotes/question.2bpp b/gfx/emotes/question.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..2408bbf445c27e8ff0c4e32e563a85f49bdc3611
GIT binary patch
literal 64
zcmb1Vu$Qk_`0xKe1_&MhJN{t!^Wz`O|4;v|fbh}(rvDEAo&P)6E7;4+GcW?-f2RM3
R{vZ0s^5@5o0|y!!7yxS9BPIX<

literal 0
HcmV?d00001

diff --git a/gfx/emotes/sad.2bpp b/gfx/emotes/sad.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..cccdcf97af718f4ec65e0fef4d0146c94fa7173e
GIT binary patch
literal 64
zcmb1Vu$Qk_`0xKe5(uOJ`~P70^Wz`O|4;vC0pTqm?eO3Azk9ucy}UdFBM|;)`oHM^
Qqkk-ae*8FaprL^Q0GqKSb^rhX

literal 0
HcmV?d00001

diff --git a/gfx/emotes/shock.2bpp b/gfx/emotes/shock.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..351921654d72896eaf8464f83fbecabdf74dd8fb
GIT binary patch
literal 64
zcmb1Vu$Qk_`0ogVKN$Y}_{Z|U2@V}VGW81f^70IfK=_{tB=e8u&yODm4m30{002xm
BA|3z$

literal 0
HcmV?d00001

diff --git a/gfx/emotes/sleep.2bpp b/gfx/emotes/sleep.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..1c9e26ec7269906758bf408ea1647d57e1318817
GIT binary patch
literal 64
zcmb1Vu$Qk__#gM*<-Z4zbojyW=f^*m|4cx*3Wz`bclhu1-=SW?US6Jo5eWY){dfBR
Q=^x9VA3qKpXlP&n06A_U(EtDd

literal 0
HcmV?d00001

diff --git a/gfx/misc/fishing.2bpp b/gfx/misc/fishing.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..0f7fd175d9c3bb9e1f57d6d72c85cd966f3cd8ad
GIT binary patch
literal 96
zcmZQ)mzTG<uLlBqdwF?w_5%k#e6X?M=VxYS00Sl_c2;)Q-tM=r?_JxmBO!r7LMn~L
viMuhZQ%cWA$ijkwfr*KMfsv7cfs2cQ!NS5pKtaNYN9c@H3a1&T7>hIjkSrAi

literal 0
HcmV?d00001

diff --git a/gfx/ow/misc.2bpp b/gfx/ow/misc.2bpp
deleted file mode 100644
index 8f9b3b96fbeb191bbc291697049a9301c94a11f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 608
zcmZvZ!Ab&A7=^FbkwFU#7a_K|;sdmB5km-b)oLPyffhj&<|2B4USO<UL@(g7Wl!L8
zaNW9vixw`6KxQ?FcsiPn+IY|I{{MH+fBvh4t-K<t3x#4FP7FLo($k7pw3QMG3UXSR
z7~?SX{dQZZKi<VP#m+e&;E)=ySEG*l8s9@N#%nZiPU$%>QN|f1$shgWOB;9>m(&&9
z$iIUQ`UuD$!&&ox#USS2Kod9Ag1;yGg%Np&^RMO~ptm9aG^GPKnx8$KJ>UkatemX)
z&nhwhCR3hrhGl+<x7iDtThJ?f2{i;UUNfh|`Mqd=5*cO~@y=P}`@EM+-ZYi6ZI8$1
z7n`Q<4~LaXHk(X}*^$yrnW>lOpYP9)ZnxDE`NEx1+j_WoD(p9MmL-IgLL?GGWHLfn
Umfk7m%iFp4!fpB>y=(0K0!(o$IsgCw

diff --git a/main.asm b/main.asm
index db15c2383..bec3610f8 100644
--- a/main.asm
+++ b/main.asm
@@ -22133,7 +22133,54 @@ EmotesPointers: ; 144d
 ; db length, bank
 ; dw dest address
 
-INCBIN "baserom.gbc",$1444d,$14495 - $1444d
+	dw ShockEmote
+	db $40, BANK(ShockEmote)
+	dw $8f80
+
+	dw QuestionEmote
+	db $40, BANK(QuestionEmote)
+	dw $8f80
+
+	dw HappyEmote
+	db $40, BANK(HappyEmote)
+	dw $8f80
+
+	dw SadEmote
+	db $40, BANK(SadEmote)
+	dw $8f80
+
+	dw HeartEmote
+	db $40, BANK(HeartEmote)
+	dw $8f80
+
+	dw BoltEmote
+	db $40, BANK(BoltEmote)
+	dw $8f80
+
+	dw SleepEmote
+	db $40, BANK(SleepEmote)
+	dw $8f80
+
+	dw FishEmote
+	db $40, BANK(FishEmote)
+	dw $8f80
+
+	dw FishingRodGFX + $00
+	db $10, BANK(FishingRodGFX)
+	dw $8fc0
+
+	dw FishingRodGFX + $10
+	db $20, BANK(FishingRodGFX)
+	dw $8fc0
+
+	dw FishingRodGFX + $30
+	db $20, BANK(FishingRodGFX)
+	dw $8fe0
+
+	dw FishingRodGFX + $50
+	db $10, BANK(FishingRodGFX)
+	dw $8fe0
+
 ; 14495
 
 
@@ -88698,9 +88745,17 @@ Function10433a: ; 10433a (41:433a)
 	dec b
 	jr nz, .asm_10433c
 	ret
+; 104350
 
-
-INCBIN "gfx/ow/misc.2bpp"
+ShockEmote:    INCBIN "gfx/emotes/shock.2bpp"
+QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
+HappyEmote:    INCBIN "gfx/emotes/happy.2bpp"
+SadEmote:      INCBIN "gfx/emotes/sad.2bpp"
+HeartEmote:    INCBIN "gfx/emotes/heart.2bpp"
+BoltEmote:     INCBIN "gfx/emotes/bolt.2bpp"
+SleepEmote:    INCBIN "gfx/emotes/sleep.2bpp"
+FishEmote:     INCBIN "gfx/emotes/fish.2bpp"
+FishingRodGFX: INCBIN "gfx/misc/fishing.2bpp"
 
 
 Function1045b0: ; 1045b0