RoamerX
fa33ee6283
多选框文本、对战开拓区头目对战后文本、存档错误界面汉化
2025-04-19 23:53:54 +08:00
RoamerX
dce4c9e6a6
秘密基地装饰物品名称及说明
...
出奇一击技能说明跟随更新修正
一些零散的汉化遗漏补全
2025-04-19 23:14:30 +08: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
RoamerX
db73674ea3
修正部分专有名词为官译+修正招式详情中文字与图标位置+修复R键投球图颜色错误
...
包括以下：
精灵 宝可梦
训练师 训练家
背包 包包
技能 招式
口袋领航员 宝可梦导航仪
濒死 昏厥
烧伤 灼伤
命中率 命中 注：指招式的命中，对战内宝可梦的能力仍叫做命中率
2025-04-11 15:14:45 +08:00
RoamerX
dce02218c7
汉化script_menu中多选框的内容
...
很多是从string.c中独立出去的
并修复了say处理的地图内OW脚本中的$导致的文本提前截止的问题
2025-04-10 23:51:48 +08:00
RoamerX
aa2a09ae3a
Revert "将宝可币符号替换成小字号的“元”（码表¥）"
...
This reverts commit 7721393332d457fdff6337474927ede7cba4ea7b.
2025-04-10 23:48:54 +08:00
RoamerX
7721393332
将宝可币符号替换成小字号的“元”（码表¥）
...
调整了金钱相关的文本中“元”与金额的顺序
修复了say处理的地图内OW脚本中的$导致的文本提前截止的问题
2025-04-10 23:21:43 +08:00
RoamerX
efa431b585
汉化文本官译化
...
统一替换“背包”为包包
将SKT之前的汉化文本调整为目前官方翻译的文本
2025-04-10 17:09:22 +08:00
sayseong
4d3a9dea09
修复字母编译错误
2025-04-08 14:38:46 +08:00
sayseong
39b26cd859
HP改为体力
2025-04-08 11:07:43 +08:00
sayseong
c039c0303b
地图脚本汉化
2025-04-08 01:07:12 +08:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier ( #6195 )
2025-02-08 12:51:22 -08:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation ( #5982 )
2025-01-25 22:02:39 +01:00
Martin Griffin
1551a33069
Fix leftover test change from #5033 ( #5987 )
2025-01-09 17:28:09 -03:00
Martin Griffin
bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention ( #5033 )
...
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.
All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.
Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.
Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
effect.
2. Immediately run triggers if they only affect flags/vars. This removes
the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
warp scripts onto the global script context if they would block
(approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
not see the player if the script has no effect, and the trainer will
use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
cant_see_if_* commands have been introduced so that scripts are able
to do something when the player interacts with the trainer even if
that trainer wouldn't see them.
2025-01-08 10:27:00 +00:00
Eduardo Quezada
82252251e7
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
2024-12-20 16:04:33 -03:00
Eduardo Quezada
3f98c78297
Added POKEMART_LIST_END to avoid users accidentally removing it ( #1947 )
2024-12-04 17:38:23 -05:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
ghoulslash
28a9ad3399
(Default Off) Item Description Headers ( #4767 )
...
* add item descption headers and (default-off) config
* revert test script
* OW_SHOW_ITEM_DESCRIPTIONS can be 0(off), 1(first time) or 2(always), move code to overworld.c to prevent issues with users whove merged original branch. fix styling
* add ow item header config value labels
* Update include/config/overworld.h
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Update src/overworld.c
* Update include/overworld.h
* ScriptShowItemDescription remove unused var
* fix ScriptShowItemDescription warning
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-03 20:22:01 +02:00
GriffinR
04197b4912
Fix swapped cycling road entrances
2024-08-31 01:54:25 -04:00
Bassoonian
a24b767276
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun
2024-06-18 15:27:06 +02:00
Bassoonian
d9001a7923
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun
2024-06-18 11:04:40 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script ( #2001 )
2024-06-17 15:44:52 -04: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
d6422da284
Fix partner palette problem ( #4736 )
2024-06-07 21:05:16 +02:00
Eduardo Quezada
1359966a14
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
2024-06-01 20:17:19 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Ariel A
a49d908254
Merge branch 'followers' into followers-expanded-id
2024-05-21 22:23:00 -04:00
Ariel A
b37d9b3000
fix: disable followers in Union Room
...
Fixed #17
2024-05-21 22:14:29 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Eduardo Quezada
e479fa1007
Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo
2024-03-25 16:03:56 -03:00
Ariel A
3486097ee9
Merge branch 'followers' into followers-expanded-id
2024-03-06 22:13:07 -05:00
Eduardo Quezada
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada
ed4a291b37
Revert Object Event change from vanilla
2024-02-17 18:09:11 -05:00
Ariel A
195d2bb79a
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
Ariel A
f861504cfc
Undo map.json changes.
2024-02-15 22:23:59 -05:00
psf
cc22fef6c8
- Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. ( #4193 )
...
- Created `ConvertMonHeightToString` and `ConvertMonWeightToString` for developers to use
2024-02-15 10:23:11 +01:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Eduardo Quezada
afb1efe0d3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player_partner.c
2024-01-28 18:11:44 -03:00
Bassoonian
e995927d13
Add extra key item bag space checks ( #4066 )
...
* Fix 4019
* I am exceedingly brilliant in my failure to build before pushing
2024-01-26 21:11:04 +01:00
Eduardo Quezada
ebbcb7d025
Whitespace, documentation and style
2024-01-22 19:12:52 -03:00
Eduardo Quezada
7e8ea89ded
Merge branch '_RHH/master' into _RHH/upcoming
2024-01-19 09:34:05 -03:00
fakuzatsu
cae58ca93e
fixed oversight causing chosen fossil to be lost if bag is full ( #3978 )
...
* fixed oversight causing chosen fossil to be lost
* fixed an error with my condition
* - conditional check and + underpass fossil check
2024-01-18 00:03:55 +01:00
Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
