Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,403 Commits 1 Branch 0 Tags
Commit Graph

718 Commits

Author SHA1 Message Date
RoamerX
acbbb4f865 修复所有句尾结束没有标点符号的对话 2025-04-29 14:54:12 +08:00
RoamerX
a812c96187 主要是开拓区的文本重译+润色 
物品统一译为道具（重要物品、装饰物品等名称不变）
 2025-04-29 14:04:21 +08:00
RoamerX
c1b992791c 文本重译+润色 
缎带统一为奖章
 2025-04-28 23:02:48 +08:00
RoamerX
b70b8224dd 对战开拓区文本大批量重译+润色 2025-04-28 21:37:36 +08:00
RoamerX
99dce883e4 文本批量修正、微调及润色 2025-04-27 21:37:42 +08:00
RoamerX
bbd7853a95 批量修正、微调及润色 2025-04-27 15:01:24 +08:00
RoamerX
ce12aa0adf 文本修正、微调及润色2 2025-04-26 21:54:01 +08:00
RoamerX
3d45119bbe 大批量文本修正、微调及润色 2025-04-26 21:51:46 +08:00
RoamerX
5fc2213e1c 遗漏的换行文本溢出情况修复 
Pokenav统一为宝可导航，全流程中仅兹伏奇初次介绍时使用
送神山码头文本错误翻译修复
城市名称统一补全为XX市/镇
哈奇老人相关的文本调整
海员统一修正为水手
标点符号重复使用修复
小遥错字修复
汉化优化
 2025-04-24 18:14:06 +08:00
RoamerX
64c17a76f2 包括全部NPC训练家对战文本在内的大量文本修正及润色 
润色了全部NPC训练家对战前后的文本
统一了破折号的使用
将“培养”“饲育”等词统一规范为“培育”
其他个别错误修正
 2025-04-24 16:19:31 +08:00
RoamerX
8175f377ee Update scripts.inc 
之前遗漏的一处汉化译名修正
 2025-04-23 20:04:34 +08:00
RoamerX
b556c1fbeb 把所有的省略号从“…”统一成“……” 补充 2025-04-22 17:05:00 +08:00
RoamerX
7036cbe69b Update scripts.inc 2025-04-22 16:57:00 +08:00
RoamerX
97501e8843 【危险举动，需要测试】把所有的省略号从“…”统一成“……” 
涉及上千处改动，出现问题则回退
 2025-04-22 16:50:58 +08:00
RoamerX
ee980e6505 继续检查每行字数超标，检查换行次数超标，汉化遗漏的英文文本 2025-04-22 16:21:52 +08:00
RoamerX
12714a337a 检查每行字数超标，检查换行次数超标，汉化遗漏的英文文本 2025-04-22 15:32:17 +08:00
RoamerX
1709580269 修复几个手残小错误 2025-04-21 21:44:19 +08:00
RoamerX
2e00ddb067 汉化补充修正 
汉化了树果混合器相关文本（src\berry_blender.c）
汉化了宝可方块相关文本（src\pokeblock.c）
汉化了所有奖章的说明文本（src\data\text\gift_ribbon_descriptions.h）
汉化了宝可梦导航器的相关文本（src\pokenav_main_menu.c，src\pokenav_list.c，src\pokenav_match_call_gfx.c，src\pokenav_menu_handler_gfx.c）
汉化了导航仪地图界面的地标名称（src\landmark.c），并统一了脚本中它们的叫法
汉化了零散遗漏的英文文本
宝可梦的量词按照朱紫统一成“只”而不是“个”
 2025-04-21 21:36:17 +08:00
RoamerX
fa33ee6283 多选框文本、对战开拓区头目对战后文本、存档错误界面汉化 2025-04-19 23:53:54 +08:00
RoamerX
dce4c9e6a6 秘密基地装饰物品名称及说明 
出奇一击技能说明跟随更新修正
一些零散的汉化遗漏补全
 2025-04-19 23:14:30 +08:00
RoamerX
011a62a38c 根据2011版汉化文本修正所有脚本中的文本错误及译名 2025-04-15 01:18:41 +08:00
RoamerX
545102685e 属性相关的翻译文本更新 2025-04-13 23:51:22 +08:00
RoamerX
5108965bd5 脚本文本将旧译替换官译 
脚本文本中宝可币符号位置修复
脚本文本中以下名词修正：
部分专有名词
重要NPC人名&组织名
地名
道具名称
招式学习器及教学相关的招式名称
对战开拓区设施名称、首领称号、印记
 2025-04-13 23:26:26 +08:00
RoamerX
db73674ea3 修正部分专有名词为官译+修正招式详情中文字与图标位置+修复R键投球图颜色错误 
包括以下：
精灵	宝可梦
训练师	训练家
背包	包包
技能	招式
口袋领航员	宝可梦导航仪
濒死	昏厥
烧伤	灼伤
命中率	命中	注：指招式的命中，对战内宝可梦的能力仍叫做命中率
 2025-04-11 15:14:45 +08:00
RoamerX
dce02218c7 汉化script_menu中多选框的内容 
很多是从string.c中独立出去的
并修复了say处理的地图内OW脚本中的$导致的文本提前截止的问题
 2025-04-10 23:51:48 +08:00
RoamerX
aa2a09ae3a Revert "将宝可币符号替换成小字号的“元”（码表¥）" 
This reverts commit 7721393332d457fdff6337474927ede7cba4ea7b.
 2025-04-10 23:48:54 +08:00
RoamerX
7721393332 将宝可币符号替换成小字号的“元”（码表¥） 
调整了金钱相关的文本中“元”与金额的顺序
修复了say处理的地图内OW脚本中的$导致的文本提前截止的问题
 2025-04-10 23:21:43 +08:00
RoamerX
efa431b585 汉化文本官译化 
统一替换“背包”为包包
将SKT之前的汉化文本调整为目前官方翻译的文本
 2025-04-10 17:09:22 +08:00
sayseong
4d3a9dea09 修复字母编译错误 2025-04-08 14:38:46 +08:00
sayseong
39b26cd859 HP改为体力 2025-04-08 11:07:43 +08:00
sayseong
c039c0303b 地图脚本汉化 2025-04-08 01:07:12 +08:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Martin Griffin
1551a33069
Fix leftover test change from #5033 (#5987) 2025-01-09 17:28:09 -03:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) 
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.

All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.

Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.

Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
   effect.
2. Immediately run triggers if they only affect flags/vars. This removes
   the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
   warp scripts onto the global script context if they would block
   (approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
   not see the player if the script has no effect, and the trainer will
   use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
   cant_see_if_* commands have been introduced so that scripts are able
   to do something when the player interacts with the trainer even if
   that trainer wouldn't see them.
 2025-01-08 10:27:00 +00:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
Eduardo Quezada
831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 
# Conflicts:
#	Makefile
#	include/battle.h
#	include/battle_main.h
#	include/battle_util.h
#	include/data.h
#	make_tools.mk
#	map_data_rules.mk
#	src/battle_setup.c
#	src/fieldmap.c
 2024-09-11 15:26:14 -03:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers (#4767) 
* add item descption headers and (default-off) config

* revert test script

* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling

* add ow item header config value labels

* Update include/config/overworld.h

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Update src/overworld.c

* Update include/overworld.h

* ScriptShowItemDescription remove unused var

* fix ScriptShowItemDescription warning

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-03 20:22:01 +02:00
GriffinR
04197b4912 Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
Bassoonian
a24b767276 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun 2024-06-18 15:27:06 +02:00
Bassoonian
d9001a7923 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun 2024-06-18 11:04:40 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00
Eduardo Quezada
64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
 2024-06-11 08:12:03 -04:00
Bassoonian
d6422da284
Fix partner palette problem (#4736) 2024-06-07 21:05:16 +02:00
Eduardo Quezada
1359966a14 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/event_object_movement.c
#	src/scrcmd.c
 2024-06-01 20:17:19 -04:00
Eduardo Quezada
25567070d6 Moved callfuncs to general macros folder + added comments + removed unused "emote" macro 2024-05-22 13:52:26 -04:00