diff --git a/graphics/contest/applause.png b/graphics/contest/applause.png index 8b720a19db..9c53376c14 100644 Binary files a/graphics/contest/applause.png and b/graphics/contest/applause.png differ diff --git a/graphics/contest/interface.png b/graphics/contest/interface.png index 598e5e338d..b181fda3fb 100644 Binary files a/graphics/contest/interface.png and b/graphics/contest/interface.png differ diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png index 852afb9cf3..ac6e92539b 100644 Binary files a/graphics/contest/nextturn.png and b/graphics/contest/nextturn.png differ diff --git a/src/data/battle_partners.h b/src/data/battle_partners.h index 34e30ea083..3c3c306f5e 100644 --- a/src/data/battle_partners.h +++ b/src/data/battle_partners.h @@ -27,7 +27,7 @@ [DIFFICULTY_NORMAL][PARTNER_STEVEN] = { #line 9 - .trainerName = _("STEVEN"), + .trainerName = _("大吾"), #line 10 .trainerClass = TRAINER_CLASS_RIVAL, #line 11 diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h index d5928b64db..d567885aa6 100644 --- a/src/data/contest_opponents.h +++ b/src/data/contest_opponents.h @@ -148,8 +148,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_ELECTRIKE, .contestCategory = CONTEST_CATEGORY_CUTE, - .monName = _("ELECTER"), - .trainerName = _("EZRA"), + .monName = _("小杰"), //ブリリアン(ト)Brilliant + .trainerName = _("俊彦"), //トシヒコ 俊彦 敏彦 .contestRank = CONTEST_RANK_NORMAL }, [CONTEST_WINNER_HALL_2 - 1] = { @@ -157,8 +157,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_TROPIUS, .contestCategory = CONTEST_CATEGORY_COOL, - .monName = _("TROPO"), - .trainerName = _("ALLAN"), + .monName = _("瑞克"), //リック(RICK)(英) + .trainerName = _("阿岚"),//アラン  .contestRank = CONTEST_RANK_HYPER }, [CONTEST_WINNER_HALL_3 - 1] = { @@ -166,8 +166,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_XATU, .contestCategory = CONTEST_CATEGORY_BEAUTY, - .monName = _("TUXA"), - .trainerName = _("JULIET"), + .monName = _("提奥"), //ティオ Tio(英) + .trainerName = _("美优"), //ミユウ 美佑 美優  .contestRank = CONTEST_RANK_NORMAL }, [CONTEST_WINNER_HALL_4 - 1] = { @@ -175,8 +175,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_PLUSLE, .contestCategory = CONTEST_CATEGORY_TOUGH, - .monName = _("PULSE"), - .trainerName = _("BAILY"), + .monName = _("奈奈"), //ナナ 菜々 奈々 七 + .trainerName = _("义则"),//ヨシノリ 良則 義則 .contestRank = CONTEST_RANK_MASTER }, [CONTEST_WINNER_HALL_5 - 1] = { @@ -184,8 +184,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_SHUPPET, .contestCategory = CONTEST_CATEGORY_SMART, - .monName = _("SHUPUP"), - .trainerName = _("MELANY"), + .monName = _("小炭"), //カーボン Carbon + .trainerName = _("阿荣"), //サカエ 栄 .contestRank = CONTEST_RANK_SUPER }, [CONTEST_WINNER_HALL_6 - 1] = { @@ -193,8 +193,8 @@ const struct ContestWinner gDefaultContestWinners[] = .trainerId = CONTEST_AI_TRAINER_ID, .species = SPECIES_ZANGOOSE, .contestCategory = CONTEST_CATEGORY_COOL, - .monName = _("GOOZAN"), - .trainerName = _("HANA"), + .monName = _("劈斩"), //スラッシュ SLASH + .trainerName = _("阳菜野"), //ヒナノ 日向野 陽菜乃 .contestRank = CONTEST_RANK_HYPER }, [CONTEST_WINNER_HALL_UNUSED_1 - 1] = { @@ -222,8 +222,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JIMMY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_POOCHYENA, - .nickname = _("POOCHY"), - .trainerName = _("JIMMY"), + .nickname = _("琅琅"), + .trainerName = _("元晖"), .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiFlags = CONTEST_AI_SET_1, .whichRank = CONTEST_RANK_NORMAL, @@ -251,8 +251,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_EDITH] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ILLUMISE, - .nickname = _("MUSILLE"), - .trainerName = _("EDITH"), + .nickname = _("萤光"), + .trainerName = _("美雅"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_NORMAL, @@ -280,8 +280,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_EVAN] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_DUSTOX, - .nickname = _("DUSTER"), - .trainerName = _("EVAN"), + .nickname = _("小毒"), + .trainerName = _("拓嘉"), .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiFlags = CONTEST_AI_SET_3, .whichRank = CONTEST_RANK_NORMAL, @@ -309,8 +309,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KELSEY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SEEDOT, - .nickname = _("DOTS"), - .trainerName = _("KELSEY"), + .nickname = _("果酱"), + .trainerName = _("齐彩"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiFlags = CONTEST_AI_SET_4, .whichRank = CONTEST_RANK_NORMAL, @@ -338,8 +338,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MADISON] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_TAILLOW, - .nickname = _("TATAY"), - .trainerName = _("MADISON"), + .nickname = _("燕乐"), + .trainerName = _("映华"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_NORMAL, @@ -367,8 +367,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_RAYMOND] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_NINCADA, - .nickname = _("NINDA"), - .trainerName = _("RAYMOND"), + .nickname = _("土居"), + .trainerName = _("廉恩"), .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiFlags = CONTEST_AI_SET_6, .whichRank = CONTEST_RANK_NORMAL, @@ -396,8 +396,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_GRANT] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SHROOMISH, - .nickname = _("SMISH"), - .trainerName = _("GRANT"), + .nickname = _("菇菇"), + .trainerName = _("家勤"), .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiFlags = CONTEST_AI_SET_7, .whichRank = CONTEST_RANK_NORMAL, @@ -425,8 +425,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_PAIGE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SPHEAL, - .nickname = _("SLEAL"), - .trainerName = _("PAIGE"), + .nickname = _("小球"), + .trainerName = _("瑜佳"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiFlags = CONTEST_AI_SET_8, .whichRank = CONTEST_RANK_NORMAL, @@ -454,8 +454,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ALEC] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SLAKOTH, - .nickname = _("SLOKTH"), - .trainerName = _("ALEC"), + .nickname = _("獭哥"), + .trainerName = _("仁辉"), .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiFlags = CONTEST_AI_SET_9, .whichRank = CONTEST_RANK_NORMAL, @@ -483,8 +483,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SYDNEY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_WHISMUR, - .nickname = _("WHIRIS"), - .trainerName = _("SYDNEY"), + .nickname = _("妞妞"), + .trainerName = _("君瑶"), .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiFlags = CONTEST_AI_SET_A, .whichRank = CONTEST_RANK_NORMAL, @@ -512,8 +512,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MORRIS] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MAKUHITA, - .nickname = _("MAHITA"), - .trainerName = _("MORRIS"), + .nickname = _("冲冲"), + .trainerName = _("彰浩"), .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiFlags = CONTEST_AI_SET_B, .whichRank = CONTEST_RANK_NORMAL, @@ -541,8 +541,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MARIAH] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ARON, - .nickname = _("RONAR"), - .trainerName = _("MARIAH"), + .nickname = _("小多拉"), + .trainerName = _("碧波"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiFlags = CONTEST_AI_SET_C, .whichRank = CONTEST_RANK_NORMAL, @@ -570,8 +570,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_RUSSELL] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_CROBAT, - .nickname = _("BATRO"), - .trainerName = _("RUSSELL"), + .nickname = _("叉仔"), + .trainerName = _("立树"), .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiFlags = CONTEST_AI_SET_D, .whichRank = CONTEST_RANK_NORMAL, @@ -599,8 +599,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MELANIE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_GULPIN, - .nickname = _("GULIN"), - .trainerName = _("MELANIE"), + .nickname = _("小容"), + .trainerName = _("郁娜"), .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiFlags = CONTEST_AI_SET_E, .whichRank = CONTEST_RANK_NORMAL, @@ -628,8 +628,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CHANCE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MANECTRIC, - .nickname = _("RIKELEC"), - .trainerName = _("CHANCE"), + .nickname = _("雷丸"), + .trainerName = _("展宏"), .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiFlags = CONTEST_AI_SET_F, .whichRank = CONTEST_RANK_NORMAL, @@ -657,8 +657,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_AGATHA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_BULBASAUR, - .nickname = _("BULBY"), - .trainerName = _("AGATHA"), + .nickname = _("种种"), + .trainerName = _("保莉"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiFlags = CONTEST_AI_SET_1, .whichRank = CONTEST_RANK_NORMAL, @@ -686,8 +686,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_BEAU] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_BUTTERFREE, - .nickname = _("FUTTERBE"), - .trainerName = _("BEAU"), + .nickname = _("巴小蝶"), + .trainerName = _("玛雅"), .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_NORMAL, @@ -715,8 +715,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KAY] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_PIDGEOTTO, - .nickname = _("PIDEOT"), - .trainerName = _("KAY"), + .nickname = _("袅袅"), + .trainerName = _("丽荷"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiFlags = CONTEST_AI_SET_3, .whichRank = CONTEST_RANK_NORMAL, @@ -744,8 +744,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CALE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_DIGLETT, - .nickname = _("DIGLE"), - .trainerName = _("CALE"), + .nickname = _("小挖"), + .trainerName = _("祖洲"), .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiFlags = CONTEST_AI_SET_4, .whichRank = CONTEST_RANK_NORMAL, @@ -773,8 +773,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CAITLIN] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_POLIWAG, - .nickname = _("WAGIL"), - .trainerName = _("CAITLIN"), + .nickname = _("蚊香香"), + .trainerName = _("文乃"), .trainerGfxId = OBJ_EVENT_GFX_TUBER_F, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_NORMAL, @@ -802,8 +802,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_COLBY] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_TOTODILE, - .nickname = _("TOTDIL"), - .trainerName = _("COLBY"), + .nickname = _("锯锯"), + .trainerName = _("文也"), .trainerGfxId = OBJ_EVENT_GFX_NINJA_BOY, .aiFlags = CONTEST_AI_SET_6, .whichRank = CONTEST_RANK_NORMAL, @@ -831,8 +831,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KYLIE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_LEDYBA, - .nickname = _("BALEDY"), - .trainerName = _("KYLIE"), + .nickname = _("芭蕾"), + .trainerName = _("如蜜"), .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiFlags = CONTEST_AI_SET_7, .whichRank = CONTEST_RANK_NORMAL, @@ -860,8 +860,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_LIAM] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_DELIBIRD, - .nickname = _("BIRDLY"), - .trainerName = _("LIAM"), + .nickname = _("递利"), + .trainerName = _("弦驰"), .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiFlags = CONTEST_AI_SET_8, .whichRank = CONTEST_RANK_NORMAL, @@ -889,8 +889,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MILO] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_LARVITAR, - .nickname = _("TARVITAR"), - .trainerName = _("MILO"), + .nickname = _("基思"), + .trainerName = _("胜荣"), .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiFlags = CONTEST_AI_SET_9, .whichRank = CONTEST_RANK_NORMAL, @@ -918,8 +918,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KARINA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ROSELIA, - .nickname = _("RELIA"), - .trainerName = _("KARINA"), + .nickname = _("乐缤缤"), + .trainerName = _("桃蕙"), .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiFlags = CONTEST_AI_SET_10, .whichRank = CONTEST_RANK_SUPER, @@ -947,8 +947,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_BOBBY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_DODRIO, - .nickname = _("DUODO"), - .trainerName = _("BOBBY"), + .nickname = _("嘟咚"), + .trainerName = _("进发"), .trainerGfxId = OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_SUPER, @@ -976,8 +976,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CLAIRE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_TRAPINCH, - .nickname = _("PINCHIN"), - .trainerName = _("CLAIRE"), + .nickname = _("小仪"), + .trainerName = _("小梅"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiFlags = CONTEST_AI_SET_11, .whichRank = CONTEST_RANK_SUPER, @@ -1005,8 +1005,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_WILLIE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_CACNEA, - .nickname = _("NACAC"), - .trainerName = _("WILLIE"), + .nickname = _("仙人刺"), + .trainerName = _("典育"), .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiFlags = CONTEST_AI_SET_12, .whichRank = CONTEST_RANK_SUPER, @@ -1034,8 +1034,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CASSIDY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SANDSLASH, - .nickname = _("SHRAND"), - .trainerName = _("CASSIDY"), + .nickname = _("小山"), + .trainerName = _("若桦"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiFlags = CONTEST_AI_SET_13, .whichRank = CONTEST_RANK_SUPER, @@ -1063,8 +1063,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MORGAN] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_BALTOY, - .nickname = _("TOYBAL"), - .trainerName = _("MORGAN"), + .nickname = _("天秤翁"), + .trainerName = _("力伟"), .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiFlags = CONTEST_AI_SET_14, .whichRank = CONTEST_RANK_SUPER, @@ -1092,8 +1092,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SUMMER] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MEDICHAM, - .nickname = _("CHAMCHAM"), - .trainerName = _("SUMMER"), + .nickname = _("雷玲"), + .trainerName = _("真佩"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiFlags = CONTEST_AI_SET_15, .whichRank = CONTEST_RANK_SUPER, @@ -1121,8 +1121,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MILES] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SPINDA, - .nickname = _("SPININ"), - .trainerName = _("MILES"), + .nickname = _("晃悠"), + .trainerName = _("修志"), .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiFlags = CONTEST_AI_SET_16, .whichRank = CONTEST_RANK_SUPER, @@ -1150,8 +1150,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_AUDREY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SWABLU, - .nickname = _("SWABY"), - .trainerName = _("AUDREY"), + .nickname = _("绵绵"), + .trainerName = _("彩羽"), .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiFlags = CONTEST_AI_SET_17, .whichRank = CONTEST_RANK_SUPER, @@ -1179,8 +1179,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_AVERY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SPOINK, - .nickname = _("POINKER"), - .trainerName = _("AVERY"), + .nickname = _("噗噗"), + .trainerName = _("顺享"), .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiFlags = CONTEST_AI_SET_A, .whichRank = CONTEST_RANK_SUPER, @@ -1208,8 +1208,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ARIANA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_KECLEON, - .nickname = _("KECON"), - .trainerName = _("ARIANA"), + .nickname = _("阿龙"), + .trainerName = _("响枫"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiFlags = CONTEST_AI_SET_18, .whichRank = CONTEST_RANK_SUPER, @@ -1237,8 +1237,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ASHTON] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_GOLDEEN, - .nickname = _("GOLDEN"), - .trainerName = _("ASHTON"), + .nickname = _("小金"), + .trainerName = _("祥勇"), .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiFlags = CONTEST_AI_SET_19, .whichRank = CONTEST_RANK_SUPER, @@ -1266,8 +1266,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SANDRA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_BARBOACH, - .nickname = _("BOBOACH"), - .trainerName = _("SANDRA"), + .nickname = _("鲶书"), + .trainerName = _("幸穗"), .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiFlags = CONTEST_AI_SET_1A, .whichRank = CONTEST_RANK_SUPER, @@ -1295,8 +1295,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CARSON] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SKARMORY, - .nickname = _("CORPY"), - .trainerName = _("CARSON"), + .nickname = _("铁甲"), + .trainerName = _("润田"), .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiFlags = CONTEST_AI_SET_1B, .whichRank = CONTEST_RANK_SUPER, @@ -1324,8 +1324,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KATRINA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LOTAD, - .nickname = _("TADO"), - .trainerName = _("KATRINA"), + .nickname = _("莲芽"), + .trainerName = _("翩翎"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiFlags = CONTEST_AI_SET_1C, .whichRank = CONTEST_RANK_SUPER, @@ -1353,8 +1353,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_LUKE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_SLOWBRO, - .nickname = _("BROWLO"), - .trainerName = _("LUKE"), + .nickname = _("呆呆"), + .trainerName = _("应吉"), .trainerGfxId = OBJ_EVENT_GFX_FAT_MAN, .aiFlags = CONTEST_AI_SET_1, .whichRank = CONTEST_RANK_SUPER, @@ -1382,8 +1382,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_RAUL] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_FARFETCHD, - .nickname = _("FETCHIN"), - .trainerName = _("RAUL"), + .nickname = _("葱菁"), + .trainerName = _("百春"), .trainerGfxId = OBJ_EVENT_GFX_MAN_5, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_SUPER, @@ -1411,8 +1411,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JADA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_SEEL, - .nickname = _("SEELEY"), - .trainerName = _("JADA"), + .nickname = _("海宝"), + .trainerName = _("瑞琦"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiFlags = CONTEST_AI_SET_3, .whichRank = CONTEST_RANK_SUPER, @@ -1440,8 +1440,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ZEEK] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_DROWZEE, - .nickname = _("DROWZIN"), - .trainerName = _("ZEEK"), + .nickname = _("昏昏"), + .trainerName = _("满元"), .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiFlags = CONTEST_AI_SET_4, .whichRank = CONTEST_RANK_SUPER, @@ -1469,8 +1469,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_DIEGO] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_HITMONCHAN, - .nickname = _("HITEMON"), - .trainerName = _("DIEGO"), + .nickname = _("铁拳"), + .trainerName = _("福水"), .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_SUPER, @@ -1498,8 +1498,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ALIYAH] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_BLISSEY, - .nickname = _("BLISS"), - .trainerName = _("ALIYAH"), + .nickname = _("杏福"), + .trainerName = _("敏娜"), .trainerGfxId = OBJ_EVENT_GFX_TEALA, .aiFlags = CONTEST_AI_SET_6, .whichRank = CONTEST_RANK_SUPER, @@ -1527,8 +1527,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_NATALIA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_ELEKID, - .nickname = _("KIDLEK"), - .trainerName = _("NATALIA"), + .nickname = _("小击怪"), + .trainerName = _("善慈"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiFlags = CONTEST_AI_SET_7, .whichRank = CONTEST_RANK_SUPER, @@ -1556,8 +1556,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_DEVIN] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_SNUBBULL, - .nickname = _("SNUBBINS"), - .trainerName = _("DEVIN"), + .nickname = _("鲁鲁"), + .trainerName = _("哈利"), .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiFlags = CONTEST_AI_SET_8, .whichRank = CONTEST_RANK_SUPER, @@ -1585,8 +1585,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_TYLOR] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_MISDREAVUS, - .nickname = _("DREAVIS"), - .trainerName = _("TYLOR"), + .nickname = _("梦魅"), + .trainerName = _("嘉月"), .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiFlags = CONTEST_AI_SET_9, .whichRank = CONTEST_RANK_SUPER, @@ -1614,8 +1614,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_RONNIE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LAIRON, - .nickname = _("LAIRN"), - .trainerName = _("RONNIE"), + .nickname = _("多拉"), + .trainerName = _("君毅"), .trainerGfxId = OBJ_EVENT_GFX_HIKER, .aiFlags = CONTEST_AI_SET_1D, .whichRank = CONTEST_RANK_HYPER, @@ -1643,8 +1643,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CLAUDIA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SHIFTRY, - .nickname = _("SHIFTY"), - .trainerName = _("CLAUDIA"), + .nickname = _("小天"), + .trainerName = _("曦兰"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_HYPER, @@ -1672,8 +1672,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ELIAS] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_NINJASK, - .nickname = _("NINAS"), - .trainerName = _("ELIAS"), + .nickname = _("忍忍"), + .trainerName = _("勘太郎"), .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiFlags = CONTEST_AI_SET_11, .whichRank = CONTEST_RANK_HYPER, @@ -1701,8 +1701,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JADE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SWELLOW, - .nickname = _("WELOW"), - .trainerName = _("JADE"), + .nickname = _("燕儿"), + .trainerName = _("初瑞"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiFlags = CONTEST_AI_SET_12, .whichRank = CONTEST_RANK_HYPER, @@ -1730,8 +1730,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_FRANCIS] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MIGHTYENA, - .nickname = _("YENA"), - .trainerName = _("FRANCIS"), + .nickname = _("天狼"), + .trainerName = _("启翔"), .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_HYPER, @@ -1759,8 +1759,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ALISHA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_BEAUTIFLY, - .nickname = _("TIFLY"), - .trainerName = _("ALISHA"), + .nickname = _("凤羽"), + .trainerName = _("璇律"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiFlags = CONTEST_AI_SET_1E, .whichRank = CONTEST_RANK_HYPER, @@ -1788,8 +1788,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SAUL] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SEAKING, - .nickname = _("KINGSEA"), - .trainerName = _("SAUL"), + .nickname = _("小魔王"), + .trainerName = _("文雄"), .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiFlags = CONTEST_AI_SET_1F, .whichRank = CONTEST_RANK_HYPER, @@ -1817,8 +1817,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_FELICIA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_CASTFORM_NORMAL, - .nickname = _("CASTER"), - .trainerName = _("FELICIA"), + .nickname = _("泡儿"), + .trainerName = _("飒雅"), .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiFlags = CONTEST_AI_SET_16, .whichRank = CONTEST_RANK_HYPER, @@ -1846,8 +1846,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_EMILIO] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MACHOKE, - .nickname = _("CHOKEM"), - .trainerName = _("EMILIO"), + .nickname = _("力士"), + .trainerName = _("恭明"), .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiFlags = CONTEST_AI_SET_20, .whichRank = CONTEST_RANK_HYPER, @@ -1875,8 +1875,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KARLA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LOMBRE, - .nickname = _("LOMBE"), - .trainerName = _("KARLA"), + .nickname = _("帽童"), + .trainerName = _("静茹"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiFlags = CONTEST_AI_SET_A, .whichRank = CONTEST_RANK_HYPER, @@ -1904,8 +1904,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_DARRYL] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SEVIPER, - .nickname = _("VIPES"), - .trainerName = _("DARRYL"), + .nickname = _("蛇蛇"), + .trainerName = _("启成"), .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiFlags = CONTEST_AI_SET_18, .whichRank = CONTEST_RANK_HYPER, @@ -1933,8 +1933,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SELENA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_WAILMER, - .nickname = _("MERAIL"), - .trainerName = _("SELENA"), + .nickname = _("吼鲸"), + .trainerName = _("真莎"), .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiFlags = CONTEST_AI_SET_19, .whichRank = CONTEST_RANK_HYPER, @@ -1962,8 +1962,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_NOEL] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_MAGIKARP, - .nickname = _("KARPAG"), - .trainerName = _("NOEL"), + .nickname = _("龙王"), + .trainerName = _("力奇"), .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiFlags = CONTEST_AI_SET_1A, .whichRank = CONTEST_RANK_HYPER, @@ -1991,8 +1991,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_LACEY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LUNATONE, - .nickname = _("LUNONE"), - .trainerName = _("LACEY"), + .nickname = _("月石"), + .trainerName = _("锦薇"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiFlags = CONTEST_AI_SET_21, .whichRank = CONTEST_RANK_HYPER, @@ -2020,8 +2020,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CORBIN] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ABSOL, - .nickname = _("ABSO"), - .trainerName = _("CORBIN"), + .nickname = _("阿勃"), + .trainerName = _("季鹏"), .trainerGfxId = OBJ_EVENT_GFX_MANIAC, .aiFlags = CONTEST_AI_SET_F, .whichRank = CONTEST_RANK_HYPER, @@ -2049,8 +2049,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_GRACIE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_EXEGGUTOR, - .nickname = _("EGGSOR"), - .trainerName = _("GRACIE"), + .nickname = _("椰仔"), + .trainerName = _("未央"), .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiFlags = CONTEST_AI_SET_1, .whichRank = CONTEST_RANK_HYPER, @@ -2078,8 +2078,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_COLTIN] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_CUBONE, - .nickname = _("CUBIN"), - .trainerName = _("COLTIN"), + .nickname = _("卡拉哔"), + .trainerName = _("满朗"), .trainerGfxId = OBJ_EVENT_GFX_MAN_4, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_HYPER, @@ -2107,8 +2107,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ELLIE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_HITMONLEE, - .nickname = _("HITMON"), - .trainerName = _("ELLIE"), + .nickname = _("月飞"), + .trainerName = _("千晨"), .trainerGfxId = OBJ_EVENT_GFX_EXPERT_F, .aiFlags = CONTEST_AI_SET_3, .whichRank = CONTEST_RANK_HYPER, @@ -2136,8 +2136,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MARCUS] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_SQUIRTLE, - .nickname = _("SURTLE"), - .trainerName = _("MARCUS"), + .nickname = _("小龟"), + .trainerName = _("锐明"), .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiFlags = CONTEST_AI_SET_4, .whichRank = CONTEST_RANK_HYPER, @@ -2165,8 +2165,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KIARA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_KANGASKHAN, - .nickname = _("KHANKAN"), - .trainerName = _("KIARA"), + .nickname = _("悦儿"), + .trainerName = _("日和"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_3, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_HYPER, @@ -2194,8 +2194,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_BRYCE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_PINECO, - .nickname = _("PINOC"), - .trainerName = _("BRYCE"), + .nickname = _("果球"), + .trainerName = _("良光"), .trainerGfxId = OBJ_EVENT_GFX_BUG_CATCHER, .aiFlags = CONTEST_AI_SET_6, .whichRank = CONTEST_RANK_HYPER, @@ -2223,8 +2223,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JAMIE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_DUNSPARCE, - .nickname = _("DILTOT"), - .trainerName = _("JAMIE"), + .nickname = _("慢慢"), + .trainerName = _("玉馨"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_5, .aiFlags = CONTEST_AI_SET_7, .whichRank = CONTEST_RANK_HYPER, @@ -2252,8 +2252,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JORGE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_HOUNDOOM, - .nickname = _("DOOMOND"), - .trainerName = _("JORGE"), + .nickname = _("黑轮"), + .trainerName = _("汤马士"), .trainerGfxId = OBJ_EVENT_GFX_GENTLEMAN, .aiFlags = CONTEST_AI_SET_8, .whichRank = CONTEST_RANK_HYPER, @@ -2281,8 +2281,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_DEVON] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_MILTANK, - .nickname = _("MILKAN"), - .trainerName = _("DEVON"), + .nickname = _("鲜奶"), + .trainerName = _("恒义"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_M, .aiFlags = CONTEST_AI_SET_9, .whichRank = CONTEST_RANK_HYPER, @@ -2310,8 +2310,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JUSTINA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_GYARADOS, - .nickname = _("RADOS"), - .trainerName = _("JUSTINA"), + .nickname = _("玲珑"), + .trainerName = _("绫娟"), .trainerGfxId = OBJ_EVENT_GFX_PICNICKER, .aiFlags = CONTEST_AI_SET_1D, .whichRank = CONTEST_RANK_MASTER, @@ -2339,8 +2339,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_RALPH] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LOUDRED, - .nickname = _("LOUDERD"), - .trainerName = _("RALPH"), + .nickname = _("吼隆"), + .trainerName = _("达宏"), .trainerGfxId = OBJ_EVENT_GFX_EXPERT_M, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_MASTER, @@ -2368,8 +2368,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_ROSA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SKITTY, - .nickname = _("SITTY"), - .trainerName = _("ROSA"), + .nickname = _("喵可"), + .trainerName = _("秋妍"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_1, .aiFlags = CONTEST_AI_SET_11, .whichRank = CONTEST_RANK_MASTER, @@ -2397,8 +2397,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KEATON] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SLAKING, - .nickname = _("SLING"), - .trainerName = _("KEATON"), + .nickname = _("勤架"), + .trainerName = _("勇海"), .trainerGfxId = OBJ_EVENT_GFX_LITTLE_BOY, .aiFlags = CONTEST_AI_SET_12, .whichRank = CONTEST_RANK_MASTER, @@ -2426,8 +2426,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MAYRA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ALTARIA, - .nickname = _("TARIA"), - .trainerName = _("MAYRA"), + .nickname = _("雅儿"), + .trainerName = _("满泉"), .trainerGfxId = OBJ_EVENT_GFX_POKEFAN_F, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_MASTER, @@ -2455,8 +2455,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_LAMAR] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_KIRLIA, - .nickname = _("LIRKI"), - .trainerName = _("LAMAR"), + .nickname = _("琦琦"), + .trainerName = _("虎雄"), .trainerGfxId = OBJ_EVENT_GFX_RICH_BOY, .aiFlags = CONTEST_AI_SET_1E, .whichRank = CONTEST_RANK_MASTER, @@ -2484,8 +2484,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_AUBREY] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_BELLOSSOM, - .nickname = _("BLOSSOM"), - .trainerName = _("AUBREY"), + .nickname = _("花花"), + .trainerName = _("仁宁"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_4, .aiFlags = CONTEST_AI_SET_1F, .whichRank = CONTEST_RANK_MASTER, @@ -2513,8 +2513,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_NIGEL] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SABLEYE, - .nickname = _("EYESAB"), - .trainerName = _("NIGEL"), + .nickname = _("小魄"), + .trainerName = _("初创"), .trainerGfxId = OBJ_EVENT_GFX_CAMPER, .aiFlags = CONTEST_AI_SET_16, .whichRank = CONTEST_RANK_MASTER, @@ -2542,8 +2542,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CAMILLE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_NATU, - .nickname = _("UTAN"), - .trainerName = _("CAMILLE"), + .nickname = _("天天"), + .trainerName = _("美玲"), .trainerGfxId = OBJ_EVENT_GFX_LASS, .aiFlags = CONTEST_AI_SET_20, .whichRank = CONTEST_RANK_MASTER, @@ -2571,8 +2571,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_DEON] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_SHARPEDO, - .nickname = _("PEDOS"), - .trainerName = _("DEON"), + .nickname = _("鲨米"), + .trainerName = _("强杰"), .trainerGfxId = OBJ_EVENT_GFX_SCHOOL_KID_M, .aiFlags = CONTEST_AI_SET_A, .whichRank = CONTEST_RANK_MASTER, @@ -2600,8 +2600,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JANELLE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_LUVDISC, - .nickname = _("LUVIS"), - .trainerName = _("JANELLE"), + .nickname = _("爱玲"), + .trainerName = _("翩翡"), .trainerGfxId = OBJ_EVENT_GFX_GIRL_2, .aiFlags = CONTEST_AI_SET_18, .whichRank = CONTEST_RANK_MASTER, @@ -2629,8 +2629,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_HEATH] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_HERACROSS, - .nickname = _("HEROSS"), - .trainerName = _("HEATH"), + .nickname = _("赫拉斯哥"), + .trainerName = _("亚敦"), .trainerGfxId = OBJ_EVENT_GFX_MAN_3, .aiFlags = CONTEST_AI_SET_19, .whichRank = CONTEST_RANK_MASTER, @@ -2658,8 +2658,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SASHA] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_ELECTRODE, - .nickname = _("RODLECT"), - .trainerName = _("SASHA"), + .nickname = _("地雷"), + .trainerName = _("奈叶"), .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiFlags = CONTEST_AI_SET_1A, .whichRank = CONTEST_RANK_MASTER, @@ -2687,8 +2687,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_FRANKIE] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_PICHU, - .nickname = _("CHUPY"), - .trainerName = _("FRANKIE"), + .nickname = _("皮太郎"), + .trainerName = _("振泰"), .trainerGfxId = OBJ_EVENT_GFX_YOUNGSTER, .aiFlags = CONTEST_AI_SET_21, .whichRank = CONTEST_RANK_MASTER, @@ -2716,8 +2716,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_HELEN] = { .filter = CONTEST_FILTER_NONE, .species = SPECIES_WOBBUFFET, - .nickname = _("WOBET"), - .trainerName = _("HELEN"), + .nickname = _("然奇奇"), + .trainerName = _("蔚来"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_1, .aiFlags = CONTEST_AI_SET_F, .whichRank = CONTEST_RANK_MASTER, @@ -2745,8 +2745,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CAMILE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_GENGAR, - .nickname = _("GAREN"), - .trainerName = _("CAMILE"), + .nickname = _("咯咯"), + .trainerName = _("绫媚"), .trainerGfxId = OBJ_EVENT_GFX_HEX_MANIAC, .aiFlags = CONTEST_AI_SET_1, .whichRank = CONTEST_RANK_MASTER, @@ -2774,8 +2774,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_MARTIN] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_PORYGON, - .nickname = _("GONPOR"), - .trainerName = _("MARTIN"), + .nickname = _("折线"), + .trainerName = _("建彦"), .trainerGfxId = OBJ_EVENT_GFX_SCIENTIST_1, .aiFlags = CONTEST_AI_SET_2, .whichRank = CONTEST_RANK_MASTER, @@ -2803,8 +2803,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_SERGIO] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_DRAGONITE, - .nickname = _("DRITE"), - .trainerName = _("SERGIO"), + .nickname = _("太龙"), + .trainerName = _("勇真"), .trainerGfxId = OBJ_EVENT_GFX_BOY_1, .aiFlags = CONTEST_AI_SET_3, .whichRank = CONTEST_RANK_MASTER, @@ -2832,8 +2832,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_KAILEY] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_MEOWTH, - .nickname = _("MEOWY"), - .trainerName = _("KAILEY"), + .nickname = _("喵咪"), + .trainerName = _("桃华"), .trainerGfxId = OBJ_EVENT_GFX_TWIN, .aiFlags = CONTEST_AI_SET_4, .whichRank = CONTEST_RANK_MASTER, @@ -2861,8 +2861,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_PERLA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_JYNX, - .nickname = _("NYX"), - .trainerName = _("PERLA"), + .nickname = _("佳丽"), + .trainerName = _("贤霞"), .trainerGfxId = OBJ_EVENT_GFX_BEAUTY, .aiFlags = CONTEST_AI_SET_5, .whichRank = CONTEST_RANK_MASTER, @@ -2890,8 +2890,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_CLARA] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_TOGEPI, - .nickname = _("GEPITO"), - .trainerName = _("CLARA"), + .nickname = _("刺福"), + .trainerName = _("律歌"), .trainerGfxId = OBJ_EVENT_GFX_WOMAN_2, .aiFlags = CONTEST_AI_SET_6, .whichRank = CONTEST_RANK_MASTER, @@ -2919,8 +2919,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_JAKOB] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_ESPEON, - .nickname = _("SPEON"), - .trainerName = _("JAKOB"), + .nickname = _("阳灵"), + .trainerName = _("震泰"), .trainerGfxId = OBJ_EVENT_GFX_PSYCHIC_M, .aiFlags = CONTEST_AI_SET_7, .whichRank = CONTEST_RANK_MASTER, @@ -2948,8 +2948,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_TREY] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_SLOWKING, - .nickname = _("SLOWGO"), - .trainerName = _("TREY"), + .nickname = _("贤王"), + .trainerName = _("雄濠"), .trainerGfxId = OBJ_EVENT_GFX_SAILOR, .aiFlags = CONTEST_AI_SET_8, .whichRank = CONTEST_RANK_MASTER, @@ -2977,8 +2977,8 @@ const struct ContestPokemon gContestOpponents[] = [CONTEST_OPPONENT_LANE] = { .filter = CONTEST_FILTER_ONLY_POSTGAME, .species = SPECIES_URSARING, - .nickname = _("URSING"), - .trainerName = _("LANE"), + .nickname = _("熊藏"), + .trainerName = _("忠德"), .trainerGfxId = OBJ_EVENT_GFX_BLACK_BELT, .aiFlags = CONTEST_AI_SET_9, .whichRank = CONTEST_RANK_MASTER,