From 6f814f491d0b93475ec313c81bbca8116a28dadf Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Tue, 15 Apr 2025 02:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3event=5Fscripts=EF=BC=8CPC?= =?UTF-8?q?=E5=AF=84=E5=AD=98=E7=B3=BB=E7=BB=9F=E7=9B=92=E5=AD=90=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=B1=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 选择PM时多选框宽度较长,待查看优化 --- data/event_scripts.s | 6 +-- src/pokemon_storage_system.c | 76 ++++++++++++++++++------------------ 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index c7b0296d8a..ba670bed26 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -887,7 +887,7 @@ gText_PokemonCenterSign:: .string "宝可梦中心$" gText_MomOrDadMightLikeThisProgram:: - .string "也许是[buffer1]喜欢的游戏\n" + .string "也许是{STR_VAR_1}喜欢的游戏\n" .string "… … … … … … … … … … … … … … … …\p" .string "该走了!$" @@ -944,7 +944,7 @@ gText_MonsHealed:: .string "大家都变得精力充沛了哦!\n" .string "那么,请加油吧!$" -gText_HadQuiteAnExperienceTakeRest::// 自己发挥 +gText_HadQuiteAnExperienceTakeRest:: .string "妈妈:{PLAYER}!\n" .string "欢迎回家。\p" .string "看来你经历了不少事情呢。\p" @@ -961,7 +961,7 @@ gText_MomExplainHPGetPotions:: .string "可以在宝可梦中心恢复。\p" .string "如果你要出远门,可别忘了\n" .string "在友好商店购买些伤药备用。\p" - .string "要加油哦,妈妈永远\n"// 自己发挥 + .string "要加油哦,妈妈永远\n" .string "以你为豪!\p" .string "路上小心!$" diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index a2c1e1a413..460f3714bb 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -7998,49 +7998,49 @@ static void InitMenu(void) sStorage->menuWindow.baseBlock = 92; } -static const u8 gPCText_Give[] = _("GIVE"); +static const u8 gPCText_Give[] = _("携带"); static const u8 *const sMenuTexts[] = { - [MENU_CANCEL] = COMPOUND_STRING("CANCEL"), - [MENU_STORE] = COMPOUND_STRING("STORE"), - [MENU_WITHDRAW] = COMPOUND_STRING("WITHDRAW"), - [MENU_MOVE] = COMPOUND_STRING("MOVE"), - [MENU_SHIFT] = COMPOUND_STRING("SHIFT"), - [MENU_PLACE] = COMPOUND_STRING("PLACE"), - [MENU_SUMMARY] = COMPOUND_STRING("SUMMARY"), - [MENU_RELEASE] = COMPOUND_STRING("RELEASE"), - [MENU_MARK] = COMPOUND_STRING("MARK"), - [MENU_JUMP] = COMPOUND_STRING("JUMP"), - [MENU_WALLPAPER] = COMPOUND_STRING("WALLPAPER"), - [MENU_NAME] = COMPOUND_STRING("NAME"), - [MENU_TAKE] = COMPOUND_STRING("TAKE"), + [MENU_CANCEL] = COMPOUND_STRING("取消"), + [MENU_STORE] = COMPOUND_STRING("寄放"), + [MENU_WITHDRAW] = COMPOUND_STRING("同行"), + [MENU_MOVE] = COMPOUND_STRING("移动"), + [MENU_SHIFT] = COMPOUND_STRING("交换"), + [MENU_PLACE] = COMPOUND_STRING("放下"), + [MENU_SUMMARY] = COMPOUND_STRING("查看能力"), + [MENU_RELEASE] = COMPOUND_STRING("放生"), + [MENU_MARK] = COMPOUND_STRING("标记"), + [MENU_JUMP] = COMPOUND_STRING("跳转"), + [MENU_WALLPAPER] = COMPOUND_STRING("壁纸"), + [MENU_NAME] = COMPOUND_STRING("名字"), + [MENU_TAKE] = COMPOUND_STRING("取下"), [MENU_GIVE] = gPCText_Give, [MENU_GIVE_2] = gPCText_Give, - [MENU_SWITCH] = COMPOUND_STRING("SWITCH"), - [MENU_BAG] = COMPOUND_STRING("BAG"), - [MENU_INFO] = COMPOUND_STRING("INFO"), - [MENU_SCENERY_1] = COMPOUND_STRING("SCENERY 1"), - [MENU_SCENERY_2] = COMPOUND_STRING("SCENERY 2"), - [MENU_SCENERY_3] = COMPOUND_STRING("SCENERY 3"), - [MENU_ETCETERA] = COMPOUND_STRING("ETCETERA"), - [MENU_FRIENDS] = COMPOUND_STRING("FRIENDS"), - [MENU_FOREST] = COMPOUND_STRING("FOREST"), - [MENU_CITY] = COMPOUND_STRING("CITY"), - [MENU_DESERT] = COMPOUND_STRING("DESERT"), - [MENU_SAVANNA] = COMPOUND_STRING("SAVANNA"), - [MENU_CRAG] = COMPOUND_STRING("CRAG"), - [MENU_VOLCANO] = COMPOUND_STRING("VOLCANO"), - [MENU_SNOW] = COMPOUND_STRING("SNOW"), - [MENU_CAVE] = COMPOUND_STRING("CAVE"), - [MENU_BEACH] = COMPOUND_STRING("BEACH"), - [MENU_SEAFLOOR] = COMPOUND_STRING("SEAFLOOR"), - [MENU_RIVER] = COMPOUND_STRING("RIVER"), - [MENU_SKY] = COMPOUND_STRING("SKY"), - [MENU_POLKADOT] = COMPOUND_STRING("POLKA-DOT"), - [MENU_POKECENTER] = COMPOUND_STRING("POKéCENTER"), - [MENU_MACHINE] = COMPOUND_STRING("MACHINE"), - [MENU_SIMPLE] = COMPOUND_STRING("SIMPLE"), + [MENU_SWITCH] = COMPOUND_STRING("调换"), + [MENU_BAG] = COMPOUND_STRING("放回包包"), + [MENU_INFO] = COMPOUND_STRING("查看信息"), + [MENU_SCENERY_1] = COMPOUND_STRING("风景1"), + [MENU_SCENERY_2] = COMPOUND_STRING("风景2"), + [MENU_SCENERY_3] = COMPOUND_STRING("风景3"), + [MENU_ETCETERA] = COMPOUND_STRING("其他"), + [MENU_FRIENDS] = COMPOUND_STRING("伙伴"), + [MENU_FOREST] = COMPOUND_STRING("森林"), + [MENU_CITY] = COMPOUND_STRING("城市"), + [MENU_DESERT] = COMPOUND_STRING("沙漠"), + [MENU_SAVANNA] = COMPOUND_STRING("热带草原"), + [MENU_CRAG] = COMPOUND_STRING("石山"), + [MENU_VOLCANO] = COMPOUND_STRING("火山"), + [MENU_SNOW] = COMPOUND_STRING("雪山"), + [MENU_CAVE] = COMPOUND_STRING("洞窟"), + [MENU_BEACH] = COMPOUND_STRING("沙滩"), + [MENU_SEAFLOOR] = COMPOUND_STRING("海底"), + [MENU_RIVER] = COMPOUND_STRING("河川"), + [MENU_SKY] = COMPOUND_STRING("天空"), + [MENU_POLKADOT] = COMPOUND_STRING("圆点"), + [MENU_POKECENTER] = COMPOUND_STRING("宝可梦中心"), + [MENU_MACHINE] = COMPOUND_STRING("机器"), + [MENU_SIMPLE] = COMPOUND_STRING("朴素"), }; static void SetMenuText(u8 textId)