From 56330ea44cd21d4a65067291d8b353bbfef6a9ba Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Sat, 12 Apr 2025 21:09:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=9F=E9=9A=8F=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3+=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/text/follower_messages.h | 274 +++++++++++++++--------------- src/follower_helper.c | 4 +- 2 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/data/text/follower_messages.h b/src/data/text/follower_messages.h index 638df64d88..94e0b5f91d 100644 --- a/src/data/text/follower_messages.h +++ b/src/data/text/follower_messages.h @@ -19,40 +19,40 @@ extern const u8 EventScript_FollowerDance[]; extern const u8 EventScript_FollowerLookUp[]; // 'Generic', unconditional happy messages -static const u8 sHappyMsg00[] = _("{STR_VAR_1} began poking you in the\nstomach."); -static const u8 sHappyMsg01[] = _("{STR_VAR_1} is happy but shy."); -static const u8 sHappyMsg02[] = _("{STR_VAR_1} is coming along happily."); -static const u8 sHappyMsg03[] = _("{STR_VAR_1} is composed."); -static const u8 sHappyMsg04[] = _("{STR_VAR_1} seems to be feeling\ngreat about walking with you!"); -static const u8 sHappyMsg05[] = _("{STR_VAR_1} is glowing with health."); -static const u8 sHappyMsg06[] = _("{STR_VAR_1} looks very happy."); -static const u8 sHappyMsg07[] = _("{STR_VAR_1} put in extra effort."); -static const u8 sHappyMsg08[] = _("{STR_VAR_1} is smelling the scents\nof the surrounding air."); -static const u8 sHappyMsg09[] = _("{STR_VAR_1} is jumping for joy!"); -static const u8 sHappyMsg10[] = _("{STR_VAR_1} is still feeling great!"); -static const u8 sHappyMsg11[] = _("Your POKéMON has caught the scent of\nsmoke."); -static const u8 sHappyMsg12[] = _("{STR_VAR_1} is poking at your belly."); -static const u8 sHappyMsg13[] = _("Your POKéMON stretched out its body\nand is relaxing."); -static const u8 sHappyMsg14[] = _("{STR_VAR_1} looks like it wants to\nlead!"); -static const u8 sHappyMsg15[] = _("{STR_VAR_1} is doing its best to\nkeep up with you."); -static const u8 sHappyMsg16[] = _("{STR_VAR_1} is happily cuddling up\nto you!"); -static const u8 sHappyMsg17[] = _("{STR_VAR_1} is full of life!"); -static const u8 sHappyMsg18[] = _("{STR_VAR_1} seems to be very happy!"); -static const u8 sHappyMsg19[] = _("{STR_VAR_1} is so happy that it\ncan't stand still!"); -static const u8 sHappyMsg20[] = _("{STR_VAR_1} nodded slowly."); -static const u8 sHappyMsg21[] = _("{STR_VAR_1} is very eager!"); -static const u8 sHappyMsg22[] = _("{STR_VAR_1} is wandering around and\nlistening to the different sounds."); -static const u8 sHappyMsg23[] = _("{STR_VAR_1} looks very interested."); -static const u8 sHappyMsg24[] = _("{STR_VAR_1} is somehow forcing\nitself to keep going."); -static const u8 sHappyMsg25[] = _("{STR_VAR_1} gave you a sunny look!"); -static const u8 sHappyMsg26[] = _("{STR_VAR_1} gives you a happy look\nand a smile."); -static const u8 sHappyMsg27[] = _("Your POKéMON is smelling the scent\nof flowers."); -static const u8 sHappyMsg28[] = _("{STR_VAR_1} seems very happy to see\nyou!"); -static const u8 sHappyMsg29[] = _("{STR_VAR_1} faced this way and\ngrinned."); -static const u8 sHappyMsg30[] = _("{STR_VAR_1} happily cuddled up to\nyou!"); +static const u8 sHappyMsg00[] = _("{STR_VAR_1}戳了戳\n你的肚子！"); +static const u8 sHappyMsg01[] = _("{STR_VAR_1}看起来既\n开心又害羞！"); +static const u8 sHappyMsg02[] = _("{STR_VAR_1}高兴地\n跟了上来！"); +static const u8 sHappyMsg03[] = _("{STR_VAR_1}非常平静。"); +static const u8 sHappyMsg04[] = _("{STR_VAR_1}好像很高兴\n能和你一起走路！"); +static const u8 sHappyMsg05[] = _("{STR_VAR_1}正散发着\n健康的光芒。"); +static const u8 sHappyMsg06[] = _("{STR_VAR_1}看起来\n非常开心。"); +static const u8 sHappyMsg07[] = _("{STR_VAR_1}使起了\n劲儿来！"); +static const u8 sHappyMsg08[] = _("{STR_VAR_1}正在闻着\n周围的气味。"); +static const u8 sHappyMsg09[] = _("{STR_VAR_1}在\n开心地跳着！"); +static const u8 sHappyMsg10[] = _("{STR_VAR_1}仍然\n精神十足！"); +static const u8 sHappyMsg11[] = _("它似乎闻到了\n烟的味道。"); +static const u8 sHappyMsg12[] = _("它戳了戳你的肚子！"); +static const u8 sHappyMsg13[] = _("它正在伸展身体\n放松身心。"); +static const u8 sHappyMsg14[] = _("{STR_VAR_1}好像想到\n前面去！"); +static const u8 sHappyMsg15[] = _("{STR_VAR_1}努力地\n在你后面跟着……"); +static const u8 sHappyMsg16[] = _("{STR_VAR_1}开心地靠了过来！"); +static const u8 sHappyMsg17[] = _("{STR_VAR_1}活力十足！"); +static const u8 sHappyMsg18[] = _("{STR_VAR_1}看起来\n很高兴！"); +static const u8 sHappyMsg19[] = _("{STR_VAR_1}开心地\n不能平静！"); +static const u8 sHappyMsg20[] = _("{STR_VAR_1}缓缓地\n点了点头。"); +static const u8 sHappyMsg21[] = _("{STR_VAR_1}干劲十足！"); +static const u8 sHappyMsg22[] = _("{STR_VAR_1}用心地听着\n四周的声音！"); +static const u8 sHappyMsg23[] = _("{STR_VAR_1}看起来好像\n非常感兴趣！"); +static const u8 sHappyMsg24[] = _("{STR_VAR_1}勉强地跟了\n上来。"); +static const u8 sHappyMsg25[] = _("{STR_VAR_1}看着\n你笑了笑。"); +static const u8 sHappyMsg26[] = _("{STR_VAR_1}开心地\n看着你笑。"); +static const u8 sHappyMsg27[] = _("它正在闻着花香。"); +static const u8 sHappyMsg28[] = _("{STR_VAR_1}一脸开心地\n看着你！"); +static const u8 sHappyMsg29[] = _("{STR_VAR_1}转了过来\n并冲着你笑了笑。"); +static const u8 sHappyMsg30[] = _("{STR_VAR_1}开心地\n向你靠了过来！"); // Conditional messages begin here, index 31 -static const u8 sHappyMsg31[] = _("Your POKéMON seems happy about the\ngreat weather."); -static const u8 sHappyMsg32[] = _("{STR_VAR_1} is very composed and\nsure of itself!"); +static const u8 sHappyMsg31[] = _("它好像因为好天气\n非常开心。"); +static const u8 sHappyMsg32[] = _("{STR_VAR_1}的心情\n非常平静与自信。"); const struct FollowerMsgInfo gFollowerHappyMessages[] = { {sHappyMsg00, EventScript_FollowerPokingPlayer}, @@ -72,20 +72,20 @@ const struct FollowerMsgInfo gFollowerHappyMessages[] = { }; // Unconditional neutral messages -static const u8 sNeutralMsg00[] = _("{STR_VAR_1} is steadily poking at\nthe ground."); -static const u8 sNeutralMsg01[] = _("{STR_VAR_1} is standing guard."); -static const u8 sNeutralMsg02[] = _("{STR_VAR_1} is staring patiently at\nnothing at all."); -static const u8 sNeutralMsg03[] = _("{STR_VAR_1} is wandering around."); -static const u8 sNeutralMsg04[] = _("Your POKéMON yawned loudly!"); -static const u8 sNeutralMsg05[] = _("Your POKéMON is looking around\nrestlessly."); -static const u8 sNeutralMsg06[] = _("{STR_VAR_1} is looking this way and\nsmiling."); -static const u8 sNeutralMsg07[] = _("{STR_VAR_1} is gazing around\nrestlessly."); -static const u8 sNeutralMsg08[] = _("{STR_VAR_1} let out a battle cry."); -static const u8 sNeutralMsg09[] = _("{STR_VAR_1} danced a wonderful\ndance!"); -static const u8 sNeutralMsg10[] = _("{STR_VAR_1} is very eager."); -static const u8 sNeutralMsg11[] = _("{STR_VAR_1} is staring intently into\nthe distance."); -static const u8 sNeutralMsg12[] = _("{STR_VAR_1} is on the lookout!"); -static const u8 sNeutralMsg13[] = _("{STR_VAR_1} looked off into the\ndistance and barked!"); +static const u8 sNeutralMsg00[] = _("{STR_VAR_1}一个劲地\n戳着地面。"); +static const u8 sNeutralMsg01[] = _("{STR_VAR_1}正保持着\n警惕！"); +static const u8 sNeutralMsg02[] = _("{STR_VAR_1}\n正在看着远方。"); +static const u8 sNeutralMsg03[] = _("{STR_VAR_1}不停地\n环视着周围。"); +static const u8 sNeutralMsg04[] = _("它啊～地\n打了个哈欠。"); +static const u8 sNeutralMsg05[] = _("它正在警惕四周！"); +static const u8 sNeutralMsg06[] = _("{STR_VAR_1}看着\n你笑了笑。"); +static const u8 sNeutralMsg07[] = _("{STR_VAR_1}紧张地\n在四处张望。"); +static const u8 sNeutralMsg08[] = _("{STR_VAR_1}打起了精神！"); +static const u8 sNeutralMsg09[] = _("{STR_VAR_1}跳了一支\n精彩的舞!"); +static const u8 sNeutralMsg10[] = _("{STR_VAR_1}干劲十足！"); +static const u8 sNeutralMsg11[] = _("{STR_VAR_1}一直在眺望\n远方。"); +static const u8 sNeutralMsg12[] = _("{STR_VAR_1}正在警惕四周！"); +static const u8 sNeutralMsg13[] = _("{STR_VAR_1}朝着远处\n吼了出来！"); const struct FollowerMsgInfo gFollowerNeutralMessages[] = { {sNeutralMsg00, EventScript_FollowerPokeGround}, @@ -103,15 +103,15 @@ const struct FollowerMsgInfo gFollowerNeutralMessages[] = { }; // Unconditional sad messages -static const u8 sSadMsg00[] = _("{STR_VAR_1} is dizzy."); -static const u8 sSadMsg01[] = _("{STR_VAR_1} is stepping on your\nfeet!"); +static const u8 sSadMsg00[] = _("{STR_VAR_1}晕乎乎的。"); +static const u8 sSadMsg01[] = _("{STR_VAR_1}踩了踩\n你的脚。"); static const u8 sSadMsg02[] = _("{STR_VAR_1} seems a little tired."); // Conditional messages begin, index 3 -static const u8 sSadMsg03[] = _("{STR_VAR_1} is not happy."); -static const u8 sSadMsg04[] = _("{STR_VAR_1} is going to fall down!\n"); -static const u8 sSadMsg05[] = _("{STR_VAR_1} seems to be about to\nfall over!"); -static const u8 sSadMsg06[] = _("{STR_VAR_1} is trying very hard to\nkeep up with you…"); -static const u8 sSadMsg07[] = _("{STR_VAR_1} is nervous."); +static const u8 sSadMsg03[] = _("{STR_VAR_1}不太开心。"); +static const u8 sSadMsg04[] = _("{STR_VAR_1}看起来\n快要倒下了！"); +static const u8 sSadMsg05[] = _("{STR_VAR_1}差点就\n摔倒了！"); +static const u8 sSadMsg06[] = _("{STR_VAR_1}努力地\n在你后面跟着……"); +static const u8 sSadMsg07[] = _("{STR_VAR_1}紧张了。"); const struct FollowerMsgInfo gFollowerSadMessages[] = { {sSadMsg00, EventScript_FollowerDizzy}, @@ -120,11 +120,11 @@ const struct FollowerMsgInfo gFollowerSadMessages[] = { }; // Unconditional upset messages -static const u8 sUpsetMsg00[] = _("{STR_VAR_1} seems unhappy somehow…"); -static const u8 sUpsetMsg01[] = _("{STR_VAR_1} is making an unhappy\nface."); -static const u8 sUpsetMsg02[] = _("…Your POKéMON seems a little\ncold."); +static const u8 sUpsetMsg00[] = _("{STR_VAR_1}好像\n有点不开心了。"); +static const u8 sUpsetMsg01[] = _("{STR_VAR_1}看起来\n好像有点不开心……"); +static const u8 sUpsetMsg02[] = _("……\n它看起来有点冷。"); // Conditional messages, index 3 -static const u8 sUpsetMsg03[] = _("{STR_VAR_1} is taking shelter in the\ngrass from the rain."); +static const u8 sUpsetMsg03[] = _("{STR_VAR_1}在草丛里躲着雨。"); const struct FollowerMsgInfo gFollowerUpsetMessages[] = { {sUpsetMsg00}, {sUpsetMsg01}, @@ -133,11 +133,11 @@ const struct FollowerMsgInfo gFollowerUpsetMessages[] = { }; // Unconditional angry messages -static const u8 sAngryMsg00[] = _("{STR_VAR_1} let out a roar!"); -static const u8 sAngryMsg01[] = _("{STR_VAR_1} is making a face like\nit's angry!"); -static const u8 sAngryMsg02[] = _("{STR_VAR_1} seems to be angry for\nsome reason."); -static const u8 sAngryMsg03[] = _("Your POKéMON turned to face the\nother way, showing a defiant face."); -static const u8 sAngryMsg04[] = _("{STR_VAR_1} cried out."); +static const u8 sAngryMsg00[] = _("{STR_VAR_1}重重地\n吼了起来！"); +static const u8 sAngryMsg01[] = _("{STR_VAR_1}摆出了\n生气的表情。"); +static const u8 sAngryMsg02[] = _("{STR_VAR_1}看起来\n很生气！"); +static const u8 sAngryMsg03[] = _("它转了过来\n摆出挑衅\n的表情。"); +static const u8 sAngryMsg04[] = _("{STR_VAR_1}突然大叫了\n起来！"); const struct FollowerMsgInfo gFollowerAngryMessages[] = { {sAngryMsg00}, {sAngryMsg01}, {sAngryMsg02}, @@ -146,26 +146,26 @@ const struct FollowerMsgInfo gFollowerAngryMessages[] = { }; // Unconditional pensive messages -static const u8 sPensiveMsg00[] = _("{STR_VAR_1} is looking down\nsteadily."); -static const u8 sPensiveMsg01[] = _("{STR_VAR_1} is surveying the area."); -static const u8 sPensiveMsg02[] = _("{STR_VAR_1} is peering down."); -static const u8 sPensiveMsg03[] = _("{STR_VAR_1} is somehow fighting off\nsleep…"); -static const u8 sPensiveMsg04[] = _("{STR_VAR_1} seems to be wandering\naround."); -static const u8 sPensiveMsg05[] = _("{STR_VAR_1} is looking around\nabsentmindedly."); -static const u8 sPensiveMsg06[] = _("{STR_VAR_1} yawned very loudly!"); -static const u8 sPensiveMsg07[] = _("{STR_VAR_1} is relaxing comfortably."); -static const u8 sPensiveMsg08[] = _("{STR_VAR_1} is staring steadfastly\nat your face."); -static const u8 sPensiveMsg09[] = _("{STR_VAR_1} is staring intently at\nyour face."); -static const u8 sPensiveMsg10[] = _("{STR_VAR_1} is focusing its\nattention on you."); -static const u8 sPensiveMsg11[] = _("{STR_VAR_1} is staring into the\ndepths."); -static const u8 sPensiveMsg12[] = _("{STR_VAR_1} is sniffing at the\nground."); -static const u8 sPensiveMsg13[] = _("Your POKéMON is staring intently at\nnothing."); -static const u8 sPensiveMsg14[] = _("{STR_VAR_1} focused with a sharp\ngaze!"); -static const u8 sPensiveMsg15[] = _("{STR_VAR_1} is concentrating."); -static const u8 sPensiveMsg16[] = _("{STR_VAR_1} faced this way and\nnodded."); -static const u8 sPensiveMsg17[] = _("{STR_VAR_1} seems a bit nervous…"); -static const u8 sPensiveMsg18[] = _("{STR_VAR_1} is looking at your\nfootprints."); -static const u8 sPensiveMsg19[] = _("{STR_VAR_1} is staring straight into\nyour eyes."); +static const u8 sPensiveMsg00[] = _("{STR_VAR_1}安静的\n盯着下面看。"); +static const u8 sPensiveMsg01[] = _("{STR_VAR_1}在四下张望！"); +static const u8 sPensiveMsg02[] = _("{STR_VAR_1}一直盯着下面看。"); +static const u8 sPensiveMsg03[] = _("{STR_VAR_1}强忍着\n睡意……"); +static const u8 sPensiveMsg04[] = _("{STR_VAR_1}正在环视n着周围。"); +static const u8 sPensiveMsg05[] = _("{STR_VAR_1}正看着\n周围发呆。"); +static const u8 sPensiveMsg06[] = _("{STR_VAR_1}打了个\n大哈欠！"); +static const u8 sPensiveMsg07[] = _("{STR_VAR_1}正在惬意\n地放松着。"); +static const u8 sPensiveMsg08[] = _("{STR_VAR_1}一直在盯着\n你的脸。"); +static const u8 sPensiveMsg09[] = _("{STR_VAR_1}一直在盯着\n你的脸。"); +static const u8 sPensiveMsg10[] = _("{STR_VAR_1}对你非常\n感兴趣！"); +static const u8 sPensiveMsg11[] = _("{STR_VAR_1}一直盯着\n下面看。"); +static const u8 sPensiveMsg12[] = _("{STR_VAR_1}不停地\n闻着地面上的气味。"); +static const u8 sPensiveMsg13[] = _("它一直在盯着什么\n都没有的地方……"); +static const u8 sPensiveMsg14[] = _("{STR_VAR_1}目光锐利，全神贯注！"); +static const u8 sPensiveMsg15[] = _("{STR_VAR_1}正在集中精神。"); +static const u8 sPensiveMsg16[] = _("{STR_VAR_1}看着你\n点了点头。"); +static const u8 sPensiveMsg17[] = _("{STR_VAR_1}看起来好像\n有点紧张。"); +static const u8 sPensiveMsg18[] = _("{STR_VAR_1}看着\n你的脚印。"); +static const u8 sPensiveMsg19[] = _("{STR_VAR_1}一直看着\n你的眼睛……"); const struct FollowerMsgInfo gFollowerPensiveMessages[] = { {sPensiveMsg00}, @@ -180,16 +180,16 @@ const struct FollowerMsgInfo gFollowerPensiveMessages[] = { }; // All 'love' messages are unconditional -static const u8 sLoveMsg00[] = _("{STR_VAR_1} suddenly started walking\ncloser!"); -static const u8 sLoveMsg01[] = _("{STR_VAR_1} cheeks are becoming\nrosy!"); -static const u8 sLoveMsg02[] = _("Woah! {STR_VAR_1} suddenly hugged\nyou!"); -static const u8 sLoveMsg03[] = _("Woah! {STR_VAR_1} is suddenly\nplayful!"); -static const u8 sLoveMsg04[] = _("{STR_VAR_1} is rubbing against your\nlegs!"); -static const u8 sLoveMsg05[] = _("{STR_VAR_1} blushes."); -static const u8 sLoveMsg06[] = _("Ah! {STR_VAR_1} cuddles you!"); -static const u8 sLoveMsg07[] = _("{STR_VAR_1} is regarding you with\nadoration!"); -static const u8 sLoveMsg08[] = _("{STR_VAR_1} got closer to you."); -static const u8 sLoveMsg09[] = _("{STR_VAR_1} is keeping close to your\nfeet."); +static const u8 sLoveMsg00[] = _("{STR_VAR_1}突然\n靠到了你的身边！"); +static const u8 sLoveMsg01[] = _("{STR_VAR_1}的脸颊\n变得红通通的！"); +static const u8 sLoveMsg02[] = _("哇！{STR_VAR_1}突然抱着\n你了！"); +static const u8 sLoveMsg03[] = _("哇！{STR_VAR_1}\n突然想和你玩！"); +static const u8 sLoveMsg04[] = _("{STR_VAR_1}戳了戳\n你的脚。"); +static const u8 sLoveMsg05[] = _("{STR_VAR_1}\n好像害羞了。"); +static const u8 sLoveMsg06[] = _("啊{STR_VAR_1}啪地一下\n靠在了你身边。"); +static const u8 sLoveMsg07[] = _("{STR_VAR_1}一脸崇拜\n地看着你！"); +static const u8 sLoveMsg08[] = _("{STR_VAR_1}开心地\n靠了过来！"); +static const u8 sLoveMsg09[] = _("{STR_VAR_1}突然\n靠到了你的脚边！"); const struct FollowerMsgInfo gFollowerLoveMessages[] = { {sLoveMsg00, EventScript_FollowerGetCloser}, @@ -205,28 +205,28 @@ const struct FollowerMsgInfo gFollowerLoveMessages[] = { }; // Unconditional surprised messages -static const u8 sSurpriseMsg00[] = _("{STR_VAR_1} is in danger of falling\nover!"); -static const u8 sSurpriseMsg01[] = _("{STR_VAR_1} bumped into you!"); -static const u8 sSurpriseMsg02[] = _("{STR_VAR_1} doesn't seem to be used\nto its own name yet."); -static const u8 sSurpriseMsg03[] = _("{STR_VAR_1} is peering down."); -static const u8 sSurpriseMsg04[] = _("Your POKéMON stumbled and nearly\nfell!"); -static const u8 sSurpriseMsg05[] = _("{STR_VAR_1} feels something and is\nhowling!"); -static const u8 sSurpriseMsg06[] = _("{STR_VAR_1} seems refreshed!"); -static const u8 sSurpriseMsg07[] = _("{STR_VAR_1} suddenly turned around\nand started barking!"); -static const u8 sSurpriseMsg08[] = _("{STR_VAR_1} suddenly turned around!"); -static const u8 sSurpriseMsg09[] = _("Your POKéMON was surprised that you\nsuddenly spoke to it!"); -static const u8 sSurpriseMsg10[] = _("Sniff sniff, something smells really\ngood!"); -static const u8 sSurpriseMsg11[] = _("{STR_VAR_1} feels refreshed."); -static const u8 sSurpriseMsg12[] = _("{STR_VAR_1} is wobbling and seems\nabout to fall over."); -static const u8 sSurpriseMsg13[] = _("{STR_VAR_1} is in danger of falling\nover."); -static const u8 sSurpriseMsg14[] = _("{STR_VAR_1} is walking along\ncautiously."); -static const u8 sSurpriseMsg15[] = _("{STR_VAR_1} is getting tense with\nnervous energy."); -static const u8 sSurpriseMsg16[] = _("{STR_VAR_1} sensed something strange\nand was surprised!"); -static const u8 sSurpriseMsg17[] = _("{STR_VAR_1} is scared and snuggled\nup to you!"); -static const u8 sSurpriseMsg18[] = _("{STR_VAR_1} is feeling an unusual\npresence…"); -static const u8 sSurpriseMsg19[] = _("{STR_VAR_1} is getting tense with\nnervous energy."); +static const u8 sSurpriseMsg00[] = _("{STR_VAR_1}差点就\n摔倒了！"); +static const u8 sSurpriseMsg01[] = _("{STR_VAR_1}向着\n你咬了过来！"); +static const u8 sSurpriseMsg02[] = _("{STR_VAR_1}好像还不习惯\n他的名字。"); +static const u8 sSurpriseMsg03[] = _("{STR_VAR_1}一直盯着下面看。"); +static const u8 sSurpriseMsg04[] = _("它摔了一小跤，\n有点慌慌的！"); +static const u8 sSurpriseMsg05[] = _("{STR_VAR_1}好像是在\n诉说着什么一般地低吼着。"); +static const u8 sSurpriseMsg06[] = _("{STR_VAR_1}挺起了身板！"); +static const u8 sSurpriseMsg07[] = _("{STR_VAR_1}转了过来\n并吼叫了起来！"); +static const u8 sSurpriseMsg08[] = _("{STR_VAR_1}转了过来！"); +static const u8 sSurpriseMsg09[] = _("它好像因为突然被搭话\n所以吓了一跳！"); +static const u8 sSurpriseMsg10[] = _("嗅了嗅，\n闻到了很香的味道！"); +static const u8 sSurpriseMsg11[] = _("{STR_VAR_1}感到很清爽。"); +static const u8 sSurpriseMsg12[] = _("{STR_VAR_1}看起来\n快要倒下了！"); +static const u8 sSurpriseMsg13[] = _("{STR_VAR_1}差点就\n摔倒了！"); +static const u8 sSurpriseMsg14[] = _("{STR_VAR_1}小心地\n跟了上来！"); +static const u8 sSurpriseMsg15[] = _("{STR_VAR_1}因为\n紧张，所以很激动。"); +static const u8 sSurpriseMsg16[] = _("{STR_VAR_1}好像因为\n奇怪的气味，所以\n吓了一跳！"); +static const u8 sSurpriseMsg17[] = _("{STR_VAR_1}因为害怕，\n向你身上靠了过来！"); +static const u8 sSurpriseMsg18[] = _("{STR_VAR_1}感觉到了\n奇怪的气味。"); +static const u8 sSurpriseMsg19[] = _("{STR_VAR_1}因为\n紧张，所以很激动。"); // Conditional messages, index 20 -static const u8 sSurpriseMsg20[] = _("{STR_VAR_1} seems to be very\nsurprised that it is raining!"); +static const u8 sSurpriseMsg20[] = _("{STR_VAR_1} 似乎对下雨感到非常惊讶！"); const struct FollowerMsgInfo gFollowerSurpriseMessages[] = { {sSurpriseMsg00}, @@ -244,13 +244,13 @@ const struct FollowerMsgInfo gFollowerSurpriseMessages[] = { }; // Unconditional curious messages -static const u8 sCuriousMsg00[] = _("Your POKéMON is looking around\nrestlessly for something."); -static const u8 sCuriousMsg01[] = _("Your POKéMON wasn't watching where\nit was going and ran into you!"); -static const u8 sCuriousMsg02[] = _("Sniff, sniff! Is there something\nnearby?"); -static const u8 sCuriousMsg03[] = _("{STR_VAR_1} is rolling a pebble\naround playfully."); -static const u8 sCuriousMsg04[] = _("{STR_VAR_1} is wandering around and\nsearching for something."); -static const u8 sCuriousMsg05[] = _("{STR_VAR_1} is sniffing at you."); -static const u8 sCuriousMsg06[] = _("{STR_VAR_1} seems to be a little\nhesitant…"); +static const u8 sCuriousMsg00[] = _("它东张西望的，\n好像在找着什么。"); +static const u8 sCuriousMsg01[] = _("它没有在看路，\n不小心撞到了你！"); +static const u8 sCuriousMsg02[] = _("嗅了嗅，\n似乎附近有什么东西！"); +static const u8 sCuriousMsg03[] = _("{STR_VAR_1}正在\n骨碌骨碌地\n滚着石头玩。"); +static const u8 sCuriousMsg04[] = _("{STR_VAR_1}东张西望地\n在找着什么。"); +static const u8 sCuriousMsg05[] = _("{STR_VAR_1}正在\n闻着你的气味。"); +static const u8 sCuriousMsg06[] = _("{STR_VAR_1}好像有点\n犹豫…"); const struct FollowerMsgInfo gFollowerCuriousMessages[] = { {sCuriousMsg00, EventScript_FollowerLookAround}, @@ -261,22 +261,22 @@ const struct FollowerMsgInfo gFollowerCuriousMessages[] = { }; // Unconditional music messages -static const u8 sMusicMsg00[] = _("{STR_VAR_1} is showing off its\nagility!"); -static const u8 sMusicMsg01[] = _("{STR_VAR_1} is moving around\nhappily!"); -static const u8 sMusicMsg02[] = _("Woah! {STR_VAR_1} suddenly started\ndancing in happiness!"); -static const u8 sMusicMsg03[] = _("{STR_VAR_1} is steadily keeping up\nwith you!"); -static const u8 sMusicMsg04[] = _("{STR_VAR_1} seems to want to play\nwith you."); -static const u8 sMusicMsg05[] = _("{STR_VAR_1} is happy skipping about."); -static const u8 sMusicMsg06[] = _("{STR_VAR_1} is singing and humming."); -static const u8 sMusicMsg07[] = _("{STR_VAR_1} is nipping at your feet!"); -static const u8 sMusicMsg08[] = _("{STR_VAR_1} turns around and looks\nat you."); -static const u8 sMusicMsg09[] = _("{STR_VAR_1} is working hard to show\noff its mighty power!"); -static const u8 sMusicMsg10[] = _("Whoa! {STR_VAR_1} suddenly danced in\nhappiness!"); -static const u8 sMusicMsg11[] = _("{STR_VAR_1} is cheerful!"); -static const u8 sMusicMsg12[] = _("{STR_VAR_1} is jumping around in a\ncarefree way!"); -static const u8 sMusicMsg13[] = _("Your POKéMON seems to be smelling a\nnostalgically familiar scent…"); +static const u8 sMusicMsg00[] = _("{STR_VAR_1}使出全力\n炫耀了一番！"); +static const u8 sMusicMsg01[] = _("{STR_VAR_1}精神十足地\n动了起来！"); +static const u8 sMusicMsg02[] = _("哇！{STR_VAR_1}，好像\n在高兴地跳舞。"); +static const u8 sMusicMsg03[] = _("{STR_VAR_1}开心地\n跟在后面！"); +static const u8 sMusicMsg04[] = _("{STR_VAR_1}好像\n想和你玩！"); +static const u8 sMusicMsg05[] = _("{STR_VAR_1}在开心地\n跳着！"); +static const u8 sMusicMsg06[] = _("{STR_VAR_1}\n竟然在\n哼着歌！"); +static const u8 sMusicMsg07[] = _("{STR_VAR_1}向着\n你的腿咬了过来！"); +static const u8 sMusicMsg08[] = _("{STR_VAR_1}转了过来\n并看着你！"); +static const u8 sMusicMsg09[] = _("{STR_VAR_1}努力地，\n表现自己！"); +static const u8 sMusicMsg10[] = _("哇！{STR_VAR_1}突然\n开心动了起来！"); +static const u8 sMusicMsg11[] = _("{STR_VAR_1}好像非常\n开心！"); +static const u8 sMusicMsg12[] = _("{STR_VAR_1}轻快地\n动了起来！"); +static const u8 sMusicMsg13[] = _("它似乎闻到了一种\n令它怀念的熟悉味道……"); // Conditional music messages, index 14 -static const u8 sMusicMsg14[] = _("{STR_VAR_1} is very happy about the\nrain."); +static const u8 sMusicMsg14[] = _("{STR_VAR_1}因为下雨了\n非常高兴。"); const struct FollowerMsgInfo gFollowerMusicMessages[] = { {sMusicMsg00, EventScript_FollowerLookAround}, @@ -294,7 +294,7 @@ const struct FollowerMsgInfo gFollowerMusicMessages[] = { }; -static const u8 sPoisonedMsg00[] = _("{STR_VAR_1} is shivering with the\neffects of being poisoned."); +static const u8 sPoisonedMsg00[] = _("{STR_VAR_1}中毒了，\n浑身都在发抖……"); const struct FollowerMsgInfo gFollowerPoisonedMessages[] = { {sPoisonedMsg00, EventScript_FollowerIsShivering}, diff --git a/src/follower_helper.c b/src/follower_helper.c index 8fae2d3bfc..89bddf1b8f 100644 --- a/src/follower_helper.c +++ b/src/follower_helper.c @@ -16,12 +16,12 @@ static const u8 sCondMsg00[] = _("{STR_VAR_1}开心地\n摇摆着身体。"); static const u8 sCondMsg01[] = _("{STR_VAR_1}优雅地\n摇摆着身体。"); static const u8* const sCelebiTexts[] = {sCondMsg00, sCondMsg01, NULL}; -static const u8 sCondMsg02[] = _("{STR_VAR_1}发出火焰并\n大声地吼叫了起来"); +static const u8 sCondMsg02[] = _("{STR_VAR_1}发出火焰并\n大声地吼叫了起来！"); static const u8 sCondMsg03[] = _("{STR_VAR_1}猛地发出了\n火焰！"); static const u8 sCondMsg04[] = _("{STR_VAR_1}突然发出了\n火焰!"); static const u8 sCondMsg05[] = _("{STR_VAR_1}猛地放出了\n火焰！"); static const u8* const sFireTexts[] = {sCondMsg02, sCondMsg03, sCondMsg04, sCondMsg05, NULL}; -static const u8 sCondMsg06[] = _("{STR_VAR_1}一直在盯着\n宝可梦联盟"); +static const u8 sCondMsg06[] = _("{STR_VAR_1}一直在盯着\n宝可梦联盟。"); static const u8 sCondMsg07[] = _("它一直在\n凝望着山峰。"); static const u8 sCondMsg08[] = _("传来了一股很香的气味。"); static const u8 sCondMsg09[] = _("它正在观察货架。"); From eb0ceac7c38a01f4b76ea725ff0cf3801ba15624 Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Sun, 13 Apr 2025 00:43:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=8E=E4=B8=BD=E5=A4=A7=E8=B5=9BNPC?= =?UTF-8?q?=E5=8F=8APM=E6=98=B5=E7=A7=B0=EF=BC=88=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=A5=9E=E7=99=BE=EF=BC=89=E5=85=A8=E6=B1=89=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=8D=8E=E4=B8=BD=E5=A4=A7=E8=B5=9B=E5=9B=BE=E7=89=87=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 感谢SKT聚聚提供的译名 --- graphics/contest/applause.png | Bin 1593 -> 1850 bytes graphics/contest/interface.png | Bin 3062 -> 4737 bytes graphics/contest/nextturn.png | Bin 1466 -> 1723 bytes src/data/battle_partners.h | 2 +- src/data/contest_opponents.h | 408 ++++++++++++++++----------------- 5 files changed, 205 insertions(+), 205 deletions(-) diff --git a/graphics/contest/applause.png b/graphics/contest/applause.png index 8b720a19dbfc771f1cad563a876a2f169670a240..9c53376c14034ddd0ee6bce030bbeac2c6f0e1e6 100644 GIT binary patch delta 866 zcmdnVvx{$nN{~T-Plzi61H+Ukfp2?@|KBVA|9{SZLy4;b4BzJ5`_B*sl)?n9aqAuf zML7#RB8wRqxP?KOkzv*x2?hq%lM|zRG|cr3b(0MY3>3^Q^%5=2jSZ75brg&Yj12V+ zEP+VZz`)Ab+{)NuGaq9MBct);$xMpYrn&}(x(4PUMg~?UhE|3a+6ER@1_nwB6}bgg zzWFJcX_YRCC8@SbKx2SPO>_;7Lx9E@nphbbO@7ZLD}W&=!)!LWnpvveEGaQ9)i~8a z*Dx{FTsP6oBw07n)Y3>dB{9{+DAh2{DA^KXjjykjOMY@`ZfahMr;DvpVoH8es#QvU za%PHEK}LQ_esM;Aft5+3VTws=vZZcPa!R7Eskw;>&@^)k-6V^oL_-5(!$eC8UBUKwHIG!mfM~#jv*eMSEn8nYF6NJ zDcAo0|70G&R3nS(mkXKYZp}QEI+GY5ymu9U9`rx*T#1_CCk`ftlX`O(X=GQoTqzS| z_{rtN5RhBiu~&79-ccdefEG8t81ZIC=2eqy7jF$#<3hYyJM%-1wD2S_e-0185d?dSn~Qk-CFI~T%CB< dvFge6FKml1r?@DsapeZ(6;D?`mvv4FO#ohx4NU+5 delta 637 zcmdnRx07drikxVGPlzi61H*q1nDhT$@wdIjQ=$a^8%lidU*tV8R)SG%Vp)&6nVx}e zvVnn-g1M!hp_z$^g@ulSk%5tczJa;Ep@FWEk(Gg&m8tP&Eyfl`Mx)8=nH2dAb%7EF z#vz7gRwkxarjze8$q0bO3=Kkz46IBntqe^jb2H0g3R*CmsTXAAm*f{`xlq}nPK2e~^bc)B{98Csf|=^E)7PR?PLNwF|XGBdR_w$x2aGBMLlOfgB+O*AyN z&^0zNPE1TrGc-vuPEk^*$Sv^owQ|W%F3nBNEAe!(RRW6WrDUd95u<x%syrh#&sGT-nCJm^hee;)NY6k)BRn%NCBM8_bMjNxxca{QfNj9| zTH)#97~*mK?$kiO76l$w&-mNFx34}{=J(mO!%zJBhhPx3>r_&*<4&*7=m(H96t3ixZT{U&sre*;QzVS^#*yKK{4zT vu5GjSO0+L5d-~NX?dQLpAO58LO1Epw=bPg&?ffC2qZvG1{an^LB{Ts5$l24u diff --git a/graphics/contest/interface.png b/graphics/contest/interface.png index 598e5e338def67b41a6c9f76be717affb1c1aa43..b181fda3fb9158dd052493808e030076a9f13746 100644 GIT binary patch literal 4737 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 by{rIOhIuVNp6={XehKh$_jNn&8lC+=i@n47 delta 2525 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 Ak^lez diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png index 852afb9cf3a0b99020a01fcbf74d2f1369aa7851..ac6e92539b3e3a61f44e0d739be520d63b18f992 100644 GIT binary patch delta 720 zcmdnRy_3^Q^%5=2jSZ75brg&Yj12V+ zEP+VZz`)Ab+{)NuGc#igBeSud!Q?I`C0;{a1M?6g11l3lD?^LPJDC)?4UI#9N{uY7 zj7=v$VNycj3o-}RC#RaF85$bv8mAhX=$e|Dr0QCvS^$X@W8=gmbIVi<6JsTXirfNU zUn`gVFq(6sv-a{F40QjQj#CBSTY5b4%kiT|+}lW8EYp zlSEw$3&S*B6Vt?GW8)OFWOGY%m}&k+ndzB%lP@!isaP5%8zx#LrRka(Ct2v4Seh8< zCK?!<>KZ1RnHicTCMBh%B~9jK33DYzp^`#ziECMjRe45go~;rv#7uP!P=jR!i=GxR zz!WsXGxJjN%ZoLY^z9UEic-?7ax$Ts6O&6a^MTrn6U!#MvdFs-6-t=)n&=`2KhR!z zRC}SeC1)h&rKhIYD(O#t%o1187MA`Im^NZOT^vI+CT^YJ&Bvg~;XJ>ybMODm*Lh;+ zScE)FjAIq%2OTh*!C+7!_|fO4Z1;6(Chc&R2W{KE8sk*Y2ARHC@_{qL;@RnjY1KO$ r*SM74cr9!c`0>|;__fh-d!MsTQCPE8>JKDsCmW_2S|l5qnI#)2DOBVZ`1)G8@a6 z&_DSXvx*8)3Y}QOT!~Srq)=SqT2^9Jo{^eos{{-cQ(Xg8uis_S;{^taf<|~|UP^v> zvF7BbtZ|i|$MX__p&sk$;uxYav3G)}P=kU1^KQ-m|5F|_dL3YW%e+}-GP4t7!(6xd zr#I{kuH{N#Tgb;&9GJ$EP(6{!?SxVymx1m?20@S9>)+EI&LnKzU(c+TT=n(wzmNQT fOu2RJeYE+0+?JI36Rq+9Xc2>_tDnm{r-UW|PPmr- 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, From daf70dbc00390b8b4e2478d8a912ad8ee229e3db Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Sun, 13 Apr 2025 00:51:45 +0800 Subject: [PATCH 3/3] Update interface.png MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 感谢SKT聚聚修复 --- graphics/contest/interface.png | Bin 4737 -> 2709 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/contest/interface.png b/graphics/contest/interface.png index b181fda3fb9158dd052493808e030076a9f13746..5ebbc882d5b4ed3dbe660d61e4d2bacb21b547e4 100644 GIT binary patch delta 2170 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 by{rIOhIuVNp6={XehKh$_jNn&8lC+=i@n47