From acdd38af105aaa4409e6a83233db89232cdb8df6 Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Thu, 2 Apr 2020 21:55:36 +0300
Subject: [PATCH 1/2] Fix Druddigon Backsprite

---
 .../backspr/gBackShinySprite674Druddigon.png    | Bin 711 -> 701 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/graphics/backspr/gBackShinySprite674Druddigon.png b/graphics/backspr/gBackShinySprite674Druddigon.png
index c1a40bf63d037f823fbdd92c06e941f001a6c071..efa4393a736dc603262c9cb6b595af85a74b2dec 100644
GIT binary patch
delta 632
zcmV-;0*C#_1-%83P=8V}5YWJ&XlQ7Y)I!++00Kx!L_t(|oYj;)j+;Of#~JrX%z~hZ
zEU~OlV661xjFgH)&^)Rs+%Odf$PxAkTcpSpQg0+IS&(A6OWu5d8Do<oRi;9`AOHXR
z8a&TAPu^cnnEo?xT#s*ZzAmvj@O24t;Oi10=j##*;MuyvDu3}}fQJMY$=8U@%LK3o
z@xurN_v7~ko>E)EHSP+8dqrSY(cuA*Ba!8)NBCU_1oC~BBj82%0rXa9Ka;qrAvDA>
zTL<ucsy%j#c@i7vM-4=aPAkAvsDW%T3o^zH@T?zG2e5I*ufWl7uSt#_oCAU1Ou*D1
z^N{Tn+a!%YI)89SfM<$JWG|C8a0M)&ie)_l)#>E5bAVGCSs>_76^OnbR3g;8pG35R
zJl6mcl3Fa&(EW@{1OSBWTL(~uXa$HtpR&@x<`%Hw4sBYe5DPFEfocR;=Hy@$#P_O_
zx}gyZjEV(VXMnd}7~nauc`&MN!omRGwv80iOe02d3V+y>9m_xK1mX8<cbWi?1Rj2$
zqYKMB1(ZsqzD`{oin|l3wFCjMg|Y+M-o*1<XIpL&h_?is1vfWDtq)5O80bJs#~_@5
zL?R$i-WA~E1^FuLI0o^<y+Hnj^Dkz9`?^%qim5+OvA-09od}jF&RFB8WCr*R@8!h+
z1#DYFF>y^f0}@fl5ir*miR<cn1TK9IVw}1DLv$cq04%^P;L}+dL||%APHU5TH|G{u
z{PM|Vz$GwA7H7Vch=v9Mvz#A4mjD^0;KSKCe7r9`23d=-2gUoZ=#Iz#ef|LWmM(M-
SXL{iP0000<MNUMnLSTXu%OAJ^

delta 642
zcmV-|0)73x1;+)DP=8=hFwnrDXlQ6a?=v(200L4;L_t(|ob8mqlAACP#=&FvmIJu8
z1#^8)ynsO0pJxKNrC>diE(P!mDO2Qqv#Wn6nVU(QBHMV-{=EC`x1c2XXXE;p{O;=~
zXP4lilv|)Y>L0G*dJF7Y1C&*g>`S!;Dq+sbx=N~g3+!59bbpm?&4p6O=X@o^D;@4z
z)rxupP+kZ++~L0|Vu0(sKy&uI-T<8QR_9SfQz-*TJib`qi*Qk&lqxNNLR}H=0Z}1f
zI>=y<^rM1OjnybaCwvb~G*+XQ;UaB)0Vg2_TnRcYeLfsC^978A>={UX0V6>J%_RU@
zTfhSRNrDlf%YPb;*UtbW%xIJwAT<q~O&Z`4V5he>Njt>t1F)l)F)+Mu0M+P1xHQF*
z!{V*Tl#^fpdX~q-(j|xY2&m<$_5chpx-Jf28TVG6X9T9z15GHCp3n0FQ||%BLZ=Xr
zYY!L;Xn---#sk*^bWBM!iM29AIbeY<25JjPo1UjRGJnegl?T=#251O9Pi7?C&yOcS
znb)PsOo{vNc@9-J2*^sWt9c>d`>#9(aEO!LX8|K>_}PU3LyfFbrVZ;yDB%7GjF5Q!
z=mvVup(w@<9;;t@!j4I48W3<^^L`x15YU!m7!m7&UXHojR`_CZ+S_#nGP~%P5MbY2
z10`NY9D4$WJ`aFHe^aW{2wr)&3HSZ@5lZM`RBw>eF7Qh$ASWQm9{@Vl!-Ng!Q{*re
zuy#=a$lkCoy-sxHG3a0kI;5rpmBF3RwaTEF0*NX8m)^sXz8bs`UeT7w1j;x-(WP@q
c{znjh06JU>q$itWg#Z8m07*qoM6N<$f*H>vtN;K2


From 1c6433eee8666d51578e13a814a7100399e49d4a Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Fri, 3 Apr 2020 18:06:28 +0300
Subject: [PATCH 2/2] Update Gender + Transform Issue

---
 assembly/hooks.s | 33 +++++++++++++++++++++++++++------
 bytereplacement  |  4 ++++
 hooks            |  5 ++++-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/assembly/hooks.s b/assembly/hooks.s
index fd0915d..1a6bbdd 100644
--- a/assembly/hooks.s
+++ b/assembly/hooks.s
@@ -104,14 +104,34 @@ LoadSpecialPokePicHook:
 	bx r0
 
 .pool
-@0x8034356 with r1
-BattleLoadOpponentMonSpriteGfxHook:
-	ldr r1, [sp] @Personality
+@0x8080344E4 with r0
+BattleLoadPlayerMonSpriteGfxHook:
+	mov r0, r5
+	mov r1, r4
 	bl TryGetFemaleGenderedSpecies
 	mov r5, r0
-	ldr r6, [sp]
-	ldr r0, =0x803436C | 1
-	bx r0
+@Prep return
+	mov r0, r6
+	mov r1, #0x1 @;Trainer Id
+	ldr r2, =GetMonData
+	bl bxr2
+	ldr r1, =0x080344EC | 1
+	bx r1
+
+.pool
+@0x803436C with r0
+BattleLoadOpponentMonSpriteGfxHook:
+	mov r0, r5
+	mov r1, r6
+	bl TryGetFemaleGenderedSpecies
+	mov r5, r0
+@Prep return
+	mov r0, r4
+	mov r1, #0x1 @;Trainer Id
+	ldr r2, =GetMonData
+	bl bxr2
+	ldr r1, =0x08034374 | 1
+	bx r1
 
 /*
 .pool
@@ -173,4 +193,5 @@ CreateMonSprite_PicBoxHook:
 	mov r3, #0x80
 	lsl r3, #0x8 @0x8000
 	ldr r2, =0x8083994 | 1
+bxr2:
 	bx r2
diff --git a/bytereplacement b/bytereplacement
index a9c5cb5..2a68a0b 100644
--- a/bytereplacement
+++ b/bytereplacement
@@ -85,3 +85,7 @@
 ##Increase Tutors to 72 (64 Regular + 8 Special)
 0811F456 LAST_TOTAL_TUTOR_NUM
 08127824 LAST_TOTAL_TUTOR_NUM
+
+##Remove old Opponent Gfx Hook
+08034356 00 04 05 0C 00 9E 06 E0 00 00
+
diff --git a/hooks b/hooks
index 57125cd..61e7131 100644
--- a/hooks
+++ b/hooks
@@ -1,6 +1,9 @@
 ##
 LoadSpecialPokePicHook 800ECF2 4
-BattleLoadOpponentMonSpriteGfxHook 8034356 1
+LoadSpecialPokePicHook 0800F136 4
+BattleLoadPlayerMonSpriteGfxHook 80344E4 0
+BattleLoadOpponentMonSpriteGfxHook 803436C 0
+
 SpeciesToCryId 8043304 1
 NationalPokedexNumToSpecies 8043200 1
 GetFrontSpritePalFromSpeciesAndPersonality 80440F4 3