Commit graph

11877 commits

Author SHA1 Message Date
Eduardo Quezada
b160bd9626 Ordered Gen 1 egg moves 2022-10-03 11:54:10 -03:00
Eduardo Quezada
70907fa375 merging in mon animations PR
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
2022-10-02 21:20:56 -03:00
Eduardo Quezada
fe107645f7 Merged pallete conversion
# Conflicts:
#	include/constants/pokemon_config.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
2022-10-02 16:01:55 -03:00
Eduardo Quezada D'Ottone
6a224e3ad1 Reordered gen 8 TeachableLearnsets 2022-10-01 22:52:29 -03:00
Eduardo Quezada D'Ottone
325c38b7d7 Reordered gen 7 TeachableLearnsets 2022-10-01 22:37:03 -03:00
Eduardo Quezada D'Ottone
52c87be04b Reordered gen 6 TeachableLearnsets 2022-10-01 21:58:28 -03:00
Eduardo Quezada D'Ottone
d9bae8ea2d Reordered gen 5 TeachableLearnsets 2022-10-01 21:51:25 -03:00
Eduardo Quezada D'Ottone
d0895a7c32
Merge pull request #2370 from StephenLynx/master
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna
764bed6580 Fixed berserk not activating if mon falls to exactly half HP. 2022-10-01 20:50:55 -03:00
Eduardo Quezada D'Ottone
b33ceee9ec Reordered gen 4 TeachableLearnsets 2022-10-01 20:34:52 -03:00
Eduardo Quezada D'Ottone
8ca0c59a88 Reordered gen 3 TeachableLearnsets 2022-10-01 18:05:21 -03:00
Eduardo Quezada D'Ottone
5c974b9182 Removed event moves from Smeargle 2022-10-01 18:00:32 -03:00
Eduardo Quezada D'Ottone
af171eb4d4 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
# Conflicts:
#	src/pokemon_summary_screen.c
2022-10-01 17:32:32 -03:00
Eduardo Quezada
0370cb3fd2 Removed comment MAP_GROUP_COUNT 2022-09-30 22:05:10 -03:00
Jaizu
34c0a5bd8a Spiky Eared Pichu second frame 2022-09-30 17:54:11 -03:00
Jaizu
40e4cb81ef finish normal palette swapping 2022-09-30 17:54:04 -03:00
Jaizu
6278f710a0 Finish plenty of sprites.
This also includes some fixes to Swanna, Spiky Eared Pichu and some broken details across other species that I already forgot.
2022-09-30 17:53:58 -03:00
GriffinR
79a34411ce Add additional DISPLAY_TILE_WIDTH usage 2022-09-29 15:22:21 -04:00
GriffinR
1ae5010233
Merge pull request #1794 from SBird1337/doc/decompress-casts
[doc] clean up casts in decompress.c
2022-09-29 11:40:02 -04:00
sbird
8dad7cc649 [doc] clean up casts in decompress.c 2022-09-29 17:33:39 +02:00
Eduardo Quezada
1fdb370ead Restored Clefable's moves 2022-09-28 14:31:15 -03:00
Eduardo Quezada
d616198bdb Ordered the rest of the form teachable learnsets 2022-09-28 14:23:36 -03:00
Eduardo Quezada
a86856489b Eternal Flower Floette uses the same learnset as the other forms 2022-09-28 14:14:24 -03:00
Eduardo Quezada
aa49ed3d18 Moved alolan forms in teachable learnsets 2022-09-28 13:01:08 -03:00
Eduardo Quezada
36a4c1b7ad Reordered gen 2 TeachableLearnsets 2022-09-28 12:54:01 -03:00
Eduardo Quezada
90ad11278d Sorry Mewtwo ^^; 2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f Special handling for Mew's Teachable moveset 2022-09-28 09:04:31 -03:00
Eduardo Quezada
b8685eaf25 Reordered gen 1 TeachableLearnsets 2022-09-28 00:17:02 -03:00
Eduardo Quezada
ccb8d7a857 Reordered evolutions and added constants for new evo methods 2022-09-28 00:15:45 -03:00
Eduardo Quezada
1ea9681534 More reordering 2022-09-28 00:14:53 -03:00
Eduardo Quezada
c104845f77 Egg moves 2022-09-27 21:26:01 -03:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
Eduardo Quezada
5b4a23b672 include/graphics.h 2022-09-27 21:09:09 -03:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
Eduardo Quezada
ecad6ff0db Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2 2022-09-27 10:46:49 -03:00
Eduardo Quezada
fb9105f8ac Added Mega Evolution flag 2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
# Conflicts:
#	src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada
5ca1b927e6 Added missing Bide exception to Battle Arena Mind Points 2022-09-27 08:13:32 -03:00
Eduardo Quezada D'Ottone
757ed2ebd4
Merge pull request #2364 from ghoulslash/be/trace
Trace records target ability
2022-09-27 08:00:27 -03:00
ghoulslash
253234378c trace records target ability 2022-09-26 23:46:41 -04:00
ghoulslash
6e276b5f4d
Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings
Extrapolated Battle Arena's move Mind ratings
2022-09-26 21:04:16 -04:00
Eduardo Quezada
ae21e1626e Reworked Mind Points 2022-09-26 21:20:08 -03:00
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -04:00
Eduardo Quezada
4c7b6d1662 Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/speciesReorder
# Conflicts:
#	src/battle_script_commands.c
2022-09-26 17:46:30 -03:00
ghoulslash
ff42806e04
Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix
Multi battle interface fix
2022-09-26 09:12:40 -04:00
ghoulslash
8ecdf68491
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix
Fixes: Pokémon Debug isn't loading female icon palettes correctly
2022-09-26 09:09:14 -04:00
ghoulslash
e41c2efc39
Merge pull request #2361 from AsparagusEduardo/RHH/pr/moveTypeConfig
Separate config for updated move types
2022-09-26 09:08:41 -04:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
TheXaman
886a487bf1 Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes 2022-09-26 12:40:30 +02:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json
use json for region map sections
2022-09-25 21:56:09 -04:00