From 220fe47299e9fd43ffd2cacfb0222ea4f5548998 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 30 Dec 2018 11:59:00 -0500
Subject: [PATCH] sub_815D838; decompile some gfx

---
 asm/trainer_tower.s                           |  76 ------------------
 data/data_8471F00.s                           |  17 +++-
 data/graphics.s                               |  36 ++++-----
 graphics/berry_fix/gba_small.bin              | Bin 0 -> 2048 bytes
 graphics/berry_fix/gba_small.pal              |  35 ++++++++
 graphics/berry_fix/gba_small.png              | Bin 0 -> 2790 bytes
 graphics/berry_fix/gba_transfer.bin           | Bin 0 -> 2048 bytes
 graphics/berry_fix/gba_transfer.pal           |  35 ++++++++
 graphics/berry_fix/gba_transfer.png           | Bin 0 -> 2311 bytes
 graphics/berry_fix/gba_transfer_error.bin     | Bin 0 -> 2048 bytes
 graphics/berry_fix/gba_transfer_error.pal     |  35 ++++++++
 graphics/berry_fix/gba_transfer_error.png     | Bin 0 -> 1865 bytes
 graphics/berry_fix/gba_transfer_highlight.bin | Bin 0 -> 2048 bytes
 graphics/berry_fix/gba_transfer_highlight.pal |  35 ++++++++
 graphics/berry_fix/gba_transfer_highlight.png | Bin 0 -> 2207 bytes
 graphics/berry_fix/logo.bin                   | Bin 0 -> 2048 bytes
 graphics/berry_fix/logo.pal                   |  51 ++++++++++++
 graphics/berry_fix/logo.png                   | Bin 0 -> 2531 bytes
 graphics/berry_fix/window.bin                 | Bin 0 -> 2048 bytes
 graphics/berry_fix/window.pal                 |  35 ++++++++
 graphics/berry_fix/window.png                 | Bin 0 -> 1430 bytes
 src/trainer_tower.c                           |  33 ++++++++
 22 files changed, 293 insertions(+), 95 deletions(-)
 create mode 100644 graphics/berry_fix/gba_small.bin
 create mode 100644 graphics/berry_fix/gba_small.pal
 create mode 100644 graphics/berry_fix/gba_small.png
 create mode 100644 graphics/berry_fix/gba_transfer.bin
 create mode 100644 graphics/berry_fix/gba_transfer.pal
 create mode 100644 graphics/berry_fix/gba_transfer.png
 create mode 100644 graphics/berry_fix/gba_transfer_error.bin
 create mode 100644 graphics/berry_fix/gba_transfer_error.pal
 create mode 100644 graphics/berry_fix/gba_transfer_error.png
 create mode 100644 graphics/berry_fix/gba_transfer_highlight.bin
 create mode 100644 graphics/berry_fix/gba_transfer_highlight.pal
 create mode 100644 graphics/berry_fix/gba_transfer_highlight.png
 create mode 100644 graphics/berry_fix/logo.bin
 create mode 100644 graphics/berry_fix/logo.pal
 create mode 100644 graphics/berry_fix/logo.png
 create mode 100644 graphics/berry_fix/window.bin
 create mode 100644 graphics/berry_fix/window.pal
 create mode 100644 graphics/berry_fix/window.png

diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s
index d5cf80b9f..a8c331cec 100644
--- a/asm/trainer_tower.s
+++ b/asm/trainer_tower.s
@@ -5,82 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_815D838
-sub_815D838: @ 815D838
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	movs r2, 0
-	ldr r0, _0815D8C0 @ =gUnknown_8479D38
-	mov r10, r0
-	movs r1, 0xFA
-	lsls r1, 2
-	adds r5, r1, 0
-_0815D84E:
-	lsls r0, r2, 3
-	subs r0, r2
-	lsls r0, 2
-	adds r1, r0, 0
-	add r1, r10
-	mov r8, r1
-	mov r1, r10
-	adds r1, 0x8
-	adds r7, r0, r1
-	ldr r1, _0815D8C4 @ =gUnknown_8479D48
-	adds r6, r0, r1
-	movs r4, 0
-	adds r2, 0x1
-	mov r9, r2
-_0815D86A:
-	mov r0, r8
-	adds r1, r0, r4
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	beq _0815D87C
-	ldrb r1, [r1]
-	adds r0, r5, r1
-	bl FlagSet
-_0815D87C:
-	adds r1, r7, r4
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	beq _0815D88C
-	ldrb r1, [r1]
-	adds r0, r5, r1
-	bl FlagSet
-_0815D88C:
-	adds r1, r6, r4
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	beq _0815D89C
-	ldrb r1, [r1]
-	adds r0, r5, r1
-	bl FlagSet
-_0815D89C:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _0815D86A
-	mov r1, r9
-	lsls r0, r1, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xE
-	bls _0815D84E
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0815D8C0: .4byte gUnknown_8479D38
-_0815D8C4: .4byte gUnknown_8479D48
-	thumb_func_end sub_815D838
-
 	thumb_func_start sub_815D8C8
 sub_815D8C8: @ 815D8C8
 	push {r4,lr}
diff --git a/data/data_8471F00.s b/data/data_8471F00.s
index 28454ac2d..f43d61cd2 100644
--- a/data/data_8471F00.s
+++ b/data/data_8471F00.s
@@ -265,6 +265,8 @@ gUnknown_8479D10:: @ 8479D10
 gUnknown_8479D24:: @ 8479D24
 	.asciz "ttdata->id == 0"
 
+	// trainer_tower
+
 gUnknown_8479D34:: @ 8479D34
 	.incbin "baserom.gba", 0x479D34, 0x4
 
@@ -313,6 +315,8 @@ gUnknown_847A2FE:: @ 847A2FE
 gUnknown_847A30E:: @ 847A30E
 	.incbin "baserom.gba", 0x47A30E, 0x48E
 
+	// unk_815F138
+
 gUnknown_847A79C:: @ 847A79C
 	.incbin "baserom.gba", 0x47A79C, 0x8
 
@@ -325,8 +329,19 @@ gUnknown_847A860:: @ 847A860
 gUnknown_847A878:: @ 847A878
 	.incbin "baserom.gba", 0x47A878, 0x18
 
+	// berry_fix_program
+
 gUnknown_847A890:: @ 847A890
-	.incbin "baserom.gba", 0x47A890, 0x7F1C
+	.4byte gUnknown_8EA467C, gUnknown_8EA52B8, gUnknown_8EA463C
+	.4byte gUnknown_8EA5664, gUnknown_8EA60C8, gUnknown_8EA5604
+	.4byte gUnknown_8EA6408, gUnknown_8EA7028, gUnknown_8EA63C8
+	.4byte gUnknown_8EA7320, gUnknown_8EA8118, gUnknown_8EA72E0
+	.4byte gUnknown_8EA8408, gUnknown_8EA8CC8, gUnknown_8EA83C8
+	.4byte gUnknown_8EA8F40, gUnknown_8EA9588, gUnknown_8EA8F00
+
+	.incbin "baserom.gba", 0x47A8D8, 0x7ED4
+
+	// trainer_tower (again?)
 
 gUnknown_84827AC:: @ 84827AC
 	.incbin "baserom.gba", 0x4827AC, 0x8
diff --git a/data/graphics.s b/data/graphics.s
index 990a3dd9c..a1e421f2c 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16222,58 +16222,58 @@ gUnknown_8EA1D68:: @ 8EA1D68
 	.incbin "baserom.gba", 0xEA1D68, 0x28D4
 
 gUnknown_8EA463C:: @ 8EA463C
-	.incbin "baserom.gba", 0xEA463C, 0x40 @UNKNOWN
+	.incbin "graphics/berry_fix/gba_small.gbapal"
 
 gUnknown_8EA467C:: @ 8EA467C
-	.incbin "baserom.gba", 0xEA467C, 0xC3C
+	.incbin "graphics/berry_fix/gba_small.4bpp.lz"
 
 gUnknown_8EA52B8:: @ 8EA52B8
-	.incbin "baserom.gba", 0xEA52B8, 0x34C
+	.incbin "graphics/berry_fix/gba_small.bin.lz"
 
 gUnknown_8EA5604:: @ 8EA5604
-	.incbin "baserom.gba", 0xEA5604, 0x60 @UNKNOWN
+	.incbin "graphics/berry_fix/logo.gbapal"
 
 gUnknown_8EA5664:: @ 8EA5664
-	.incbin "baserom.gba", 0xEA5664, 0xA64
+	.incbin "graphics/berry_fix/logo.4bpp.lz"
 
 gUnknown_8EA60C8:: @ 8EA60C8
-	.incbin "baserom.gba", 0xEA60C8, 0x300
+	.incbin "graphics/berry_fix/logo.bin.lz"
 
 gUnknown_8EA63C8:: @ 8EA63C8
-	.incbin "baserom.gba", 0xEA63C8, 0x40 @UNKNOWN
+	.incbin "graphics/berry_fix/gba_transfer.gbapal"
 
 gUnknown_8EA6408:: @ 8EA6408
-	.incbin "baserom.gba", 0xEA6408, 0xC20
+	.incbin "graphics/berry_fix/gba_transfer.4bpp.lz"
 
 gUnknown_8EA7028:: @ 8EA7028
-	.incbin "baserom.gba", 0xEA7028, 0x2B8
+	.incbin "graphics/berry_fix/gba_transfer.bin.lz"
 
 gUnknown_8EA72E0:: @ 8EA72E0
-	.incbin "baserom.gba", 0xEA72E0, 0x40 @UNKNOWN
+	.incbin "graphics/berry_fix/gba_transfer_highlight.gbapal"
 
 gUnknown_8EA7320:: @ 8EA7320
-	.incbin "baserom.gba", 0xEA7320, 0xDF8
+	.incbin "graphics/berry_fix/gba_transfer_highlight.4bpp.lz"
 
 gUnknown_8EA8118:: @ 8EA8118
-	.incbin "baserom.gba", 0xEA8118, 0x2B0
+	.incbin "graphics/berry_fix/gba_transfer_highlight.bin.lz"
 
 gUnknown_8EA83C8:: @ 8EA83C8
-	.incbin "baserom.gba", 0xEA83C8, 0x40 @UNKNOWN
+	.incbin "graphics/berry_fix/gba_transfer_error.gbapal"
 
 gUnknown_8EA8408:: @ 8EA8408
-	.incbin "baserom.gba", 0xEA8408, 0x8C0
+	.incbin "graphics/berry_fix/gba_transfer_error.4bpp.lz"
 
 gUnknown_8EA8CC8:: @ 8EA8CC8
-	.incbin "baserom.gba", 0xEA8CC8, 0x238
+	.incbin "graphics/berry_fix/gba_transfer_error.bin.lz"
 
 gUnknown_8EA8F00:: @ 8EA8F00
-	.incbin "baserom.gba", 0xEA8F00, 0x40 @UNKNOWN
+	.incbin "graphics/berry_fix/window.gbapal"
 
 gUnknown_8EA8F40:: @ 8EA8F40
-	.incbin "baserom.gba", 0xEA8F40, 0x648
+	.incbin "graphics/berry_fix/window.4bpp.lz"
 
 gUnknown_8EA9588:: @ 8EA9588
-	.incbin "baserom.gba", 0xEA9588, 0x26C
+	.incbin "graphics/berry_fix/window.bin.lz"
 
 gUnknown_8EA97F4:: @ 8EA97F4
 	.incbin "baserom.gba", 0xEA97F4, 0x120 @UNKNOWN
diff --git a/graphics/berry_fix/gba_small.bin b/graphics/berry_fix/gba_small.bin
new file mode 100644
index 0000000000000000000000000000000000000000..86a29cf704e41266187eb6730f2325431ed73832
GIT binary patch
literal 2048
zcmeH{Q;=L?5JpdLvdp44nYCiuwq0@Z6x+6K+qP}nwryKGo1LAxNhX!bYxaIs_vQ5I
zpY@B%AL5`6Ci|T5&q!lvOm$SJs5q;$$tfzOwTxk`Uws#KRX0P8v42?uv-+{rT|LxO
zy;Rj(V{05k-49wtt7<hZXG5*NNqy8;{nTImOaU6GK?dI*wfeytqM;fVk+>R9;~RW?
z)aobDgqkSQPpnBaslm5Lt$s31t|>I7rqa}!M$>9KgKv*oebMxqK{G}qlV&#9<`eim
zwfI@cN;a~SgPi0dH+jfQKAW47p8^!55QQm1QHoJKl9~PTRQRiu2(KzhDVy3#W}S*u
zrv^2tMQ!R(mwMEv0S#$HW17&EW^|_qJ?TYn`p}nt^k)DPp30Gab6U`nR<x!KZD~h)
zI?$0$bfybk>BewIFp^P>W(;E)$9N_f{DBN&Fhdy1Fs3tunapA~bC}CK=Cgo>EMhTB
zSjsZCvxA-NVz<rs6Pd(hrZAOhEN2BPS;cDBu$FbKX9FAA#Addzm2Dj71SdJgX&ZkJ
zd)dc+4seh|9Oei|ImUHvaFbiy=1#<H%_}y>vi>ui<s9d^z(p=`nJZl78qaybOJ4Ds
zH$QonE*AeT_qfjk9`cCCJmD$N!k+~Z2Z<pu#ZjEZSzN?b+$5H`i-&lMmzaB4{I|U0
zJs<eUCqDCquY5zrTVhKbF^P}(il6vPfCNgA1WSm7N|=pb-lf7nrjkp<1&IDd@4$b&
G1K$C&(XjIX

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_small.pal b/graphics/berry_fix/gba_small.pal
new file mode 100644
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_small.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..59bfaf4d503372bc5ff3f9693d3561db5fdda7ee
GIT binary patch
literal 2790
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

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer.bin b/graphics/berry_fix/gba_transfer.bin
new file mode 100644
index 0000000000000000000000000000000000000000..077beaa832df441982ae6ced00ebe8a6a3b3c982
GIT binary patch
literal 2048
zcmeIw<#N<u7{&2_pt8tJ50K&%cXvwBqD5Nh72xjB;w@5Ki#x^L-Q8h^0>!xk;2!Ai
zB+aI?VYYmwIWzfko?qTKZ(_*!OCl6udiUgCh1*C)DY_s&`ON5oL}`#~tx&#{HBr*E
zQzB>wgFSp{l~Gy!)Gz&3jHGg|Ij`1Pzq~5QRIDm0)~uw;s^aoqt>deznyRZtAaSax
zS}yO^I=;5*sIKMfslFPxyjSb^hH9k7YNDoUrsis)mM-trI^Iw#wN{%z+NzyP`@eAL
z*7oh`Ku0<ePiGS7LRY%cJ?PKqK~ECtMQ{4hmwxoOI=@dQC9EXnPYqyT&}^!oGlXFb
zX9Ob|#c0MbmT?$iWvJz+F`XIAWEN?pGn+YKX#?AjX95$M#AK#0l|?KrqMyq==Cgo>
zWRS^5vWw`Ku#_y8v78mGWEHDf!&=s{o(<%1fP)<3Fh@AbF^+SBlh*U?{cmD3TiD7r
zwzGqs>|!^2*vmflbDj%a<Pw*;!d0$uog3UN<WF&$Go0ld_j$lW9`TqbJmneBdBICw
z@tQXw-pOA77Pq;>UGDLgT;B1X59INYPkiPJU-`y&et7z1U&=ow)fe~yif_dy@E@PR
EA6ILSVgLXD

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer.pal b/graphics/berry_fix/gba_transfer.pal
new file mode 100644
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a741fe1b991d69b784989978cc8b9bf200a65bf9
GIT binary patch
literal 2311
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

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer_error.bin b/graphics/berry_fix/gba_transfer_error.bin
new file mode 100644
index 0000000000000000000000000000000000000000..9d1cfdae4520cf456c1c7cfb6e554fb73bec0706
GIT binary patch
literal 2048
zcmeH_*-jKu6h&7t*_wzOXhA^*nFIwC91xXJK*d??1_LCHpbQBhGO39&BQJs=2tR9A
zr<>xMt_tyq1ZpSsaMxZrRVUYy6*E$bQWd8-e{61_5_<ln@k&r)C|NqC(@Ij3KXE$=
zYBgrX@()EC1uE1zqis)mZk#y2Plt6x9qLq<jw)HljGh~H{51J>T<OYCy8nbuD%0@Y
zsN<hewsLefoLuE8-|*e2;}@w|=Og|Fm8jJ4-KgW2>7p*FTot;kE4r#{hVMol-%_Qn
zt16rux@p+<-ec3Ke~W5rsHKj28n{g(O*HSg8F#qLJzBWW10M2-#}Q`x0fM{AlThm^
z&vta%ZJjn=@`~5I;Vtjzrib@@pqD=S8Nl+$i-<qS5W{?Aginkz#yAs9@|iDu^{_3X
z{x`le#WXX_GRHg%Eb@aTPuKpgsQ;5?R`|s#Yy4)N4gRpn)~<c8fAnI}`Cc6_wm1BM
UFZiEn_k}OO!RufH`*;I?0Zuhu9RL6T

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer_error.pal b/graphics/berry_fix/gba_transfer_error.pal
new file mode 100644
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_error.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..766b9f28e5534ea4af4a9e06275962b125deacdf
GIT binary patch
literal 1865
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
DuDp}V

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer_highlight.bin b/graphics/berry_fix/gba_transfer_highlight.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4683bab3ac102017d55fa4007bf1ec2085b6d924
GIT binary patch
literal 2048
zcmeH_RdW<U6otP@0&KDgd!PmwV37bJXmEE38X#ywkSg5WdBfeEH{2b50PYSyh}~gl
zw`Ue8!V^`bPgVEBx!<|BZnY)rH_A|k{cE4t3A!~DQg%`~%CWPP3TcwB*U$Kxz6vir
zQ(3B}>YA)9JJYrjGo^T`mTGI7rfY`ksIKZ6DPiR*&v5hXTs!P0r1<)3poWU7k)n2E
zHBnQ8k0{-Z1o(V4Q**U&RiKtCG<Zkpt`p!}skPc9__k`N_9pM7yG}H|nbiCp)KQ((
zSzXjs-PBz@3_jwdyO98Isi%6Wx2rztYtWX$PEo)uvco>UAN?7?Kn5|GArv!|VGK8Z
z#t23-iV{XMhOv|~F5$)JFQfdAG(J`}fr&<KMI2`eGnvI~<}jCe%x3`$S;S(Nu#{yi
zX9X)+#cI~DmUXOW0~^_d71PuNznLv;WgFYs!A^Fun?3AhANx7LK@M@4BOK)z$2q}C
zPH~zuKK?A{IL`$xa*4}a;VRd-&JAvIi`(4cF88?410K3myz>uv{U7m|Cp_gD&w0U1
zUh$eYyyYG5`M^g$@tH4t<y(^U^Il$MU$1{<Ij{cT;LAegf2oR)`vI!1stx?d8~6^G
C!G6gA

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/gba_transfer_highlight.pal b/graphics/berry_fix/gba_transfer_highlight.pal
new file mode 100644
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/gba_transfer_highlight.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..25b47d036aac2f8da4bd0809b9a08271d22e16be
GIT binary patch
literal 2207
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

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/logo.bin b/graphics/berry_fix/logo.bin
new file mode 100644
index 0000000000000000000000000000000000000000..673ff47e4f2e369129c1248364751936d4aed3ac
GIT binary patch
literal 2048
zcmeIxRj?OC6vy$;y`Z9iUXaeERl0l@2@$0g5K-w8q!9%Kq>+>ogHT#Rz@R%MRX|ed
zkP-zYRcbCX%)NhR?!bc&u)mpo*gfC<ojqqaDkdtP9`K-tB=N9EB$Z5Z@nf#9xHcl~
zJnAtqQb_4>sic-BV$|*U=$J$i6rC!*Q)K_dF;U_xaf11@AzerxGK7pFQ^*{$gsdTi
zY$1C{sDF--Gvo@nL!R(NcrrW{@`ijNe<+Y({%-UCzxn8Ni6SUEQ{?&;ROk*>?0WkZ
z_KXsqRZ=OXmGPXio>$HbUQ}KM71dTpUG>!0Ktqi*j(r`)WBE!dtD>rxysVn)YIsFW
zud3xWuX{sFt+dugTkW*>whnRlCYpLvGtIrFg|51JUw1w9)Jt!D^wrM?`Ws-NLB<;A
zb6;FL<EH;R-qlejoxP`v!G`$IP{Ry2!bl$(<zt`t)MrK;<14ewHs=<8ya^_nWU?uy
z`qDJh%`nqa%PhCTN~^54#`o4*XT1$^^8ea5zV)5C=9zDSg%(+Ci68xBvn{sz**4ql
zu+uKP{St@YXp<l8v)=&+9dg(aNB!oQ<4!o~l;53>Wp4eKH}C(eJ@)#;pUybzFMm7d
hybCV6<g$PK>pxd+%NJ4f4)yen{@<VOSKwZ*z*RgYogDxG

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/logo.pal b/graphics/berry_fix/logo.pal
new file mode 100644
index 000000000..4c76f3f9a
--- /dev/null
+++ b/graphics/berry_fix/logo.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
+0 0 0
+255 255 255
+238 238 238
+222 222 230
+205 205 222
+197 197 205
+180 180 197
+164 164 189
+156 156 172
+139 139 164
+123 123 156
+115 115 139
+98 98 131
+82 82 123
+74 74 115
+32 32 32
diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab91d5a26d6e475ef06ef010a0c1847e3e5459e3
GIT binary patch
literal 2531
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

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/window.bin b/graphics/berry_fix/window.bin
new file mode 100644
index 0000000000000000000000000000000000000000..100c5da6fa65e75fd57e487e6024a0d960de0630
GIT binary patch
literal 2048
zcmeIx*H4sD5XRwWt&4S4RInhicU0_Hu=n0O*bv3uz`Ax(v3n1Sy|@3*UE$koVo3Zp
zUXaMl#W@%AJMWvBGm%&%<CKWZ=}7Ef@%f5FX8gDBK)*z!F<WV^jkelpFDgq19d*)K
z7hT14OV!mj!4EXZU_%Tw%y1)&G|FgWj8$Nq@lEjg(c+L9k0$#b_|J3(&4CX;yI|Jw
zq<tm2>mgfDz4VqNS08=#(_fwe=9p`q`4(7ck;Rr+nl^(5eu6?1O)}XOQ%y5nkr`&1
zWwuhg?XlNB`;|GM+`&KiWtLlErBzm2W36@8+hC(jHrryWZMNHCr(LeN>YD3rxapSK
zq<q5vAr%fg;;3VeJK>~LPCMhQN>$D|?}Cdixvb7}FVuVKmDef$wrY3Wbx)1^9(d@H
z$DVlVS;}khzthh^|BbiadGCXdKKbm6ufF;2ho67Nr@tBI9_WW*(rX*|@VgW2T0EL)
Me@nD<;J@y`FD(;o{Qv*}

literal 0
HcmV?d00001

diff --git a/graphics/berry_fix/window.pal b/graphics/berry_fix/window.pal
new file mode 100644
index 000000000..0e177217f
--- /dev/null
+++ b/graphics/berry_fix/window.pal
@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+255 255 255
+32 32 32
+172 172 172
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+164 213 90
+238 230 197
+148 197 213
+32 57 98
+106 148 197
+90 106 156
+255 255 255
+164 213 90
+32 32 32
+123 123 205
+255 255 255
+74 74 115
+197 197 197
+98 98 189
+106 106 197
+98 123 57
+131 131 131
+222 41 0
+189 123 41
+180 180 222
+0 0 0
+0 0 0
diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e437e72773fdd93a305304a33324d4e4f704df5
GIT binary patch
literal 1430
zcmV;H1!?+;P)<h;3K|Lk000e1NJLTq000O800saA00000s~5Wg000GDNkl<ZScUCb
zOOE6=4E0$W$W3~kMS#Af3h)7BASaM?0%}&Xs<w26<dO2f$dZw4W-+yRu*+&uBp=D=
z>fs-Jh8s}v`EQUJXoLOsxGpC^AigEJEg82II@>48aiAPxXI&(!17ZKpI@;iRJ{+)Z
zK(ztkyO2Bk<&<d%v3tInsSH@w_XBakF?w+!oOd96l&56DX&qf4!&N;W$6b&%g599m
z6(|j`O#IOOO&i>f-}V<Tc|#0>9EhqwUamTMyUD+Lk1x0_eA~B6Y&ZApMi3fgu;cui
z#>)dHNIk}d_`5!@QXWul-E|-|4%y9HiOl=HADQ_VbUxq8$JH+TA^G^iXMw*yK8CLk
zfzMCCpY;HpI3MBC>x@`!6@_rZw>0bPh`^jgs2O5Nq0Z{Mz%)w@uwSaOAKR#>ok@YP
zh3>E}B;uzF1j~<9aK0)qXLdU1>tZUgLCEOYRXCIhBn(0Gqp%;uek3C<L<a~dnVj77
zA#~K^S9wARpsRB}r1oWCgtJ`^2?NrG^Ua38#4b<~dIRPZbh~IY$W{qqwQKB`lq=nj
zdaCKr<zFT6r3Q<Cn@M_W9LDlC7LjBS+NfmY9MP4l%KjP^3L*?8HHe5`%UgcQ;I0`M
zL_*}iSLxz!NXK><EI&YK_#rT7oA(7=Za|W^D!uNt0wVhnQ-jE-n)M(ui_6C61VY>S
zxRkDu4{8uI+Up#Q`q=y52e&?fPki1m%sN#}-F1bdTeu6nUk5n^mc*#X;9wU6gsV*R
z?V>yPhI}%V>QQ%A)>m26S7$wx_<Y2LeRYt8LkB-H`_c3F_Pk_S5fvS4=u>50(h*7m
zcT2jVv)8V7-K7L+|J-f_!11EYs6(8azlclh+g)_5st=B-&D%VGSyz}t>k!Gzzd)tS
ztJ^xq;(g}mhL~2$3;A=G_c{J=zLYDZ<?38uoDZCw2e<(ICB<KUx<f|JV7FVB)qJlw
z=Yv`uz2>8^P@kDim1WNX&g+r|TB3H?_4q~RnXqJVg;~qF9Gsh*z$|iFD4^&ZtVj(q
z1_<V*F=q(X1mLn~nCEmO;sW}9GJ2Q#jW6o(U{@l<9WF2}AYb&HgRwmA;qP)a>vKQy
zsB93x-PzJPk<YioZ0Q4HCeqx7T;%zy+bxL}pdYNXEW59|Zhaw|LptqOrNN6XX1g6d
zS-6d`J~eghYM0nr*k#IDq3rWq+B)$(R~3L1(+*bNh~IEgP@$u9TH`)n>2Z!5@42l9
zBX3v{hs0FL+~y!VExsUI=x~Agl5M`Emo{g-9|c4sRe_n`k4#<1(v&+KjK9%M_2zrU
z-r*vjz~sTT%~|hxNdeXFO+9|pe}9Mw{DS@i)SqXt4Aq?*+V2ckFE?Vo-_QKL<gCM*
zzA}HO+2&T$5q*7?dF){RzU+5t|KhJU_or#BgLfWK8+d%@rjFfdoc!P(?$KHIJ^5*P
zIOn_j0o<rQ#oziBWWT4svETPJIPYC&-N@k8gJ0vqvGU3;6URyn`SYz|NMQ8e<KP+8
zsEzC@!!$i^#n0os@V6fq&x;>pm-oNnSB0NSuT!82=2Yw9O5JboaFKpMJ(%zDhj|`(
zp3lZS-*g1Ajxgsr{{*)H>xi>z*#RmowP7g#zA$y?`o@y@H+Y^~#(v(7o@;OcSF7G5
z&_Gbh-wscoQqxXf=cW-&(D~=^kly5sbyD^yy!XAX9(rA!(2J|JU-f({>2MxBqPpiB
zyW{yvkISjox#}zu`VHR2#cv(XJ^bIp_#8)d-QMfa!Z?1T<?k97xa$VEtM3Pk0#gI`
kwD#Mgv4gqpH~cE_FR;c}<$z<8@Bjb+07*qoM6N<$f>3|o*8l(j

literal 0
HcmV?d00001

diff --git a/src/trainer_tower.c b/src/trainer_tower.c
index 9d6ea8a3b..f2726d59b 100644
--- a/src/trainer_tower.c
+++ b/src/trainer_tower.c
@@ -1,8 +1,20 @@
 #include "global.h"
 #include "malloc.h"
 #include "save.h"
+#include "event_data.h"
 #include "cereader_tool.h"
 
+struct UnkStruct_8479D38
+{
+    u8 flags1[8];
+    u8 flags2[8];
+    u8 flags3[8];
+    u8 unk_24;
+    u8 unk_25;
+};
+
+extern const struct UnkStruct_8479D38 gUnknown_8479D38[15];
+
 bool32 sub_815D7BC(void * dest, void * buffer)
 {
     if (TryCopySpecialSaveSection(30, buffer) != 1)
@@ -31,3 +43,24 @@ bool32 sub_815D834(void)
     // Stubbed out?
     return FALSE;
 }
+
+void sub_815D838(void)
+{
+    u8 i, j;
+
+    for (i = 0; i < 15; i++)
+    {
+        const u8 * flags1 = gUnknown_8479D38[i].flags1;
+        const u8 * flags2 = gUnknown_8479D38[i].flags2;
+        const u8 * flags3 = gUnknown_8479D38[i].flags3;
+        for (j = 0; j < 8; j++)
+        {
+            if (flags1[j] != 0xFF)
+                FlagSet(1000 + flags1[j]);
+            if (flags2[j] != 0xFF)
+                FlagSet(1000 + flags2[j]);
+            if (flags3[j] != 0xFF)
+                FlagSet(1000 + flags3[j]);
+        }
+    }
+}