AlexOn1ine
ce52d83343
25/08/25 Master merge
2025-08-25 17:30:38 +02:00
Alex
6df3a48ca2
Fixes octolock not ending after user switched out ( #7556 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-25 15:46:36 +02: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
hedara90
95eb3ba1a7
Fix B_ANIMATE_MON_AFTER_KO with a new counter ( #7531 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-21 14:43:41 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker ( #2174 )
2025-08-21 13:43:19 +01:00
hedara90
1a39ebd7da
Changed default print level for DebugPrintf for mGBA to MGBA_LOG_WARN ( #7567 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-08-18 19:51:19 +02: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
Ruby
d5ada82455
Moved summary screen nature colors to summary_screen.h ( #7560 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-15 19:33:39 +02:00
Eduardo Quezada
4986e06cae
Fixed B_PSYWAVE_DMG ( #7557 )
2025-08-15 09:03:21 +02:00
surskitty
260b12337e
Helping Hand logic ( #7504 )
2025-08-13 16:21:13 +02:00
Pawkkie
5794b26a31
Remove funcResult from AiThinkingStruct ( #7545 )
2025-08-13 11:41:14 +02:00
grintoul
916f083852
Added trainerBackPic to Trainer struct to de-couple trainer pic and trainer back pic defines ( #7425 )
2025-08-13 11:02:41 +02:00
Martin Griffin
7b5844762d
make check TESTS="..." support for filenames and infix matches ( #7536 )
2025-08-13 10:39:55 +02:00
surskitty
7fb5d98bf6
AI uses Tailwind. ( #7515 )
2025-08-12 17:12:45 -04:00
Pawkkie
eab10dc2f0
Fix AI's KO evaluation getting messed up by priority ( #7533 )
2025-08-12 10:30:14 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles ( #7514 )
2025-08-11 23:19:36 +02:00
Alex
38cfc4bacf
Modify move prediction to work in doubles ( #7087 )
2025-08-11 12:26:41 -04:00
Eduardo Quezada
a9d5c2cd28
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards ( #7528 )
2025-08-11 16:06:58 +02:00
Martin Griffin
de6c9c6176
Hacky support for enums in C asm statements ( #7494 )
2025-08-11 10:06:23 +02:00
AlexOn1ine
bd919e3219
11/08/25 Master to upcoming merge
2025-08-11 08:31:12 +02:00
Alex
7de3663f38
Fixes Life Orb still activating if move was absorbed ( #7521 )
2025-08-10 16:58:36 +02:00
surskitty
fda783b394
AI handling for similar utility moves ( #7513 )
2025-08-08 22:54:07 +02:00
Nephrite
38eb3461b9
Changed item name/pluralName to a compound string ( #7359 )
2025-08-08 20:51:16 +02:00
cornixsenex
80a3a3b7ef
Remove shadow and hide follower on stair warp ( #7368 )
2025-08-08 11:22:42 +02:00
surskitty
070a4f1dfa
Improved hazards logic and Mycelium Might ignores ability checks ( #7509 )
2025-08-08 09:54:30 +02:00
surskitty
6cb18f2048
Fiddling with CanLowerStat. ( #7510 )
2025-08-08 09:53:13 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 ( #7498 )
2025-08-08 09:44:12 +02:00
RavePossum
bf68865e0d
Implement using party menu items from field ( #7481 )
2025-08-07 21:21:33 +02:00
surskitty
e778d3cdfe
Improved Guaranteed Flinch logic (fake out et al) ( #7501 )
2025-08-06 23:39:43 +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
Bivurnum
f6a120310e
Bug fix: add handling for forced movements into/after ledge jumps with follower NPCs ( #7055 )
2025-08-04 15:10:20 +02: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
Linathan
9faa5294ce
Wild Pokémon animate after breaking out of Poké Ball ( #7339 )
2025-08-01 18:14:42 +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
Josh
0dfec24967
Allow names for voicegroups and use a macro for use with drumsets ( #2149 )
...
mid2agb has been modified to allow more than just numbers when naming voicegroups and voicegroups have been renamed to match. A "voice_group" macro has been set up with a optional parameter for the starting note will shift the offset by the specified amount * 0xC which is the length of 1 voice in a voicegroup. All drumset voicegroups have a "starting_note" of 36.
2025-07-30 19:43:08 +01: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
Alex
cb4450efaf
Fixes Effect Spore and Baneful Bunker/Burning Bulwark ( #7412 )
2025-07-30 19:54:12 +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
grintoul
1fbee7cce0
fixed-damage-move-ai-calc-fix ( #7385 )
2025-07-28 14:10:34 +02:00
surskitty
7b2fe32050
Make B_VAR_STARTING_STATUS tests run in CI ( #7419 )
2025-07-28 13:11:04 +02:00
Nephrite
7c6cff1fb3
Get/SetMonData optimisation ( #7313 )
2025-07-28 11:42:28 +01:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
