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,517 Commits 1 Branch 0 Tags 235 MiB
f93a95244b
Commit Graph

305 Commits

Author SHA1 Message Date
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
Alex
ca9e784102
Fixes Toxic Debris + CanTargetFaintAi index issue (#3306) 
* Fixes Toxic Debris + CanTargetFaintAi index issue

* swap macro
 2023-09-13 10:31:20 +02:00
Alex
09f92719cb
Tests for status curing berries (#3289) 2023-09-10 18:59:12 -03:00
Eduardo Quezada
755e260da4 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/constants/battle_move_effects.h
#	test/battle/move_effect/multi_hit.c
 2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves (#3290) 2023-09-10 11:57:19 -03:00
DizzyEggg
dd3334aa82
Battle bond tests and small fix (#3279) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-07 17:23:43 -03:00
Eduardo Quezada
820113d883 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle_scripts.h
#	include/battle_util.h
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests (#3191) 
* begin fling tests

* fling fixes and tests

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* Update test/move_effect_fling.c

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

* scripts names change

* fix fling's test file

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-09-05 06:56:36 -03:00
Eduardo Quezada
1513443c39 Fixed Ultra Burst + Mega Evolution test 2023-08-31 22:33:20 -04:00
Eduardo Quezada
35d7201935 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/battle_scripts.h
 2023-08-31 20:46:53 -04:00
Eduardo Quezada
be152fbee8 Merge branch 'RHH/master' into RHH/pr/master/opponentName 2023-08-29 13:11:32 -04:00
kittenchilly
7ffd31f5de Update ultra_burst.c 2023-08-26 16:42:35 -05:00
kittenchilly
96e39cde0b Update ultra_burst.c 2023-08-26 16:14:24 -05:00
kittenchilly
ac67900c0a Fix test speed 2023-08-26 15:32:10 -05:00
kittenchilly
2e1b137183 Ultra Burst tests 2023-08-26 15:19:47 -05:00
kittenchilly
48d6fe2e64 Merge branch 'upcoming' into ultraburst 2023-08-26 14:43:31 -05:00
Philipp AUER
905fc6fd4d
Fixed Metronome Item damage multiplier (#3246) 
Co-authored-by: sbird <sbird@no.tld>
 2023-08-23 19:23:00 -04:00
Eduardo Quezada
d3333812dd Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 2023-08-17 17:52:28 -04:00
kittenchilly
f95b4fdb4c Merge branch 'upcoming' into ultraburst 2023-08-17 13:25:00 -05:00
Eduardo Quezada
32c3c33376 Missing master merge organization 
My bad ^^;
 2023-08-13 19:01:03 -04:00
kittenchilly
3435c590c9 Merge branch 'upcoming' into ultraburst 2023-08-12 18:58:38 -05:00
Eduardo Quezada
09fc48461f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	test/battle/move_flags/three_strikes.c
#	test/move_flag_strike_count.c
#	test/move_flag_three_strikes.c
#	test/powder_moves.c
#	test/status1.c
 2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders (#2822) 2023-08-12 20:00:15 +01:00
kittenchilly
5e8caa8d45 Merge branch 'upcoming' into ultraburst 2023-08-12 12:36:11 -05:00
Eduardo Quezada
952bacd858 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
#	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
#	.github/ISSUE_TEMPLATE/04_other_errors.yaml
 2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-08-11 17:26:43 -04:00
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ (#3196) 
* [battle, damage] refactor damage formula to match gen5+

* [test] use exact values for dry skin, swarm tests

* fixup: assume stats for dry-skin, swarm tests

---------

Co-authored-by: sbird <sbird@no.tld>
 2023-08-11 16:28:38 -04:00
kittenchilly
063d83b58e Fix build 2023-08-11 14:01:45 -05:00
Eduardo Quezada
f026b51b48 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer 
# Conflicts:
#	src/battle_main.c
#	src/battle_tower.c
#	src/match_call.c
 2023-08-11 11:41:44 -04:00
kittenchilly
c3e31af5f3 Ultra burst trigger 2023-08-09 22:12:26 -05:00
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner (#3215) 2023-08-09 10:06:03 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles (#3166) 2023-08-07 11:23:12 -04:00
DizzyEggg
1fb42e4497
Sticky web / Court Change / Mirror Armor tests + small fixes (#3160) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
 2023-08-07 10:27:57 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
Philipp AUER
7d8bcce9a5
Optimize sprite.c (#3175) 2023-08-03 15:57:04 +03:00
Martin Griffin
b08b6a37cb Optimize BuildOamBuffer 2023-08-02 12:22:30 +01:00
Eduardo Quezada
f94efa94e1 Merge branch 'RHH/master' into RHH/upcoming 2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5 MOVE_CORROSIVE_GAS Effect (#3152) 
# Conflicts:
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
 2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08 Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143) 2023-08-01 23:54:04 -04:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves (#3138) 
* fix various issues with primal weather blocking water/fire type moves

* forgot to change return to effect=1

* fix bugs
 2023-07-30 10:50:51 -04:00
Alex
5167b01b14 var for ability + hold effect, loaded dice comparison 
fix for small bug introduced in the latest commit
 2023-07-29 23:36:01 +02:00
Alex
5fa7a6d4c6 Skill Link Tests, Loaded Dice stuff 2023-07-28 13:20:06 +02:00
Eduardo Quezada
8dafc5e208 Fixed B_ATK_TRAINER_NAME not working properly in tests 2023-07-26 17:36:37 -04:00
Alex
bca29d8586 Adds Mortal Spin and Population Bomb 2023-07-26 17:37:56 +02:00
DizzyEggg
6f31314c4a Fix uturn typo in test 2023-07-26 09:42:29 +02:00
DizzyEggg
a3d6e31227 Merge branch 'rattled' into stamina_fix 2023-07-26 09:36:46 +02:00
Eduardo Quezada
ad78dfcf68 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
#	src/battle_util.c
 2023-07-25 14:38:53 -04:00
Alex
da9b421ae1
Fix Ruin ability calcs (#3171) 2023-07-25 09:59:26 +02:00
Martin Griffin
b499f41a5c Print ticks 2023-07-25 07:40:51 +01:00
Martin Griffin
3f5daa8cf1 Add BENCHMARK to test runner 
Counts the time spent in the block in arbitrary time units (64-cycles
currently). If the block takes more than ~4 million cycles (~0.25s) the
benchmark will wrap around.

Note that the time can be affected by the timeout IRQs, and should only
be taken as a loose indication of relative performance.
 2023-07-24 15:18:28 +01:00
Martin Griffin
6f40d44a23 Cleanup RandomUniform and RandomElementArray 2023-07-23 10:24:58 +01:00
Martin Griffin
fc321965a9 RNG_HITS and RNG_LOADED_DICE 2023-07-23 10:24:58 +01:00
Martin Griffin
b406a9c1bd RandomUniformExcept and RNG_METRONOME 2023-07-20 10:25:03 +01:00
Eduardo Quezada
47cea526ec Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_util.c
 2023-07-19 23:22:07 -04:00
Alex
6b5d1e7577
Adds some gen9 moves (#3147) 
* Adds some gen9 moves

* Fix Test + Tabs

* Collision Course boost changed to 1.3333
 2023-07-19 13:25:20 +02:00
DizzyEggg
34beb3d662 add tests for rattled 2023-07-19 10:59:36 +02:00
Eduardo Quezada D'Ottone
b08c8f85fc
Fixed Utility Umbrella damage calculations (#2835) 
* Fixed Utility Umbrella holders not receiving regular damage when being hurt by what would've been weakened rain/sun attacks

* Fixed reading move incorrectly

* Tests: Sun, Rain, Utility Umbrella and Hydro Steam

* [STASH] Skeli changes, needs to remake tests

* Fixed tests

* Removed redundant tests

* Removed unused variable

* Removed Primal Todo tests
 2023-07-18 09:22:05 +02:00
Eduardo Quezada D'Ottone
43ad1a4d3b
Unified multi-strike move flags (#3126) 
* Unified twoStrikes and threeStrikes flags into strikeCount

* Decreased strikeCount max from 255 to 15.
 2023-07-18 09:07:14 +02:00
Alex
38655b9d1f
Fix gem boost on multi hit moves and config for gem param (#3144) 2023-07-18 06:11:54 +01:00
DizzyEggg
04feba8314 test for electromorphosis, small fix for wind power 2023-07-17 16:30:59 +02:00
DizzyEggg
1b6f582600 tests for stamina/wind power 2023-07-17 15:33:44 +02:00
Alex
330e20b9e9
Fix Protosynthesis and Quark Drive boosts (#3139) 
* Fix Protosynthesis and Quark Drive boosts

* Added Tests + fix newly introduced bug in the PR

Add unintentionally deletet break

new line
 2023-07-17 11:10:13 +02:00
DizzyEggg
1f1d24b3e4
Fix Primal Reversion not activating when switching in after fainting (#3141) 
* Fixed Primal Reversion not activating when switching in after a fainting
* add tests for primal reversion

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2023-07-16 12:26:54 +01:00
Martin Griffin
17f8f50a59 Merge remote-tracking branch 'rhh/master' into upcoming 2023-07-16 07:46:34 +01:00
Martin Griffin
c4057cb0e0
Fix Metronome's/Mirror Move's called move to take powder moves / multi hit moves into account (#3135) 2023-07-16 06:41:18 +01:00
DizzyEggg
381aa58587
Fix Bad Dreams ability pop-up + tests (#3131) 
* Fix all bad dreams issues and add tests

Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>
 2023-07-16 06:38:00 +01:00
Eduardo Quezada
786bf7752f Merge branch 'RHH/master' into RHH/upcoming 2023-07-16 01:33:30 -04:00
DizzyEggg
2a249654e7 fix mirror move/metronome powder/multi hit moves & tests 2023-07-15 14:00:55 +02:00
Martin Griffin
25986be089 Prevent corrupted heaps causing infinite loops 2023-07-15 11:48:53 +01:00
Martin Griffin
4637d7e7ee Recover from test crashes 2023-07-15 11:48:52 +01:00
Martin Griffin
b31f10d124
Make Hydra respect -jN (#3132) 2023-07-14 19:10:42 +02:00
Eduardo Quezada
168b005406 Merge branch 'RHH/master' into RHH/upcoming 2023-07-14 12:40:01 -04:00
Eduardo Quezada D'Ottone
5f29ae6f99
Failed tests are now listed in the total (#3073) 
* Failed tests are now listed in the total
 2023-07-14 10:17:54 +01:00
sbird
6482279fa3 [battle, math] refactor damage calculation to use proper fp type and inlined multiplication 2023-07-07 18:51:23 +02:00
Eduardo Quezada
4bbb3a1e51 Merge branch 'RHH/master' into RHH/upcoming 2023-07-05 19:28:37 -04:00
Eduardo Quezada
b10b5fd9c3 EVERYTHING_CUSTOMIZED -> TRAINER_PARTY 2023-07-05 18:31:08 -04:00
Eduardo Quezada
e8487961c7 TrainerMonCustomized -> TrainerMon 2023-07-05 18:29:28 -04:00
Martin Griffin
eab4e32e2a
Shuffle implementation (#3097) 2023-07-05 19:46:40 +02:00
Eduardo Quezada
3dd7a2c09e Removed TrainerMonNoItemDefaultMoves 2023-07-04 21:29:58 -04:00
Eduardo Quezada D'Ottone
81522554c2
Fixed KNOWN_FAILING tests running memory leak checks when unneeded (#3102) 2023-07-04 17:19:38 +01:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields (#2952) 
* Slicing moves to new bitfield

* Wind moves to new bitfield

* Two-strike moves to new bitfield

* Forgot to add flagTwoStrikes to battle_moves.h

* Removed "flag" from field names

* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER

* Airborne moves

* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE

* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE

* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c

* FLAG_SOUND

* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER

* FLAG_DMG_MINIMIZE

* Cleanup

* FLAG_STAT_STAGES_IGNORED

* Updated Pollen Puff's ballistic flag

* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST

* thaw

* FLAG_THREE_STRIKES

* FLAG_IRON_FIST_BOOST

* FLAG_RECKLESS_BOOST

* FLAG_HIGH_CRIT

* Removed empty flags

* Moves that fail when called by Me First + added missing Shell Trap

* Moves that fail when Gravity is active

* Better names for banned fields

* Moves that fail when called by Instruct

* Cleanup

* Contact Moves + Fixed Wandering Spirit skipping contact checks

* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.

* Simplified B_MOVE_FLAGS configs

* FORBIDDEN_METRONOME

* Renamed hitsPastSubstitute to ignoresSubstitute

* FORBIDDEN_PARENTAL_BOND

* Struggle uncallable by Metronome

* FORBIDDEN_MIMIC

* FLAG_KINGS_ROCK_AFFECTED

* Made a single config for move flags

* Macro for checking move flags

* FLAG_MAGIC_COAT_AFFECTED

* Fixed HasMagicCoatAffectedMove

* FLAG_SNATCH_AFFECTED

* Removed unused EFFECT_FLINCH_MINIMIZE_HIT

* Fixed Stench/King's Rock interaction

* Removed sMovesNotAffectedByStench in favor of checking move effects

* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT

* Changed Gen2 configs to less than Gen 3

* FORBIDDEN_SLEEP_TALK

* Cleanup

* Inverted FLAG_MIRROR_MOVE_AFFECTED

* FLAG_SHEER_FORCE_BOOST

* Ordered

* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT

* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field

* Fixed Triple Arrows test
 2023-07-03 10:01:59 +02:00
hetoord
40a5995ead
Teatime tests and fixes (#3096) 2023-07-03 09:54:43 +02:00
Eduardo Quezada
2c4a9b754d Merge branch 'RHH/master' into RHH/upcoming 2023-06-30 16:14:57 -04:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff (#3063) 
* Removed gCastformFrontSpriteCoords

* Removed sCastformElevations and IsCastformForm

* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct

* Scrubbed unused BS commands

* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants

* Removed redundant function in Pokémon Debug menu

* Removed handling in animation scripts

* Removed gBattleMonForms

* Reduced MAX_MON_PIC_FRAMES to 2

* Removed Castform/Cherrim makefile stuff

* Fixed weather form change tests not checking species.

* Fixed Castform palettes after Lunos' PR
 2023-06-30 09:58:07 +02:00
Alex
20099274d8
Fix Clear Amulet visual bug + Tests (#3074) 
* Fix Clear Amulet visual bug + Tests

TODO Tests, additional tests + Triple Kick pp bug

* Wonder Guard message, switch instead of if, misalignments
 2023-06-28 12:26:03 -04:00
Eduardo Quezada
f9bf91a2f0 Merge branch 'RHH/master' into RHH/upcoming 2023-06-26 18:09:53 -04:00
Eduardo Quezada D'Ottone
f3be4e1ac5
Fixed 2 test runner issues (#3076) 
* Fixed 2 test runner issues

Thanks to MGriffin for the help
- Fixed non-battle tests omitting errors when failing.
- Fixed non-battle tests showing false positive memory leak errors due to the test failing for a different cause.

* Update test/test_runner.c

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-06-26 19:26:42 +01:00
hetoord
4a6f791482
Tests for Air Balloon (#3071) 
* Add tests for HOLD_EFFECT_AIR_BALLOON

* Apply suggestions from code review

---------

Co-authored-by: Bart <bart@DESKTOP-IKF42MG.localdomain>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-06-26 08:37:48 -04:00
Martin Griffin
8995296db4 Use ; instead of {} for empty PLAYER/OPPONENT 2023-06-23 15:09:41 +01:00
Martin Griffin
1987bda497 Regularize whitespace in tests 2023-06-23 15:09:41 +01:00
Martin Griffin
b90ff23b80 I_HEALTH_RECOVERY in item_effect_restore_hp.c 2023-06-23 15:09:41 +01:00
Martin Griffin
0d930946a7 Parametrize item_effect_restore_hp.c 2023-06-23 15:09:41 +01:00