88 Commits

Author SHA1 Message Date
Wokann
bfcda83b2c 完善中文符号的相关代码 2025-10-11 04:00:01 +08: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
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
90eef35715 master merge 2025-07-19 17:01:18 +02:00
Alex
705f194d98
Fixes various battler corruption during switch in ability activation (#7352) 2025-07-18 12:28:00 +02:00
RoamerX
3615447727 增加“・”字符,调整部分标点字符的样式,更新卡璞家族名称 2025-07-12 16:27:02 +08:00
Alex
be2d36b6ee
Fixes instances of battler mutation for abilities (#7250) 2025-07-01 19:48:12 +02:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
RoamerX
f7ce740f4d 电视节目文本全部重新汉化
此外修正了原本使用了神百的译名的部分装饰物品的名称及对应说明
将训练师卡片统一调整为训练师卡
修正了彩排相关的文本
将所有的训练师重新修正为训练家
修正了连接华丽大赛的翻译文本
在charmap中增加了日式中式书名号的码表编号
2025-05-27 20:54:33 +08:00
RoamerX
7f6b6dc165 添加了Font_Small字体的中文标点符号
对应更新了宽度值
更改破折号“—”位置以避开原本的字符,同步更新码表
2025-05-06 12:57:05 +08:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
RoamerX
47c9504397 根据神百汉化了全部的训练师名
在字库图和码表中增加了'祐'、'咲'、'冴'字
2025-04-12 00:09:15 +08:00
Bubble
7d59cdb1e7 字库破解 2025-04-02 01:56:00 +08:00
PhallenTree
cf9ee2caee
Fixes Toxic Spikes Absorbed message (#6448) 2025-03-19 13:46:23 +01:00
Eduardo Quezada
66a2a16bbc Merge branch '_RHH/master' into _RHH/upcoming 2024-12-08 12:00:29 -03:00
hedara90
54d372162f
Added NBSP and up+down arrows to all fonts (#5767)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 07:26:23 -03:00
Eduardo Quezada
a92350fb53 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-04 18:55:56 -03:00
Eduardo Quezada
5c180a0b09
Added FONT_SHORT_NARROWER (#5101) 2024-12-04 06:30:19 -08:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
Alex
81442e32e2
Changes name of B_SCR_NAME_WITH_PREFIX (#5675) 2024-11-20 09:46:50 -03:00
kittenchilly
7409b87d17
Add merged placeholder text for trainer name with class (#5622) 2024-11-10 21:21:27 -03:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards (#3240)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Alex
04b5c013a9
Adds config to show target of ingame partner (#5307)
* Adds config to show chosen move and target of ingame partner, `#define B_SHOW_PARTNER_TARGET`, default `FALSE`
---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-03 19:28:59 +02:00
Eduardo Quezada
ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c
2024-05-15 09:58:21 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything (#3949)" (#4525)
This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.

# Conflicts:
#	gflib/text.c
#	include/config/decap.h
#	src/battle_message.c
#	src/item.c
2024-05-13 19:19:37 +02:00
Martin Griffin
e42a0a6dbe Narrower fonts 2024-04-25 18:40:37 +01:00
Ariel A
85aab338a9 Merge branch 'guillotine' into guillotine-expansion 2024-01-08 19:43:06 -05:00
Ariel A
1ce961768e Added automatic runtime decapitalization. 2024-01-07 20:21:14 -05:00
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
DizzyEggg
d9677763e5 remove gActiveBattler replacement 2023-09-04 10:26:37 +02:00
DizzyEggg
c29f8259f6 remove gActiveBattler entirely 2023-08-30 12:46:22 +02:00
TheXaman
eaa74ca7cc Merge commit 'f4cb6d229f9c0130f763fa711c8a1f7ef59ac2c9' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2023-03-25 14:49:27 +01:00
Eduardo Quezada
51b716c9d9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
# Conflicts:
#	data/battle_scripts_2.s
#	include/constants/battle_string_ids.h
#	include/constants/songs.h
#	src/battle_message.c
#	src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
Eduardo Quezada
a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
Eduardo Quezada
d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Eduardo Quezada
503b85aa2d Generating music names for the debug menu based on their labels 2022-09-09 16:44:34 -04:00
TheXaman
8006b8dbcd Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2022-04-16 23:17:55 +02:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
6d6ff91268 Allow right single quotation mark in charmap 2022-01-16 10:29:15 -05:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
TheXaman
111555132f Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2021-11-18 16:48:49 +01:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
LOuroboros
7574af3558 Fixed charmap comment about the FONT text controller 2021-10-29 19:08:24 -03:00
LOuroboros
5536bce88d SIZE -> FONT 2021-10-29 18:39:31 -03:00
TheXaman
73cc40fd03 Egg cycles now with icons insteat of numbers 2021-06-12 19:52:43 +02:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00