From 639428cefdc715710ff5e4c913cad62ae7e2db76 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Thu, 3 Jan 2019 13:35:16 -0500
Subject: [PATCH] Dump some more data

---
 data/data_835B488.s             |   2 +-
 data/data_8471F00.s             |  65 ++++++++++++++++++++++++++++----
 data/graphics/unk_847a348.png   | Bin 0 -> 828 bytes
 data/text/map_section_names.inc |   2 +-
 4 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 data/graphics/unk_847a348.png

diff --git a/data/data_835B488.s b/data/data_835B488.s
index 8a3bec79c..8d2183672 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -2287,7 +2287,7 @@ gUnknown_83F1CAC:: @ 83F1CAC
 	.4byte gMapSecName_BerryForest
 	.4byte gMapSecName_IcefallCave
 	.4byte gMapSecName_RocketWarehouse
-	.4byte gMapSecName_TrainerTower2
+	.4byte gMapSecName_TrainerTower_2
 	.4byte gMapSecName_DottedHole
 	.4byte gMapSecName_LostCave
 	.4byte gMapSecName_PatternBush
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index c030cf67d..6490d59e2 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -1,3 +1,6 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
 	.section .rodata
 
 	.align 2
@@ -608,27 +611,75 @@ gUnknown_847A284:: @ 847A284
 	.2byte 0x0131, 0x0175, 0x017d
 
 gUnknown_847A2B4:: @ 847A2B4
-	.incbin "baserom.gba", 0x47A2B4, 0x1E
+	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
 
 gUnknown_847A2D2:: @ 847A2D2
-	.incbin "baserom.gba", 0x47A2D2, 0x1C
+	.2byte 0x011d
+	.2byte 0x011c
+	.2byte 0x011c
+	.2byte 0x011b
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011b
+	.2byte 0x011b
+	.2byte 0x011d
+	.2byte 0x011c
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011d
+	.2byte 0x011d
 
 gUnknown_847A2EE:: @ 847A2EE
-	.incbin "baserom.gba", 0x47A2EE, 0x10
+	.byte 0x00, 0x02
+	.byte 0x01, 0x03
+	.byte 0x02, 0x04
+	.byte 0x03, 0x05
+	.byte 0x04, 0x01
+	.byte 0x05, 0x02
+	.byte 0x00, 0x03
+	.byte 0x01, 0x04
 
 gUnknown_847A2FE:: @ 847A2FE
-	.incbin "baserom.gba", 0x47A2FE, 0x10
+	.byte 0x00, 0x01
+	.byte 0x01, 0x03
+	.byte 0x02, 0x00
+	.byte 0x03, 0x04
+	.byte 0x04, 0x02
+	.byte 0x05, 0x02
+	.byte 0x00, 0x03
+	.byte 0x01, 0x05
 
 gUnknown_847A30E:: @ 847A30E
-	.incbin "baserom.gba", 0x47A30E, 0x48E
+	.byte 0x00, 0x02
+	.byte 0x04, 0x01
+	.byte 0x03, 0x05
+	.byte 0x02, 0x03
+	.byte 0x01, 0x03
+	.byte 0x04, 0x00
+	.byte 0x04, 0x01
+	.byte 0x02, 0x05
+	.byte 0x00, 0x03
+	.byte 0x00, 0x05
+	.byte 0x02, 0x01
+	.byte 0x04, 0x05
+	.byte 0x00, 0x00
+
+gUnknown_847A328::
+	.incbin "data/graphics/unk_847a348.gbapal"
+
+gUnknown_847A348::
+	.incbin "data/graphics/unk_847a348.4bpp.lz"
 
 	// unk_815F138
 
 gUnknown_847A79C:: @ 847A79C
-	.incbin "baserom.gba", 0x47A79C, 0x8
+	obj_tiles gUnknown_847A348, 0xE00, 0
 
 gUnknown_847A7A4:: @ 847A7A4
-	.incbin "baserom.gba", 0x47A7A4, 0xBC
+	obj_pal gUnknown_847A328, 0
+
+gUnknown_847A7AC::
+	.incbin "baserom.gba", 0x47A7AC, 0xB4
 
 gUnknown_847A860:: @ 847A860
 	.incbin "baserom.gba", 0x47A860, 0x18
diff --git a/data/graphics/unk_847a348.png b/data/graphics/unk_847a348.png
new file mode 100644
index 0000000000000000000000000000000000000000..9897a6d3657aebdb9ca7e40c0db1361ee49b381b
GIT binary patch
literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq002M$003|V0{{R3Ts><*0000mP)t-soYm(4
z0RR60|Nj90{{a900RR60|Nj90ARr)vF)`*rDV#w;|5{3{b2<OLO8@`=myMom00001
zbW%=J06^y0W&i*Jx=BPqR7i>CmOXM~Aq>a40oTSawrM>+f&EU9Vh`Y%yaS}#I!!#3
zG#Rag_z++A?rgD{Srv(a-vc4UUntd?_II`q*AE6@ziqF^Y}*Z{z|8_6W+#B(EYM#8
z09jrU3^gSHU&fe2CNu!H_r(YObwHm#P4Nl8M!Tgi;K19mt^vdsYcLy~Jah9@09w-^
z;9@Hfr!phC1+c6a7hA*|3uTxFbOx9Qxd0JmhCXuZjskODPZMBSuejtcJ2?Q@u9L&*
zmyG%F{x~0gJj;id?d@;!L4^aG=Yvz#41GS(NBiPK%!f}IC-BuSG<XbTjC2lMIU79R
zg#tMPaGaXS2klL?v}PL5IhrkYgd8m6gUE&PDu-$SojO%(4uED`&kT-qjppMzT&zdH
z{yA`K0htc8glPbZt_T7c-vH#c=+MvrA<?TZ+8Ib7N=J&EjN2aq-gHM(0jf!d9_S3k
z0fAXM@S2!1vve4H{asB*mCz|pPSwGJcUB2VHxFq4Vgmn@RU(Pp-D*q|F~Ko*7XT_C
zSIYv>FR{Y58LpP$ANfFC1z>eFD1lt@fJ&!Sq0rJ&0z2T%Cb?uF%v1UBn(EL9NTtx`
z8Q5(RhkYrQ41^9D$t4%hkfNMN@+^EVo?}3j;+cR;by&Q?8i4A~Q!X@sNMjr#t=!Fl
zg|3F->N*2>o6{xErMixQ_-eTFX^w#SY6zPJ(lkuj`nIOD=buigsr>(!M#0cY4@ylf
z0EIIu0=Qh2MU3g~8}BnJ#<718-#;MVd<!E0D@m4y5rB8du{6+=!-uzQ<pZ`I%fU+#
z1-T1q=eufIC#p1|?%x7PeTINxAiuObfFyyngJ0SmK!wDMJJTlna{!-M1O)B4i~wN3
zChh0|9Rb#hhX5DXIiUU_fGQB=fJLEK1<G`m1OEFRRpA%3V_AW`@kAN`0000<MNUMn
GLSTY}uW$AM

literal 0
HcmV?d00001

diff --git a/data/text/map_section_names.inc b/data/text/map_section_names.inc
index 611274f4e..e91368a40 100644
--- a/data/text/map_section_names.inc
+++ b/data/text/map_section_names.inc
@@ -271,7 +271,7 @@ gMapSecName_IcefallCave::
 gMapSecName_RocketWarehouse::
 	.string "ROCKET WAREHOUSE$"
 
-gMapSecName_TrainerTower2::
+gMapSecName_TrainerTower_2::
 	.string "TRAINER TOWER$"
 
 gMapSecName_DottedHole::