Hedara
aa8c4d460b
Merge commit '3efb836f72c5253dfa6869e836a7daeaa4d6aad7' into master-merge
...
Conflicts:
src/battle_util.c
src/pokedex_area_screen.c
2026-04-30 18:39:28 +02:00
FosterProgramming
9651c26b43
Fix rare labelling issues with RUN_OVERWORLD_SCRIPT ( #9869 )
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
CI / build (push) Has been cancelled
2026-04-27 12:06:40 +01:00
grintoul
f25594e8c7
Adds AreMultiPartiesFullTeams and Test_BattlersShareParty handling to tests ( #9751 )
2026-04-23 17:51:38 +01:00
Martin Griffin
8c950fb648
Merge branch 'master' into upcoming
2026-04-09 20:59:48 +01:00
Martin Griffin
8e5bc0da4d
Remove test-specific CFLAGS ( #9723 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-04-09 17:56:31 +02:00
grintoul
70340c1135
12v12 capability ( #8943 )
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-04-07 13:57:29 +02:00
Pawkkie
137670bed2
GenConfig naming cleanup (#9529 )
2026-03-19 00:54:39 +01:00
Bassoonian
b4c311a308
Add Species enum ( #9507 )
...
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
2026-03-17 12:47:48 +00:00
Eduardo Quezada
730d0a1fe8
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge
2026-03-14 15:45:44 -03:00
Eduardo Quezada
4c3ff3979c
PARAMETRIZE_LABEL now supports multiple args (#9206 )
2026-03-14 15:43:43 +00:00
Martin Griffin
44e9991e8b
preproc: (shared) COMPOUND_STRING ( #9086 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-04 17:09:12 +01:00
Bassoonian
de6947a6e5
Fix spacing for conditions ( #9369 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 15:10:52 +01:00
AlexOn1ine
675de8cbea
21/02/26 Master to upcoming merge
2026-02-21 12:55:21 +01:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names ( #8824 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-02-06 11:57:33 +01:00
Eduardo Quezada
4a4a72f9fb
Added enum BattlerId type checks ( #8954 )
2026-01-28 09:32:03 +01:00
Alex
6c05a08750
Refactor OHKO Moves ( #8916 )
2026-01-21 11:55:30 +01:00
FosterProgramming
8d059cf5c4
Change randomweightedarray to use u16 weights instead of u8 ( #8934 )
2026-01-18 10:24:49 +01:00
Bassoonian
36fcd9c6b2
Adds `Item` enum ( #8897 )
2026-01-17 02:26:09 -08:00
grintoul
8c4fa6e71d
Refactor multi test system trainer party allocation and adds enum BattleTrainer ( #8908 )
2026-01-14 23:33:24 +01:00
FosterProgramming
8ad0451914
Capture odds refactor and new catch rate modifiers ( #8682 )
...
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2026-01-11 09:52:38 +01:00
FosterProgramming
1dcfe54b59
Refactor mon generation ( #8204 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2026-01-04 20:01:59 -08:00
Bassoonian
66df755e9a
Extra enum typechecking ( #8786 )
2026-01-04 12:48:21 +01:00
AlexOn1ine
a1948b7c40
01/01/26 Master to upcoming merge
2026-01-01 10:24:19 +01:00
grintoul
a71fc91484
Trainer slides for multiple trainers and multibattles ( #7588 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-30 20:28:53 +00:00
grintoul
6e9f8998b4
Adds EXPECT_FAIL macro to test system to allow for testing of conditions correctly triggering failures ( #8553 )
2025-12-28 11:21:02 +01:00
grintoul
d55d2b6dfc
Corrects test system Forced Ability handing for multi battles ( #8611 )
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-12-22 10:11:21 +01:00
Hedara
e4ae9317c9
Merge branch 'master' into master-to-upcoming
...
Manual fixes to Lunar Dance handling
Conflicts:
include/battle_util.h
src/battle_ai_main.c
src/battle_ai_switch.c
src/battle_ai_util.c
src/battle_end_turn.c
src/battle_script_commands.c
src/battle_util.c
test/battle/ai/ai_doubles.c
test/battle/move_effect/snatch.c
test/battle/spread_moves.c
2025-12-19 15:31:37 +01:00
Martin Griffin
cc8c8bd668
assertf: Formatted asserts
...
assertf's behavior depends on the build:
- In release builds it executes recovery code.
- In debug builds it shows a crash screen. When start is pressed it
resumes and executes the recovery code.
- In test builds it fails the test with an INVALID result.
2025-12-17 17:14:34 +00:00
hedara90
ec1a283b1b
Add SUB_HIT check to tests ( #8413 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-16 19:19:34 +01:00
AlexOn1ine
23cefec579
08/12/25 master to upcoming merge
2025-12-08 18:15:19 +01:00
grintoul
b58787f966
Adds TIE_BREAK_SCORE and TIE_BREAK_TARGET to test system to allow for forced or random move and target selection ( #8398 )
2025-12-07 16:58:10 -05:00
Eduardo Quezada
115694675f
Renamed Config Test system to more general names ( #7283 )
2025-12-02 11:26:44 -05:00
Eduardo Quezada
0dd73131d0
Test type enum indentation
2025-11-17 09:15:45 -03:00
FosterProgramming
44d4e0c1de
Refactor random functions to be runner specific ( #7816 )
2025-11-11 20:48:41 +00:00
grintoul1
c230e54678
Master to Upcoming merge 20251107
2025-11-07 22:45:57 +00:00
FosterProgramming
2467584af5
Prevent EXPECT functions from casting negative numbers into unsigned ( #7866 )
2025-11-07 18:32:15 +01:00
FosterProgramming
fd07daf0d8
Fix nature power string and add support for evnvironment in tests ( #8068 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-28 19:23:16 +01:00
Bassoonian
f7cbe4853b
Add type enum ( #8054 )
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-10-27 16:41:22 +00:00
grintoul
a32da780c4
Corrects ONE_VS_TWO_BATTLE_TEST to use BATTLE_TEST_ARGS_ONE_VS_TWO ( #8061 )
2025-10-27 15:24:33 +00:00
grintoul
95c2a6e2b6
Multibattle testing system ( #7257 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-10-24 15:00:23 +02:00
Bassoonian
fbd702e3a4
Some more documentation and cleanup ( #8020 )
2025-10-23 20:14:38 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum ( #7006 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 21:35:09 +02:00
AlexOn1ine
a4470cac2c
Master to upcoming merge
2025-09-27 22:42:53 +02:00
FosterProgramming
1d11a2cb0a
Improve how test involving ball throw work ( #7774 )
2025-09-22 20:44:12 +02:00
FosterProgramming
db7e062fe1
Add some missing move animations to the move animation tests ( #7507 )
2025-09-21 23:27:05 +02:00
Martin Griffin
97376a5b5a
Support gimmicks in AI tests
2025-09-05 07:31:13 +01:00
Martin Griffin
7b5844762d
make check TESTS="..." support for filenames and infix matches ( #7536 )
2025-08-13 10:39:55 +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
Martin Griffin
de6c9c6176
Hacky support for enums in C asm statements ( #7494 )
2025-08-11 10:06:23 +02:00
AlexOn1ine
68db4c5a77
12/07/25 master to upcoming merge
2025-07-12 11:55:06 +02:00