Eduardo Quezada
bcf0377d9a
Merge branch 'RHH/master' into RHH/upcoming
2023-10-22 16:30:26 -03: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
kittenchilly
d495e177b9
Add Snow weather animation ( #3440 )
...
* Snow weather animation
* Update battle_anim_scripts.s
* Apply changes from review
2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone
7fdc4aacda
Fixed Cheat Start not initiating time-based events ( #3446 )
2023-10-22 21:03:54 +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
Martin Griffin
551dc62085
Added a macro to flush the text box in battles ( #3442 )
2023-10-22 08:26:36 +01:00
Eduardo Quezada
a34c260169
Merge branch 'RHH/master' into RHH/upcoming
2023-10-21 23:59:33 -03:00
Eduardo Quezada D'Ottone
eb907c343d
[pokedex_plus] refactor #if to C if ( #3445 )
2023-10-21 23:10:30 -03:00
sbird
e08aae2a32
apply changes from #3436
2023-10-22 03:55:35 +02:00
sbird
8992a2f0de
fixup! fix normal hoeen dex colors
2023-10-22 03:53:31 +02:00
sbird
e34f32fdc1
fix normal hoeen dex colors
2023-10-22 03:34:38 +02:00
sbird
196038eaee
[pokedex_plus] refactor #if to C if
2023-10-22 03:26:24 +02:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles ( #3441 )
2023-10-21 23:42:19 +02:00
LOuroboros
620998e68d
Added a macro to flush the text box in battles
2023-10-21 17:28:43 -03:00
voloved
ebdf14c620
Push B in wild battle moves to Run ( #3362 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-21 12:45:40 -03:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move ( #3425 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Eduardo Quezada D'Ottone
14b7a70254
Dynamax ( #2417 )
2023-10-19 11:32:25 -03:00
Eduardo Quezada
6348c24be1
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
2023-10-19 08:10:49 -03:00
Eduardo Quezada
b0e572b385
Added HGSS Dex to README
2023-10-18 19:49:54 -03:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax
2023-10-18 19:37:09 -03:00
AgustinGDLV
8b835285b2
Merge pull request #3 from AsparagusEduardo/RHH/pr/upcoming/dynamax
...
Updated Dynamax branch to Upcoming + Fixes
2023-10-18 11:37:56 -07:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities ( #3415 )
2023-10-18 08:29:53 -03:00
Philipp AUER
9ece7ed047
Use dka container for a more modern gcc ( #3429 )
...
Co-authored-by: sbird <sbird@no.tld>
2023-10-16 15:11:34 -03:00
LOuroboros
8176dd8af1
Added src/data/map_group_count.h to .gitignore
2023-10-16 09:40:09 +01:00
sbird
b77bc71862
fix -Warray-parameter, -Waddress, -Warray-bounds warnings
...
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
2023-10-16 09:36:36 +01:00
Eduardo Quezada D'Ottone
fef7171c79
Fixed Parental Bond ( #3417 )
2023-10-15 12:02:43 -03:00
Eduardo Quezada
ca101e9952
Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm
2023-10-15 09:42:56 -03:00
Eduardo Quezada
6e1d4b4409
Fixed compile on modern + tests
2023-10-15 08:32:25 -03:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -03:00
Eduardo Quezada D'Ottone
8ed29fb8e3
Front/Back Species Anim Array Filled ( #3424 )
2023-10-14 23:32:02 -03:00
Kaitlyn
bf5fdfa942
Front Pic Animation Organization
...
Organized and formatted
2023-10-14 23:10:25 -03:00
Kaitlyn
0694e1bf1f
Battle Animation Organization
...
Added remaining sprites not listed
Organized and formatted.
2023-10-14 23:10:25 -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
a936b78ad5
Merge branch 'RHH/master' into RHH/upcoming
2023-10-14 21:32:20 -03:00
Eduardo Quezada D'Ottone
6016c606d6
Converted Get(Box)MonData2 to proper functions ( #3416 )
2023-10-14 18:23:17 +02:00
LOuroboros
0f979ac796
Removed pointless for loop in CB2_InitBattleInternal ( #3422 )
2023-10-14 13:16:04 -03:00
Eduardo Quezada D'Ottone
0f3971a360
Updated Zacian/Zamazenta stats to Gen 9 ( #3421 )
2023-10-14 17:54:31 +02:00
LOuroboros
b46c2c2bf8
Made AbilityBattleEffects use the B_MSG_TERRAIN constants for the field terrain intro text ( #3410 )
2023-10-14 10:23:45 +02:00
LOuroboros
a746d0e726
Updated Cresselia's base stats ( #3419 )
2023-10-14 10:20:49 +02: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
Eduardo Quezada
3409869f9c
Merge branch 'RHH/master' into RHH/upcoming
2023-10-13 17:44:43 -03: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
cbdba65218
Move battle tests off the heap ( #3413 )
...
* Catch OOM in tests
* Alias gBattleTestRunnerState with sBackupMapData
Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
2023-10-13 20:29:30 +02:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern ( #3412 )
...
* Fix Wall Werror errors
* fix hgss pokedex modern errors
* tests build on modern
* learnset change
* Update src/battle_ai_util.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/battle_anim_new.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/pokedex_plus_hgss.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* review changes
* unused cmd args
* various args back
---------
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-10-13 18:39:35 +02:00
Martin Griffin
311224d32f
Converted most battle preproc ifs to regular ifs ( #3392 )
2023-10-12 15:28:41 +01: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
805c65b255
Merge branch 'RHH/master' into RHH/upcoming
2023-10-11 13:14:23 -03:00