ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,464 Commits 1 Branch 0 Tags 235 MiB
bd71946372
Commit Graph

296 Commits

Author SHA1 Message Date
kittenchilly
bd71946372
Remove all trailing whitespace (master) (#3472) 2023-10-27 13:52:44 -03:00
Alex
591ef71e3b
Fixes form change when using switch moves (#3463) 
* Fixes form change with switch moves
 2023-10-25 08:33:43 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' (#3459) 
Fix Purifying Salt to be immune to statuses from secondary effects.
 2023-10-24 09:55:32 +02:00
Philipp AUER
4aabd09ab3
Fix test_runner.c modern warning (#3451) 2023-10-23 19:41:59 +02:00
Martin Griffin
5fd36a8e39
Fix ModifyPersonalityForNature (#3452) 2023-10-23 09:37:40 -03:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303) 
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
 2023-10-23 10:08:36 +01:00
Martin Griffin
b0b6e16042 Separate ASSIGN_TEST from NEXT_TEST 
Silences a warning about an invalid pointer when building with modern.
 2023-10-23 07:58:45 +01:00
Eduardo Quezada D'Ottone
77e2b0dd2c
Test cleanup and improvements (#3449) 
* Fixed duplicated test names

* Test improvements for Jaboca, Kee and Rowap Berries

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Lansat Berry test improvements

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Jaboca Berry/Bug Bite interaction test

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-10-22 21:22:59 +02:00
Martin Griffin
8a6284c408
Fix battle test estimateCost bug (#3448) 2023-10-22 10:03:46 -03:00
Alex
8ab2fbd9a2
Fixes tests rng (#3433) 
* Seed RNG before setUp

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-10-22 10:20:27 +01:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles (#3441) 2023-10-21 23:42:19 +02:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities (#3415) 2023-10-18 08:29:53 -03:00
Eduardo Quezada D'Ottone
fef7171c79
Fixed Parental Bond (#3417) 2023-10-15 12:02:43 -03:00
kittenchilly
28c6a1af49
More weather and type-specific tests (#3260) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-14 22:58:31 -03:00
Eduardo Quezada
c6b43d992a Fixed Parental Bond 2023-10-13 21:56:54 -03:00
Alex
1ae26b32e6
Fix Kee Berry and Custap Berry + Tests (#3409) 
* Fix Kee Berry and Custap Berry + Tests

* add missing assumes

* fix wrong test files

* fix new line
 2023-10-13 23:07:04 +02:00
Martin Griffin
45897cefbc
Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399) 
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
 2023-10-13 20:50:48 +02:00
Martin Griffin
f5b149b971
Test improvements (#3408) 
* Run assumptions on all runners

* Make i const in battle tests

This avoids the pitfall of using i in a PARAMETRIZEd test and confusing
the runner.
 2023-10-12 12:14:07 +02:00
Eduardo Quezada
482029d7ec Removed Transistor from master 2023-10-11 13:07:16 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update (#3385) 2023-10-11 11:34:20 -03:00
Bassoonian
8c9ea8b786 Incorporate requested changes 2023-10-11 16:11:46 +02:00
DizzyEggg
a4041d0f6a
Fix ASSUMPTIONS not working (#3368) 2023-10-10 22:42:36 -03:00
Alex
36174f12ae
Fixes Salt Cure visual bug if mon fainted by direct attack (#3388) 
* Fixes Salt Cure visual bug if mon fainted by direct attack

* Removes duplicate give all tm/hms in the debug menu

* test

* Revert "Removes duplicate give all tm/hms in the debug menu"

This reverts commit 4e80451d6f5898799ef9b887a068dc1e1a3df56e.
 2023-10-09 23:40:38 +02:00
Eduardo Quezada D'Ottone
25540a7fec
Fixed Rivalry's effect + Tests (#3381) 
- It was doing the opposite if neither attacker or target were genderless
- It wasn't accounting for genderless mon
 2023-10-09 12:14:18 +02:00
Bassoonian
cee84f0f74 Fix issues and add more ability tests 2023-10-06 15:13:26 +02:00
Bassoonian
9735c5d68e Defeatist, Gale Wings, Poison Heal, Sap Sipper tests 2023-10-05 23:12:30 +02:00
Brandon Lourenco
89e4f30867
Roost suppresses the user's Flying-type rather than remove and re-add it. Added tests for EFFECT_ROOST. (#3258) 
* Fixed Roost clearing type3 when used by a pure Flying-type. (Gen 5+)

* Created a test file for Roost.

* Marked tests as TODO for now.

* Added more tests for HP healed and type changing.

* Created a function to handle Roost's Flying suppression when getting a battler's type. Added more tests.

* Added test for not-yet-aquired Flying-type. Fixed/rewrote some other tests.

* Now using GetBattlerType() in most relevant places. Fixed some tests.

* Added tests for interactions between Roost and Delta Stream, type-changing effects, Grassy Terrain healing, Levitate, Air Balloon, Magnet Rise, and Telekinesis.

* Added test for interaction between Roost and Reflect Type.

* Gen 4 tests merged with Gen 5+ tests.

* Removed errant space.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-10-05 09:19:29 +02:00
Alex
b18d01878f
Fix Battle/Shell Armor + crit chance Tests (#3377) 
* Fix Battle/Shell Armor + crit chance Tests

* fix typos

* minor record ability change
 2023-10-04 16:46:42 +02:00
DizzyEggg
a9528e7ade
Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367) 2023-10-02 18:33:47 -03:00
DizzyEggg
dc119b27c2 Fix Intimidate Contrary in double battles 2023-10-01 19:06:43 +02:00
DizzyEggg
f840f7eb56
Fix Red Card not getting consumed after Sticky Web activation (#3364) 2023-10-01 10:35:12 -03:00
DizzyEggg
10adba3af4
Fixed entry hazards switch in issue (#3316) 
* fix entry hazards switch in issue

* accidental known failing fix
 2023-10-01 10:30:41 -03:00
DizzyEggg
093c653801
Fixed Berserk gene issue in double battles (#3363) 
* fix berserk gene issue + tests

* Update test/battle/hold_effect/berserk_gene.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/hold_effect/berserk_gene.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* berserk gene review changes

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-01 10:25:04 -03:00
DizzyEggg
8efc34eb7e
flinch tests + protect/flinch fix (#3345) 2023-09-30 20:30:28 -03:00
Eduardo Quezada
f3a65c0315 Merge branch 'RHH/master' into RHH/upcoming 2023-09-26 09:12:28 -03:00
DizzyEggg
e0e49a9933
Fix protect recoil issue and add tests for protect (#3321) 
* fix protect recoil issue and add tests for protect

* test for #3312 and baneful bunker fix

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* more recoil moves for protect test

* Update test/battle/move_effect/protect.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* rename spiky shield test

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-26 07:26:23 -03:00
ghoulslash
a2640838c9
Fix Seed Sower changing move targets when triggered in double battles (#3341) 
Fix Seed Sower changing move targets when triggered in double battles
 2023-09-24 21:33:29 -04:00
Eduardo Quezada
566ec93492 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	include/constants/battle_script_commands.h
#	include/constants/battle_string_ids.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-09-24 20:32:45 -03:00
DizzyEggg
1f1308f2f5 merge ghoul fix and correct test 2023-09-24 14:42:27 +02:00
DizzyEggg
ba03992abd test for seed sower 2023-09-24 14:28:06 +02:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247) 
Co-authored-by: Alex <alexthenotes@gmail.com>
 2023-09-24 00:01:18 -03:00
Alex
415d6e9054
Fix Toxic Debris after user faints (#3323) 2023-09-19 15:54:52 +02:00
DizzyEggg
136ea395ac
Fix tests breaking on modern (#3319) 
* Fix tests breaking on modern

* modern tests fix - macro and rodata changes

* ld script rodata modern
 2023-09-19 12:15:03 +02:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure (#3297) 2023-09-15 11:18:47 -03:00
DizzyEggg
4fb0b55664
Bug bite/Fling enigma berry interaction & tests (#3311) 2023-09-14 14:13:11 -03:00
Eduardo Quezada
f3217c18dc Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-09-14 09:12:12 -03:00
DizzyEggg
7936910f90
Bug Bite - Tests and small fix (#3282) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-14 08:57:30 -03:00
Eduardo Quezada
c9b2a8ae24 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
 2023-09-14 08:34:47 -03:00
kittenchilly
2ce3f4db78
Implement Enigma Berry's hold effect + tests (#3300) 
* Fix Enigma Berry

* Tests

* Update enigma_berry.c
 2023-09-14 13:08:24 +02:00