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

261 Commits

Author SHA1 Message Date
RoamerX
b995c5f609 汉化修补 2025-09-02 22:42:04 +08:00
RoamerX
11603d8c2d 测试发现的文本问题修复 
反派组织手下部分台词重新翻译
招式学习器道具说明换行调整
其他零散台词修正调整
 2025-06-05 23:54:19 +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
RoamerX
f423a23c28 道具名称中的“TMXX”全部改为“招式学习器XX” 
找到及获得文本格式参考正作
修正一些通关中发现的文本问题
 2025-05-30 21:15:09 +08:00
RoamerX
2bf2206883 华丽大赛一些相关文本的修正 
还有几个秘传招式相关文本的修正
 2025-05-24 13:44:50 +08:00
RoamerX
dcfeec35d6 更正与熏香效果相同的属性强化道具的说明 
变成独立的文本了，顺便把中文用不到的pluralName复数名称项全部删除了
 2025-04-26 18:47:30 +08:00
RoamerX
98b0c6f021
Merge branch 'rh-hideout:master' into master 2025-04-12 11:43:45 +08:00
Bassoonian
3c8d5d1a57
Add hold effects for PLA Origin Trio items (#6578) 2025-04-11 16:38:08 +02:00
RoamerX
db73674ea3 修正部分专有名词为官译+修正招式详情中文字与图标位置+修复R键投球图颜色错误 
包括以下：
精灵	宝可梦
训练师	训练家
背包	包包
技能	招式
口袋领航员	宝可梦导航仪
濒死	昏厥
烧伤	灼伤
命中率	命中	注：指招式的命中，对战内宝可梦的能力仍叫做命中率
 2025-04-11 15:14:45 +08:00
RoamerX
d131bd6977 属性文件type_info汉化，修正了几个道具描述错误 2025-04-07 17:48:27 +08:00
nkuAlexLee
2693b4f892 update 2025-04-07 16:03:01 +08:00
nkuAlexLee
b7ece3ae5a update 2025-04-07 16:00:31 +08:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405) 
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
 2024-10-03 10:52:59 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests (#5444) 2024-09-29 17:05:54 -04:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391) 
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
 2024-09-19 00:25:53 +02:00
psf
4f39354185
Deprecate MMBN Names (#5240) 
* Removed HANDLE_EXPANDED_MOVE_NAME

* Removed HANDLE_EXPANDED_TYPE_NAME

* Removed HANDLE_EXPANDED_ITEM_NAME

* Removed HANDLE_EXPANDED_SPECIES_NAME

* Removed I_EXPANDED_ITEM_NAMES

* Removed B_EXPANDED_MOVE_NAMES

* Removed B_EXPANDED_TYPE_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Removed B_EXPANDED_ABILITY_NAMES

* Added documentation of names

* Github markdown spacing is silly

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339

* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
 2024-08-29 16:33:25 -04:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name (#5134) 2024-08-10 23:59:23 +02:00
Eduardo Quezada
64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
 2024-06-11 08:12:03 -04:00
Bassoonian
0fda9d6cd6
Fix Hyper Potion price (#4737) 2024-06-07 21:04:03 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
 2024-05-27 10:13:42 -04:00
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
kittenchilly
4b221b5802
Get rid of gItemIconTable (#4579) 
* Get rid of gItemIconTable

* Move the script to the folder
 2024-05-18 10:22:26 +02:00
Bassoonian
2e7c32019f
Update items.h (#4574) 2024-05-14 17:36:12 +02:00
Eduardo Quezada
be37820bd9 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2024-05-11 19:53:19 -04:00
WillKolada
4c5260c82e
Changed item descriptions to prevent text overflowing into scroll menus (#4540) 
* Changed Dubious Disc description to prevent overflow

The first line of the Dubious Disc description was too long. A few letters would escape the box in the Bag and in Marts. This brings them in line.

* Changed Ice Beam and Blizzard Frostbite descriptions

These descriptions also overflowed, even more so than the Dubious Disc.
 2024-05-10 23:01:37 +02:00
Eduardo Quezada
dd098baf77
Official GF names by default (#4241) 2024-04-25 14:23:08 -04:00
Martin Griffin
484e288cad Expanded item names 2024-04-25 18:40:37 +01:00
Martin Griffin
87dca8eb1c
Fix typo in Rotom Catalog (#4433) 
https://discord.com/channels/419213663107416084/774393519569502268/1232372639562072084
 2024-04-23 21:49:22 +02:00
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB (#4355) 
* Change Frostbite abbreviation from FSB to FRB

* Melted the ice is actually the one used

* Update moves_info.h

* Update moves_info.h

* Update items.h
 2024-04-10 09:16:32 +02:00
Eduardo Quezada D'Ottone
6bc0bf0afa
Adjusted item description alignment (#4088) 2024-01-29 12:02:54 +01:00
Bassoonian
b9a02b205d
Rename gItems and gAbilities to gItemsInfo and gAbilitiesInfo (#4068) 
* Rename gItems to gItemsInfo

* Rename gAbilities to gAbilitiesInfo

* Just fixing up my bad merge

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-26 15:25:52 -03:00
Bassoonian
80e6ca1df0
Converts a bunch of #if to regular conditions (#4071) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-26 18:15:45 +01:00
Bassoonian
4c21c85ee2
PLA Items (#3825) 
* Add PLA item data

* Add most item sprites

* Incorporate review feedback
 2024-01-23 18:24:58 +01:00
Bassoonian
1f9655ee2b
Fixed plural item names (#4015) 
* Update items.h

* Update items.h

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-17 16:53:12 +01:00
psf
cdf7190d15
Add pluralName to gItems to allow the proper spelling when multiple items are received at once (#4001) 
* Updated CopyItemNameHandlePlural to deal with plural names

* Fixed whitespace in a few places

* Fixed whitespace in a few places

* Add remaining plural forms.

* Created ITEM_NAME_PLURAL_LENGTH

* Updated ITEM_NAME_PLURAL_LENGTH per feedback https://github.com/rh-hideout/pokeemerald-expansion/pull/4001\#discussion_r1453598165

* Reverted ITEM_NAME_PLURAL_LENGTH to +2 and added new comment

* Removed GetBerryCountString from CopyItemNameHandlePlural
Will deprecate the former in a future feature: https://github.com/rh-hideout/pokeemerald-expansion/issues/4010

---------

Co-authored-by: Zimmermann Gyula <graiondilach@hotmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-16 19:05:41 +01:00
Eduardo Quezada D'Ottone
9445953833
Moved Item Effects to gItems (#3991) 
* Moved Item Effects to gItems

* Removed redundant item effects

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-14 10:03:48 +01:00
Bassoonian
ce48616477
Add power item config (#3961) 2024-01-11 09:34:19 +01:00
Bassoonian
418e551960 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2024-01-05 00:32:21 +01:00
kittenchilly
66a638f7b4
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) 
* Change Ivy Cudgel to be based on Ogerpon form rather than held item

* Update ivy_cudgel.c

* Address reviews

* Update test/battle/move_effect/ivy_cudgel.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 11:40:58 +01:00
Bassoonian
1662dc3478
Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
kittenchilly
1e958ada8c
Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
kittenchilly
28f17772ec
Implement Pokemon Box Link functionality (#3837) 
* Implement Pokemon Box Link functionality

* Update item_use.c

* Update item_use.c

* Can only use box link if the map allows escape

* Revert "Can only use box link if the map allows escape"

This reverts commit be5b46b6c4420cd350ac1932d4c3562f7bfbebe5.

* Overworld_IsEscapingAllowed

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 11:47:00 +01:00
kittenchilly
4f61d44dfe
Add Treasure Factor to Nugget and Tiny Mushroom (#3836) 2023-12-28 00:02:51 +01:00