196 Commits

Author SHA1 Message Date
Nephrite
73fd567520
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-01 18:13:23 +02: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
hedara90
05b1db8cc6
trainerproc copy other trainer party (#7251) 2025-07-18 15:57:57 +01:00
surskitty
1a1d8b58f8 Merge remote-tracking branch 'rh-hideout/upcoming' into rhh_assume_powerful_status 2025-07-13 22:03:48 -04:00
surskitty
f6b0a15841 Renaming to AI_ASSUME_STATUS_MOVES and making a config for universal status move guessing + disabling the custom tuning. 2025-07-12 18:50:08 -04:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
surskitty
c7b8787f59 Better description in the documentation. 2025-07-12 00:55:52 -04:00
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
surskitty
3ee93c69ec Preliminary handling for AI_FLAG_ASSUME_POWERFUL_STATUS, not actually yet called. 2025-07-10 23:38:08 -04:00
Pawkkie
419219bb31
Add AI_FLAG_ASSUME_STAB (#6797) 2025-07-10 19:58:31 +02: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
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) (#6821) 2025-06-30 23:50:48 +02:00
hedara90
4f51ea4839
Update follower NPC tutorial doc for createfollowernpc macro (#7230) 2025-06-30 21:40:47 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
Bivurnum
b1200117a9
Better system for Follower NPC running frames (#7222)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-27 10:12:35 +02:00
Bivurnum
1f5195c686
update fnpc docs for createfollowernpc 2025-06-26 15:55:43 -05:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
hedara90
2e50314fb2
Applied Kasen's documentation improvements (#7104)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-16 13:38:49 +02:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
hedara90
0834d9d80b
Added loop iterator style (#7092)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-09 13:52:37 -07:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02: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
jfb1337
096493aa35
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705)
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-31 09:47:25 +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
Pawkkie
5e2a066eda
Add AI_FLAG_PP_STALL_PREVENTION to ai_flags.md (#6756) 2025-05-03 10:48:30 +02: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
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
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