From bf30806c7017b778e2570dfc91e854b9c0f554d3 Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Sun, 20 Apr 2025 11:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AD=E7=BB=83=E5=AE=B6=E4=B9=8B=E4=B8=98?= =?UTF-8?q?=E4=BA=BA=E5=90=8D&PM=E6=98=B5=E7=A7=B0=E6=B1=89=E5=8C=96+?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsrc\frontier=5Futil.c=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E5=A4=96=E5=8F=B9=E5=8F=B7=E5=85=A8=E8=A7=92=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/battle_frontier/trainer_hill.h | 478 ++++++++++++------------ src/frontier_util.c | 50 +-- 2 files changed, 264 insertions(+), 264 deletions(-) diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h index ffde333e7b..ade730b044 100644 --- a/src/data/battle_frontier/trainer_hill.h +++ b/src/data/battle_frontier/trainer_hill.h @@ -23,7 +23,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .trainerNum2 = 0, .trainers = { [0] = { - .name = __("シゲノブ$$$$ "), + .name = __("展荣"), .facilityClass = FACILITY_CLASS_YOUNGSTER, .unused = TRUE, .speechBefore = { EC_WORD_TRAINER, EC_WORD_MRS, EC_WORD_EXCL, EC_WORD_THEY_WERE, EC_WORD_OPPONENT, EC_WORD_CAN }, @@ -49,7 +49,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x80, - .nickname = __("ジグザグマ$$$$$$"), + .nickname = __("蛇纹熊"), .friendship = MAX_FRIENDSHIP }, [1] = { @@ -69,7 +69,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = __("キノココ$$$$$$$"), + .nickname = __("蘑蘑菇"), .friendship = MAX_FRIENDSHIP }, [2] = { @@ -89,7 +89,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x80, - .nickname = __("サンド$$$$$$$$"), + .nickname = __("穿山鼠"), .friendship = MAX_FRIENDSHIP }, [3] = DUMMY_HILL_MON, @@ -98,7 +98,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { } }, [1] = { - .name = __("アカリ$$$$$ "), + .name = __("明莉"), .facilityClass = FACILITY_CLASS_PARASOL_LADY, .unused = TRUE, .speechBefore = { EC_WORD_SHE, EC_WORD_EVERY, EC_WORD_TYPE, EC_WORD_ADORE, EC_WORD_FOR, EC_WORD_EXCL }, @@ -127,7 +127,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = __("キャモメ$$$$$$$"), + .nickname = __("长翅鸥"), .friendship = MAX_FRIENDSHIP }, [4] = { @@ -148,7 +148,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = __("ドンメル$$$$$$$"), + .nickname = __("呆火驼"), .friendship = MAX_FRIENDSHIP }, [5] = { @@ -169,7 +169,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = __("アメタマ$$$$$$$"), + .nickname = __("溜溜糖球"), .friendship = MAX_FRIENDSHIP }, } @@ -188,7 +188,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .trainerNum2 = 0, .trainers = { [0] = { - .name = __("シゲゾウ$$$$ "), + .name = __("重藏"), .facilityClass = FACILITY_CLASS_NINJA_BOY, .unused = TRUE, .speechBefore = { EC_WORD_WIN, EC_WORD_UNTIL, EC_WORD_DAUGHTER, EC_MOVE(CONSTRICT), EC_WORD_OF, EC_WORD_WERE }, @@ -213,7 +213,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0x0, - .nickname = __("ラクライ$$$$$$$"), + .nickname = __("落雷兽"), .friendship = MAX_FRIENDSHIP }, [1] = { @@ -234,7 +234,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0x96, - .nickname = __("ヘイガニ$$$$$$$"), + .nickname = __("龙虾小兵"), .friendship = MAX_FRIENDSHIP }, [2] = { @@ -255,7 +255,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = __("ヤジロン$$$$$$$"), + .nickname = __("天秤偶"), .friendship = MAX_FRIENDSHIP }, [3] = DUMMY_HILL_MON, @@ -264,7 +264,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { } }, [1] = { - .name = __("ナミコ$$$$$ "), + .name = __("凌波"), .facilityClass = FACILITY_CLASS_BEAUTY, .unused = TRUE, .speechBefore = { EC_WORD_SISTER, EC_WORD_ALTHOUGH, EC_WORD_KIND, EC_WORD_MATCH, EC_WORD_PLEASE, EC_WORD_WITHOUT }, @@ -293,7 +293,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x80, - .nickname = __("タマザラシ$$$$$$"), + .nickname = __("海豹球"), .friendship = MAX_FRIENDSHIP }, [4] = { @@ -314,7 +314,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0xf, - .nickname = __("バネブー$$$$$$$"), + .nickname = __("跳跳猪"), .friendship = MAX_FRIENDSHIP }, [5] = { @@ -336,7 +336,7 @@ static const struct TrainerHillFloor sFloors_JPDefault[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = __("ポチエナ$$$$$$$"), + .nickname = __("土狼犬"), .friendship = MAX_FRIENDSHIP }, } @@ -370,7 +370,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = { [0] = { - .name = _("ALAINA"), + .name = _("阿莱娜"), .facilityClass = FACILITY_CLASS_HEX_MANIAC, .speechBefore = {EC_WORD_YOU, EC_WORD_CAN, EC_WORD_CHOOSE, EC_WORD_NOT, EC_WORD_TO, EC_WORD_BELIEVE}, .speechWin = {EC_WORD_A, EC_WORD_SUPER, EC_WORD_NATURAL, EC_WORD_POWER, EC_WORD_HAS, EC_WORD_COME}, @@ -395,7 +395,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0x0, - .nickname = _("MISDREAVUS"), + .nickname = _("梦妖"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -416,7 +416,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0xF, - .nickname = _("SOLROCK"), + .nickname = _("太阳岩"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -436,7 +436,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0xC, - .nickname = _("CLAYDOL"), + .nickname = _("念力土偶"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -456,7 +456,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0x80, - .nickname = _("WEEZING"), + .nickname = _("双弹瓦斯"), .friendship = 0, }, [4] = @@ -477,7 +477,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0xF, - .nickname = _("LUNATONE"), + .nickname = _("月石"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -497,14 +497,14 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 24, .abilityNum = 0, .personality = 0x83, - .nickname = _("FLYGON"), + .nickname = _("沙漠蜻蜓"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("ALFONSO"), + .name = _("阿尔方索"), .facilityClass = FACILITY_CLASS_CYCLING_TRIATHLETE_M, .speechBefore = {EC_WORD_I, EC_WORD_NEVER, EC_WORD_TAKE, EC_WORD_A, EC_WORD_TRAIN, EC_EMPTY_WORD}, .speechWin = {EC_WORD_I_AM, EC_WORD_FEELING, EC_MOVE2(SUPERSONIC), EC_WORD_ON, EC_WORD_MY, EC_WORD_BIKE}, @@ -528,7 +528,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("SEALEO"), + .nickname = _("海魔狮"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -547,7 +547,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("AMPHAROS"), + .nickname = _("电龙"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -566,7 +566,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x4E, - .nickname = _("MACHOKE"), + .nickname = _("豪力"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -585,7 +585,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x28, - .nickname = _("FLAREON"), + .nickname = _("火伊布"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -604,7 +604,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x0, - .nickname = _("MAGNETON"), + .nickname = _("三合一磁怪"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -624,7 +624,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x85, - .nickname = _("PINSIR"), + .nickname = _("凯罗斯"), .friendship = MAX_FRIENDSHIP, }, }, @@ -646,7 +646,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = { [0] = { - .name = _("THEODORE"), + .name = _("西奥多"), .facilityClass = FACILITY_CLASS_BLACK_BELT, .speechBefore = {EC_WORD_MY, EC_WORD_POWER, EC_WORD_WILL, EC_MOVE2(STOMP), EC_WORD_YOU, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAAAH, EC_WORD_HAHAHA, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_HAHAHA, EC_WORD_EXCL_EXCL}, @@ -671,7 +671,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 0, .personality = 0x80, - .nickname = _("MEDITITE"), + .nickname = _("玛沙那"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -691,7 +691,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 1, .personality = 0x80, - .nickname = _("HERACROSS"), + .nickname = _("赫拉克罗斯"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -711,7 +711,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 0, .personality = 0x3, - .nickname = _("HITMONTOP"), + .nickname = _("战舞郎"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -731,7 +731,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 0, .personality = 0x4E, - .nickname = _("MACHOP"), + .nickname = _("腕力"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -751,7 +751,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 0, .personality = 0x80, - .nickname = _("PINSIR"), + .nickname = _("凯罗斯"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -771,14 +771,14 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 20, .abilityNum = 0, .personality = 0x3, - .nickname = _("HITMONCHAN"), + .nickname = _("快拳郎"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("JAYDEN"), + .name = _("洁登"), .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F, .speechBefore = {EC_WORD_SOME, EC_WORD_THINGS, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_DO, EC_WORD_ALONE}, .speechWin = {EC_WORD_YOU, EC_WORD_WIN, EC_WORD_AS, EC_WORD_A, EC_WORD_GROUP, EC_EMPTY_WORD}, @@ -803,7 +803,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("VULPIX"), + .nickname = _("六尾"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -823,7 +823,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8C, - .nickname = _("MINUN"), + .nickname = _("负电拍拍"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -843,7 +843,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 1, .personality = 0xF, - .nickname = _("ROSELIA"), + .nickname = _("毒蔷薇"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -883,7 +883,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x5, - .nickname = _("PLUSLE"), + .nickname = _("正电拍拍"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -903,7 +903,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 1, .personality = 0x37, - .nickname = _("TOGEPI"), + .nickname = _("波克比"), .friendship = MAX_FRIENDSHIP, }, }, @@ -925,7 +925,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = { [0] = { - .name = _("SALVADORE"), + .name = _("萨尔瓦多"), .facilityClass = FACILITY_CLASS_PKMN_BREEDER_M, .speechBefore = {EC_WORD_LET_S, EC_MOVE2(WRAP), EC_WORD_THINGS, EC_WORD_UP, EC_WORD_HERE, EC_WORD_HEY_QUES}, .speechWin = {EC_WORD_WOULD, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_QUES}, @@ -950,7 +950,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x37, - .nickname = _("VAPOREON"), + .nickname = _("水伊布"), .friendship = 0, }, [1] = @@ -970,7 +970,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 1, .personality = 0x8A, - .nickname = _("DODRIO"), + .nickname = _("嘟嘟利"), .friendship = 0, }, [2] = @@ -990,7 +990,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x14, - .nickname = _("OMASTAR"), + .nickname = _("多刺菊石兽"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1010,7 +1010,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8, - .nickname = _("LICKITUNG"), + .nickname = _("大舌头"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1030,7 +1030,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 1, .personality = 0x94, - .nickname = _("SLOWBRO"), + .nickname = _("呆壳兽"), .friendship = 0, }, [5] = @@ -1050,14 +1050,14 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8, - .nickname = _("LINOONE"), + .nickname = _("直冲熊"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("VERONICA"), + .name = _("维罗妮卡"), .facilityClass = FACILITY_CLASS_PKMN_BREEDER_F, .speechBefore = {EC_WORD_I_AM, EC_WORD_THE, EC_WORD_STRONG, EC_WORD_BEAUTY, EC_WORD_AROUND, EC_WORD_HERE}, .speechWin = {EC_WORD_I_AM, EC_WORD_STRONG, EC_WORD_THAT_S, EC_WORD_WHY, EC_WORD_EXCL, EC_EMPTY_WORD}, @@ -1081,7 +1081,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xCB, - .nickname = _("SKITTY"), + .nickname = _("向尾喵"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1101,7 +1101,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD, - .nickname = _("MEDICHAM"), + .nickname = _("恰雷姆"), .friendship = 0, }, [2] = @@ -1121,7 +1121,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("STANTLER"), + .nickname = _("惊角鹿"), .friendship = 0, }, [3] = @@ -1141,7 +1141,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("NIDOQUEEN"), + .nickname = _("尼多后"), .friendship = 0, }, [4] = @@ -1161,7 +1161,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD7, - .nickname = _("NINETALES"), + .nickname = _("九尾"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1181,7 +1181,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x28, - .nickname = _("CHARIZARD"), + .nickname = _("喷火龙"), .friendship = MAX_FRIENDSHIP, }, }, @@ -1203,7 +1203,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = { [0] = { - .name = _("KEENAN"), + .name = _("基南"), .facilityClass = FACILITY_CLASS_PSYCHIC_M, .speechBefore = {EC_WORD_YOU, EC_WORD_LOOK, EC_WORD_SO, EC_WORD_HURRIED, EC_EMPTY_WORD, EC_EMPTY_WORD}, .speechWin = {EC_WORD_TOO, EC_WORD_BAD, EC_EMPTY_WORD, EC_WORD_TIME, EC_WORD_IS, EC_WORD_UP}, @@ -1227,7 +1227,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 0, .personality = 0x41, - .nickname = _("ALAKAZAM"), + .nickname = _("胡地"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1247,7 +1247,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 1, .personality = 0xF, - .nickname = _("BLISSEY"), + .nickname = _("幸福蛋"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1267,7 +1267,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 0, .personality = 0x8C, - .nickname = _("GRUMPIG"), + .nickname = _("噗噗猪"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1286,7 +1286,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 1, .personality = 0xF, - .nickname = _("GARDEVOIR"), + .nickname = _("沙奈朵"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1305,7 +1305,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 0, .personality = 0x80, - .nickname = _("VENOMOTH"), + .nickname = _("摩鲁蛾"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1324,14 +1324,14 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 5, .abilityNum = 0, .personality = 0xF, - .nickname = _("ESPEON"), + .nickname = _("太阳伊布"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("KRISTINA"), + .name = _("克莉丝蒂娜"), .facilityClass = FACILITY_CLASS_AROMA_LADY, .speechBefore = {EC_WORD_IT_S, EC_WORD_HOT, EC_WORD_ELLIPSIS, EC_WORD_WHAT, EC_WORD_A, EC_WORD_STENCH}, .speechWin = {EC_WORD_I, EC_WORD_REALLY, EC_WORD_LIKE, EC_WORD_AN, EC_WORD_OFFENSIVE, EC_WORD_STENCH}, @@ -1355,7 +1355,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("WEEZING"), + .nickname = _("双弹瓦斯"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1374,7 +1374,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8C, - .nickname = _("GLOOM"), + .nickname = _("臭臭花"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1393,7 +1393,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("MUK"), + .nickname = _("臭臭泥"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1413,7 +1413,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x83, - .nickname = _("TROPIUS"), + .nickname = _("热带龙"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1432,7 +1432,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x6, - .nickname = _("BELLOSSOM"), + .nickname = _("美丽花"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1452,7 +1452,7 @@ static const struct TrainerHillFloor sFloors_Normal[] = .spDefenseIV = 15, .abilityNum = 0, .personality = 0x1F, - .nickname = _("MEGANIUM"), + .nickname = _("大竺葵"), .friendship = MAX_FRIENDSHIP, }, }, @@ -1485,7 +1485,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { { [0] = { - .name = _("TERRANCE"), + .name = _("特伦斯"), .facilityClass = FACILITY_CLASS_GENTLEMAN, .speechBefore = {EC_WORD_GOOD, EC_WORD_CHILDREN, EC_WORD_WILL, EC_WORD_GET, EC_WORD_A, EC_MOVE2(PRESENT)}, .speechWin = {EC_WORD_THANK_YOU, EC_WORD_MY, EC_WORD_VICTORY, EC_WORD_IS, EC_WORD_YOUR, EC_MOVE2(PRESENT)}, @@ -1509,7 +1509,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x8A, - .nickname = _("DELIBIRD"), + .nickname = _("信使鸟"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1528,7 +1528,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD, - .nickname = _("CLEFAIRY"), + .nickname = _("皮皮"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1547,7 +1547,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD, - .nickname = _("PIKACHU"), + .nickname = _("皮卡丘"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1566,7 +1566,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x8A, - .nickname = _("MARILL"), + .nickname = _("玛力露"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1585,7 +1585,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD, - .nickname = _("JIGGLYPUFF"), + .nickname = _("胖丁"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1604,14 +1604,14 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x26, - .nickname = _("TOGETIC"), + .nickname = _("波克基古"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("ELIZABETH"), + .name = _("伊丽莎白"), .facilityClass = FACILITY_CLASS_LADY, .speechBefore = {EC_WORD_CAN, EC_WORD_YOU, EC_WORD_SENSE, EC_WORD_ME, EC_MOVE(FOCUS_ENERGY), EC_WORD_QUES}, .speechWin = {EC_WORD_THAT_S, EC_WORD_ABOUT, EC_WORD_RIGHT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_THINK}, @@ -1635,7 +1635,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xC1, - .nickname = _("WIGGLYTUFF"), + .nickname = _("胖可丁"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1654,7 +1654,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x87, - .nickname = _("SABLEYE"), + .nickname = _("勾魂眼"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1673,7 +1673,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xA, - .nickname = _("GRUMPIG"), + .nickname = _("噗噗猪"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1692,7 +1692,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x12, - .nickname = _("CORSOLA"), + .nickname = _("太阳珊瑚"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1711,7 +1711,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xA, - .nickname = _("CLAMPERL"), + .nickname = _("珍珠贝"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1730,7 +1730,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xA, - .nickname = _("STARMIE"), + .nickname = _("宝石海星"), .friendship = MAX_FRIENDSHIP, }, }, @@ -1752,7 +1752,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { { [0] = { - .name = _("ANNABELL"), + .name = _("安娜贝尔"), .facilityClass = FACILITY_CLASS_PARASOL_LADY, .speechBefore = {EC_WORD_HI, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_UPBEAT, EC_WORD_QUES}, .speechWin = {EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FEELING, EC_WORD_WELL, EC_WORD_QUES, EC_EMPTY_WORD}, @@ -1780,7 +1780,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = _("JIGGLYPUFF"), + .nickname = _("胖丁"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1803,7 +1803,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = _("JYNX"), + .nickname = _("迷唇姐"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1826,7 +1826,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = _("EXPLOUD"), + .nickname = _("爆音怪"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1849,7 +1849,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = _("ABSOL"), + .nickname = _("阿勃梭鲁"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -1872,7 +1872,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x96, - .nickname = _("PIDGEOTTO"), + .nickname = _("比比鸟"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -1895,14 +1895,14 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x0, - .nickname = _("ALTARIA"), + .nickname = _("七夕青鸟"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("COLEMAN"), + .name = _("科尔曼"), .facilityClass = FACILITY_CLASS_COLLECTOR, .speechBefore = {EC_WORD_I, EC_WORD_SEEK, EC_WORD_SOMEONE, EC_WORD_AS, EC_WORD_MY, EC_WORD_IDOL}, .speechWin = {EC_WORD_DID, EC_WORD_MY, EC_WORD_IDOL, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES}, @@ -1927,7 +1927,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xD, - .nickname = _("CHIMECHO"), + .nickname = _("风铃铃"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -1947,7 +1947,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xD, - .nickname = _("WHISMUR"), + .nickname = _("咕妞妞"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -1967,7 +1967,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x8A, - .nickname = _("YANMA"), + .nickname = _("蜻蜻蜓"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -1987,7 +1987,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xA, - .nickname = _("ILLUMISE"), + .nickname = _("甜甜萤"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2007,7 +2007,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xA, - .nickname = _("SPHEAL"), + .nickname = _("海豹球"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -2027,7 +2027,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x87, - .nickname = _("VIGOROTH"), + .nickname = _("过动猿"), .friendship = MAX_FRIENDSHIP, }, }, @@ -2049,7 +2049,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { { [0] = { - .name = _("ENRIQUE"), + .name = _("恩里克"), .facilityClass = FACILITY_CLASS_RICH_BOY, .speechBefore = {EC_WORD_GET, EC_WORD_READY, EC_WORD_FOR, EC_WORD_AN, EC_WORD_AWESOME, EC_WORD_TIME}, .speechWin = {EC_WORD_HEY, EC_WORD_HEY, EC_WORD_EXCL, EC_WORD_WHAT_S_UP_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD}, @@ -2074,7 +2074,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8C, - .nickname = _("WOOPER"), + .nickname = _("乌波"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2094,7 +2094,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x3, - .nickname = _("POLIWAG"), + .nickname = _("蚊香蝌蚪"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2114,7 +2114,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("PSYDUCK"), + .nickname = _("可达鸭"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2134,7 +2134,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x96, - .nickname = _("RHYDON"), + .nickname = _("钻角犀兽"), .friendship = 0, }, [4] = @@ -2154,7 +2154,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("RHYHORN"), + .nickname = _("独角犀牛"), .friendship = 0, }, [5] = @@ -2174,14 +2174,14 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x80, - .nickname = _("CUBONE"), + .nickname = _("卡拉卡拉"), .friendship = 0, }, }, }, [1] = { - .name = _("COLLEEN"), + .name = _("柯琳"), .facilityClass = FACILITY_CLASS_LADY, .speechBefore = {EC_WORD_I, EC_WORD_WOULD, EC_WORD_LIKE, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_OUT}, .speechWin = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_ROCK, EC_WORD_THING, EC_WORD_EXCL}, @@ -2206,7 +2206,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8C, - .nickname = _("MAGNEMITE"), + .nickname = _("小磁怪"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2226,7 +2226,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x41, - .nickname = _("ELECTABUZZ"), + .nickname = _("电击兽"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2245,7 +2245,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x0, - .nickname = _("FLAAFFY"), + .nickname = _("茸茸羊"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2265,7 +2265,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("BALTOY"), + .nickname = _("天秤偶"), .friendship = 0, }, [4] = @@ -2285,7 +2285,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("PINECO"), + .nickname = _("榛果球"), .friendship = 0, }, [5] = @@ -2305,7 +2305,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x80, - .nickname = _("VOLTORB"), + .nickname = _("霹雳电球"), .friendship = 0, }, }, @@ -2327,7 +2327,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { { [0] = { - .name = _("KIMBERLY"), + .name = _("金伯莉"), .facilityClass = FACILITY_CLASS_POKEFAN_F, .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_WORKING, EC_WORD_AT, EC_WORD_MY, EC_WORD_OWN_TEMPO}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_BAD, EC_WORD_YOU, EC_WORD_THINK, EC_WORD_QUES}, @@ -2351,7 +2351,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x202, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2370,7 +2370,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x10001, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2389,7 +2389,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 30, .abilityNum = 0, .personality = 0x102, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2409,7 +2409,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x88FE980F, - .nickname = _("SPINDA"), + .nickname = _("晃晃斑"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2428,7 +2428,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("PLUSLE"), + .nickname = _("正电拍拍"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -2447,14 +2447,14 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0xF, - .nickname = _("VOLBEAT"), + .nickname = _("电萤虫"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("FRANCISCO"), + .name = _("弗朗西斯科"), .facilityClass = FACILITY_CLASS_POKEFAN_M, .speechBefore = {EC_WORD_I, EC_WORD_STUDY, EC_WORD_EVERY, EC_WORD_DAY, EC_WORD_TOO, EC_EMPTY_WORD}, .speechWin = {EC_WORD_SO, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_YOU, EC_WORD_LOSE, EC_EMPTY_WORD}, @@ -2479,7 +2479,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xE2880098, - .nickname = _("SPINDA"), + .nickname = _("晃晃斑"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2498,7 +2498,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8C, - .nickname = _("MINUN"), + .nickname = _("负电拍拍"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2517,7 +2517,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("ILLUMISE"), + .nickname = _("甜甜萤"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2536,7 +2536,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x302, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2555,7 +2555,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = 30, .abilityNum = 0, .personality = 0x203, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -2574,7 +2574,7 @@ static const struct TrainerHillFloor sFloors_Variety[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x301, - .nickname = _("UNOWN"), + .nickname = _("未知图腾"), .friendship = MAX_FRIENDSHIP, }, }, @@ -2607,7 +2607,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { { [0] = { - .name = _("MEREDITH"), + .name = _("美迪斯"), .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, .speechBefore = {EC_WORD_UM, EC_WORD_ELLIPSIS, EC_EMPTY_WORD, EC_WORD_I, EC_WORD_ELLIPSIS, EC_EMPTY_WORD}, .speechWin = {EC_WORD_OH, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_UM, EC_WORD_ELLIPSIS, EC_WORD_YAY}, @@ -2632,7 +2632,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x0, - .nickname = _("SUNFLORA"), + .nickname = _("向日花怪"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2651,7 +2651,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x91, - .nickname = _("TANGELA"), + .nickname = _("蔓藤怪"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2673,7 +2673,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x1F, - .nickname = _("VENUSAUR"), + .nickname = _("妙蛙花"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2692,7 +2692,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("LANTURN"), + .nickname = _("电灯怪"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2711,7 +2711,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0xF, - .nickname = _("MANECTRIC"), + .nickname = _("雷电兽"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -2730,14 +2730,14 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("RAIKOU"), + .nickname = _("雷公"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("BERNARD"), + .name = _("伯纳德"), .facilityClass = FACILITY_CLASS_KINDLER, .speechBefore = {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_THIS, EC_WORD_HOT, EC_WORD_BATTLE}, .speechWin = {EC_WORD_DID, EC_WORD_I, EC_WORD_COOL, EC_WORD_YOU, EC_WORD_DOWN, EC_WORD_QUES}, @@ -2762,7 +2762,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x2F, - .nickname = _("RELICANTH"), + .nickname = _("古空棘鱼"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2781,7 +2781,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("GOLDUCK"), + .nickname = _("哥达鸭"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2800,7 +2800,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x28, - .nickname = _("BLASTOISE"), + .nickname = _("水箭龟"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2819,7 +2819,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x93, - .nickname = _("MAGCARGO"), + .nickname = _("熔岩蜗牛"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2838,7 +2838,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0xF, - .nickname = _("RAPIDASH"), + .nickname = _("烈焰马"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -2857,7 +2857,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("MOLTRES"), + .nickname = _("火焰鸟"), .friendship = MAX_FRIENDSHIP, }, }, @@ -2879,7 +2879,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { { [0] = { - .name = _("ABRAHAM"), + .name = _("亚伯拉罕"), .facilityClass = FACILITY_CLASS_RUIN_MANIAC, .speechBefore = {EC_WORD_I, EC_WORD_LIKE, EC_WORD_THIS, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_BEST}, .speechWin = {EC_WORD_WHAT, EC_WORD_A, EC_WORD_GREAT, EC_WORD_POKEMON, EC_WORD_IT, EC_WORD_IS}, @@ -2904,7 +2904,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8A, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -2924,7 +2924,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x87, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -2944,7 +2944,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xD, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -2964,7 +2964,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xA, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -2984,7 +2984,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xA, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3004,14 +3004,14 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x8A, - .nickname = _("SMEARGLE"), + .nickname = _("图图犬"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("LUC"), + .name = _("路克"), .facilityClass = FACILITY_CLASS_TUBER_M, .speechBefore = {EC_WORD_I, EC_WORD_HAVE, EC_WORD_A, EC_WORD_COOL, EC_WORD_RARE, EC_WORD_MOVE}, .speechWin = {EC_WORD_MY, EC_WORD_RARE, EC_WORD_MOVE, EC_WORD_IS, EC_WORD_COOL, EC_WORD_ISN_T_IT_QUES}, @@ -3036,7 +3036,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0xA, - .nickname = _("STARYU"), + .nickname = _("海星星"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -3056,7 +3056,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0xD, - .nickname = _("MEOWTH"), + .nickname = _("喵喵"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -3076,7 +3076,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x28, - .nickname = _("BLAZIKEN"), + .nickname = _("火焰鸡"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -3096,7 +3096,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0x16, - .nickname = _("CUBONE"), + .nickname = _("卡拉卡拉"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -3115,7 +3115,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 0, .personality = 0x8A, - .nickname = _("BEEDRILL"), + .nickname = _("大针蜂"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3135,7 +3135,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 5, .abilityNum = 1, .personality = 0xD, - .nickname = _("RATICATE"), + .nickname = _("拉达"), .friendship = MAX_FRIENDSHIP, }, }, @@ -3157,7 +3157,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { { [0] = { - .name = _("BREYDEN"), + .name = _("布雷登"), .facilityClass = FACILITY_CLASS_YOUNGSTER, .speechBefore = {EC_WORD_I, EC_WORD_CARE, EC_WORD_FOR, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_A_LOT}, .speechWin = {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_CAN, EC_WORD_DO, EC_WORD_IT, EC_WORD_ALL}, @@ -3182,7 +3182,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 25, .abilityNum = 0, .personality = 0x32, - .nickname = _("CHARMELEON"), + .nickname = _("火恐龙"), .friendship = 100, }, [1] = @@ -3201,7 +3201,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 25, .abilityNum = 0, .personality = 0x0, - .nickname = _("WARTORTLE"), + .nickname = _("卡咪龟"), .friendship = 100, }, [2] = @@ -3221,7 +3221,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 25, .abilityNum = 0, .personality = 0x0, - .nickname = _("IVYSAUR"), + .nickname = _("妙蛙草"), .friendship = 100, }, [3] = @@ -3241,7 +3241,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 25, .abilityNum = 0, .personality = 0x32, - .nickname = _("BAYLEEF"), + .nickname = _("月桂叶"), .friendship = 100, }, [4] = @@ -3261,7 +3261,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 25, .abilityNum = 0, .personality = 0x3, - .nickname = _("CROCONAW"), + .nickname = _("蓝鳄"), .friendship = 100, }, [5] = @@ -3281,14 +3281,14 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x28, - .nickname = _("QUILAVA"), + .nickname = _("火岩鼠"), .friendship = 100, }, }, }, [1] = { - .name = _("ANIYA"), + .name = _("安妮雅"), .facilityClass = FACILITY_CLASS_TUBER_F, .speechBefore = {EC_WORD_SOMEONE, EC_WORD_GOT, EC_WORD_ME, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_EGG}, .speechWin = {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_NEW, EC_WORD_AT, EC_WORD_THIS, EC_WORD_EXCL}, @@ -3313,7 +3313,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x32, - .nickname = _("SMOOCHUM"), + .nickname = _("迷唇娃"), .friendship = 50, }, [1] = @@ -3333,7 +3333,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xC8, - .nickname = _("AZURILL"), + .nickname = _("露力丽"), .friendship = 50, }, [2] = @@ -3353,7 +3353,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, - .nickname = _("ELEKID"), + .nickname = _("电击怪"), .friendship = 50, }, [3] = @@ -3373,7 +3373,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, - .nickname = _("CLEFFA"), + .nickname = _("皮宝宝"), .friendship = 50, }, [4] = @@ -3393,7 +3393,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x84, - .nickname = _("WYNAUT"), + .nickname = _("小果然"), .friendship = 50, }, [5] = @@ -3413,7 +3413,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, - .nickname = _("MAGBY"), + .nickname = _("鸭嘴宝宝"), .friendship = 50, }, }, @@ -3435,7 +3435,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { { [0] = { - .name = _("DANE"), + .name = _("戴恩"), .facilityClass = FACILITY_CLASS_BIRD_KEEPER, .speechBefore = {EC_WORD_I, EC_WORD_GOT, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ON, EC_WORD_VACATION}, .speechWin = {EC_WORD_IT_S, EC_WORD_GREAT, EC_WORD_TO, EC_WORD_TRAVEL, EC_WORD_AND, EC_WORD_BATTLE}, @@ -3460,7 +3460,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x80, - .nickname = _("SUDOWOODO"), + .nickname = _("树才怪"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -3479,7 +3479,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x8C, - .nickname = _("SLOWKING"), + .nickname = _("呆呆王"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -3498,7 +3498,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("ENTEI"), + .nickname = _("炎帝"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -3517,7 +3517,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("HITMONCHAN"), + .nickname = _("快拳郎"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -3536,7 +3536,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0x6, - .nickname = _("MANTINE"), + .nickname = _("巨翅飞鱼"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3555,14 +3555,14 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x18, - .nickname = _("ZAPDOS"), + .nickname = _("闪电鸟"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("STEPHANIE"), + .name = _("斯蒂芬妮"), .facilityClass = FACILITY_CLASS_SWIMMING_TRIATHLETE_F, .speechBefore = {EC_WORD_THIS, EC_WORD_IS, EC_WORD_HOW, EC_WORD_YOU, EC_WORD_WIN, EC_WORD_EXCL}, .speechWin = {EC_WORD_DO, EC_WORD_YOU, EC_WORD_UNDERSTAND, EC_WORD_HOW, EC_WORD_NOW, EC_WORD_QUES}, @@ -3586,7 +3586,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("HITMONLEE"), + .nickname = _("飞腿郎"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -3605,7 +3605,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("PORYGON2"), + .nickname = _("多边兽2型"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -3624,7 +3624,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("SUICUNE"), + .nickname = _("水君"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -3643,7 +3643,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 1, .personality = 0xF, - .nickname = _("HOUNDOOM"), + .nickname = _("黑鲁加"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -3662,7 +3662,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0x3, - .nickname = _("STANTLER"), + .nickname = _("惊角鹿"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3681,7 +3681,7 @@ static const struct TrainerHillFloor sFloors_Unique[] = { .spDefenseIV = 15, .abilityNum = 0, .personality = 0xF, - .nickname = _("ARTICUNO"), + .nickname = _("急冻鸟"), .friendship = MAX_FRIENDSHIP, }, }, @@ -3714,7 +3714,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { { [0] = { - .name = _("ALFRED"), + .name = _("阿尔弗雷德"), .facilityClass = FACILITY_CLASS_COOLTRAINER_M, .speechBefore = {EC_WORD_WE, EC_WORD_CAN, EC_WORD_TAKE, EC_WORD_ON, EC_WORD_ANY, EC_WORD_TYPE}, .speechWin = {EC_WORD_WE, EC_WORD_DID, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_OKAY, EC_WORD_EXCL}, @@ -3739,7 +3739,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x35, - .nickname = _("SNORLAX"), + .nickname = _("卡比兽"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -3759,7 +3759,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("MILTANK"), + .nickname = _("大奶罐"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -3779,7 +3779,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x7F, - .nickname = _("URSARING"), + .nickname = _("圈圈熊"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -3799,7 +3799,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, - .nickname = _("SLAKING"), + .nickname = _("请假王"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -3819,7 +3819,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("KANGASKHAN"), + .nickname = _("袋兽"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3839,14 +3839,14 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, - .nickname = _("ZANGOOSE"), + .nickname = _("猫鼬斩"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("EDIE"), + .name = _("艾迪"), .facilityClass = FACILITY_CLASS_PSYCHIC_F, .speechBefore = {EC_WORD_WE, EC_WORD_WILL_BE_HERE, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_TRAINER, EC_WORD_CHALLENGE}, .speechWin = {EC_WORD_MY, EC_WORD_STRATEGY, EC_WORD_WORKS, EC_WORD_TO, EC_WORD_PERFECTION, EC_WORD_EXCL}, @@ -3871,7 +3871,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xF, - .nickname = _("SLOWKING"), + .nickname = _("呆呆王"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -3891,7 +3891,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x28, - .nickname = _("ESPEON"), + .nickname = _("太阳伊布"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -3911,7 +3911,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xF, - .nickname = _("STARMIE"), + .nickname = _("宝石海星"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -3931,7 +3931,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, - .nickname = _("GENGAR"), + .nickname = _("耿鬼"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -3951,7 +3951,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, - .nickname = _("GARDEVOIR"), + .nickname = _("沙奈朵"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -3971,7 +3971,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, - .nickname = _("ALAKAZAM"), + .nickname = _("胡地"), .friendship = MAX_FRIENDSHIP, }, }, @@ -3993,7 +3993,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { { [0] = { - .name = _("RODERICK"), + .name = _("罗德里克"), .facilityClass = FACILITY_CLASS_COOLTRAINER_M, .speechBefore = {EC_WORD_I, EC_WORD_CAN, EC_WORD_WIN, EC_WORD_WITHOUT, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, .speechWin = {EC_WORD_IT_S, EC_WORD_ONLY, EC_WORD_NATURAL, EC_WORD_THAT, EC_WORD_I, EC_WORD_WIN}, @@ -4018,7 +4018,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("SWELLOW"), + .nickname = _("大王燕"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -4038,7 +4038,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("MACHAMP"), + .nickname = _("怪力"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -4058,7 +4058,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("URSARING"), + .nickname = _("圈圈熊"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -4078,7 +4078,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, - .nickname = _("KINGLER"), + .nickname = _("巨钳蟹"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -4098,7 +4098,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, - .nickname = _("TYRANITAR"), + .nickname = _("班基拉斯"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -4118,14 +4118,14 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, - .nickname = _("DRAGONITE"), + .nickname = _("快龙"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("ALICIA"), + .name = _("艾丽西亚"), .facilityClass = FACILITY_CLASS_COOLTRAINER_F, .speechBefore = {EC_WORD_I, EC_WORD_DON_T, EC_WORD_NEED, EC_WORD_A, EC_MOVE2(HELPING_HAND), EC_WORD_EXCL}, .speechWin = {EC_WORD_SORRY, EC_WORD_EXCL, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_FOR, EC_WORD_YOU}, @@ -4150,7 +4150,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xA, - .nickname = _("JOLTEON"), + .nickname = _("雷伊布"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -4170,7 +4170,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xA, - .nickname = _("ALAKAZAM"), + .nickname = _("胡地"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -4190,7 +4190,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xA, - .nickname = _("STARMIE"), + .nickname = _("宝石海星"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -4210,7 +4210,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x82, - .nickname = _("DUSCLOPS"), + .nickname = _("彷徨夜灵"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -4230,7 +4230,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xD2, - .nickname = _("NINETALES"), + .nickname = _("九尾"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -4250,7 +4250,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, - .nickname = _("BANETTE"), + .nickname = _("诅咒娃娃"), .friendship = MAX_FRIENDSHIP, }, }, @@ -4272,7 +4272,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { { [0] = { - .name = _("TERRENCE"), + .name = _("泰伦斯"), .facilityClass = FACILITY_CLASS_EXPERT_M, .speechBefore = {EC_WORD_OH_DEAR, EC_WORD_THIS, EC_WORD_MATCH, EC_WORD_IS, EC_WORD_FOR, EC_WORD_YOU}, .speechWin = {EC_WORD_OH_DEAR, EC_WORD_DID, EC_WORD_YOU, EC_WORD_SEE, EC_WORD_THAT, EC_WORD_QUES}, @@ -4297,7 +4297,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x94, - .nickname = _("WOBBUFFET"), + .nickname = _("果然翁"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -4317,7 +4317,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, - .nickname = _("EXPLOUD"), + .nickname = _("爆音怪"), .friendship = 0, }, [2] = @@ -4337,7 +4337,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, - .nickname = _("CROBAT"), + .nickname = _("叉字蝠"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -4357,7 +4357,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xD, - .nickname = _("DUGTRIO"), + .nickname = _("三地鼠"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -4377,7 +4377,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x5, - .nickname = _("ELECTRODE"), + .nickname = _("顽皮雷弹"), .friendship = 0, }, [5] = @@ -4397,14 +4397,14 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, - .nickname = _("GENGAR"), + .nickname = _("耿鬼"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("CARLOTTA"), + .name = _("卡萝塔"), .facilityClass = FACILITY_CLASS_EXPERT_F, .speechBefore = {EC_WORD_OH_DEAR, EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN, EC_WORD_FOR, EC_WORD_YOU}, .speechWin = {EC_WORD_OH_DEAR, EC_WORD_WE, EC_WORD_HAVE, EC_WORD_A, EC_WORD_PARTY, EC_WORD_LATER}, @@ -4429,7 +4429,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x82, - .nickname = _("LAPRAS"), + .nickname = _("拉普拉斯"), .friendship = 0, }, [1] = @@ -4449,7 +4449,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x8A, - .nickname = _("ABSOL"), + .nickname = _("阿勃梭鲁"), .friendship = 0, }, [2] = @@ -4469,7 +4469,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, - .nickname = _("ALTARIA"), + .nickname = _("七夕青鸟"), .friendship = 0, }, [3] = @@ -4489,7 +4489,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, - .nickname = _("DEWGONG"), + .nickname = _("白海狮"), .friendship = 0, }, [4] = @@ -4509,7 +4509,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0x14, - .nickname = _("POLITOED"), + .nickname = _("蚊香蛙皇"), .friendship = 0, }, [5] = @@ -4529,7 +4529,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0x17, - .nickname = _("MAROWAK"), + .nickname = _("嘎啦嘎啦"), .friendship = 0, }, }, @@ -4551,7 +4551,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { { [0] = { - .name = _("NORA"), + .name = _("诺拉"), .facilityClass = FACILITY_CLASS_PKMN_RANGER_F, .speechBefore = {EC_WORD_WAAAH, EC_WORD_THIS, EC_WORD_IS, EC_WORD_SO, EC_WORD_EXCITING, EC_WORD_EXCL}, .speechWin = {EC_WORD_WAAAH, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_HAPPY, EC_WORD_I, EC_WORD_WON}, @@ -4576,7 +4576,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("FORRETRESS"), + .nickname = _("佛烈托斯"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -4595,7 +4595,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xC, - .nickname = _("ELECTRODE"), + .nickname = _("顽皮雷弹"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -4614,7 +4614,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x7F, - .nickname = _("EXEGGUTOR"), + .nickname = _("椰蛋树"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -4634,7 +4634,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x93, - .nickname = _("DUSCLOPS"), + .nickname = _("彷徨夜灵"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -4653,7 +4653,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, - .nickname = _("NINETALES"), + .nickname = _("九尾"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -4672,14 +4672,14 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x96, - .nickname = _("BANETTE"), + .nickname = _("诅咒娃娃"), .friendship = MAX_FRIENDSHIP, }, }, }, [1] = { - .name = _("GAV"), + .name = _("加夫"), .facilityClass = FACILITY_CLASS_PKMN_RANGER_M, .speechBefore = {EC_WORD_WAHAHAHA, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_STOP, EC_WORD_ME, EC_WORD_EXCL}, .speechWin = {EC_WORD_WOWEE, EC_WORD_EXCL, EC_EMPTY_WORD, EC_WORD_I_AM, EC_WORD_AWESOME, EC_WORD_COOL}, @@ -4703,7 +4703,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x95, - .nickname = _("SALAMENCE"), + .nickname = _("暴飞龙"), .friendship = MAX_FRIENDSHIP, }, [1] = @@ -4722,7 +4722,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x8C, - .nickname = _("GENGAR"), + .nickname = _("耿鬼"), .friendship = MAX_FRIENDSHIP, }, [2] = @@ -4741,7 +4741,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("GYARADOS"), + .nickname = _("暴鲤龙"), .friendship = MAX_FRIENDSHIP, }, [3] = @@ -4760,7 +4760,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, - .nickname = _("GENGAR"), + .nickname = _("耿鬼"), .friendship = MAX_FRIENDSHIP, }, [4] = @@ -4780,7 +4780,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, - .nickname = _("DUSCLOPS"), + .nickname = _("彷徨夜灵"), .friendship = MAX_FRIENDSHIP, }, [5] = @@ -4800,7 +4800,7 @@ static const struct TrainerHillFloor sFloors_Expert[] = { .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, - .nickname = _("MISDREAVUS"), + .nickname = _("梦妖"), .friendship = MAX_FRIENDSHIP, }, }, diff --git a/src/frontier_util.c b/src/frontier_util.c index 1b2519793c..b5639d1688 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -1012,25 +1012,25 @@ static void TowerPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x { default: case FRONTIER_MODE_SINGLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_TOWER_SINGLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_TOWER_SINGLES_50); break; case FRONTIER_MODE_DOUBLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_TOWER_DOUBLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_TOWER_DOUBLES_50); break; case FRONTIER_MODE_MULTIS: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_TOWER_MULTIS_OPEN); else isCurrent = IsWinStreakActive(STREAK_TOWER_MULTIS_50); break; case FRONTIER_MODE_LINK_MULTIS: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_TOWER_LINK_MULTIS_OPEN); else isCurrent = IsWinStreakActive(STREAK_TOWER_LINK_MULTIS_50); @@ -1095,13 +1095,13 @@ static void DomePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 x2 { default: case FRONTIER_MODE_SINGLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_DOME_SINGLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_DOME_SINGLES_50); break; case FRONTIER_MODE_DOUBLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_DOME_DOUBLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_DOME_DOUBLES_50); @@ -1172,13 +1172,13 @@ static void PalacePrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 { default: case FRONTIER_MODE_SINGLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_PALACE_SINGLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_PALACE_SINGLES_50); break; case FRONTIER_MODE_DOUBLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_PALACE_DOUBLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_PALACE_DOUBLES_50); @@ -1235,7 +1235,7 @@ static void PikePrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) bool8 isCurrent; u16 winStreak = PikeGetWinStreak(lvlMode); - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_PIKE_OPEN); else isCurrent = IsWinStreakActive(STREAK_PIKE_50); @@ -1297,7 +1297,7 @@ static void ArenaPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) bool8 isCurrent; u16 winStreak = ArenaGetWinStreak(lvlMode); - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_ARENA_OPEN); else isCurrent = IsWinStreakActive(STREAK_ARENA_50); @@ -1375,13 +1375,13 @@ static void FactoryPrintPrevOrCurrentStreak(u8 battleMode, u8 lvlMode, u8 x1, u8 { default: case FRONTIER_MODE_SINGLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_FACTORY_SINGLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_FACTORY_SINGLES_50); break; case FRONTIER_MODE_DOUBLES: - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_FACTORY_DOUBLES_OPEN); else isCurrent = IsWinStreakActive(STREAK_FACTORY_DOUBLES_50); @@ -1448,7 +1448,7 @@ static void PyramidPrintPrevOrCurrentStreak(u8 lvlMode, u8 x1, u8 x2, u8 y) bool8 isCurrent; u16 winStreak = PyramidGetWinStreak(lvlMode); - if (lvlMode ！= FRONTIER_LVL_50) + if (lvlMode != FRONTIER_LVL_50) isCurrent = IsWinStreakActive(STREAK_PYRAMID_OPEN); else isCurrent = IsWinStreakActive(STREAK_PYRAMID_50); @@ -1663,7 +1663,7 @@ u8 GetFrontierBrainStatus(void) s32 winStreak = winStreakNoModifier + gFrontierBrainInfo[facility].streakAppearances[3]; s32 symbolsCount; - if (battleMode ！= FRONTIER_MODE_SINGLES) + if (battleMode != FRONTIER_MODE_SINGLES) return FRONTIER_BRAIN_NOT_READY; symbolsCount = GetPlayerSymbolCountForFacility(facility); @@ -1808,7 +1808,7 @@ void ResetWinStreaks(void) } } } - if (gSaveBlock2Ptr->frontier.challengeStatus ！= 0) + if (gSaveBlock2Ptr->frontier.challengeStatus != 0) gSaveBlock2Ptr->frontier.challengeStatus = CHALLENGE_STATUS_SAVING; } @@ -1894,7 +1894,7 @@ static void GiveBattlePoints(void) break; } - if (challengeNum ！= 0) + if (challengeNum != 0) challengeNum--; if (challengeNum >= ARRAY_COUNT(sBattlePointAwards[0][0])) challengeNum = ARRAY_COUNT(sBattlePointAwards[0][0]) - 1; @@ -1972,16 +1972,16 @@ static void AppendIfValid(u16 species, u16 heldItem, u16 hp, u8 lvlMode, u8 monL if (lvlMode == FRONTIER_LVL_50 && monLevel > FRONTIER_MAX_LEVEL_50) return; - for (i = 0; i < *count && speciesArray[i] ！= species; i++) + for (i = 0; i < *count && speciesArray[i] != species; i++) ; - if (i ！= *count) + if (i != *count) return; - if (heldItem ！= 0) + if (heldItem != 0) { - for (i = 0; i < *count && itemsArray[i] ！= heldItem; i++) + for (i = 0; i < *count && itemsArray[i] != heldItem; i++) ; - if (i ！= *count) + if (i != *count) return; } @@ -2046,7 +2046,7 @@ static void CheckPartyIneligibility(void) monId++; if (monId >= PARTY_SIZE) monId = 0; - } while (monId ！= monIdLooper); + } while (monId != monIdLooper); monIdLooper++; } while (monIdLooper < PARTY_SIZE && numEligibleMons < toChoose); @@ -2163,7 +2163,7 @@ static void RestoreHeldItems(void) for (i = 0; i < MAX_FRONTIER_PARTY_SIZE; i++) { - if (gSaveBlock2Ptr->frontier.selectedPartyMons[i] ！= 0) + if (gSaveBlock2Ptr->frontier.selectedPartyMons[i] != 0) { u16 item = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM, NULL); SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &item); @@ -2523,13 +2523,13 @@ void CreateFrontierBrainPokemon(void) monLevel = SetFacilityPtrsGetLevel(); for (i = 0; i < FRONTIER_PARTY_SIZE; selectedMonBits >>= 1, i++) { - if (！(selectedMonBits & 1)) + if (!(selectedMonBits & 1)) continue; do { j = Random32(); //should just be one while loop, but that doesn't match - } while (sFrontierBrainsMons[facility][symbol][i].nature ！= GetNatureFromPersonality(j)); + } while (sFrontierBrainsMons[facility][symbol][i].nature != GetNatureFromPersonality(j)); CreateMon(&gEnemyParty[monPartyId], sFrontierBrainsMons[facility][symbol][i].species, monLevel,