RoamerX
|
65afe8db21
|
汉化本次expansion更新后新增的未汉化文本
|
2025-05-27 22:58:30 +08: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
|
cf50b5b2f6
|
Update item.c
|
2025-05-27 18:26:34 +08:00 |
|
sayseong
|
8e0dffd855
|
Update battle_message.c
|
2025-05-27 13:44:33 +08:00 |
|
sayseong
|
24f260f6c7
|
Merge remote-tracking branch 'upstream/master'
|
2025-05-27 13:33:46 +08:00 |
|
ghoulslash
|
84118dec97
|
Fix heal bell test, add sparkly swirl test (#6262)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-26 19:45:51 +02:00 |
|
RoamerX
|
b202457bce
|
树果混合器相关文本重新汉化
将部分“记录”更正为“纪录”
文本中的自行车名称修正
|
2025-05-26 20:59:50 +08:00 |
|
Alex
|
803bd2dfbf
|
Prankster block check was missng the IsStatusMove check (#6987)
|
2025-05-26 13:06:19 +02:00 |
|
Martin Griffin
|
372553b319
|
Explicit -std=gnu17 in CPPFLAGS to mirror CFLAGS (#6839)
|
2025-05-26 09:33:17 +02:00 |
|
RoamerX
|
fca6f4d5cc
|
Update strings.c
修正小错误
|
2025-05-26 15:32:32 +08:00 |
|
Bassoonian
|
812bde8a48
|
Pret merge (24th of May, 2025) (#6978)
|
2025-05-25 23:08:37 +02:00 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01:11 +02:00 |
|
RoamerX
|
dfa8ae8e0c
|
华丽大赛部分文本再调整
华丽大赛结果界面图片文字更新至与当前翻译一致。修改了部分文字的位置
训练师卡图片上的文字至与当前翻译一致
存档确认文本微调
|
2025-05-25 23:36:32 +08:00 |
|
Pawkkie
|
f8b3a02f6c
|
Backport #6712 Fix party data assignment (#6980)
|
2025-05-25 10:06:49 +02:00 |
|
Alex
|
d0313ff323
|
Rename AI test (#6977)
|
2025-05-24 17:12:48 -04:00 |
|
Hedara
|
dc6e40a839
|
Fix tests using old item functions
|
2025-05-24 21:57:51 +02:00 |
|
Hedara
|
86ca6e2719
|
Merge remote-tracking branch 'pret/master' into pret-merge
|
2025-05-24 21:27:25 +02:00 |
|
Hedara
|
bd735033af
|
Merge commit 'e245f1ec2291a9eac1b8688c99c0126e100178e8' into pret-merge
|
2025-05-24 21:25:57 +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
|
3ecd8afab0
|
Merge commit 'bd0a02c45630d6b3666b079593e787de263d0a17' into pret-merge
Conflicts:
Makefile
|
2025-05-24 20:42:01 +02:00 |
|
Hedara
|
2b92ba315a
|
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
|
2025-05-24 20:38:21 +02:00 |
|
Hedara
|
a90dd491d2
|
Merge commit 'e1e7d1cf3530799774fa13d4e409bed7067ffa25' into pret-merge
|
2025-05-24 19:35:01 +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 |
|
PhallenTree
|
0b67aa7546
|
Fixes checking wrong move's Dynamic Move Type in Summary Screen (#6975)
|
2025-05-24 15:13:08 +02:00 |
|
RoamerX
|
f74efd2017
|
多选菜单的“说明”参照正作修改为“听说明”
|
2025-05-24 13:49:26 +08:00 |
|
RoamerX
|
2bf2206883
|
华丽大赛一些相关文本的修正
还有几个秘传招式相关文本的修正
|
2025-05-24 13:44:50 +08:00 |
|
Hedara
|
a714779928
|
Merge commit '74bf498' into pret-merge
|
2025-05-23 17:35:13 +02:00 |
|
RoamerX
|
2cb08cdf3e
|
Update contest.c
|
2025-05-23 21:58:02 +08:00 |
|
RoamerX
|
f9b101fdb8
|
批量文本润色修正及重新汉化
string.c中的大量专有名词及语句的文本参照正作官译进行调整
华丽大赛柜台的所有文本重新汉化
华丽大赛招式参照神百再次进行了调整
华丽大赛场内文本在SKT大佬的基础上进行了微调
汉化了宝可方块盒中遗漏的文本及图片，调整了相关文本的代码以优化语序
修正部分换行问题
|
2025-05-23 21:55:52 +08:00 |
|
Alex
|
87cbb457f1
|
Fixes AI not seeing primal weather and partner absorbing abilities (#6936)
|
2025-05-22 17:25:29 -04:00 |
|
Alex
|
f9400332fc
|
Fixes AI repeated use of weather set up moves (#6963)
|
2025-05-22 16:50:13 -04:00 |
|
Eduardo Quezada
|
2e3ae0d167
|
Added check for gBattleStringsTable (#6948)
|
2025-05-22 21:05:22 +02:00 |
|
GriffinR
|
fba096a500
|
Remove map_group_count.h
|
2025-05-22 13:59:23 -04:00 |
|
GriffinR
|
d6962aacd7
|
Merge pull request #2146 from AlexOn1ine/removeFiles
Remove files that were wrongly commited
|
2025-05-22 13:58:18 -04:00 |
|
Alex
|
48100e9593
|
Fixes Unnerve activation not limited to 1 per switch-in (#6960)
|
2025-05-22 19:15:01 +02:00 |
|
RoamerX
|
c0b954333e
|
对战开拓区接待处文本修正
一些其他换行问题的修正
|
2025-05-22 21:11:41 +08:00 |
|
AlexOn1ine
|
e245f1ec22
|
Remove files that were wrongly commited
|
2025-05-22 14:33:31 +02:00 |
|
Alex
|
b31a73f990
|
Rename ItemId_GetX to GetItemX (#2116)
|
2025-05-22 13:27:52 +01:00 |
|
Alex
|
8ec998abff
|
Fixes ate type being ignored after checking summary screen (#6888)
|
2025-05-22 14:07:36 +02:00 |
|
Alex
|
8ad1f329c9
|
Fixes Dazzling abilities activating on all multi hit move hits (#6943)
|
2025-05-22 10:37:00 +02:00 |
|
Eduardo Quezada
|
be4b8ca3d0
|
Fix KNOWN_FAILING Bestow tests (#6947)
|
2025-05-22 10:23:15 +02:00 |
|
hedara90
|
e9ba4b5db0
|
Added type: documentation to required labels for the label check (#6957)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-22 00:45:25 -07:00 |
|
RoamerX
|
5546037e80
|
调整优化对战开拓区对话文本
重新翻译了对战开拓区所有设施以及接待处的所有文本
进一步调整了暂停挑战以及结束挑战的相关文本以避免混淆
更新了对战设施门口牌子的介绍文本，部分参照神百
参照正作更新了选择宝可梦参加挑战时的相关文本
其他：
将联机中心的译名修改为联机俱乐部
将文本英文的!?:,.替换成对应的汉字符号
|
2025-05-21 23:47:05 +08:00 |
|
Alex
|
ce079cfcc8
|
Fixes Life Orb damage still happening after attacker was unable to attack (#6940)
|
2025-05-21 16:16:33 +02:00 |
|
jfb1337
|
ce9bbcc3b7
|
Fix trainers.party parser failing on apostrophes (#6938)
|
2025-05-21 10:41:18 +02:00 |
|
ghoulslash
|
c485ae4e90
|
add fail ptr arg to JumpIfMoveFailed, fix tryworryseed (#6925)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-05-20 17:07:29 +02:00 |
|
allcontributors[bot]
|
8f88cfad5b
|
add surskitty as a contributor for code (#6924)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-20 06:25:26 -07:00 |
|
Pawkkie
|
3f89abea74
|
Fix test not referencing AI_TRAINER_NAME (#6926)
|
2025-05-19 22:17:46 -07:00 |
|
allcontributors[bot]
|
100121ad06
|
add grintoul1 as a contributor for code (#6920)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-05-19 22:14:59 -07:00 |
|