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

18884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bubble
81760e45e0
Merge branch 'rh-hideout:master' into master 2025-04-09 23:36:00 +08:00
RoamerX
a0391ec7ef 老虎机图修正，string.c文本修正，部分跟随文本汉化 2025-04-09 23:27:24 +08:00
12014
6f3269cb1e Some Translations& Bug fixing 2025-04-10 00:04:08 +09:00
Pawkkie
89da80b9d1
Ability access cleanup for #6550 (#6565) 2025-04-09 09:37:59 -04:00
pokemonmasteraaron
d890436b2a Fixed a compilation error if using AGBPrint as your log handler, misnamed AGBPrintfInit should be AGBPrintInit 2025-04-09 09:06:20 -04:00
RoamerX
1ae844541b 修复招式详情弹窗图片 2025-04-09 19:58:27 +08:00
RoamerX
30dece69da
Merge pull request #19 from ExMingYan/master 
bKGD Fix
 2025-04-09 19:45:55 +08:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
ExMingYan
cbdc4143d8 bKGD Fix 2025-04-09 19:17:24 +08:00
Hedara
76a08abeaa Updated documentation 2025-04-09 12:59:03 +02:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
hedara90
3d68061f23
Updated move animation tests (#6554) 2025-04-09 12:17:57 +02:00
Alex
73d2b5d940
master to upcoming, 2025-04-09 (#6563) 
Co-authored-by: AlexOn1ine <alexthenotes@gmail.com>
Co-authored-by: Isaac Aronson <i@pingas.org>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2025-04-09 12:16:52 +02:00
RoamerX
8b038e6e2c 图片汉化上传 
感谢猫佬、明雅佬、兔佬的贡献，赞美
 2025-04-09 17:59:39 +08:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00