Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
hedara90
|
62e2f2b505
|
master to upcoming, 2025-04-12 (#6587)
|
2025-04-12 16:21:07 +02:00 |
|
RoamerX
|
56330ea44c
|
跟随文本修正+替换
|
2025-04-12 21:09:56 +08:00 |
|
Bassoonian
|
d86aedfd32
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr
|
2025-04-12 14:59:06 +02:00 |
|
psf
|
e146940f25
|
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-12 10:23:48 +02:00 |
|
Hedara
|
51c3709a56
|
Review comments
|
2025-04-12 08:58:23 +02:00 |
|
12014
|
bb7d260c53
|
Merge pull request #5 from rh-hideout-chinese/master
Update the Translation
|
2025-04-12 13:14:51 +09:00 |
|
RoamerX
|
98b0c6f021
|
Merge branch 'rh-hideout:master' into master
|
2025-04-12 11:43:45 +08:00 |
|
RoamerX
|
819333e52f
|
重新生成字库图片，不再需要拼好字了
感谢明雅大佬
|
2025-04-12 11:38:55 +08:00 |
|
RoamerX
|
6c43af125c
|
修正两处“精灵“为”宝可梦“
|
2025-04-12 11:37:07 +08:00 |
|
agsmgmaster64
|
1344d8e9dd
|
Type Effectiveness Indicators when selecting moves (#6559)
|
2025-04-12 01:03:45 +02:00 |
|
wiz1989
|
3d8b912087
|
Ability imposter (#6552)
|
2025-04-12 00:01:29 +02:00 |
|
psf
|
1ade433028
|
Added call to ItemId_GetDescription (#6582)
|
2025-04-11 23:59:43 +02:00 |
|
Hedara
|
66a6e92417
|
Fixed unused variables
|
2025-04-11 22:15:47 +02:00 |
|
Hedara
|
fff6bd3ed8
|
Removed legacy handling, fix if statment argument style
|
2025-04-11 21:27:49 +02:00 |
|
Hedara
|
3c2cc35158
|
Match expansion formatting for some preproc
|
2025-04-11 21:17:52 +02:00 |
|
Hedara
|
11df205d89
|
Merge branch 'nemo-merrp-fix' into merrps-dns
|
2025-04-11 18:50:24 +02:00 |
|
RoamerX
|
47c9504397
|
根据神百汉化了全部的训练师名
在字库图和码表中增加了'祐'、'咲'、'冴'字
|
2025-04-12 00:09:15 +08:00 |
|
Bassoonian
|
3c8d5d1a57
|
Add hold effects for PLA Origin Trio items (#6578)
|
2025-04-11 16:38:08 +02:00 |
|
hedara90
|
a186ce1bff
|
Animation fixes from lucky adapted to expansion (#6452)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-11 13:15:13 +02:00 |
|
hedara90
|
a243b97907
|
Documentation (#6576)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-11 12:52:12 +02:00 |
|
hedara90
|
cc957ed075
|
Pret merge (11 of April) (#6575)
|
2025-04-11 12:01:28 +02:00 |
|
Hedara
|
301ef288f5
|
Review comments
|
2025-04-11 11:37:36 +02:00 |
|
RoamerX
|
3990c164f5
|
Merge pull request #22 from rh-hideout/master
Gimmick Indicator refactor (#6553)
|
2025-04-11 15:17:34 +08:00 |
|
RoamerX
|
db73674ea3
|
修正部分专有名词为官译+修正招式详情中文字与图标位置+修复R键投球图颜色错误
包括以下：
精灵 宝可梦
训练师 训练家
背包 包包
技能 招式
口袋领航员 宝可梦导航仪
濒死 昏厥
烧伤 灼伤
命中率 命中 注：指招式的命中，对战内宝可梦的能力仍叫做命中率
|
2025-04-11 15:14:45 +08:00 |
|
Bassoonian
|
708bb4a831
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr
|
2025-04-10 23:57:57 +02:00 |
|
hedara90
|
cf98d764ad
|
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-10 23:56:26 +02:00 |
|
Hedara
|
d78afca94f
|
More shadow options and documentation
|
2025-04-10 22:41:38 +02:00 |
|
khbsd
|
c1ad43b1cc
|
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561)
|
2025-04-10 21:43:21 +02:00 |
|
Hedara
|
b075163c57
|
Cleanup and config options
|
2025-04-10 21:17:20 +02:00 |
|
khbsd
|
8bdad34211
|
fix: missing break statement (#6572)
|
2025-04-10 19:27:44 +02:00 |
|
RoamerX
|
524a4fe1e9
|
Merge pull request #21 from 12014/expansion_chs
华丽大赛技能说明文本，相关文本；PokeNav头栏；HGSS图鉴第一部分（头栏）by 兔砸博士
|
2025-04-11 00:54:27 +08:00 |
|
12014
|
ac0aca27c6
|
Translation of Texts about the Contest, Fix the header of Pokenav, the header of HGSS dex
|
2025-04-11 01:40:11 +09: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
|
962b58d33d
|
地名汉化
地名json生成规则按照之前泡泡的方法修改
|
2025-04-10 21:46:36 +08:00 |
|
psf
|
7ff50e3586
|
Fix broken links in merge_checklist.md (#6570)
|
2025-04-10 15:38:51 +02:00 |
|
RoamerX
|
ddb4abfbab
|
Update battle_message.c
对战文本官译化
|
2025-04-10 21:23:14 +08:00 |
|
Alex
|
4aca2fdcd3
|
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 15:01:02 +02:00 |
|
psf
|
17d851e1f9
|
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 14:59:58 +02:00 |
|
wiz1989
|
60a4e191ae
|
fixed damage calculations in CanTargetFaintAiWithMod() (#6446)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-10 14:56:49 +02:00 |
|
12014
|
b55f4502d0
|
Merge pull request #4 from rh-hideout-chinese/master
Update
|
2025-04-10 19:18:19 +09:00 |
|
RoamerX
|
efa431b585
|
汉化文本官译化
统一替换“背包”为包包
将SKT之前的汉化文本调整为目前官方翻译的文本
|
2025-04-10 17:09:22 +08:00 |
|
RoamerX
|
77de9a2349
|
Merge branch '12014-expansion_chs'
|
2025-04-10 15:30:12 +08:00 |
|
RoamerX
|
4896433dc3
|
SKT聚的PRmerge前手动处理
感谢修复及汉化贡献，抱歉之前string.c的汉化出现了一些问题
文本部分：汉化包括宝可梦存储系统、对战、获得道具（包括复数逻辑调整），部分对战文本、party界面、 存档、主角性别区分称呼等
图片部分：调整了标题画面的press start图片
代码部分：仿照日文版，为开始菜单和记录保存页面图鉴数和徽章数添加单位显示，且记录保存文本全部根据日文版原文重写翻译文本
|
2025-04-10 15:28:56 +08:00 |
|
RoamerX
|
9a0c95ae3d
|
Merge branch '12014-pokenav_translation'
|
2025-04-10 15:04:31 +08:00 |
|
RoamerX
|
b1b1ce5d8e
|
merge SKT的部分提交
喷雾剂秘密基地牌子等文本汉化
金钱及nav城市缩放图例图片汉化
pokenav主界面相关的暂时搁置，因为日版这部分图片也是英文的
|
2025-04-10 15:03:48 +08:00 |
|
Martin Griffin
|
2a0d3fd070
|
Merge pull request #2118 from cawtds/linkdirection-range-x-access
Make linkDirection more robust to member reordering
|
2025-04-10 06:47:06 +01:00 |
|
GriffinR
|
6d71c656fc
|
Merge pull request #2119 from pokemonmasteraaron/fix-agbprint
Fixed init call when using AGBPrint as log handler
|
2025-04-09 13:32:25 -04:00 |
|