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/graphics/backspr/gBackShinySprite674Druddigon.png b/graphics/backspr/gBackShinySprite674Druddigon.png
index c1a40bf..efa4393 100644
Binary files a/graphics/backspr/gBackShinySprite674Druddigon.png and b/graphics/backspr/gBackShinySprite674Druddigon.png differ
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