72 Commits

Author SHA1 Message Date
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
RoamerX
c2f3ec5ca1 剩余有名字的NPC全部对话文本及其他几个文本的重新翻译
包括哈奇老人、楠木、津贺、满盈、阿潮、阿泉、火村、兹伏奇社长、索蓝斯博士
其中几个角色神百有部分可供参考的,但翻译质量普通,主要还是参考deepseek英文翻译及原版英文
2025-05-11 00:19:55 +08:00
RoamerX
6c675f1945 大批量文本修正
包括所有馆主、四天王、米可利和大吾的(除电话外的)文本,基本参照神百,部分自己额外润色
所有城市介绍牌子以及道馆馆主的文字
“做为”修正为“作为”,“从新”修正为“重新”
以及少量其他部分修正
2025-05-08 00:08:23 +08:00
RoamerX
3d45119bbe 大批量文本修正、微调及润色 2025-04-26 21:51:46 +08:00
RoamerX
5fc2213e1c 遗漏的换行文本溢出情况修复
Pokenav统一为宝可导航,全流程中仅兹伏奇初次介绍时使用
送神山码头文本错误翻译修复
城市名称统一补全为XX市/镇
哈奇老人相关的文本调整
海员统一修正为水手
标点符号重复使用修复
小遥错字修复
汉化优化
2025-04-24 18:14:06 +08:00
RoamerX
97501e8843 【危险举动,需要测试】把所有的省略号从“…”统一成“……”
涉及上千处改动,出现问题则回退
2025-04-22 16:50:58 +08:00
sayseong
c039c0303b 地图脚本汉化 2025-04-08 01:07:12 +08: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
GriffinR
cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
GriffinR
36551dff2f Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
GriffinR
e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
04cc923d6c Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
cbt6
32aaf6912f Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
06351bf63c Remove address comments 2021-07-20 15:18:31 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
fac6288156 Add local object event ids for referenced objects 2020-06-22 17:18:58 -04:00
GriffinR
e5757a3def Use trainer type constants 2020-04-28 19:59:08 -05:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
GriffinR
f2e7b1507e Port some macro/script fixes from pokefirered 2020-01-11 14:12:31 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR
4334e31a7e Fix sailing typo 2019-11-07 16:46:56 -05:00
GriffinR
5e4dd022a6 Document Dewford scripts 2019-11-07 16:36:48 -05:00
GriffinR
033c6cea3b Use YES/NO constants for MSGBOX_YESNO 2019-11-02 16:36:43 -05:00
Marcus Huderle
13f9760187 Document route 109 scripts 2019-10-26 12:55:53 -05:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts 2019-09-22 12:18:48 -04:00
GriffinR
de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR
1d703e786b move some data out of event_scripts, use game stat constants 2019-09-05 14:56:34 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
Tustin2121
6508469259 Rename movobjectoffscreen to copyobjectxytoperm
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
GriffinR
ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
GriffinR
0f5d96e5f5
name used and unnamed vars 2019-08-03 14:12:48 -04:00
Fontbane
901a83d249 Fix some labels and include decorations.h
Include decorations.h in shop.c

Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
Marcus Huderle
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
huderlem
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
Event vars
2019-02-25 08:02:28 -06:00
Phlosioneer
8816aa527d Update map script files 2019-02-25 08:01:22 -06:00
Phlosioneer
4e5fae0086 Merge branch 'master' into event-vars 2019-02-25 02:24:20 -05:00
Phlosioneer
4582fd1545 Name a ton of commonly used event scripts 2019-02-24 10:10:18 -06:00
Phlosioneer
e12a7790cf Start porting pokeruby vars to pokeemerald 2019-02-22 04:01:38 -05:00
Marcus Huderle
19b76bffda Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields 2019-02-16 16:56:41 -06:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Marcus Huderle
5c1667b41a Define layout constants 2019-01-29 16:55:25 -06:00
Tetrable
a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00