190 Commits

Author SHA1 Message Date
RoamerX
c58b0a0921 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-10 22:39:44 +08:00
pokesidv
94ddf6dea0
fix: added warning about dns tutorial and triple-layer metatiles tutorial compatibility to the dns tutorial. (#7256) 2025-07-07 13:26:44 -04: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
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
RoamerX
79171b28cb 说明文档重新汉化 2025-06-28 22:47:17 +08: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
hedara90
2e50314fb2
Applied Kasen's documentation improvements (#7104)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-16 13:38:49 +02:00
ExMingYan
580f75f217 更新Termux编译指南 2025-06-10 21:36:14 +08:00
hedara90
0834d9d80b
Added loop iterator style (#7092)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-09 13:52:37 -07:00
RoamerX
9c6ffa037a Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-06-02 14:57:09 +08:00
RoamerX
f83e94af5e merge1.12.0 2025-06-02 14:17:22 +08:00
hedara90
46e09a9e46
Changed trainer tutorial to take into account removed palette compression (#7044)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-01 21:02:52 +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
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
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
Bivurnum
494a04cd76
Add follower NPC documentation (#6704) 2025-05-26 17:05:54 +02:00
surskitty
8a960e77f7
Beefing up the DNS tutorial for some of the common questions/errors. (#6922) 2025-05-24 23:06:51 -04:00
Eduardo Quezada
17e570407e
Remove trailing whitespace (#6968) 2025-05-23 22:33:12 +02:00
psf
591c8cc69c
Updated CONTRIBUTING.md and Merge Freeze definition (#6952) 2025-05-22 09:29:13 +02:00
Eduardo Quezada
5f0a853e74 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide 2025-05-12 20:58:27 -04:00
Alex
006abe097e
Add AI_FLAG_PREDICT_MOVES (#6551) 2025-05-12 23:10:10 +02:00
Eduardo Quezada
13071f7019 Added IsOnPlayerSide 2025-05-12 13:53:15 -04:00
hedara90
e587757fa6
Added JSON as the preferred data format (#6801) 2025-05-09 15:15:48 +02:00
Pawkkie
c7ee329433 Full functionality 2025-05-08 16:45:10 -04:00
ExMingYan
e4b9a40b83 更新编译指南 2025-05-05 17:00:14 +08:00
ExMingYan
0a4efa9b45 WSL_ZH.md加入部分错误解决方法 2025-05-05 02:44:56 +08:00
Pawkkie
5e2a066eda
Add AI_FLAG_PP_STALL_PREVENTION to ai_flags.md (#6756) 2025-05-03 10:48:30 +02:00
摆烂
fc76d93d26
Merge branch 'rh-hideout:master' into master 2025-05-02 09:34:31 +08:00
ExMingYan
77b0362b4e 新增Android使用Termux编译指南 2025-05-01 14:17:57 +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
Hedara
accb85554a Expansion 1.11.2 Release 2025-04-30 11:23:05 +02:00
ExMingYan
e151fa83df 增加Msys2使用mingw64编译指南 2025-04-28 16:09:05 +08:00
ExMingYan
57b61cff7a 翻译WSL安装指南 2025-04-28 00:10:06 +08:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +02:00
khbsd
0534e7a87b
Add Time-Based Encounter Tutorial (#6568) 2025-04-14 23:13:25 -04:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
RoamerX
98b0c6f021
Merge branch 'rh-hideout:master' into master 2025-04-12 11:43:45 +08:00
hedara90
a243b97907
Documentation (#6576)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-11 12:52:12 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Hedara
d78afca94f More shadow options and documentation 2025-04-10 22:41:38 +02:00
psf
7ff50e3586
Fix broken links in merge_checklist.md (#6570) 2025-04-10 15:38:51 +02:00
ExMingYan
cbdc4143d8 bKGD Fix 2025-04-09 19:17:24 +08:00
Hedara
76a08abeaa Updated documentation 2025-04-09 12:59:03 +02:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00