diff --git a/graphics/pokemon/cosme/front.png b/graphics/pokemon/cosme/front.png index 4f6f0253f4..f2cca2f463 100644 Binary files a/graphics/pokemon/cosme/front.png and b/graphics/pokemon/cosme/front.png differ diff --git a/graphics/pokemon/tita/anim_front.png b/graphics/pokemon/tita/anim_front.png index ba97de5ec9..e1f238609c 100644 Binary files a/graphics/pokemon/tita/anim_front.png and b/graphics/pokemon/tita/anim_front.png differ diff --git a/graphics/pokemon/tita/back.png b/graphics/pokemon/tita/back.png index 2ba65d946f..9109daa9fe 100644 Binary files a/graphics/pokemon/tita/back.png and b/graphics/pokemon/tita/back.png differ diff --git a/graphics/pokemon/tita/front.png b/graphics/pokemon/tita/front.png index 4f6f0253f4..2d47ff597e 100644 Binary files a/graphics/pokemon/tita/front.png and b/graphics/pokemon/tita/front.png differ diff --git a/graphics/pokemon/tita/icon.png b/graphics/pokemon/tita/icon.png index 4d3551ea5e..ab468e1994 100644 Binary files a/graphics/pokemon/tita/icon.png and b/graphics/pokemon/tita/icon.png differ diff --git a/graphics/pokemon/tita/normal.pal b/graphics/pokemon/tita/normal.pal index 7951fc8a7e..9f12a5db90 100644 --- a/graphics/pokemon/tita/normal.pal +++ b/graphics/pokemon/tita/normal.pal @@ -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 diff --git a/graphics/pokemon/tita/shiny.pal b/graphics/pokemon/tita/shiny.pal index 68f386ca69..9f12a5db90 100644 --- a/graphics/pokemon/tita/shiny.pal +++ b/graphics/pokemon/tita/shiny.pal @@ -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 diff --git a/graphics/title_screen/emerald_version.png b/graphics/title_screen/emerald_version.png index f0bb99cf86..b9268c2270 100644 Binary files a/graphics/title_screen/emerald_version.png and b/graphics/title_screen/emerald_version.png differ diff --git a/sound/direct_sound_samples/cries/tita.aif b/sound/direct_sound_samples/cries/tita.aif new file mode 100644 index 0000000000..aaf3825d59 Binary files /dev/null and b/sound/direct_sound_samples/cries/tita.aif differ diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index bfecee9d9c..25abff3d42 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -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."); diff --git a/src/data/wild_encounters.json b/src/data/wild_encounters.json index 0b30c0f65b..7f406a9252 100755 --- a/src/data/wild_encounters.json +++ b/src/data/wild_encounters.json @@ -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" } ] }