13536 Commits

Author SHA1 Message Date
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
Alex
bf56ea8a8b apply suggestions 2023-10-22 19:46:31 +02:00
sbird
e08aae2a32 apply changes from #3436 2023-10-22 03:55:35 +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
GriffinR
5712777dc2 Correct dynamic type flag name 2023-10-20 12:57:36 -04:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
Alex
6daea655e5 fix line alignment 2023-10-20 12:33:56 +02:00
Alex
ab6c5bafe9 New function to check ability stat loss 2023-10-20 12:29:55 +02: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
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 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
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 a4538d606d32175323bc06928d55857e8d13b6d2)
2023-10-18 14:37:28 -04:00
Eduardo Quezada
5831f9344c
4 digits in dex num in summary screen
(cherry picked from commit 7175214663a817e72894bd4b594ba1f8cea701c3)
2023-10-18 14:37:28 -04:00
Eduardo Quezada
6cc2a1ef03
4 digits option for dex numbers
(cherry picked from commit 9bad51cbc69786ecd2e6719f2bca201a961bff5e)
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
f1464bbab6
fix icon palettes 2023-10-18 14:37:21 -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 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
(cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)
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 cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)
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
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
Ariel A
f27a252958 Merge branch 'followers' into followers-expanded-id 2023-10-15 02:46:46 -04:00
Ariel A
b1bdd3e0b7 Fixed Deoxys rock palette with lighting. 2023-10-15 01:58:35 -04:00
Ariel A
4689f0b0d0 Fixes for make modern. 2023-10-15 01:39:44 -04:00
Ariel A
a63242d96f Merge branch 'followers' into lighting 2023-10-15 00:43:54 -04: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
Ariel A
94a2e04fc6 Made Deoxys rock palette dynamic. 2023-10-14 22:18:12 -04:00
Ariel A
9c77aa3c66 Improved support for 64x64 followers. Updated reflection code.
Added 24x24 subsprite tables.
2023-10-14 22:14:42 -04: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
Eduardo Quezada
4f0802f96e Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2
# Conflicts:
#	src/debug.c
2023-10-14 22:14:39 -03:00