RoamerX
|
acbbb4f865
|
修复所有句尾结束没有标点符号的对话
|
2025-04-29 14:54:12 +08:00 |
|
RoamerX
|
a812c96187
|
主要是开拓区的文本重译+润色
物品统一译为道具（重要物品、装饰物品等名称不变）
|
2025-04-29 14:04:21 +08:00 |
|
RoamerX
|
c1b992791c
|
文本重译+润色
缎带统一为奖章
|
2025-04-28 23:02:48 +08:00 |
|
RoamerX
|
b70b8224dd
|
对战开拓区文本大批量重译+润色
|
2025-04-28 21:37:36 +08:00 |
|
RoamerX
|
12714a337a
|
检查每行字数超标，检查换行次数超标，汉化遗漏的英文文本
|
2025-04-22 15:32:17 +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
|
efa431b585
|
汉化文本官译化
统一替换“背包”为包包
将SKT之前的汉化文本调整为目前官方翻译的文本
|
2025-04-10 17:09:22 +08:00 |
|
sayseong
|
c039c0303b
|
地图脚本汉化
|
2025-04-08 01:07:12 +08: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 |
|
Eduardo Quezada
|
8e0991475c
|
Incorporated upstream fixes
|
2023-10-27 11:04:10 -03:00 |
|
Eduardo Quezada
|
7ae37ab79c
|
Merge branch 'pret_master' into RHH/upcoming
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/event_scripts.s
|
2023-10-27 11:03:37 -03:00 |
|
GriffinR
|
a5c2ac5e49
|
Use BUGFIX in assembly files
|
2023-10-20 09:10:49 -04:00 |
|
GriffinR
|
866c32a735
|
Add temp var aliases
|
2023-08-04 14:17:28 -04:00 |
|
PSF
|
b2901c51b0
|
Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat
|
2023-06-27 15:34:31 -07:00 |
|
Eduardo Quezada
|
341ce6fd95
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
|
2023-06-16 21:25:16 -04:00 |
|
Ariel A
|
66c57e3442
|
Merge branch 'master' into followers
|
2023-01-29 18:44:06 -05:00 |
|
Eduardo Quezada
|
4a9515e8db
|
Restored improvements from upstream
|
2023-01-20 12:34:15 -03:00 |
|
Eduardo Quezada
|
749225ace1
|
Matching merge from upstream pret
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
|
2023-01-20 12:31:54 -03:00 |
|
GriffinR
|
e88139d1b5
|
Add fix for Battle Tower cloning bug
|
2022-12-29 11:22:53 -05:00 |
|
Ariel A
|
e6d1cfae24
|
Merge branch 'master' into followers
|
2022-11-21 21:21:50 -05:00 |
|
GriffinR
|
01c71b4ce1
|
Fix more text and movements labeled as scripts
|
2022-10-30 03:27:28 -04:00 |
|
Ariel A
|
4236f18f2d
|
Fixed follower bugs when returning from a battle facility challenge.
|
2022-05-20 00:18:41 -04:00 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
GriffinR
|
c4f8f4d11a
|
Add STR_VAR_# ids to string buffer macros
|
2021-11-17 22:00:44 -05:00 |
|
GriffinR
|
04cc923d6c
|
Handle optional arguments for warp commands, add WARP_ID_NONE
|
2021-11-16 10:53:00 -05:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
GriffinR
|
0f538102d9
|
Add local id constants for C
|
2021-07-05 13:54:43 -04:00 |
|
GriffinR
|
f602a9dcbf
|
Use bool for multichoice ignoreBPress
|
2021-03-31 00:35:56 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
89bcf3cbd9
|
Merge branch 'master' into add-localids
|
2020-07-08 15:47:45 -04:00 |
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
GriffinR
|
2859900ea9
|
Second pass on documenting union room
|
2020-06-10 17:30:59 -04:00 |
|
GriffinR
|
3f97763181
|
Document cable_club.c
|
2020-06-06 16:10:03 -04:00 |
|
GriffinR
|
655910a16f
|
Merge branch 'master' into fix-eventobj
|
2020-01-12 22:42:43 -05:00 |
|
GriffinR
|
6a470ddfda
|
Some script clean up, document secret base secrets show
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
ef67f2d33b
|
Merge master into ObjEvent rename and prune accidental inclusions
|
2020-01-08 05:43:06 -05:00 |
|
GriffinR
|
949509aade
|
Merge branch 'master' into fix-eventobj
|
2019-12-18 13:16:38 -05:00 |
|
GriffinR
|
23f952b34e
|
Merge master into doc-tower
|
2019-12-17 21:17:46 -05:00 |
|
GriffinR
|
ddfa0c6298
|
Document Battle Tower scripts
|
2019-12-17 20:56:13 -05:00 |
|
GriffinR
|
4879c1eab2
|
Merge branch 'master' into constants-fade
|
2019-12-17 19:11:51 -05:00 |
|
GriffinR
|
96ec5e1b84
|
Use fadescreen constants
|
2019-12-15 11:42:50 -05:00 |
|
GriffinR
|
82f55f2381
|
Merge master into ObjEvent rename
|
2019-12-15 02:00:00 -05:00 |
|
GriffinR
|
97b5560bdb
|
Document Battle Tent scripts
|
2019-12-15 01:47:01 -05:00 |
|
GriffinR
|
75b0c9d7a9
|
Document Battle Pyramid scripts
|
2019-12-14 08:38:26 -06:00 |
|
GriffinR
|
c51e0f3bae
|
Merge branch 'master' into fix-eventobj
|
2019-12-06 02:34:54 -05:00 |
|
GriffinR
|
9b3d1cfab6
|
Set up Battle Dome and Tower macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
be17c1602d
|
Set up remaining facility script doc, use Palace macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
cb90f22c5e
|
Merge master into ObjEvent rename
|
2019-11-27 12:51:10 -05:00 |
|
GriffinR
|
8d870d94c9
|
Document Battle Arena scripts
|
2019-11-26 18:47:48 -06:00 |
|