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

12563 Commits

Author SHA1 Message Date
Alex
9259b7ee69
Bugfixes batch (#6750) 2025-05-02 20:14:27 +02:00
DavidJCobb
0f17e70371 Shorter names for engine/controller communication enum members 2025-05-02 00:01:15 -04:00
DavidJCobb
d83b0671f7 Battle anims, ice: ARRAY_COUNT works if used with a cast 2025-05-01 23:49:05 -04:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry (#6718) 2025-05-01 10:16:15 +02:00
Cafe
b451bc3606
New Lurantis animation (#6725) 2025-04-30 12:45:29 +02:00
RoamerX
091c17b5bf EASYCHAT图片汉化 2025-04-30 18:41:15 +08:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719) 2025-04-29 23:25:56 +02:00
Hedara
4873589c65 Merge remote-tracking branch 'pret/master' into new-pret-merge 
Conflicts:
	asm/macros/battle_script.inc
	data/battle_anim_scripts.s
	include/battle.h
	include/battle_controllers.h
	include/battle_setup.h
	include/constants/battle.h
	src/battle_anim_normal.c
	src/battle_anim_utility_funcs.c
	src/battle_bg.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
 2025-04-29 20:27:33 +02:00
RoamerX
acbbb4f865 修复所有句尾结束没有标点符号的对话 2025-04-29 14:54:12 +08:00
RoamerX
a7211fe61d Update strings.c 2025-04-29 14:10:23 +08:00
RoamerX
a812c96187 主要是开拓区的文本重译+润色 
物品统一译为道具（重要物品、装饰物品等名称不变）
 2025-04-29 14:04:21 +08:00
RoamerX
c1b992791c 文本重译+润色 
缎带统一为奖章
 2025-04-28 23:02:48 +08:00
DavidJCobb
35b33a46e9 Identified task and sprite fields related to battle weather animations 
Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm.
 2025-04-28 05:39:52 -04:00
RoamerX
99dce883e4 文本批量修正、微调及润色 2025-04-27 21:37:42 +08:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon (#6702) 2025-04-27 15:27:21 +02:00
RoamerX
bbd7853a95 批量修正、微调及润色 2025-04-27 15:01:24 +08:00
RoamerX
951296a9d3 修复釜炎镇地名错误 2025-04-27 10:51:38 +08:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection (#6697) 2025-04-26 21:46:41 +02:00
DavidJCobb
2864408060 Tweaks to documentation comments 2025-04-26 11:40:14 -04:00
DavidJCobb
b4ee45f3e8 Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_ 
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.

I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
 2025-04-26 11:37:20 -04:00
RoamerX
75d2beddbb 宝可导航信息调整 
对战寻呼训练家信息暂时改用小号字体以显示完整
菜单选项由“导航器”改成“导航”
 2025-04-26 22:54:47 +08:00
DavidJCobb
d8721b668e Fixed find-and-replace mistake 
Functions were using the wrong constant.
 2025-04-26 10:54:22 -04:00
RoamerX
257c6e1f41 Merge branch 'master' of https://github.com/rh-hideout-chinese/pokeemerald-expansion 2025-04-26 21:54:05 +08:00
RoamerX
ce12aa0adf 文本修正、微调及润色2 2025-04-26 21:54:01 +08:00
RoamerX
df515d0057
Merge branch 'rh-hideout:master' into master 2025-04-26 21:52:42 +08:00
RoamerX
3d45119bbe 大批量文本修正、微调及润色 2025-04-26 21:51:46 +08:00
RoamerX
454343f53d 装饰物品说明换行修正 2025-04-26 19:16:14 +08:00
RoamerX
dcfeec35d6 更正与熏香效果相同的属性强化道具的说明 
变成独立的文本了，顺便把中文用不到的pluralName复数名称项全部删除了
 2025-04-26 18:47:30 +08:00
DavidJCobb
2738d11b0f Additional fixes to last few commits 
ROM now compiles, but it's not comparing as equal...
 2025-04-26 01:00:16 -04:00
DavidJCobb
bab9f0cfef gBattleControllerExecFlags macro in MarkAllBattlersForControllerExec 
whoops, missed one
 2025-04-26 00:46:06 -04:00
DavidJCobb
a4370ffcde gBattleControllerExecFlags bits now identified via helper macros 
Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work.
 2025-04-26 00:45:03 -04:00
DavidJCobb
9dc48899d3 BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names 
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.

Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
 2025-04-26 00:13:42 -04:00
hedara90
5cd7bd77b3
Fix various Toxic Spikes interactions (#6690) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
 2025-04-24 17:06:47 +02:00
RoamerX
10328eec96 在easychat中停止使用StringCopyUppercase以避免汉字显示错误 2025-04-24 22:17:39 +08:00
PhallenTree
34e91dd96f
Fixes Unburden doubling speed when affected by Neutralizing Gas (#6691) 2025-04-24 15:26:23 +02:00
RoamerX
dfb76bf8fa Update pokedex_plus_hgss.c 
HGSS图鉴文字位置微调以适应UI
 2025-04-24 18:27:54 +08:00
RoamerX
5fc2213e1c 遗漏的换行文本溢出情况修复 
Pokenav统一为宝可导航，全流程中仅兹伏奇初次介绍时使用
送神山码头文本错误翻译修复
城市名称统一补全为XX市/镇
哈奇老人相关的文本调整
海员统一修正为水手
标点符号重复使用修复
小遥错字修复
汉化优化
 2025-04-24 18:14:06 +08:00
RoamerX
64c17a76f2 包括全部NPC训练家对战文本在内的大量文本修正及润色 
润色了全部NPC训练家对战前后的文本
统一了破折号的使用
将“培养”“饲育”等词统一规范为“培育”
其他个别错误修正
 2025-04-24 16:19:31 +08:00
Estellar
dd70446db5 Added constant in Birch speech dialogue 2025-04-23 18:46:11 -04:00
RoamerX
d49d284cb2
Merge branch 'rh-hideout:master' into master 2025-04-23 21:52:37 +08:00
RoamerX
8bdfd1b1ae Update pokemon_storage_system.c 
宝可梦盒子多选框宽度调整
 2025-04-23 20:36:27 +08:00
Alex
20799d5835
Remove misleading comment (#6684) 2025-04-23 14:24:25 +02:00
RoamerX
fd8b3d7676 特性弹窗汉字上下一行像素补全 
解决方案来自卧看微尘聚聚，感谢
 2025-04-23 18:25:03 +08:00
hedara90
6fdb6a9e34
Fixed broken palette load for shiny followers in the sprite visualizer (#6683) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-23 12:17:54 +02:00
RoamerX
bde6119201 debug相关文本汉化 2025-04-23 18:13:15 +08:00
RoamerX
2b265bd01a
Merge branch 'rh-hideout:master' into master 2025-04-23 15:42:35 +08:00
RoamerX
65aecb14d9 HGSS图鉴文本汉化+形态模式tilemap错误修复 
对几个文字位置相关代码进行了优化
 2025-04-23 14:19:07 +08:00
Alex
71cfab6477
Fixes Magician Life Orb interaction (#6676) 2025-04-22 21:01:00 +02:00
RoamerX
5ba6e60b56 Update apprentice.h 
徒弟名字汉化，感谢SKT大佬
 2025-04-22 23:16:44 +08:00