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
Kurausukun
e1e7d1cf35
Fixes for C23 Support (#2138) 
* fixes for c23 support
* include global.h in m4a.c & remove <string.h> include
 2025-05-19 09:11:59 +01:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
RoamerX
6f69e7f5eb 对于对战开拓区&对战帐篷的文本进行了重新翻译 
虽然原本进行了一些修正和润色，但是整体质量偏低，于是重新进行了汉化
调整了开拓区对战设施的成绩页面文字展示位置
对培育屋的文本进行了重新翻译
参照官方正作的使用逻辑统一调整了数字使用阿拉伯数字和汉字的情况
参照官方正作的使用逻辑统一调整了使用“战斗”和“对战”的情况
修正了部分连接相关文本的译名
主要参考deepseek英文翻译及原版英文
 2025-05-18 00:10:23 +08:00
Bassoonian
16357c7e29
Streamline pointer notation (#2139) 2025-05-16 12:04:44 +01:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00
Hedara
6896750921 Merge commit '0aae36984f2561f075b2b7e7d2a0924a912f6af7' into pret-merge 2025-05-15 21:48:17 +02:00
Hedara
468454d810 Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge 
Conflicts:
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
 2025-05-15 21:38:57 +02:00
Hedara
578c5f96cd Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge 
Conflicts:
	include/battle_gfx_sfx_util.h
	src/apprentice.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_dome.c
	src/battle_gfx_sfx_util.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/item_menu.c
	src/move_relearner.c
	src/pokemon.c
	src/scrcmd.c
 2025-05-15 21:31:54 +02:00
Hedara
2945c83bbc Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge 
Conflicts:
	include/battle.h
	include/battle_ai_script_commands.h
	include/battle_anim.h
	include/battle_controllers.h
	include/battle_gfx_sfx_util.h
	include/battle_main.h
	include/battle_script_commands.h
	include/battle_util.h
	include/pokemon.h
	include/recorded_battle.h
	src/battle_ai_script_commands.c
	src/battle_anim.c
	src/battle_anim_mons.c
	src/battle_anim_sound_tasks.c
	src/battle_anim_status_effects.c
	src/battle_controller_link_opponent.c
	src/battle_controller_link_partner.c
	src/battle_controller_opponent.c
	src/battle_controller_player.c
	src/battle_controller_player_partner.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_controller_wally.c
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
	src/battle_interface.c
	src/battle_main.c
	src/battle_message.c
	src/battle_records.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/battle_util.c
	src/battle_util2.c
	src/pokeball.c
	src/pokemon.c
	src/recorded_battle.c
	src/reshow_battle_screen.c
 2025-05-15 21:15:37 +02:00
Hedara
a001e36f1c Merge commit '384b8f127e6a18aef0a3' into pret-merge 
Conflicts:
	src/battle_anim_mons.c
 2025-05-15 17:36:48 +02:00
Hedara
49906a81f7 Merge commit 'c39ef1a03002a7af94' into pret-merge 
Conflicts:
	src/battle_ai_switch_items.c
	src/battle_controller_link_opponent.c
	src/battle_controller_link_partner.c
	src/battle_controller_opponent.c
	src/battle_controller_player.c
	src/battle_controller_player_partner.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_controller_safari.c
	src/battle_controller_wally.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/battle_util2.c
	src/pokemon.c
 2025-05-15 17:31:50 +02:00
Hedara
659473760c Merge commit '263026e4320c' into pret-merge 
Conflicts:
	src/battle_anim_rock.c
	src/battle_anim_water.c
 2025-05-15 16:21:33 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
kittenchilly
4474bd5b80
Add move description data for Z-Moves and Max/G-Max moves (#6852) 2025-05-15 10:44:09 +02:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
RoamerX
68ec0481a9 更新训练师类型中的译名为目前官译 
并修正了文本中提及的部分
 2025-05-13 17:06:12 +08: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
RoamerX
c1ff759873 全重要NPC对战寻呼对话+大吾剧情文本重新翻译 
”老爸“的翻译调整为”爸爸“
居合劈与碎岩大叔的翻译修正

主要参考deepseek英文及少量日文翻译及原版英文
 2025-05-12 17:13:39 +08: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
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex (#2134) 2025-05-09 16:33:23 +01:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01: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
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
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
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
fe7d20c93c Update fonts.c 2025-05-06 13:07:01 +08:00
RoamerX
81775a628b Update battle_controller_player.c 
招式信息中的说明文本更改成字号FONT_SMALL以容纳全部内容
 2025-05-06 12:58:31 +08:00
RoamerX
7f6b6dc165 添加了Font_Small字体的中文标点符号 
对应更新了宽度值
更改破折号“—”位置以避开原本的字符，同步更新码表
 2025-05-06 12:57:05 +08:00
GriffinR
c39ef1a030
Merge pull request #2125 from DavidJCobb/battle-link-re 
Battle link reverse-engineering
 2025-05-05 18:17:28 -04:00
RoamerX
df81b368a1 EasyChat选词A-Z模式改为按拼音排序 2025-05-05 21:13:27 +08:00
RoamerX
58b414d4e8 pokemon_sprite_visualizer.c汉化 
汉化了debug用的src\pokemon_sprite_visualizer.c
 2025-05-05 18:27:58 +08:00
RoamerX
b151869a6a
Merge pull request #43 from rh-hideout/master 
UPDATE MASTER
 2025-05-05 16:49:33 +08:00
RoamerX
65738ff5bc NamingScreen按钮高光修复 
顺便汉化了遗漏的输入代码相关的一句英文
 2025-05-05 14:44:01 +08:00
spindrift64
0742741dd3
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773) 2025-05-04 22:26:12 +02:00
RoamerX
48f3a4d8ed EasyChat汉化 
汉化了原本的单词，根据使用需求替换了其中一部分的单词
按照新的单词表重拼了所有游戏中使用了EasyChat的NPC对话
显示方式目前仍保留了原本的三个一行，单词之间一个空格的格式
 2025-05-04 23:07:16 +08:00
PCG
904b399a81
Added Egg Moves for Basculin White Striped (#6769) 2025-05-04 11:43:57 +02:00
hedara90
fe2d7442af
Remove old slide workaround (#6754) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-03 10:54:49 +02:00