AlexOn1ine e2e012c3a9 conflicts

2025-04-21 15:50:57 +02:00

..

battle

conflicts

2025-04-21 15:50:57 +02:00

daycare.c

Fixed non-regional forms breeding incorrectly (#4985)

2025-02-03 17:03:29 +01:00

fpmath.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

pokemon.c

helper function to get the species type based on personality

2025-03-31 14:49:40 +02:00

random.c

Remove support for the original LCG random number generator (#5078)

2024-08-24 10:07:00 -07:00

script.c

Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)

2025-01-08 10:27:00 +00:00

species.c

Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046)

2024-07-27 21:41:05 +02:00

sprite.c

Merge branch 'RHH/master' into RHH/upcoming

2023-08-12 16:31:44 -04:00

test_runner_args.c

Test moves, items, and abilities in battle

2023-02-01 13:53:57 +00:00

test_runner_battle.c

conflicts

2025-04-21 15:50:57 +02:00

test_runner.c

Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)

2025-03-28 21:43:04 +01:00

text.c

Turn battle string ids into enums (#6594)

2025-04-13 16:12:30 +02:00