Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-24 11:10:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'add-tita-as-pokemon'

Browse Source
This commit is contained in:
Sebastian Colandrea
2026-07-05 10:44:19 -03:00
parent 6f42c31c70 d8c1a282b5
commit 3d9ad8a9ce
11 changed files with 70 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/pokemon/cosme/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 819 B

After

Width:  |  Height:  |  Size: 819 B

BIN
graphics/pokemon/tita/anim_front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
graphics/pokemon/tita/back.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/pokemon/tita/front.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 819 B

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
graphics/pokemon/tita/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 448 B

After

Width:  |  Height:  |  Size: 565 B

26
graphics/pokemon/tita/normal.pal
View File

@@ -2,18 +2,18 @@ JASC-PAL
0100
16
255 255 255
91 91 91
122 122 122
117 117 118
0 0 0
25 25 25
166 166 166
156 156 156
149 149 149
141 141 141
69 69 69
182 182 182
207 207 207
88 87 87
18 16 22
195 189 186
134 72 31
244 244 244
231 216 206
158 155 159
37 39 54
227 153 100
211 105 31
79 43 23
196 87 16
149 150 31
43 43 43
9 9 9
0 0 0

30
graphics/pokemon/tita/shiny.pal
View File

@@ -1,19 +1,19 @@
JASC-PAL
0100
16
205 205 172
255 255 255
255 255 148
255 213 0
205 164 0
255 115 82
213 90 57
16 16 16
230 230 230
255 123 139
222 82 98
139 41 57
255 238 148
255 197 106
213 156 65
131 74 0
117 117 118
0 0 0
88 87 87
18 16 22
195 189 186
134 72 31
244 244 244
231 216 206
158 155 159
37 39 54
227 153 100
211 105 31
79 43 23
196 87 16
149 150 31

BIN
graphics/title_screen/emerald_version.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
sound/direct_sound_samples/cries/tita.aif Normal file
View File

Binary file not shown.

7
src/data/pokemon/pokedex_text.h
View File

@@ -2326,6 +2326,7 @@ const u8 gCosmePokedexText[] = _(
"and treasures food's pouch above all else.");
const u8 gTitaPokedexText[] = _(
"A gray feline POKéMON, always female and\n"
"unhinged, dashing free under moonlight,\n"
"and treasures food's pouch above all else.");
"A multicolored feline POKéMON that spends\n"
"its days napping in warm spots and lazily\n"
"waiting for its next meal. Its calm nature\n"
"hides a surprisingly sharp instinct.");

76
src/data/wild_encounters.json
View File

@@ -43,63 +43,63 @@
"mons": [
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_WURMPLE"
"max_level": 3,
"species": "SPECIES_COSME"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_POOCHYENA"
"max_level": 3,
"species": "SPECIES_COSME"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_WURMPLE"
},
{
"min_level": 3,
"max_level": 3,
"species": "SPECIES_POOCHYENA"
"species": "SPECIES_COSME"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_ZIGZAGOON"
"max_level": 3,
"species": "SPECIES_COSME"
},
{
"min_level": 2,
"max_level": 2,
"species": "SPECIES_ZIGZAGOON"
"max_level": 3,
"species": "SPECIES_COSME"
},
{
"min_level": 3,
"min_level": 2,
"max_level": 3,
"species": "SPECIES_ZIGZAGOON"
"species": "SPECIES_COSME"
},
{
"min_level": 3,
"min_level": 2,
"max_level": 3,
"species": "SPECIES_ZIGZAGOON"
"species": "SPECIES_TITA"
},
{
"min_level": 2,
"max_level": 3,
"species": "SPECIES_TITA"
},
{
"min_level": 2,
"max_level": 3,
"species": "SPECIES_TITA"
},
{
"min_level": 2,
"max_level": 3,
"species": "SPECIES_TITA"
},
{
"min_level": 2,
"max_level": 3,
"species": "SPECIES_TITA"
},
{
"min_level": 2,
"max_level": 3,
"species": "SPECIES_TITA"
}
]
}