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

18330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grintoul
3255f23239
Added line break between Trainer 1 name and Trainer 2 name in sText_TwoTrainersWantToBattle (#7028) 2025-05-31 09:50:41 +02:00
RoamerX
8e4762fa0d
Merge pull request #53 from ExMingYan/PullRequest 
增加installdeps.sh用于部分系统安装依赖项
 2025-05-31 14:52:04 +08:00
Alex
8cfe915bcd
Expansion 1.11.4 & 1.12.0 (#7026) 2025-05-30 21:17:15 +02:00
Hedara
98c03315a9 Start of 1.12.1 cycle 2025-05-30 20:55:09 +02:00
Hedara
efa2fb3be7 Expansion 1.12.0 2025-05-30 20:53:32 +02:00
Hedara
09ee1d0b2d Merge branch 'upcoming' into expansion-1.11.4 2025-05-30 20:45:19 +02:00
Hedara
acb4a9cf62 Expansion 1.11.4 2025-05-30 20:15:56 +02:00
hedara90
347d0e1189
Master to upcoming merge (#7024) 2025-05-30 20:01:35 +02:00
cawtds
555bda4e66
Fix UB when using time menu (#7023) 2025-05-30 20:00:25 +02:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
Bivurnum
37669e62ae
Bug fix: setfollowernpc macro no longer runs when FNPC_ENABLE_NPC_FOLLOWERS is FALSE (#6755) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-05-30 17:41:02 +02:00
khbsd
38ba41b324
fix: better area mons handling, no longer duplicates hiddenMons field (#6945) 2025-05-30 17:22:05 +02:00
psf
9656400f88
Moved time constants to dedicated files (#7019) 2025-05-30 16:39:01 +02:00
cawtds
1e32cf278c
fix battle controller macros (#7021) 2025-05-30 16:31:38 +02:00
RoamerX
f423a23c28 道具名称中的“TMXX”全部改为“招式学习器XX” 
找到及获得文本格式参考正作
修正一些通关中发现的文本问题
 2025-05-30 21:15:09 +08:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix (#7015) 2025-05-30 11:58:32 +02:00
ExMingYan
112c991c12 增加installdeps.sh用于部分系统安装依赖项 2025-05-30 16:18:50 +08:00
RoamerX
6e84893562 忘记及回忆NPC参照正作文本修正 
主线海洋队抢夺事件及隧道相关文本重新翻译
其他一些少量文本优化
 2025-05-30 11:34:54 +08:00
Bivurnum
5dd45a0479
Fixed surf blob binding to invisible follower NPC on map reload (#7013) 2025-05-29 18:18:30 +02:00
Bivurnum
e631f3baa9
Fix follower NPC not reappearing after Mossdeep gym warp (#7014) 2025-05-29 18:17:54 +02:00
Alex
2864831c2b
Pret merge, (29th of May, 2025) (#7012) 2025-05-29 18:17:20 +02:00
RoamerX
0ee10d486e 大批量文本修正 
徒弟文本全部重新翻译（主要使用deepseek，之后进行了润色和格式调整）
调整整个游戏中大量少数几个字后就换行导致观感奇怪的情况
将所有的游船修正为轮渡（ferry，連絡船）
润色/重新翻译乘船相关的文本
个体值评定员、回忆技能NPC的文本重新翻译
修正很多换页时逗号的使用
修正几个遗漏的文本超出
统一所有自行车道的译名
调整润色传送到盒子的文本
修正所有宝玉为宝珠
训练家的量词统一为“位”
 2025-05-29 23:09:11 +08:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets (#6998) 2025-05-29 11:25:10 +02:00
Bivurnum
f2a3226b47
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010) 2025-05-29 11:05:23 +02:00
Bivurnum
79abc885e7
Fixes follower NPC not changing state with player after warp (#7009) 2025-05-29 11:04:41 +02:00
Raymond Dodge
e605b87722
Fix out-of-bounds in Heal Bell Cures Entire Party test (#7011) 2025-05-29 10:59:47 +02:00
Hedara
8ce7ffd080 Merge remote-tracking branch 'pret/master' into pret-merge 2025-05-29 09:10:41 +02:00
psf
cc8694d26d
Clarifies when to use each merge type for maintainers (#6999) 
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-05-28 17:22:11 +02:00
RoamerX
5168d76fca 狩猎地带、秘密基地、宝可梦发烧友俱乐部相关文本重新汉化 
其他：
卡绿隧道相关的文本对话重新汉化
修正很多换页时逗号的使用
修正几个遗漏的文本超出
润色/重新翻译了几处文本
将“训练家小技巧”按照正作修改为“有用的公告牌！”
修正了几处“选美”的旧译为“华丽大赛”
 2025-05-28 23:06:25 +08:00
Alex
7a9b51b387
Master to upcoming, 2025-05-28 (#7001) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: malad1211 <43647853+malad1211@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Vex <edanvirgo@gmail.com>
Co-authored-by: PCG <75729017+PCG06@users.noreply.github.com>
 2025-05-28 16:32:21 +02:00
Hedara
c8570d7c2b Remove incorrectly re-added ABILITYEFFECT_ cases 2025-05-28 14:38:57 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming 
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
 2025-05-28 14:26:15 +02:00
PCG
00f3c09a22
Fixed CreateMon param order in CreateFacilityMon (#6989) 2025-05-28 12:51:00 +02:00
psf
d80e92e687
Pret merge (27th of May, 2025) (#6995) 2025-05-28 03:44:51 -07:00
Vex
ecb20b2a25
Fix Eiscue not resetting back to Ice Face form after battle. (#6997) 2025-05-28 12:43:38 +02:00
RoamerX
187ae170d2 壁纸女孩文乃、寻宝者文本润色或重新汉化 
以及所有汉字数字变成阿拉伯数字的情况查漏补缺
 2025-05-28 14:52:27 +08:00
RoamerX
1e3e10e990 宝可梦新闻、混合名人文本重新汉化 
游戏中心调整为游戏城
省略号及换行等一些文本修正
 2025-05-28 13:02:57 +08:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
Alex
7da5121b6c
Expansion 1.11.3 (#6994) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-27 20:52:45 +02:00
Hedara
156e0b394c Start of 1.11.4 cycle 2025-05-27 20:34:28 +02:00
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02:00
Hedara
647c786c53 Merge commit '07c897a' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:46:13 +02:00
Hedara
c27930eabf Merge commit '678fdf9' into pret-merge 
Conflicts:
	data/maps/BirthIsland_Exterior/scripts.inc
	data/maps/DesertUnderpass/scripts.inc
	data/maps/Route117/scripts.inc
	data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
	data/maps/SootopolisCity/scripts.inc
	include/constants/event_objects.h
	src/battle_setup.c
	src/event_object_movement.c
	src/field_control_avatar.c
	src/item_use.c
	src/scrcmd.c
	tools/mapjson/mapjson.cpp
 2025-05-27 19:22:40 +02:00
Hedara
5e9b8cdbad Merge commit 'cc388ef' into pret-merge 
Conflicts:
	src/map_name_popup.c
 2025-05-27 19:06:35 +02:00
Hedara
4a442cc3e6 Merge commit '091b726' into pret-merge 
Conflicts:
	include/constants/heal_locations.h
	map_data_rules.mk
 2025-05-27 19:02:53 +02:00
Hedara
9bfef357a2 Merge commit 'e4e90ea' into pret-merge 
Conflicts:
	src/battle_setup.c
	src/field_specials.c
	src/menu_helpers.c
	src/pokedex_area_screen.c
	src/roamer.c
	src/script.c
 2025-05-27 18:53:30 +02:00
Hedara
090550626e Merge commit '113226b03ad745183299dae1833f2a773b927cef' into pret-merge 
Conflicts:
	include/constants/metatile_behaviors.h
 2025-05-27 18:34:53 +02:00
RoamerX
d87fbe4c90 获得道具时判断复数的函数重新修改回更新前 
以及几个小修复
 2025-05-27 23:45:09 +08:00
RoamerX
5d492a1aca 测试发现的文本问题修正 2025-05-27 23:08:06 +08:00
RoamerX
9793921525 Merge branch 'master' of https://github.com/rh-hideout-chinese/pokeemerald-expansion 2025-05-27 22:58:36 +08:00