Eduardo Quezada
ff60b7ff73
Maushold Family of Three define
2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c
Oinkologne Male define
2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df
Fixed Paldean Tauros Combat Breed order and data names
2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
...
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names ( #3248 )
...
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup ( #3435 )
...
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
kittenchilly
3755155e9d
Update friendship evo threshold to gen 8+ with config ( #3376 )
2023-10-22 18:05:54 -03:00
Eduardo Quezada
bcf0377d9a
Merge branch 'RHH/master' into RHH/upcoming
2023-10-22 16:30:26 -03: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
sbird
196038eaee
[pokedex_plus] refactor #if to C if
2023-10-22 03:26:24 +02: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
d153947aa2
Merge branch 'upcoming' into dynamax
2023-10-18 19:37:09 -03:00
leo60228
87a03c3c73
Fix Paldean form order
2023-10-18 14:44:30 -04:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
leo60228
920fd481e7
Regional Dex numbers are always 3 digits
2023-10-18 14:37:28 -04:00
Eduardo Quezada
6cc2a1ef03
4 digits option for dex numbers
...
(cherry picked from commit 9bad51cbc6
)
2023-10-18 14:37:28 -04:00
leo60228
b3e5c3179f
Revert "reorder species.h"
...
This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.
2023-10-18 14:37:27 -04:00
leo60228
3e1ecec800
revert SPECIES_DARMANITAN_GALARIAN_* renames
2023-10-18 14:37:27 -04:00
leo60228
61d3cdd8da
revert separate SPECIES_UNOWN
2023-10-18 14:37:21 -04:00
Eduardo Quezada D'Ottone
6df433735e
reorder species.h
2023-10-18 14:37:01 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
...
(cherry picked from commit 6dc58dcc17
)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
...
(cherry picked from commit e081d2b773
)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
...
Add gen 9 Pokémon data
(cherry picked from commit cd3e65f5c9
)
2023-10-18 14:33:56 -04: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
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
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
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
Eduardo Quezada
482029d7ec
Removed Transistor from master
2023-10-11 13:07:16 -03:00
Eduardo Quezada
186884120c
Merge branch 'RHH/master' into RHH/upcoming
2023-10-11 13:02:12 -03:00
Eduardo Quezada D'Ottone
eedc61709d
Various tests + Poison Heal fix + Transistor update ( #3385 )
2023-10-11 11:34:20 -03:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel ( #3402 )
...
* initial commit
* done
* clean up
2023-10-11 11:09:50 +02:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon ( #3401 )
2023-10-11 11:02:28 +02:00
DizzyEggg
403326035e
fix broken move anims in tests ( #3398 )
2023-10-10 22:41:34 -03:00
Eduardo Quezada
3cb29f87a6
gBattleCommunication ids
2023-10-10 19:53:56 -03:00
Eduardo Quezada
4d4d566c2b
Undid flag
2023-10-10 18:09:42 -03:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
Eduardo Quezada
644fba2db1
Gigantamax Flag
2023-10-10 17:37:18 -03:00
ghoulslash
70fbf9e9df
Opportunist Ability ( #2994 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-09 22:35:00 -03:00
Eduardo Quezada
2fac60055f
Merge branch 'RHH/master' into RHH/upcoming
2023-10-09 22:08:32 -03:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
68c2c45b52
Fixed VSCode shenanigans ( #3383 )
2023-10-09 12:20:09 +02:00