3373 Commits

Author SHA1 Message Date
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
9ff4c48f77 Start of 1.13.1 cycle 2025-08-28 16:16:40 +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
AlexOn1ine
1131b205f2 conflicts 2025-08-28 14:09:38 +02:00
RavePossum
2fbf45d057
Restore X item friendship increase (#7583) 2025-08-26 22:17:30 +02:00
Bassoonian
28e7a25989
25/08/25 Master merge (#7618) 2025-08-26 15:23:24 +02:00
Alex
e2f24bbb3f
Prevents a regression for custom abilties (#7616) 2025-08-25 17:37:57 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
RoamerX
53c0f8061d Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-08-25 16:21:16 +08:00
FosterProgramming
1e6bb4f47c
Fix overlap between spin evolution and script evolution (#7593) 2025-08-22 20:23:18 +02:00
Hedara
da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-08-21 15:40:38 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
Eduardo Quezada
7d459fd6dc
Fixed Transistor damage calculation test failing when GEN_LATEST is less than GEN_9 (#7577) 2025-08-18 19:44:43 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles (#7514) 2025-08-11 23:19:36 +02:00
Eduardo Quezada
a9d5c2cd28
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards (#7528) 2025-08-11 16:06:58 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44:12 +02:00
surskitty
e8b6d40f18
AI_FLAG_ATTACKS_PARTNER with a config for bloodthirstiness (#7401) 2025-08-06 10:22:34 -04:00
Alex
acc82e7d79
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
grintoul
27886a6577
Macro-for-AI-Flag-definitions (#7471) 2025-08-05 14:14:04 +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
pokesidv
4d31693005
Rock climb by ghoulslash (#7432)
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-03 14:52:07 +02:00
Alex
3841fee888
Clean up noResultString (#7408) 2025-08-02 15:17:44 +02:00
Nephrite
73fd567520
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-01 18:13:23 +02:00
surskitty
0b44093a8e
Adds AI_FLAG_ASSUMPTIONS as a constant for semi-omniscience (#7435) 2025-08-01 18:11:34 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Hedara
637f7dff46 Start of 1.12.3 cycle 2025-07-30 20:35:16 +02:00
Hedara
d8059ce3d1 1.12.2 release version 2025-07-30 20:34:43 +02:00
Nephrite
2eeb346387
Bag refactor3 + Ghoulslash's sorting feature port (#7330) 2025-07-29 10:47:32 +02:00
Alex
038bd2717d
Pret merge (27th of July, 2025) (#7422) 2025-07-28 15:13:23 +02:00
surskitty
7b2fe32050
Make B_VAR_STARTING_STATUS tests run in CI (#7419) 2025-07-28 13:11:04 +02:00
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
Eduardo Quezada
cf4bb3e286
Moved some fields to BattlerState/PartyState (#7409) 2025-07-25 22:16:35 +02:00
Alex
e7cf162180
Fixes various Choice lock issues (#7383) 2025-07-25 10:18:30 -04:00
RoamerX
f7e45ca2b3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-07-24 17:15:11 +08:00
Pawkkie
249b4d1574
19/07/25 Master merge (#7375) 2025-07-19 19:22:48 -04:00
surskitty
1b996fbb8e
AI refactor for weather-setting, terrain-setting, Trick Room behaviors; doubles-focused (#7319) 2025-07-19 19:20:07 -04:00
AlexOn1ine
90eef35715 master merge 2025-07-19 17:01:18 +02:00
hedara90
2f6e1ea6d3
Enum conversion for enum MoveEffects and enum BattleMoveEffects (#7366) 2025-07-19 10:28:25 +02:00
Alex
71d40cc3f1
Convert various to callnatives (#7355) 2025-07-18 19:12:37 +02:00
Alex
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326) 2025-07-14 21:34:21 +02: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
Frank DeBlasio
c9ec896312
Refactor battle environment (#4891) 2025-07-12 12:38:06 -04:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02: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
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Nephrite
7d5a949b71
Bag refactor 2 (#7166) 2025-07-11 11:50:38 +02:00