Commit graph

13958 commits

Author SHA1 Message Date
Alex
f3580aa3f5 tabs 2023-10-19 21:31:04 +02:00
Alex
535768838f Hyper Cutter tests 2023-10-19 21:28:27 +02: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
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Alex
876341105b parantheses 2023-10-19 11:32:58 +02: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
Alex
354f84be21 intim changes 2023-10-18 22:14:49 +02: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
leo60228
fed554a110
sSpeciesToNationalPokedexNum 2023-10-18 14:34: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
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
kittenchilly
70985ed3d6
Fixed and more accurate Ruin abilities (#3415) 2023-10-18 08:29:53 -03:00
GriffinR
ad0c28df70
Merge pull request #1919 from AnonymousRandomPerson/master
Replaced decomp list with pret.github.io link
2023-10-17 02:44:08 -04: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
4f0802f96e Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2
# Conflicts:
#	src/debug.c
2023-10-14 22:14:39 -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