AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Eduardo Quezada
|
5966852f8d
|
Removed Mind Blown effect in favor of move flag (#7138)
|
2025-06-17 00:02:46 +02:00 |
|
Eduardo Quezada
|
651e87af5f
|
Converted Relic Song into a proper form change (#7139)
|
2025-06-17 00:02:25 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
RoamerX
|
1ee4d508c4
|
将4行的PM图鉴说明调整至3行或以内
并调整图鉴说明文字位置
|
2025-06-11 17:30:11 +08:00 |
|
GriffinR
|
50d81616cd
|
Relax MAPSEC region map data requirements
|
2025-06-10 13:05:03 -04:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
RoamerX
|
773957bd73
|
联机相关文本参照正作进行调整
主要包括联机俱乐部以及联盟交谊厅
统一了“群组”与“组长”的翻译
|
2025-06-08 23:35:17 +08:00 |
|
Bassoonian
|
b372c272f4
|
Update FRLG whiteouts to new pret system (#7040)
Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>
|
2025-06-08 14:45:14 +02:00 |
|
wiz1989
|
e63ac48de2
|
added Ash Greninja overworld sprites (#6976)
|
2025-06-07 09:57:43 +02:00 |
|
ExMingYan
|
98de648c66
|
移除追踪heal_locations.h
|
2025-06-07 13:25:45 +08:00 |
|
Linathan
|
dc279f14ba
|
Chloroblast fix (#7008)
|
2025-06-06 21:33:56 +02:00 |
|
RoamerX
|
7228b9e0a1
|
一些文本修正
乔伊小姐对话、蛋孵化的文本及训练家卡的颜色替换为正作翻译
将树果粉碎的错误翻译修正、并将对应翻译参照神百调整
将树果混合器的翻译统一
|
2025-06-06 21:04:14 +08:00 |
|
RoamerX
|
11603d8c2d
|
测试发现的文本问题修复
反派组织手下部分台词重新翻译
招式学习器道具说明换行调整
其他零散台词修正调整
|
2025-06-05 23:54:19 +08:00 |
|
RoamerX
|
85af9cdb32
|
测试发现的文本问题修复
姓名鉴定师、秘密基地教学文本重新翻译
debug部分遗漏文本补充汉化
其他几处零散汉化修正
|
2025-06-04 23:17:06 +08:00 |
|
Eduardo Quezada
|
d795de9e9d
|
Remove more instances of hard-coded Move IDs (#7056)
|
2025-06-03 23:26:48 +02:00 |
|
Philipp AUER
|
21f0eb1583
|
Debug parties and battles (#6884)
Co-authored-by: sbird <sbird@no.tld>
|
2025-06-03 23:21:17 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
Bassoonian
|
c5c7bb13c9
|
Converts a bunch of defines to enums (#7041)
|
2025-06-02 15:54:37 +02:00 |
|
RoamerX
|
f83e94af5e
|
merge1.12.0
|
2025-06-02 14:17:22 +08:00 |
|
hedara90
|
0917af214c
|
Replace all usages of lz compression with smol (#7032)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-31 19:47:54 +02:00 |
|
RoamerX
|
9a06bed011
|
easychat对话文本检查修正
|
2025-05-31 23:42:39 +08:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +02:00 |
|
cawtds
|
21499cbee1
|
Refactor field moves (#6660)
|
2025-05-31 09:03:12 +02:00 |
|
RoamerX
|
f423a23c28
|
道具名称中的“TMXX”全部改为“招式学习器XX”
找到及获得文本格式参考正作
修正一些通关中发现的文本问题
|
2025-05-30 21:15:09 +08:00 |
|
RoamerX
|
0ee10d486e
|
大批量文本修正
徒弟文本全部重新翻译（主要使用deepseek，之后进行了润色和格式调整）
调整整个游戏中大量少数几个字后就换行导致观感奇怪的情况
将所有的游船修正为轮渡（ferry，連絡船）
润色/重新翻译乘船相关的文本
个体值评定员、回忆技能NPC的文本重新翻译
修正很多换页时逗号的使用
修正几个遗漏的文本超出
统一所有自行车道的译名
调整润色传送到盒子的文本
修正所有宝玉为宝珠
训练家的量词统一为“位”
|
2025-05-29 23:09:11 +08:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
RoamerX
|
1e3e10e990
|
宝可梦新闻、混合名人文本重新汉化
游戏中心调整为游戏城
省略号及换行等一些文本修正
|
2025-05-28 13:02:57 +08:00 |
|
Hedara
|
647c786c53
|
Merge commit '07c897a' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:46:13 +02:00 |
|
Hedara
|
5e9b8cdbad
|
Merge commit 'cc388ef' into pret-merge
Conflicts:
src/map_name_popup.c
|
2025-05-27 19:06:35 +02:00 |
|
Hedara
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
RoamerX
|
65afe8db21
|
汉化本次expansion更新后新增的未汉化文本
|
2025-05-27 22:58:30 +08:00 |
|
GriffinR
|
0c32d840fa
|
Merge pull request #2141 from pret/porymap-6
Update for Porymap 6
|
2025-05-27 10:53:17 -04:00 |
|
RoamerX
|
466111cbf2
|
Merge branch 'merge'
|
2025-05-27 21:00:44 +08:00 |
|
RoamerX
|
f7ce740f4d
|
电视节目文本全部重新汉化
此外修正了原本使用了神百的译名的部分装饰物品的名称及对应说明
将训练师卡片统一调整为训练师卡
修正了彩排相关的文本
将所有的训练师重新修正为训练家
修正了连接华丽大赛的翻译文本
在charmap中增加了日式中式书名号的码表编号
|
2025-05-27 20:54:33 +08:00 |
|
sayseong
|
24f260f6c7
|
Merge remote-tracking branch 'upstream/master'
|
2025-05-27 13:33:46 +08:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Hedara
|
86ca6e2719
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-24 21:27:25 +02:00 |
|
Hedara
|
2e4833240f
|
Merge commit 'b31a73f990fb680629e2a503d72d137bcff0872a' into pret-merge
Conflicts:
include/item.h
src/battle_ai_script_commands.c
src/battle_main.c
src/battle_pyramid_bag.c
src/battle_script_commands.c
src/battle_util.c
src/item.c
src/item_menu.c
src/item_use.c
src/pokemon.c
src/pokemon_summary_screen.c
src/shop.c
|
2025-05-24 21:24:56 +02:00 |
|
Hedara
|
950dbe7897
|
Merge commit '16357c7' into pret-merge
Conflicts:
include/battle.h
include/battle_controllers.h
include/battle_script_commands.h
include/contest.h
include/list_menu.h
src/battle_controllers.c
src/battle_gfx_sfx_util.c
src/battle_main.c
src/battle_message.c
src/battle_tower.c
src/berry_crush.c
src/contest.c
src/ereader_helpers.c
src/evolution_scene.c
src/hall_of_fame.c
src/mauville_old_man.c
src/mystery_gift_menu.c
src/pokedex.c
src/pokenav_conditions_search_results.c
src/pokenav_menu_handler_gfx.c
src/pokenav_ribbons_list.c
src/rom_header_gf.c
src/union_room.c
src/union_room_battle.c
src/union_room_player_avatar.c
|
2025-05-24 19:22:31 +02:00 |
|
RoamerX
|
f74efd2017
|
多选菜单的“说明”参照正作修改为“听说明”
|
2025-05-24 13:49:26 +08:00 |
|
RoamerX
|
2bf2206883
|
华丽大赛一些相关文本的修正
还有几个秘传招式相关文本的修正
|
2025-05-24 13:44:50 +08:00 |
|
RoamerX
|
f9b101fdb8
|
批量文本润色修正及重新汉化
string.c中的大量专有名词及语句的文本参照正作官译进行调整
华丽大赛柜台的所有文本重新汉化
华丽大赛招式参照神百再次进行了调整
华丽大赛场内文本在SKT大佬的基础上进行了微调
汉化了宝可方块盒中遗漏的文本及图片，调整了相关文本的代码以优化语序
修正部分换行问题
|
2025-05-23 21:55:52 +08:00 |
|
GriffinR
|
fba096a500
|
Remove map_group_count.h
|
2025-05-22 13:59:23 -04:00 |
|
Hedara
|
90aed43c27
|
Merge branch 'master' into master-upcoming
Conflicts:
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
.github/ISSUE_TEMPLATE/03_feature_requests.yaml
.github/ISSUE_TEMPLATE/04_other_errors.yaml
.github/pull_request_template.md
src/battle_controller_player.c
src/battle_main.c
src/battle_script_commands.c
src/battle_util.c
src/data/graphics/pokemon.h
src/data/pokemon/species_info/gen_9_families.h
test/battle/ability/flower_veil.c
test/battle/ability/sweet_veil.c
test/battle/ability/synchronize.c
test/battle/ability/water_bubble.c
test/battle/move_effect/fell_stinger.c
test/battle/move_effect/level_damage.c
test/battle/move_effect/magic_room.c
test/battle/move_effect/me_first.c
test/battle/move_effect/sky_drop.c
test/battle/move_effect/smack_down.c
test/battle/move_effect/wish.c
test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
|
2025-05-22 15:41:08 +02:00 |
|
RoamerX
|
c0b954333e
|
对战开拓区接待处文本修正
一些其他换行问题的修正
|
2025-05-22 21:11:41 +08:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Eduardo Quezada
|
be4b8ca3d0
|
Fix KNOWN_FAILING Bestow tests (#6947)
|
2025-05-22 10:23:15 +02:00 |
|
RoamerX
|
5546037e80
|
调整优化对战开拓区对话文本
重新翻译了对战开拓区所有设施以及接待处的所有文本
进一步调整了暂停挑战以及结束挑战的相关文本以避免混淆
更新了对战设施门口牌子的介绍文本，部分参照神百
参照正作更新了选择宝可梦参加挑战时的相关文本
其他：
将联机中心的译名修改为联机俱乐部
将文本英文的!?:,.替换成对应的汉字符号
|
2025-05-21 23:47:05 +08:00 |
|