Commit graph

13759 commits

Author SHA1 Message Date
Eduardo Quezada
792aee86ea SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 2023-10-23 10:55:16 -03:00
Eduardo Quezada
d69ac7ab4c Fixed Maushold Family of Four icon 2023-10-23 10:27:51 -03:00
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
leo60228
fcc18c2ef0
correct paldean wooper type 2023-10-22 19:15:55 -04:00
leo60228
14c225436a
remove leftover cry 2023-10-22 19:15:25 -04: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
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
leo60228
87a03c3c73
Fix Paldean form order 2023-10-18 14:44:30 -04: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
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
d27e566b4b
fix 4 digit spacing
(cherry picked from commit a4538d606d)
2023-10-18 14:37:28 -04:00
Eduardo Quezada
5831f9344c
4 digits in dex num in summary screen
(cherry picked from commit 7175214663)
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
f1464bbab6
fix icon palettes 2023-10-18 14:37:21 -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
leo60228
5113efa64a
cry fixes 2023-10-18 14:37:01 -04:00
leo60228
4e8ae5965e
make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON 2023-10-18 14:37:01 -04:00
leo60228
e10acf8b2d
gen 9 form learnsets 2023-10-18 14:37:00 -04:00
leo60228
5e0ff4ab52
gen 9 form learnset pointers 2023-10-18 14:37:00 -04:00
leo60228
ca931d09e9
form species info 2023-10-18 14:37:00 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing) 2023-10-18 14:36:59 -04:00