Skip to content

Commit 2b78a85

Browse files
committed
Fix hoenn pokedex palette being split in two
1 parent af0165a commit 2b78a85

File tree

4 files changed

+50
-54
lines changed

4 files changed

+50
-54
lines changed

graphics/pokedex/bg_hoenn.pal

+49-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
JASC-PAL
22
0100
3-
48
3+
96
44
123 131 0
55
255 255 255
66
222 222 222
@@ -49,3 +49,51 @@ JASC-PAL
4949
49 139 255
5050
189 156 90
5151
0 0 0
52+
123 131 0
53+
255 255 255
54+
255 238 0
55+
255 189 0
56+
255 115 0
57+
98 98 115
58+
41 57 65
59+
41 57 106
60+
0 0 41
61+
255 255 255
62+
238 246 57
63+
255 0 189
64+
49 213 74
65+
24 131 32
66+
189 156 90
67+
0 0 0
68+
123 131 0
69+
255 255 255
70+
197 32 32
71+
189 189 189
72+
164 164 164
73+
98 98 115
74+
41 57 65
75+
41 57 106
76+
0 0 41
77+
255 255 255
78+
238 246 57
79+
189 0 0
80+
74 148 180
81+
8 90 131
82+
189 156 90
83+
0 0 0
84+
123 131 0
85+
255 255 255
86+
197 32 32
87+
189 189 189
88+
164 164 164
89+
98 98 115
90+
41 57 65
91+
41 57 106
92+
0 0 41
93+
255 255 255
94+
238 246 57
95+
255 0 189
96+
180 205 246
97+
49 139 255
98+
189 156 90
99+
0 0 0

graphics/pokedex/caught_screen.pal

-51
This file was deleted.

src/graphics.c

-1
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,6 @@ const u16 gFrontierPassMedalsGold_Pal[] = INCBIN_U16("graphics/frontier_pass/gol
12301230

12311231
// Pokédex
12321232
const u16 gPokedexBgHoenn_Pal[] = INCBIN_U16("graphics/pokedex/bg_hoenn.gbapal");
1233-
const u16 gPokedexCaughtScreen_Pal[] = INCBIN_U16("graphics/pokedex/caught_screen.gbapal");
12341233
const u16 gPokedexSearchResults_Pal[] = INCBIN_U16("graphics/pokedex/search_results_bg.gbapal");
12351234
const u16 gPokedexBgNational_Pal[] = INCBIN_U16("graphics/pokedex/bg_national.gbapal");
12361235
const u32 gPokedexMenu_Gfx[] = INCBIN_U32("graphics/pokedex/menu.4bpp.lz");

src/pokedex.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4036,7 +4036,7 @@ static void Task_HandleCaughtMonPageInput(u8 taskId)
40364036
}
40374037
else
40384038
{
4039-
LoadPalette(gPokedexCaughtScreen_Pal + 1, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(7));
4039+
LoadPalette(gPokedexBgHoenn_Pal + 49, BG_PLTT_ID(3) + 1, PLTT_SIZEOF(7));
40404040
}
40414041
}
40424042

0 commit comments

Comments
 (0)