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

159 Commits

Author SHA1 Message Date
RoamerX
60ba6858f9
Merge pull request #69 from rh-hideout/master 
expansion 1.13 update
 2025-09-02 23:16:46 +08:00
RoamerX
d9c2fb3cd2 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-09-02 22:32:57 +08:00
Hedara
c1b1fb4cdc 1.13.1 Release version 2025-09-02 16:17:05 +02:00
Hedara
7056aaba6e Expansion version 1.13.0 2025-08-28 16:15:09 +02:00
Hedara
acf7f0c6e1 Merge branch 'upcoming' into expansion-release 2025-08-28 16:13:58 +02:00
Hedara
d812b58064 Expansion version 1.12.3 2025-08-28 15:49:29 +02:00
RoamerX
cc5b36846a Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-08-04 20:19:39 +08:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Hedara
d8059ce3d1 1.12.2 release version 2025-07-30 20:34:43 +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
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
hedara90
502c73dc9b
Fix 01_battle_engine_bugs.yaml (#7242) 2025-06-28 13:24:24 -07:00
RoamerX
bef820682f 说明文档格式调整 2025-06-28 23:02:37 +08:00
RoamerX
79171b28cb 说明文档重新汉化 2025-06-28 22:47:17 +08:00
DizzyEggg
8e7274f3fc
lto support (#7182) 2025-06-26 15:53:14 +02: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
psf
fd90802a37
Fixed CI issue introduced 7046 (#7072) 2025-06-07 09:51:47 +02:00
ExMingYan
e0e08da7a8 删除文件中存在的U+200C零宽字符 2025-06-05 12:43:27 +08:00
psf
7263bb1886
Update CI to ignore allcontributors commits (#7046) 2025-06-02 15:41:05 +02:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08: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
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
Hedara
7d1833f277 1.11.3 release 2025-05-27 20:33:27 +02:00
sayseong
24f260f6c7 Merge remote-tracking branch 'upstream/master' 2025-05-27 13:33:46 +08:00
Hedara
90aed43c27 Merge branch 'master' into master-upcoming 
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
 2025-05-22 15:41:08 +02:00
hedara90
e9ba4b5db0
Added type: documentation to required labels for the label check (#6957) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-22 00:45:25 -07:00
psf
b8b73bf219
Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700) 2025-05-17 19:33:22 +02:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming 
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
 2025-05-12 18:21:35 +02:00
hedara90
5f86fd7de6
Changed github CI to use arm-none-eabi-gcc (#6829) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-12 16:38:03 +01:00
ExMingYan
4be47582ff 修正README中相对文件路径 2025-05-10 00:34:31 +08:00
RoamerX
a18cfa7892 修复readme文件格式 2025-05-06 13:39:04 +08:00
RoamerX
d4f72c04dc 同步更新猫佬的readme修正至github预览界面 
微调了flag的叫法
 2025-05-06 13:34:24 +08:00
ExMingYan
424f8f9875 修改部分指向rh-hideout github仓库的链接，使其指向本地文件 2025-05-05 17:50:36 +08:00
明雅
6b857e041a
修复两个超链接语法错误 2025-05-05 15:33:45 +08:00
RoamerX
dfb4091cd8 修正readme错误 2025-05-04 23:19:21 +08:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08:00
Hedara
0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30 
Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c
 2025-04-30 15:22:37 +02:00
hedara90
66a5ad5258
Updated label workflow (#6729) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-30 14:01:45 +02:00
Hedara
accb85554a Expansion 1.11.2 Release 2025-04-30 11:23:05 +02:00
RoamerX
518d46acc8 readme调整 2025-04-23 23:25:14 +08:00
RoamerX
07c5afc985 readme调整 2025-04-23 22:05:48 +08:00
RoamerX
0b2f257de1 说明md文本调整 2025-04-23 21:56:18 +08:00
RoamerX
9be524e0e4 说明md文本调整 2025-04-23 21:55:06 +08:00
RoamerX
8d1d7af31e 说明md文本调整 2025-04-23 21:51:04 +08:00
RoamerX
a7dbb743bf 说明md文本调整 2025-04-23 21:46:06 +08:00
RoamerX
41309b0dbf Update README.md 2025-04-23 21:38:15 +08:00
RoamerX
49558d8872 说明md文件汉化 2025-04-23 21:36:02 +08:00