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

659 Commits

Author SHA1 Message Date
RoamerX
4cde1f63ec 补充汉化 2025-12-18 20:01:56 +08:00
RoamerX
013c7ad7fd 补充汉化 2025-12-18 11:25:55 +08:00
RoamerX
0f4d49aeb3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-17 21:21:49 +08:00
RoamerX
607e09b2cc Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-11-21 21:38:17 +08:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
AlexOn1ine
ba74c076f6 pret merge 2025-11-16 12:01:13 +01:00
hedara90
f8e7a2db5f
Fix incorrect UBFIX checks (#2206) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-11-16 10:33:16 +00:00
hedara90
61e06cae08
Fix Apricorns with OW_SHOW_ITEM_DESCRIPTIONS not off (#8253) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-11-14 22:49:47 +01:00
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-11-14 20:28:55 +01:00
RoamerX
c262995dd7 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-11-10 12:09:54 +08:00
PCG
d2425c1468
Move Relearners for TMs, Tutors and Egg moves (#8040) 
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
 2025-11-09 12:54:01 -08:00
Martin Griffin
1a9fbbcfba Fix copyvar with non-var argument 2025-11-06 14:29:09 +01:00
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming 
Conflicts:
	include/constants/expansion.h
 2025-11-03 11:11:07 +01:00
FosterProgramming
4d60c9e83f
Fix copyvar instead of setvar causing issue with LTO (#8097) 2025-11-01 16:42:07 +00:00
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge 
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
 2025-11-01 15:13:16 +01:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages (#2196) 2025-10-29 21:34:03 -04:00
Bivurnum
6ddabde582
New Feature: ORAS Dowsing (#7211) 2025-10-27 17:41:07 +01:00
FosterProgramming
5348de4abb
Banned species list (#8003) 2025-10-23 21:29:33 +02:00
RoamerX
691d217fa3 翻译修正 
修复了几个翻译问题
 2025-10-12 22:58:40 +08:00
FosterProgramming
730352683c
Add new actions to Debug Menu (#7837) 2025-10-03 20:26:49 +02:00
FosterProgramming
2156651313
No bag use flag changed to a varable (#7780) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-10-01 14:51:09 +02:00
RoamerX
d9c2fb3cd2 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-09-02 22:32:57 +08:00
AlexOn1ine
0eb715de11 Add rock climb history from ghoul 2025-08-05 20:47:05 +02:00
RoamerX
cc5b36846a Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-08-04 20:19:39 +08:00
pokesidv
4d31693005
Rock climb by ghoulslash (#7432) 
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-08-03 14:52:07 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
Alex
0422a013c4
Add Set Hidden Nature option to the debug menu (#7281) 2025-07-07 13:33:57 -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
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04:00
Bivurnum
c6221fa50e
Add debug options for follower NPCs (#7215) 2025-06-25 21:13:43 +02:00
Hedara
150091990d Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge 2025-06-25 17:14:52 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming 
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
 2025-06-25 14:17:07 +02: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
GriffinR
e2e3438674 Add missing uses of LOCALID_NONE for trainerbattle 2025-06-20 15:33:12 -04:00
RoamerX
773957bd73 联机相关文本参照正作进行调整 
主要包括联机俱乐部以及联盟交谊厅
统一了“群组”与“组长”的翻译
 2025-06-08 23:35:17 +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
cawtds
21499cbee1
Refactor field moves (#6660) 2025-05-31 09:03:12 +02: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
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
RoamerX
5d492a1aca 测试发现的文本问题修正 2025-05-27 23:08:06 +08:00