From 28c9f40b3ef344900afc1e8473c5c7b2cd16ab07 Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Sat, 20 Jan 2018 19:18:03 -0600
Subject: [PATCH] Extract data from fossil_special_fldeff_groundshake

---
 asm/fossil_specials.s                    |   2 +-
 data/fossil_special_fldeff_groundshake.s |  86 ++++++++++++++++++++---
 graphics/misc/fossil.png                 | Bin 0 -> 298 bytes
 graphics/misc/mirage_tower.bin           |   2 +
 graphics/misc/mirage_tower.png           | Bin 0 -> 847 bytes
 graphics/misc/mirage_tower_crumbles.png  | Bin 0 -> 201 bytes
 6 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 graphics/misc/fossil.png
 create mode 100644 graphics/misc/mirage_tower.bin
 create mode 100644 graphics/misc/mirage_tower.png
 create mode 100644 graphics/misc/mirage_tower_crumbles.png

diff --git a/asm/fossil_specials.s b/asm/fossil_specials.s
index 6883743ec..7956f814a 100755
--- a/asm/fossil_specials.s
+++ b/asm/fossil_specials.s
@@ -657,7 +657,7 @@ _081BF0B4:
 	ldr r0, [r0]
 	ldr r1, [r0]
 	movs r5, 0
-	ldr r2, =gUnknown_08617C44
+	ldr r2, =gRootFossil_Gfx
 _081BF0BE:
 	adds r0, r5, r2
 	ldrb r0, [r0]
diff --git a/data/fossil_special_fldeff_groundshake.s b/data/fossil_special_fldeff_groundshake.s
index 8f968d409..8fa546ce8 100644
--- a/data/fossil_special_fldeff_groundshake.s
+++ b/data/fossil_special_fldeff_groundshake.s
@@ -3,32 +3,96 @@
 
 	.section .rodata
 
+	.align 2
 gUnknown_08617274:: @ 8617274
-	.incbin "baserom.gba", 0x617274, 0x920
+	.space 0x20
+	.incbin "graphics/misc/mirage_tower.4bpp"
 
+	.align 2
 gUnknown_08617B94:: @ 8617B94
-	.incbin "baserom.gba", 0x617b94, 0xb0
+	.incbin "graphics/misc/mirage_tower.bin"
 
-gUnknown_08617C44:: @ 8617C44
-	.incbin "baserom.gba", 0x617c44, 0x120
+	.align 2
+gRootFossil_Pal:: @ 8617C24
+	.incbin "graphics/misc/fossil.gbapal"
 
+	.align 2
+gRootFossil_Gfx:: @ 8617C44
+	.incbin "graphics/misc/fossil.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Gfx:: @ 8617CC4
+	.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Palette:: @ 8617D44
+	.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
+
+	.align 1
 gUnknown_08617D64:: @ 8617D64
-	.incbin "baserom.gba", 0x617d64, 0x30
+	.2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
+	.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
 
+	.align 2
 gUnknown_08617D94:: @ 8617D94
-	.incbin "baserom.gba", 0x617d94, 0x10
+	obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
+	null_obj_tiles
 
+	.align 2
 gUnknown_08617DA4:: @ 8617DA4
-	.incbin "baserom.gba", 0x617da4, 0x5c
+	.byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
+	.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
+	.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
 
+	.align 2
+gSpriteAnim_8617DEC:: @ 8617DEC
+	.2byte 0x0000, 0x0001, 0xffff, 0x0000
+
+	.align 2
+gOamData_8617DF4:: @ 8617DF4
+	.2byte 0x0000, 0x4000, 0x3000, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617DFC:: @ 8617DFC
+	.4byte gSpriteAnim_8617DEC
+
+	.align 2
 gUnknown_08617E00:: @ 8617E00
-	.incbin "baserom.gba", 0x617e00, 0x18
+	spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08617E18:: @ 8617E18
-	.incbin "baserom.gba", 0x617e18, 0x1c
+	.byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
 
+	.align 2
+gSpriteAnim_8617E20:: @ 8617E20
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617E28:: @ 8617E28
+	.4byte gSpriteAnim_8617E20
+
+	.align 2
+gUnknown_08617E2C:: @ 8617E2C
+	.2byte 0x0000, 0x0000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E34:: @ 8617E34
-	.incbin "baserom.gba", 0x617e34, 0x2c
+	spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
 
+	.align 2
+gSpriteAnim_8617E4C:: @ 8617E4C
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnim_8617E54:: @ 8617E54
+	.4byte gSpriteAnim_8617E4C
+
+	.align 2
+gOamData_8617E58:: @ 8617E58
+	.2byte 0x0000, 0x4000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E60:: @ 8617E60
-	.incbin "baserom.gba", 0x617e60, 0x18
+	spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
+
diff --git a/graphics/misc/fossil.png b/graphics/misc/fossil.png
new file mode 100644
index 0000000000000000000000000000000000000000..f92649e9876ad6c5464836302778b5293b6c40c8
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0Avx;1l9naA3iY3mbkMm~dl4L4||Ej|CepWK?uG1WY*aA);f4fI+~91ql@e
z4i**?KYsiGY7%W!To0r;3p^r=85sBugD~Uq{1quc!Ddev#}J9js%H(kn+-%*9!SSD
z|98CZ<hXfj<dv)OGObST@e53{<=*SF!~|aoueyAkw>(2kqHWpB>svm0U%cCQ_<dL6
zoju>9T#r9F%zRAPa4ExPVb)~~e&R`*O;_$aKeubj)X2Af6;N}{;_Rf0$6i}TU+jN$
oWL@ONO*;FTR)iY;JH@cC_Oc`MB<IERfzDy@boFyt=akR{02rEeu>b%7

literal 0
HcmV?d00001

diff --git a/graphics/misc/mirage_tower.bin b/graphics/misc/mirage_tower.bin
new file mode 100644
index 000000000..85f288387
--- /dev/null
+++ b/graphics/misc/mirage_tower.bin
@@ -0,0 +1,2 @@
+
````````	`
+```
``````````````````` `!`"`#`$`%`&`'`(`)`*`+`,`-`.`/`0`1`2`3`4`5`6`7`8`9`:`;`<`=`>`?`@`A`B`C`D`E`F`G`H`
\ No newline at end of file
diff --git a/graphics/misc/mirage_tower.png b/graphics/misc/mirage_tower.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ac6a51e0a489816dee46c4be43ea508f6edb89
GIT binary patch
literal 847
zcmV-V1F-ywP)<h;3K|Lk000e1NJLTq001xm003YF00000yB9;P0009PNkl<ZNQtG^
zKX=+N5CCw#g6uAMvy>sQS?8hl)>uokXDDB!bWI27lm~8K3k%PX1ucBNz>?nSEdL>-
zO<(UlY{x$fopc9e@XT?tbsXv&13uXuD8SH=+b&p0O<^$70>HL#0=&n7FE})?OS@q5
z7R+ThrF|$4H5}m#HZ_!nGNpv*1z<7{ZUjB;Mj2=zO?yzhHlq0N5iX&#5wC$upV#IV
z)PU}7VxbyP{VloiuuS{g4x<_tQ1oHwM?ji(=V(ThP!t_d?Iyk}QfL6u4>cUi)Zi>P
zw7@G|CN6N};5+VBsIjFm6sQF2@sZ$Y7LbGzw3bpSkVyzbvvE)&#6koBbVSG;e5DZq
z-iiP!gqTLWZ$Nku9VkNvAsCX(LlVdkG~SIABr*;gz)3?$@M(7npam%_5lLB}T1aoY
za8<Nm3YuF=njQaWAT&nHG0m}+Sj{#oOev5t0iG~154#W~J&b|FBqVta73eM~h-$bc
zhysGRB6#e9aM1&^)3WjqNtGLh)ZA`mWf^QF$B(9{p~!6~@KetK7vgUq&w^ozd$$G1
z#jZI>IjUjz3Pe<EmoFWnis3}%;a=cwppqRBO8XLQMgaC4ED$WY&$<A>lfML?Rpp+_
z1tnX#$!oCuyxV#N+W@sw3)El)$AH?2Dqcmd>eyhh```#E_A7$@nqalY8w4ee->)d0
z{hCr*(UBJ@qCQl@FEFxh@z!l2UN;M*{P%0B93683-FkGPR}VLVJNkMo5c~vuL>LkT
z4kB)k%0WzU5<%oQm$$cy1y@j<gP;l?v4SrDl?z@EWSc>`R6reD@*EjmgC1oFQsOee
z1HN)hw}l1IG3)`o@v08)t2Y6^)jy2*`Ps#nH^BB1jI+TqzXZF{A3)icU^Rl|&qo(5
zb_0R}%HIQB<ChMB9MiV`nog&)+3Xu#W1<XhFJ^O$>59J@5$-*-TS9O>c)AP^gXepO
zHGe1V8LqKQo@$s(?k1DTCx!?5jhZ|7ap!_z&Odi^`lD1zX{|H5p8Nk~C{e{-qUoCM
Z{Ra6)HqO_BxvBsF002ovPDHLkV1mOFa<~8h

literal 0
HcmV?d00001

diff --git a/graphics/misc/mirage_tower_crumbles.png b/graphics/misc/mirage_tower_crumbles.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e5daed07b4921c461fe5e0edca543e06f791ca
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0Avx;1lA?P;ubJhaWc{yx4K#!HfkvIyz<~Bvd$fWE@CHSmBTXRCQni!-oqJ
zK*o<BKRhxz1f%Q9fE>;OkH}&M2EM}}%y>M1MG8<*$<xI#MB;L?1Ecf-6?0~_8wWNd
nGWQ&G;3!bm$YTp)U}k36Rl(w$pmY`J3<d^IS3j3^P6<r_@wh(N

literal 0
HcmV?d00001