Fixed Fishing Animation Emote

data/sprites/emotes.asm

@@ -15,7 +15,7 @@ EmotesPointers:
 	emote SleepEmote,      4, $78 ; EMOTE_SLEEP
 	emote FishEmote,       4, $78 ; EMOTE_FISH
 	emote JumpShadowGFX,   1, $7c ; EMOTE_SHADOW
-	emote FishingRodGFX,   2, $7c ; EMOTE_ROD
+	emote FishingRodGFX,   2, $7a ; EMOTE_ROD
 	emote BoulderDustGFX,  2, $7e ; EMOTE_BOULDER_DUST
 	emote ShakingGrassGFX, 1, $7e ; EMOTE_SHAKING_GRASS
 	emote PuddleSplashGFX, 1, $7f ; EMOTE_PUDDLE_SPLASH

data/sprites/facings.asm

@@ -199,7 +199,7 @@ FacingFishDown:
 	db  0,  8, 0, $01
 	db  8,  0, 2, $02
 	db  8,  8, 2, $03
-	db 16,  0, 4, $7c
+	db 16,  0, 4, $7a
 ; 414a
 
 FacingFishUp:
@@ -208,7 +208,7 @@ FacingFishUp:
 	db  0,  8, 0, $05
 	db  8,  0, 2, $06
 	db  8,  8, 2, $07
-	db -8,  0, 4, $7c
+	db -8,  0, 4, $7a
 ; 415f
 
 FacingFishLeft:
@@ -217,7 +217,7 @@ FacingFishLeft:
 	db  0,  8, 0, $09
 	db  8,  0, 2, $0a
 	db  8,  8, 2, $0b
-	db  5, -8, 4 | X_FLIP, $7d
+	db  5, -8, 4 | X_FLIP, $7b
 ; 4174
 
 FacingFishRight:
@@ -226,7 +226,7 @@ FacingFishRight:
 	db  0,  0, 0 | X_FLIP, $09
 	db  8,  8, 2 | X_FLIP, $0a
 	db  8,  0, 2 | X_FLIP, $0b
-	db  5, 16, 4, $7d
+	db  5, 16, 4, $7b
 ; 4189
 
 FacingEmote:

engine/events/overworld.asm

@@ -2230,13 +2230,7 @@ Script_NotEvenANibble: ; 0xd01e
 
 Script_GotAnItem:
 	scall Script_FishCastRod
-;	callasm MakePalGray
-	iffalse .NotFacingUp
-	applymovement PLAYER, Movement_HookedItemFacingUp
-	jump .GetTheHookedItem
-.NotFacingUp:
-	applymovement PLAYER, Movement_HookedItemNotFacingUp
-.GetTheHookedItem:
+	applymovement PLAYER, Movement_HookedItem
 	pause 40
 	applymovement PLAYER, Movement_RestoreRod
 	callasm PutTheRodAway
@@ -2247,14 +2241,7 @@ Script_GotAnItem:
 
 Script_GotABite: ; 0xd035
 	scall Script_FishCastRod
-;	callasm MakePalGray
-	callasm Fishing_CheckFacingUp
-	iffalse .NotFacingUp
-	applymovement PLAYER, Movement_BiteFacingUp
-	jump .FightTheHookedPokemon
-.NotFacingUp: ; 0xd046
-	applymovement PLAYER, Movement_BiteNotFacingUp
-.FightTheHookedPokemon: ; 0xd04a
+	applymovement PLAYER, Movement_Bite
 	pause 40
 	applymovement PLAYER, Movement_RestoreRod
 	opentext
@@ -2266,27 +2253,15 @@ Script_GotABite: ; 0xd035
 	reloadmapafterbattle
 	end
 
-Movement_BiteNotFacingUp: ; d05c
+Movement_Bite: ; d05c
 	fish_got_bite
 	fish_got_bite
 	fish_got_bite
-Movement_HookedItemNotFacingUp:
+Movement_HookedItem:
 	fish_got_bite
-;	show_emote
-	step_end
-
-Movement_BiteFacingUp: ; d062
-	fish_got_bite
-	fish_got_bite
-	fish_got_bite
-Movement_HookedItemFacingUp:
-	fish_got_bite
-	step_sleep_1
-;	show_emote
 	step_end
 
 Movement_RestoreRod: ; d069
-;	hide_emote
 	fish_cast_rod
 	step_end
 
@@ -2303,12 +2278,10 @@ Fishing_CheckFacingUp: ; d06c
 	ret
 
 Script_FishCastRod: ; 0xd07c
-;	reloadmappart
 	loadvar hBGMapMode, $0
 	special UpdateTimePals
 	loademote EMOTE_ROD
 	callasm LoadFishingGFX
-;	loademote EMOTE_SHOCK
 	applymovement PLAYER, MovementData_0xd093
 	pause 40
 	end

engine/events_2.asm

@@ -1059,7 +1059,7 @@ LoadFishingGFX: ; b84b3
 	call .LoadGFX
 	ld hl, VTiles0 tile $0a
 	call .LoadGFX
-	ld hl, VTiles0 tile $7c
+	ld hl, VTiles0 tile $7a
 	call .LoadGFX
 
 	pop af