Skip to content

Commit

Permalink
2.38.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MiniEmerald committed Oct 27, 2023
1 parent 950899d commit 7834c51
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 21 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/characters/256/ch0256_10_nezz_256.ktx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/characters/256/ch0269_00_ayumi_256.ktx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/menu/characters.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions json/character_ids.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
{"number": "0266", "name": "The Shadow Triad", "internal_name": "shadowtriad2", "status": "npc"},
{"number": "0267", "name": "The Shadow Triad", "internal_name": "shadowtriad3", "status": "npc"},

{"number": "0269", "name": "Elaine", "internal_name": "ayumi", "status": "id-only"},
{"number": "0269", "name": "Elaine", "internal_name": "ayumi"},

{"number": "0280", "name": "Team Yell Grunt ♂", "internal_name": "yellm", "status": "npc"},
{"number": "0281", "name": "Team Yell Grunt ♀", "internal_name": "yellf", "status": "npc"},
Expand All @@ -248,6 +248,8 @@
{"number": "0290", "name": "Rei", "internal_name": "teru"},
{"number": "0291", "name": "Akari", "internal_name": "sho"},

{"number": "0293", "name": "Penny", "internal_name": "button"},

{"number": "0502", "name": "Team Aqua Grunt ♂", "internal_name": "aqua_shitappam", "status": "npc"},
{"number": "0503", "name": "Team Aqua Grunt ♀", "internal_name": "aqua_shitappaf", "status": "npc"},

Expand Down Expand Up @@ -291,5 +293,8 @@

{"number": "0651", "name": "Naomi (Sightseer)", "internal_name": "nanase"},
{"number": "0652", "name": "Helena (Hex Maniac)", "internal_name": "sayoko"},
{"number": "0653", "name": "Kali (Furisode Girl)", "internal_name": "kirika"}
{"number": "0653", "name": "Kali (Furisode Girl)", "internal_name": "kirika"},
{"number": "0654", "name": "Poké Kid", "internal_name": "pokekidf", "excludeFromCount": true},

{"number": "0656", "name": "Eve (Poké Kid)", "internal_name": "ibu"}
]
17 changes: 0 additions & 17 deletions json/characters.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
{
"title": "Current Version (non-playable)",
"characters": [
{
"name": "Elaine ?",
"date": "2023-06-28",
"notes": [
"ch0269_00_ayumi referenced in the Team Yell Grunts' model files (<code>Actors/ch0280_00_yellm/Motions/ch0280_00_yellm_110_cutin_trainer_cam.lmd</code> and <code>Actors/ch0281_00_yellf/Motions/ch0281_00_yellf_110_cutin_trainer_cam.lmd</code>)"
]
},
{
"name": "Team Yell Grunt ♂",
"date": "2023-06-28",
Expand Down Expand Up @@ -388,16 +381,6 @@
"ch0212_00_banjiro referenced in one of Lisia's model files (<code>Actors/ch0215_00_lutia/Models/ch0215_00_lutia.figure</code>)"
]
},
{
"name": "Ryuki",
"images": [
"images/characters/256/ch0190_00_ryuki_256.ktx.png"
],
"date": "2020-07-29",
"notes": [
"Appears in the <a href='https://bulbapedia.bulbagarden.net/wiki/List_of_story_events_in_Pok%C3%A9mon_Masters_EX#Summer_Superstars'>Summer Superstars</a> story event, with Turtonator"
]
},
{
"name": "Meowth (Team Rocket)",
"images": [
Expand Down
13 changes: 13 additions & 0 deletions json/timeline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1026,5 +1026,18 @@
{
"name": "2.37.1",
"date": "2023-10-06"
},
{
"name": "2.38.0",
"date": "2023-10-27"
},
{
"name": "A Message from the Pokémon Masters EX Team (Vol. 53)",
"link": "https://pokemonmasters-game.com/en-US/announcements/Other_5090_5W_2",
"date": "2023-10-27"
},
{
"name": "First Mix Sync Pair (Red and Venusaur)",
"date": "2023-11-01"
}
]
3 changes: 2 additions & 1 deletion json/va/exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
{"id": "ch0560_70_scullm", "path": "render/ch0561_70_scullf.png"},
{"id": "ch0561_70_scullf", "path": "render/ch0561_70_scullf.png"},
{"id": "ch0652_68_sayoko", "path": "256/ch0521_60_hexmaniac_256.ktx.png"},
{"id": "ch0653_68_kirika", "path": "256/ch0610_60_furisodegirl_256.ktx.png"}
{"id": "ch0653_68_kirika", "path": "256/ch0610_60_furisodegirl_256.ktx.png"},
{"id": "ch0656_00_ibu", "path": "256/ch0654_00_pokekidf_256.ktx.png"}
]
42 changes: 42 additions & 0 deletions json/va/jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,10 @@
{
"id": "ch0011_00_homika",
"name": "Roxie"
},
{
"id": "ch0011_10_homika",
"name": "Sygna Suit Roxie"
}
]
},
Expand Down Expand Up @@ -1017,6 +1021,10 @@
{
"id": "ch0256_00_nezz",
"name": "Piers"
},
{
"id": "ch0256_10_nezz",
"name": "Sygna Suit Piers"
}
]
},
Expand Down Expand Up @@ -1439,6 +1447,30 @@
}
]
},
{
"name": "Miria Takagishi",
"name_jp": "高岸美里亜",
"characters": [
{
"id": "ch0654_00_pokekidf",
"name": "Poké Kid"
},
{
"id": "ch0656_00_ibu",
"name": "Eve (Poké Kid)"
}
]
},
{
"name": "Misato Fukuen",
"name_jp": "福圓美里",
"characters": [
{
"id": "ch0293_00_button",
"name": "Penny"
}
]
},
{
"name": "Misuzu Togashi",
"name_jp": "富樫美鈴",
Expand Down Expand Up @@ -1761,6 +1793,16 @@
}
]
},
{
"name": "Satomi Akesaka",
"name_jp": "明坂聡美",
"characters": [
{
"id": "ch0269_00_ayumi",
"name": "Elaine"
}
]
},
{
"name": "Satomi Moriya",
"name_jp": "森谷里美",
Expand Down
2 changes: 1 addition & 1 deletion json/version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"2.37.1"
"2.38.0"

0 comments on commit 7834c51

Please sign in to comment.