From c9dc151d196def131d4c4fc894fb7e7f8befc09e Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Tue, 24 Dec 2013 11:34:21 -0600
Subject: [PATCH] Red fishing tiles and ss anne smoke puff gfx INCBIN.

---
 gfx/red_fishing.2bpp            | Bin 160 -> 0 bytes
 gfx/red_fishing_tile_back.2bpp  |   1 +
 gfx/red_fishing_tile_front.2bpp |   1 +
 gfx/red_fishing_tile_side.2bpp  |   1 +
 gfx/red_fishingrod_tiles.2bpp   | Bin 0 -> 48 bytes
 gfx/ss_anne_smoke_puff.2bpp     | Bin 0 -> 16 bytes
 main.asm                        |  40 ++++++++++++++++++++++++++------
 7 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 100755 gfx/red_fishing.2bpp
 create mode 100644 gfx/red_fishing_tile_back.2bpp
 create mode 100644 gfx/red_fishing_tile_front.2bpp
 create mode 100644 gfx/red_fishing_tile_side.2bpp
 create mode 100644 gfx/red_fishingrod_tiles.2bpp
 create mode 100644 gfx/ss_anne_smoke_puff.2bpp

diff --git a/gfx/red_fishing.2bpp b/gfx/red_fishing.2bpp
deleted file mode 100755
index 11da10733de82016e3de995b7f6ac7803ea70bab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmZROkV<25;%*G<l+yDNvaql>l9$l8SGSj!l$R8j=jZ?9^F!jxpC^BQ%=j_m#g7jk
z?2UEowe2P4WaP!=1?Bnp{+u!SbLG#B3X2~vesugOD7b&&_aA$E8+ChiIe8X#X66q9
y4-yPM6nwY<#0n1%9FRZ*2M&DrU}MA2&&<pK224!stn944-EUvtyS8ITLIMEaLOe16

diff --git a/gfx/red_fishing_tile_back.2bpp b/gfx/red_fishing_tile_back.2bpp
new file mode 100644
index 00000000..76d4653e
--- /dev/null
+++ b/gfx/red_fishing_tile_back.2bpp
@@ -0,0 +1 @@
+?3,?+?üÌ4üÔü˜x8øèøˆøpp
\ No newline at end of file
diff --git a/gfx/red_fishing_tile_front.2bpp b/gfx/red_fishing_tile_front.2bpp
new file mode 100644
index 00000000..9662a623
--- /dev/null
+++ b/gfx/red_fishing_tile_front.2bpp
@@ -0,0 +1 @@
+?2/?'?üLøôüäüø˜ø˜èøðð
\ No newline at end of file
diff --git a/gfx/red_fishing_tile_side.2bpp b/gfx/red_fishing_tile_side.2bpp
new file mode 100644
index 00000000..c5fab8e6
--- /dev/null
+++ b/gfx/red_fishing_tile_side.2bpp
@@ -0,0 +1 @@
+ßÐûü??<'?'ðà`0ðpðÐðpð àÀÀ
\ No newline at end of file
diff --git a/gfx/red_fishingrod_tiles.2bpp b/gfx/red_fishingrod_tiles.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..2efaa47e6da5aaa5da5a3408af38a23c4f92aae3
GIT binary patch
literal 48
ocmb1;Km`X5eE48v!_Uvm%m4;VOzf=eti9cDU*Eg7V@E;)0Nox8Z2$lO

literal 0
HcmV?d00001

diff --git a/gfx/ss_anne_smoke_puff.2bpp b/gfx/ss_anne_smoke_puff.2bpp
new file mode 100644
index 0000000000000000000000000000000000000000..5e46add5611e31089875097ae9bb8aaf3bc4d2cf
GIT binary patch
literal 16
XcmZROkV<25;%*G<l+yDNvakRE8V&<s

literal 0
HcmV?d00001

diff --git a/main.asm b/main.asm
index a169862a..582dd71b 100755
--- a/main.asm
+++ b/main.asm
@@ -103574,7 +103574,7 @@ Func_707b6: ; 707b6 (1c:47b6)
 	ld bc, (BANK(RedSprite) << 8) + $0c
 	call CopyVideoData
 	ld a, $4
-	ld hl, Unknown_70866 ; $4866
+	ld hl, RedFishingTiles ; $4866
 	call Func_71771
 	ld a, [$c102]
 	ld c, a
@@ -103657,8 +103657,22 @@ FishingRodGfxProperties: ; 70856 (1c:4856)
 	db $50, $40, $FE, $00 ; player facing left
 	db $50, $58, $FE, $20 ; player facing right ($20 means "horizontally flip the tile")
 
-Unknown_70866: ; 70866 (1c:4866)
-INCBIN "baserom.gbc",$70866,$7087e - $70866
+RedFishingTiles: ; 70866 (1c:4866)
+	dw RedFishingTilesFront
+	db $02, $1E
+	dw $8020
+
+	dw RedFishingTilesBack
+	db $02, $1E
+	dw $8060
+
+	dw RedFishingTilesSide
+	db $02, $1E
+	dw $80A0
+
+	dw RedFishingRodTiles
+	db $03, $1E
+	dw $8FD0
 
 _HandleMidJump: ; 7087e (1c:487e)
 	ld a, [$d714]
@@ -115994,12 +116008,24 @@ Func_79fc0: ; 79fc0 (1e:5fc0)
 	ret
 
 Func_79fd4: ; 79fd4 (1e:5fd4)
-	ld de, RedFishingTiles ; $5fdd
-	ld bc, (BANK(RedFishingTiles) << 8) + $01
+	ld de, SSAnneSmokePuffTile ; $5fdd
+	ld bc, (BANK(SSAnneSmokePuffTile) << 8) + $01
 	jp CopyVideoData
 
-RedFishingTiles: ; 79fdd (1e:5fdd)
-	INCBIN "gfx/red_fishing.2bpp"
+SSAnneSmokePuffTile: ; 79fdd (1e:5fdd)
+	INCBIN "gfx/ss_anne_smoke_puff.2bpp"
+
+RedFishingTilesFront: ; 79fed (1e:5fed)
+	INCBIN "gfx/red_fishing_tile_front.2bpp"
+
+RedFishingTilesBack: ; 7a00d (1e:600d)
+	INCBIN "gfx/red_fishing_tile_back.2bpp"
+
+RedFishingTilesSide: ; 7a02d (1e:602d)
+	INCBIN "gfx/red_fishing_tile_side.2bpp"
+
+RedFishingRodTiles: ; 7a04d (1e:604d)
+	INCBIN "gfx/red_fishingrod_tiles.2bpp"
 
 AttackAnimationPointers: ; 7a07d (1e:607d)
 	dw PoundAnim