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

3110 Commits

Author SHA1 Message Date
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-07-11 22:53:49 +02:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Nephrite
5a6e7749ab
Removed all instances of .chance = 100, SHEER_FORCE_NO_BOOST (#7300) 2025-07-08 16:17:05 +02:00
RoamerX
6d5abfcc06 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-05 15:47:12 +08:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids (#7173) 2025-07-04 19:07:53 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) (#6821) 2025-06-30 23:50:48 +02:00
Alex
5451e40830
Fixes Toxic Thread animation not being played at the right time (#7247) 
Co-authored-by: hedara90 <90hedara@gmail.com>
 2025-06-30 21:41:29 +02:00
GriffinR
44c3069895 Add explicit defaults for MAPSEC data 2025-06-26 16:26:59 -04:00
GriffinR
670d3a6c9f
Merge pull request #2152 from GriffinRichards/mapsec-data 
Relax MAPSEC region map data requirements
 2025-06-25 22:05:35 -04:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming 
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
 2025-06-25 14:17:07 +02:00
Hedara
726f18f360 Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	asm/macros/event.inc
	data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
	data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
	data/scripts/trainer_hill.inc
	include/graphics.h
 2025-06-24 10:42:24 +02:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089) 2025-06-23 20:31:18 +01:00
RoamerX
c20c5d851b Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-06-23 20:29:34 +08:00
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
grintoul
6c6daa8b9c
Fixes Rapid Spin description (#7178) (#7181) 2025-06-23 10:02:51 +02:00
Eduardo Quezada
bca28b40bb
Use argument.type for EFFECT_SOAK (#7141) 2025-06-21 00:04:52 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
RoamerX
1ee4d508c4 将4行的PM图鉴说明调整至3行或以内 
并调整图鉴说明文字位置
 2025-06-11 17:30:11 +08:00
GriffinR
50d81616cd Relax MAPSEC region map data requirements 2025-06-10 13:05:03 -04:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge 
Conflicts:
	src/contest_painting.c
 2025-06-09 23:27:18 +02:00
RoamerX
773957bd73 联机相关文本参照正作进行调整 
主要包括联机俱乐部以及联盟交谊厅
统一了“群组”与“组长”的翻译
 2025-06-08 23:35:17 +08:00
Bassoonian
b372c272f4
Update FRLG whiteouts to new pret system (#7040) 
Co-authored-by: cawtds <38510667+cawtds@users.noreply.github.com>
 2025-06-08 14:45:14 +02:00
wiz1989
e63ac48de2
added Ash Greninja overworld sprites (#6976) 2025-06-07 09:57:43 +02:00
ExMingYan
98de648c66 移除追踪heal_locations.h 2025-06-07 13:25:45 +08:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
RoamerX
7228b9e0a1 一些文本修正 
乔伊小姐对话、蛋孵化的文本及训练家卡的颜色替换为正作翻译
将树果粉碎的错误翻译修正、并将对应翻译参照神百调整
将树果混合器的翻译统一
 2025-06-06 21:04:14 +08:00
RoamerX
11603d8c2d 测试发现的文本问题修复 
反派组织手下部分台词重新翻译
招式学习器道具说明换行调整
其他零散台词修正调整
 2025-06-05 23:54:19 +08:00
RoamerX
85af9cdb32 测试发现的文本问题修复 
姓名鉴定师、秘密基地教学文本重新翻译
debug部分遗漏文本补充汉化
其他几处零散汉化修正
 2025-06-04 23:17:06 +08:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Philipp AUER
21f0eb1583
Debug parties and battles (#6884) 
Co-authored-by: sbird <sbird@no.tld>
 2025-06-03 23:21:17 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
hedara90
0917af214c
Replace all usages of lz compression with smol (#7032) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-31 19:47:54 +02:00
RoamerX
9a06bed011 easychat对话文本检查修正 2025-05-31 23:42:39 +08:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
cawtds
21499cbee1
Refactor field moves (#6660) 2025-05-31 09:03:12 +02:00
RoamerX
f423a23c28 道具名称中的“TMXX”全部改为“招式学习器XX” 
找到及获得文本格式参考正作
修正一些通关中发现的文本问题
 2025-05-30 21:15:09 +08:00
RoamerX
0ee10d486e 大批量文本修正 
徒弟文本全部重新翻译（主要使用deepseek，之后进行了润色和格式调整）
调整整个游戏中大量少数几个字后就换行导致观感奇怪的情况
将所有的游船修正为轮渡（ferry，連絡船）
润色/重新翻译乘船相关的文本
个体值评定员、回忆技能NPC的文本重新翻译
修正很多换页时逗号的使用
修正几个遗漏的文本超出
统一所有自行车道的译名
调整润色传送到盒子的文本
修正所有宝玉为宝珠
训练家的量词统一为“位”
 2025-05-29 23:09:11 +08: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
RoamerX
1e3e10e990 宝可梦新闻、混合名人文本重新汉化 
游戏中心调整为游戏城
省略号及换行等一些文本修正
 2025-05-28 13:02:57 +08: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
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