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

4579 Commits

Author SHA1 Message Date
RoamerX
f7e45ca2b3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-24 17:15:11 +08:00
Alex
705f194d98
Fixes various battler corruption during switch in ability activation (#7352) 2025-07-18 12:28:00 +02:00
AERDU
da3d223c45
fallback bugfix for B_DARK_VOID_FAIL < GEN_7 (#7351) 2025-07-16 12:41:32 +02:00
ghoulslash
c7b2c771e1
Cotton down use jumpifabsent (#7318) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-07-11 09:43:14 +02:00
RoamerX
c58b0a0921 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-10 22:39:44 +08:00
Alex
f808201945
Fixes Natural Gift moveend execution (#7274) 2025-07-05 15:05:35 -04:00
RoamerX
6d5abfcc06 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-05 15:47:12 +08:00
hedara90
56907bc26e
Merrp merge, 2025-06-25 (#7217) 2025-07-04 13:03:09 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
Alex
5451e40830
Fixes Toxic Thread animation not being played at the right time (#7247) 
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-06-30 21:41:29 +02:00
ghoulslash
21ac62f781
Flush textbox for Truant Popup (#7252) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-06-29 21:38:52 +02:00
PhallenTree
6ed4f73f6a
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241) 2025-06-28 23:20:40 +02:00
Alex
773ecd4c24
Fixes OOB for Teatime and Flower Shield (#7214) 2025-06-25 21:00:49 +02:00
Hedara
c0a50096f3 Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge 
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
 2025-06-25 17:54:59 +02:00
Hedara
1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge 
Conflicts:
	include/battle_script_commands.h
	include/constants/event_objects.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/sprite.h
	src/battle_controller_player.c
	src/event_object_movement.c
	src/pokeball.c
 2025-06-25 17:49:19 +02:00
Hedara
150091990d Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge 2025-06-25 17:14:52 +02:00
Ariel A
7564262543 Merge branch 'followers' into lighting 2025-06-24 20:44:44 -04:00
Ariel A
685a8a9118 Merge remote-tracking branch 'upstream/master' into followers 2025-06-24 20:39:12 -04:00
Ariel A
07fd8a28fb fix: hide followers when player enters Battle Pike curtains 2025-06-24 20:16:04 -04:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
 2025-06-24 10:42:24 +02:00
RoamerX
c20c5d851b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-06-23 20:29:34 +08:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170) 2025-06-21 00:04:01 +02:00
GriffinR
e2e3438674 Add missing uses of LOCALID_NONE for trainerbattle 2025-06-20 15:33:12 -04:00
Alex
57feee3743
Add missing flag for Berserk Gene (#7151) 2025-06-19 14:26:28 +02:00
ghoulslash
a154d7a7a4
Fix savage spin out spider web template (#7137) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-06-18 11:04:24 +02:00
Alex
c120fa71dc
Fixes Ally Switch in multi battles (#7109) 2025-06-13 15:18:27 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
RoamerX
8c0bfceb99 Update scripts.inc 2025-06-12 22:39:59 +08:00
RoamerX
773957bd73 联机相关文本参照正作进行调整 
主要包括联机俱乐部以及联盟交谊厅
统一了“群组”与“组长”的翻译
 2025-06-08 23:35:17 +08:00
RoamerX
7228b9e0a1 一些文本修正 
乔伊小姐对话、蛋孵化的文本及训练家卡的颜色替换为正作翻译
将树果粉碎的错误翻译修正、并将对应翻译参照神百调整
将树果混合器的翻译统一
 2025-06-06 21:04:14 +08:00
RoamerX
714cec1f69 反派组织成员剩余台词润色/重新翻译 2025-06-06 17:04:44 +08:00
Alex
f374291f69
Fixes Wandering Spirit copied ability activation on fainted mon (#7066) 2025-06-05 22:47:32 +02:00
RoamerX
11603d8c2d 测试发现的文本问题修复 
反派组织手下部分台词重新翻译
招式学习器道具说明换行调整
其他零散台词修正调整
 2025-06-05 23:54:19 +08:00
ExMingYan
e0e08da7a8 删除文件中存在的U+200C零宽字符 2025-06-05 12:43:27 +08:00
RoamerX
85af9cdb32 测试发现的文本问题修复 
姓名鉴定师、秘密基地教学文本重新翻译
debug部分遗漏文本补充汉化
其他几处零散汉化修正
 2025-06-04 23:17:06 +08:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
psf
9656400f88
Moved time constants to dedicated files (#7019) 2025-05-30 16:39:01 +02:00
RoamerX
f423a23c28 道具名称中的“TMXX”全部改为“招式学习器XX” 
找到及获得文本格式参考正作
修正一些通关中发现的文本问题
 2025-05-30 21:15:09 +08:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix (#7015) 2025-05-30 11:58:32 +02:00
RoamerX
6e84893562 忘记及回忆NPC参照正作文本修正 
主线海洋队抢夺事件及隧道相关文本重新翻译
其他一些少量文本优化
 2025-05-30 11:34:54 +08:00
RoamerX
0ee10d486e 大批量文本修正 
徒弟文本全部重新翻译（主要使用deepseek，之后进行了润色和格式调整）
调整整个游戏中大量少数几个字后就换行导致观感奇怪的情况
将所有的游船修正为轮渡（ferry，連絡船）
润色/重新翻译乘船相关的文本
个体值评定员、回忆技能NPC的文本重新翻译
修正很多换页时逗号的使用
修正几个遗漏的文本超出
统一所有自行车道的译名
调整润色传送到盒子的文本
修正所有宝玉为宝珠
训练家的量词统一为“位”
 2025-05-29 23:09:11 +08:00
Bivurnum
f2a3226b47
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010) 2025-05-29 11:05:23 +02:00
RoamerX
5168d76fca 狩猎地带、秘密基地、宝可梦发烧友俱乐部相关文本重新汉化 
其他：
卡绿隧道相关的文本对话重新汉化
修正很多换页时逗号的使用
修正几个遗漏的文本超出
润色/重新翻译了几处文本
将“训练家小技巧”按照正作修改为“有用的公告牌！”
修正了几处“选美”的旧译为“华丽大赛”
 2025-05-28 23:06:25 +08:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
RoamerX
187ae170d2 壁纸女孩文乃、寻宝者文本润色或重新汉化 
以及所有汉字数字变成阿拉伯数字的情况查漏补缺
 2025-05-28 14:52:27 +08:00
RoamerX
1e3e10e990 宝可梦新闻、混合名人文本重新汉化 
游戏中心调整为游戏城
省略号及换行等一些文本修正
 2025-05-28 13:02:57 +08:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00