181 Commits

Author SHA1 Message Date
RoamerX
f3917e42d4 Update questionnaire.inc 2025-04-23 20:13:17 +08:00
RoamerX
b556c1fbeb 把所有的省略号从“…”统一成“……” 补充 2025-04-22 17:05:00 +08:00
RoamerX
97501e8843 【危险举动,需要测试】把所有的省略号从“…”统一成“……”
涉及上千处改动,出现问题则回退
2025-04-22 16:50:58 +08:00
RoamerX
ee980e6505 继续检查每行字数超标,检查换行次数超标,汉化遗漏的英文文本 2025-04-22 16:21:52 +08:00
RoamerX
12714a337a 检查每行字数超标,检查换行次数超标,汉化遗漏的英文文本 2025-04-22 15:32:17 +08:00
RoamerX
2e00ddb067 汉化补充修正
汉化了树果混合器相关文本(src\berry_blender.c)
汉化了宝可方块相关文本(src\pokeblock.c)
汉化了所有奖章的说明文本(src\data\text\gift_ribbon_descriptions.h)
汉化了宝可梦导航器的相关文本(src\pokenav_main_menu.c,src\pokenav_list.c,src\pokenav_match_call_gfx.c,src\pokenav_menu_handler_gfx.c)
汉化了导航仪地图界面的地标名称(src\landmark.c),并统一了脚本中它们的叫法
汉化了零散遗漏的英文文本
宝可梦的量词按照朱紫统一成“只”而不是“个”
2025-04-21 21:36:17 +08:00
RoamerX
1f32b0796e Update braille.inc 2025-04-20 22:18:18 +08:00
RoamerX
1e83c50595 盲文翻译
但是文言文(
一部分是因为字数限制
之后可能会再更改
2025-04-20 21:52:50 +08:00
RoamerX
dce4c9e6a6 秘密基地装饰物品名称及说明
出奇一击技能说明跟随更新修正
一些零散的汉化遗漏补全
2025-04-19 23:14:30 +08:00
RoamerX
0cf7325d5e 汉化之前漏过的问卷(神秘礼物相关)、秘密基地训练家文本
上一个commit里提交了边境的小岛(梦幻)相关的脚本文本
修正了双人训练师后续电话文本的人名颠倒错误
2025-04-19 16:16:08 +08:00
RoamerX
407cb8294c battle_message.c对战文本替换程序及结果修正 2025-04-19 15:48:50 +08:00
12014
9910770613 Redo Translations for the text and picture of Contests 2025-04-17 02:51:06 +09:00
RoamerX
011a62a38c 根据2011版汉化文本修正所有脚本中的文本错误及译名 2025-04-15 01:18:41 +08:00
RoamerX
545102685e 属性相关的翻译文本更新 2025-04-13 23:51:22 +08:00
RoamerX
5108965bd5 脚本文本将旧译替换官译
脚本文本中宝可币符号位置修复
脚本文本中以下名词修正:
部分专有名词
重要NPC人名&组织名
地名
道具名称
招式学习器及教学相关的招式名称
对战开拓区设施名称、首领称号、印记
2025-04-13 23:26:26 +08:00
12014
a6b24280af Fix the Glitch Pause text in Contest 2025-04-13 02:39:37 +09:00
12014
94d74fac72 Update the interface of Pokedex, TrainerCard, Berry Fix Program; Do some Translations on item menu and mini games 2025-04-13 02:34:09 +09:00
RoamerX
db73674ea3 修正部分专有名词为官译+修正招式详情中文字与图标位置+修复R键投球图颜色错误
包括以下:
精灵	宝可梦
训练师	训练家
背包	包包
技能	招式
口袋领航员	宝可梦导航仪
濒死	昏厥
烧伤	灼伤
命中率	命中	注:指招式的命中,对战内宝可梦的能力仍叫做命中率
2025-04-11 15:14:45 +08:00
RoamerX
efa431b585 汉化文本官译化
统一替换“背包”为包包
将SKT之前的汉化文本调整为目前官方翻译的文本
2025-04-10 17:09:22 +08:00
12014
6f3269cb1e Some Translations& Bug fixing 2025-04-10 00:04:08 +09:00
sayseong
272b4c835e 修复编译空格问题报错 2025-04-08 20:58:56 +08:00
sayseong
92f0f3b5a1 汉化TEXT文件 2025-04-08 17:40:39 +08:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +01:00
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166)
* Removed FRONTIER_BRAIN_SPRITES

* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE

* Updated TRAINER_CLASS macro

* Removed FRONTIER_BRAIN_TEXTS

* Turned Frontier Brain text to COMPOUND_STRINGs

* Removed frontier_brain.inc from event_scripts.s

* Addressed front sprite comment

* Addressed backsprite comments
2024-09-22 09:54:01 +02:00
Frank DeBlasio
3aa24f527e
Converted Mechadoll text to COMPOUND_STRINGs (#5276) 2024-09-04 14:56:19 -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
Bassoonian
2f2d7c281f
Clean up contest strings (#3876)
* Move contest move descriptions out of inc file

* Clean up unused contest strings

* More contest cleanup

* sRoundResultTexts cleanup

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2024-02-02 10:55:39 +01:00
Eduardo Quezada D'Ottone
c8d73c0827
Merge branch 'upcoming' into guillotine-expansion 2024-01-26 10:10:27 -03:00
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem

* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem

* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c

* Updated ObjectEventTemplate

* Updated inc files to support plural item names

* Refactored CopyItemNameHandlePlural to handle all items

* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT

* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130

* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +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
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald (#3256)
* First version of Vs. Seeker

* Update movement.inc

98f7e9978d (r1306721924)

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024

* Update item_use.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401

* Update movement_action_func_tables.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828

* Update event_object_movement.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887

* Update overworld.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396

* Update vs_seeker.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158

* Update vs_seeker.c

Addressed some cleanup comments from SBird

* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId

* Updated UseVsSeekerEffect_2

* Updated UseVsSeekerEffect_3

* Updated UseVsSeekerEffect_4

* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header

* Refactored FieldUseFunc_VsSeeker

* Added curly braces to else case in FieldUseFunc_VsSeeker

* renamed data[x] in Task_ResetObjectsRematchWantedState

* Refactored Task_ResetObjectsRematchWantedState

* Refactored VsSeekerResetObjectMovementAfterChargeComplete

* Refactored ResetMovementOfRematchableTrainers

* Refactored GatherNearbyTrainerInfo

* Refactored Task_VsSeeker_3

* CanUseVsSeeker

* Refactored GetVsSeekerResponseInArea

* GetCurVsSeekerResponse refactored

* Cleaned up GetTrainerFlagFromScript

* Gave sensible names to Task_VsSeeker

* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater

* Renamed UseVsSeeker Functions

* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code

* Addressed PR feedback

* Fixed issue with building non-modern

* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId

* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function

* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522

* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392

* Removed ifdef tags around the repo unless needed
b5dc744ced
2023-11-26 18:58:43 +01:00
Eduardo Quezada
63e4a8adcd Fixed instances of .string being used with spaces instead of tabs 2022-08-15 14:32:01 -04:00
GriffinR
21ed288f50
Merge pull request #1687 from SimplyBLGDev/patch-1
Format newlines in surf.inc
2022-06-18 11:04:39 -04:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
Simply BLG
324a157b34
Format newlines in surf.inc
One of the strings declared in surf.inc was poorly formatted.

## Description
Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.
2022-06-17 15:21:12 -03:00
Simply BLG
380cc8615b
Format newlines in pc_transfer.inc 2022-06-17 14:22:31 -03:00
Simply BLG
1860b61fe3
Corrected two missing newlines 2022-06-17 12:05:32 -03:00
Simply BLG
e48341f7fc
Format newlines in contest_string.inc
Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.
2022-06-17 11:52:54 -03:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
GriffinR
6dc3c9864c
Merge pull request #1520 from GriffinRichards/doc-random
Document random remaining symbols
2021-10-24 23:43:17 -04:00
GriffinR
24b4e898ad More mauville_old_man clean up 2021-10-18 14:40:04 -04:00
GriffinR
ece7ef3410 Correct usage of MysteryEvent to MysteryGift 2021-10-17 03:00:48 -04:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
c8be6a1fbb Remove leftover berry descriptions 2021-05-17 03:06:02 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
8be2c5d60b Document Contest Lady TV Show 2021-04-02 01:49:38 -04:00