Fix palettes for pokemon icons in trade animation

SoupPotato · Jul 21, 2024 · 9aefb90 · 9aefb90
1 parent 989fc6f
commit 9aefb90
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
@@ -674,6 +674,19 @@ SetFirstOBJPalette::
 	ldh [hCGBPalUpdate], a
 	jp ApplyPals
 
+SetSecondOBJPalette::
+; input: e must contain the offset of the selected palette from PartyMenuOBPals
+	ld hl, PartyMenuOBPals
+	ld d, 0
+	add hl, de
+	ld de, wOBPals1 palette 1
+	ld bc, 1 palettes
+	ld a, BANK(wOBPals1)
+	call FarCopyWRAM
+	ld a, TRUE
+	ldh [hCGBPalUpdate], a
+	jmp ApplyPals
+
 InitPokegearOBPal:
 	ld a, d
 	ld hl, PartyMenuOBPals

diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
@@ -443,8 +443,16 @@ MoveList_InitAnimatedMonIcon:
 	ret
 
 Trade_LoadMonIconGFX:
+	ld hl, wTempMonDVs
 	ld a, [wTempIconSpecies]
+	ld [wCurPartySpecies], a
 	ld [wCurIcon], a
+	call GetMenuMonIconPalette
+	add a
+	add a
+	add a
+	ld e, a
+	farcall SetSecondOBJPalette
 	ld a, $62
 	ld [wCurIconTile], a
 	ld de, wTempMonDVs