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

17623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hedara90
9924ae3391
Make make clean work again (#6848) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-15 10:40:35 +02:00
RoamerX
20a96f2592 对战寻呼所有普通NPC文本重新润色/汉化 
主要参考deepseek英文翻译及原版英文
 2025-05-14 22:52:28 +08:00
GriffinR
0aae36984f
Merge pull request #2136 from mrgriffin/pret-remove-files 
Remove files that should not have been committed in #2126
 2025-05-13 12:15:58 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
444e77b7f6
BattleScript_BerryStatRaiseRet Ripen checks berry and cleanup (#6835) 2025-05-13 15:53:36 +02:00
ghoulslash
5ad8d852fd Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix 2025-05-13 08:01:41 -04:00
RoamerX
68ec0481a9 更新训练师类型中的译名为目前官译 
并修正了文本中提及的部分
 2025-05-13 17:06:12 +08:00
Eduardo Quezada
e64d260f52
Added Ability TODO tests B (#6836) 2025-05-13 10:34:06 +02:00
Bassoonian
60587682e3
Remove redundant script declaration in battle_scripts.h (#6837) 2025-05-13 10:32:03 +02:00
ghoulslash
d4c64d3b67 rename berrystatraise script to consumablestatraise 2025-05-12 21:11:25 -04:00
ghoulslash
14a66d612f combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries 2025-05-12 21:06:12 -04:00
cawtds
be03feca94
Fixed double battles send out breaking (#6822) 2025-05-12 18:07:22 +02:00
hedara90
5f86fd7de6
Changed github CI to use arm-none-eabi-gcc (#6829) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-12 16:38:03 +01:00
PhallenTree
a6b02b00c0
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827) 2025-05-12 15:16:40 +02:00
RoamerX
c1ff759873 全重要NPC对战寻呼对话+大吾剧情文本重新翻译 
”老爸“的翻译调整为”爸爸“
居合劈与碎岩大叔的翻译修正

主要参考deepseek英文及少量日文翻译及原版英文
 2025-05-12 17:13:39 +08:00
hedara90
2bc82a886a
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-11 22:37:11 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
Alex
51b000860b
Add BattlerId enum and document (#2135) 2025-05-11 07:36:39 +01:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
Alex
8d5d7c7fca
Fixes ai moves being recorded without correct index (#6803) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-05-10 19:38:48 +02:00
RoamerX
f7d405b9ad
Merge pull request #50 from rh-hideout/master 
update
 2025-05-11 00:23:51 +08:00
RoamerX
84afd52b41
Merge pull request #49 from ExMingYan/master 
修正README中相对文件路径
 2025-05-11 00:21:12 +08:00
RoamerX
c2f3ec5ca1 剩余有名字的NPC全部对话文本及其他几个文本的重新翻译 
包括哈奇老人、楠木、津贺、满盈、阿潮、阿泉、火村、兹伏奇社长、索蓝斯博士
其中几个角色神百有部分可供参考的，但翻译质量普通，主要还是参考deepseek英文翻译及原版英文
 2025-05-11 00:19:55 +08:00
RoamerX
f877c165f0 赤焰松水梧桐全部对话+大吾米可利琉璃市事件相关文本重新翻译 
同样是神百基本没有可供参考的，参考deepseek日文英文翻译及原版英文
 2025-05-10 17:16:24 +08:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
ExMingYan
4be47582ff 修正README中相对文件路径 2025-05-10 00:34:31 +08:00
RoamerX
2a2f324afa 亚希达的对话及对战寻呼文本重新翻译 
同样是神百基本没有可供参考的，参考deepseek日文英文翻译及原版英文
 2025-05-10 00:01:30 +08:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
RoamerX
0ce86de76d 爸爸、妈妈和满充的台词重新翻译 
同样是神百基本没有可供参考的，参考deepseek日文英文翻译及原版英文
 2025-05-09 20:05:20 +08:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
RoamerX
95b004aab7 找到道具以及摘下树果的文本统一BDSP 2025-05-09 18:04:53 +08:00
RoamerX
29bd9bb968 小悠小遥小田卷博士台词重新翻译 
神百基本没有可供参考的，参考deepseek日文英文翻译及原版英文
道馆部分文本微调
 2025-05-09 16:17:15 +08:00
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02:00
i0brendan0
8cc289ef35
Fix rerolls overwriting Fixed Personality (#6774) 2025-05-08 11:28:00 +02:00
RoamerX
27cef114f5 波妮对主角的称呼更新为“您” 
参照宝可梦大师，她和杜娟是唯二这么称呼主角的重要对战NPC
 2025-05-08 00:19:11 +08:00
RoamerX
61f9d00a6f Update scripts.inc 
修个繁体字
 2025-05-08 00:10:56 +08:00
RoamerX
6c675f1945 大批量文本修正 
包括所有馆主、四天王、米可利和大吾的（除电话外的）文本，基本参照神百，部分自己额外润色
所有城市介绍牌子以及道馆馆主的文字
“做为”修正为“作为”，“从新”修正为“重新”
以及少量其他部分修正
 2025-05-08 00:08:23 +08:00
hedara90
b6b6e91959
A lot of tests (#6734) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-07 16:50:12 +02:00
Alex
7c4fb512a1
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782) 2025-05-07 11:04:11 +02:00
RoamerX
94e7f69fd3 批量文本修正 
包括“携带”与“持有”，“碰到/上”与“遇到”，所有等级以及秘传招式相关的表述
统一学习器内容说明相关的文本
统一开拓区的两种等级的译名
将电视文本中的“酱油众”修正为“粉丝们”
修正了禁止参加名单的PM的展示(修改了一小部分代码)
 2025-05-07 16:06:22 +08:00
Martin Griffin
384b8f127e
Merge pull request #2132 from AsparagusEduardo/_pret/pr/respectMonPicOffsets 
`InitSpritePosToAnimAttacker` documentation
 2025-05-07 07:02:14 +01:00
Eduardo Quezada
15e39339b9 InitSpritePosToAnimAttacker documentation 2025-05-06 15:11:38 -04:00
RoamerX
88fe5e672b 修正几个easychat的词语组合错误 
把几个错误的“我是”修正为“我”
调整excel格式，规范py文件并上传
 2025-05-06 23:24:26 +08:00
RoamerX
0f8015feef 重新汉化了招式学习器的属性图片 
并将之前没有一眼发现问题的5个属性图标修正
至此全部属性图标全部重新制作
 2025-05-06 22:46:37 +08:00
RoamerX
38e4268eaa 以对战开拓区为主的大批量文本修正 
以下修改均参照正作目前的使用习惯：
对战开拓区及一些其他设施服务人员的称呼由“你”改为“您”
润色对战开拓区相关的大量脚本文本
将“中断”挑战修改为“暂停”挑战
将“对战房间”修改为“对战间”
将“保存”“存档”等文字修改为“记录”并润色所在句子
主菜单的“导航”和“保存”改为“宝可导航”和“记录”
更正剧情中宝可导航登记语句的格式
修复个别语句错误
 2025-05-06 22:03:17 +08:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762) 2025-05-06 12:07:01 +02:00
RoamerX
a18cfa7892 修复readme文件格式 2025-05-06 13:39:04 +08:00
RoamerX
d4f72c04dc 同步更新猫佬的readme修正至github预览界面 
微调了flag的叫法
 2025-05-06 13:34:24 +08:00
RoamerX
fe7d20c93c Update fonts.c 2025-05-06 13:07:01 +08:00
RoamerX
2f9884e77a
Merge pull request #47 from ExMingYan/PullRequest 
修改README.md中部分指向rh-hideout github仓库的链接，使其指向本地文件
 2025-05-06 13:00:29 +08:00