1374 Commits

Author SHA1 Message Date
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
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
2025-11-01 15:13:16 +01:00
Raymond Dodge
95d98305dd
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881) 2025-10-26 11:45:40 +01:00
Josh
fa5ca10b17
Add spritesheet rules for healthbox graphics (#2180) 2025-10-19 18:32:19 +01:00
hedara90
358f3211ca
Fix nicknames containing many / overflowing the party screen textbox (#7970)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-17 20:17:35 +02:00
RoamerX
f9570a4404 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-10-12 22:53:13 +08:00
FosterProgramming
d84d5cb0d4
Fix pikachu starter icon (#7879) 2025-10-08 10:36:30 +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
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
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
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
RoamerX
3615447727 增加“・”字符,调整部分标点字符的样式,更新卡璞家族名称 2025-07-12 16:27:02 +08:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Phantonomy
809379797e
Better Hydrapple Backsprite (Adapted from DegelAlex on deviantart (#7246) 2025-07-10 23:43:43 -04:00
mudskipper13
0d09e5cce8
battle_interface: overhaul ability pop up (#7227) 2025-07-10 19:09:52 +02:00
12014
7598de60a6 Use 'Stringappend' in some functions & Few Changes of Pics 2025-07-07 00:56:39 +09:00
RoamerX
a929a69962 标题logo更新
感谢贴吧的大神丶橡皮聚聚制作的logo文字图,我与SKT做了一些简单处理以优化游戏内显示效果
2025-06-28 21:43:22 +08:00
RoamerX
97bec4a695 修正标题logo宝可梦文字图片背景色为黑色 2025-06-21 23:21:56 +08:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites (#6976) 2025-06-07 09:57:43 +02:00
RoamerX
6319057820 标题logo更新 2025-06-04 18:16:22 +08:00
RoamerX
b8d9b715c3 标题logo更新 2025-06-03 23:03:25 +08:00
RoamerX
9c15cbbd21 更新翻译“栖息地不明”并更新对应图片 2025-06-02 16:01:52 +08:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
RoamerX
dda99a8e88 标题logo更新 2025-06-01 18:08:25 +08:00
RoamerX
57bb0cb175 标题界面logo更新
PS废柴一天速成,凑合用先
2025-05-31 18:53:53 +08:00
sayseong
24f260f6c7 Merge remote-tracking branch 'upstream/master' 2025-05-27 13:33:46 +08:00
RoamerX
dfa8ae8e0c 华丽大赛部分文本再调整
华丽大赛结果界面图片文字更新至与当前翻译一致。修改了部分文字的位置
训练师卡图片上的文字至与当前翻译一致
存档确认文本微调
2025-05-25 23:36:32 +08:00
RoamerX
f9b101fdb8 批量文本润色修正及重新汉化
string.c中的大量专有名词及语句的文本参照正作官译进行调整
华丽大赛柜台的所有文本重新汉化
华丽大赛招式参照神百再次进行了调整
华丽大赛场内文本在SKT大佬的基础上进行了微调
汉化了宝可方块盒中遗漏的文本及图片,调整了相关文本的代码以优化语序
修正部分换行问题
2025-05-23 21:55:52 +08:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
AlexOn1ine
33607529cd conflicts 2025-05-16 10:46:32 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00
RoamerX
0f8015feef 重新汉化了招式学习器的属性图片
并将之前没有一眼发现问题的5个属性图标修正
至此全部属性图标全部重新制作
2025-05-06 22:46:37 +08:00
RoamerX
7f6b6dc165 添加了Font_Small字体的中文标点符号
对应更新了宽度值
更改破折号“—”位置以避开原本的字符,同步更新码表
2025-05-06 12:57:05 +08:00
RoamerX
df81b368a1 EasyChat选词A-Z模式改为按拼音排序 2025-05-05 21:13:27 +08:00
RoamerX
65738ff5bc NamingScreen按钮高光修复
顺便汉化了遗漏的输入代码相关的一句英文
2025-05-05 14:44:01 +08:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08:00
Hedara
0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +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
RoamerX
1e989ff45d SUMMARY界面奖章文字译名更新 2025-04-30 13:04:21 +08: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
60275fae18 宝可导航图片文字修复
包括译名更正以及文字间隔统一
2025-04-28 23:23:42 +08:00
RoamerX
39f051b6b3 图鉴汉字阴影修正,开拓通行证官译统一
基于SKT和猫佬的图片修改,感谢
2025-04-23 15:28:47 +08:00
RoamerX
65aecb14d9 HGSS图鉴文本汉化+形态模式tilemap错误修复
对几个文字位置相关代码进行了优化
2025-04-23 14:19:07 +08:00
RoamerX
c3cc219c95 Update tileset_interface.png
HGSS图鉴剩余图片汉化
2025-04-22 23:16:25 +08:00
RoamerX
765e5a8349 HGSS图鉴图片汉化+Pokenav图片图片文字修正
将SKT大佬对于图鉴叫声及体型对比部分的文字修改复制到了HGSS
2025-04-22 22:20:52 +08:00
RoamerX
e9077df569
Merge pull request #31 from 12014/expansion_chs
重新汉化华丽大赛文本(日文原文附),图片 By 猫猫
2025-04-17 15:35:33 +08:00
12014
9910770613 Redo Translations for the text and picture of Contests 2025-04-17 02:51:06 +09:00
RoamerX
97c29fe45a 查看能力界面图片译名修正
顺便把EVIV查看模式的图一并汉化了
2025-04-16 23:31:10 +08:00