ghoulslash
|
923046c993
|
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
|
2022-10-07 10:25:59 -04:00 |
|
GriffinR
|
bb2e64b3fc
|
Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
|
2022-10-06 22:17:32 -04:00 |
|
tustin2121
|
ea168d1a6b
|
Fix typo 2: revelations
|
2022-10-06 20:34:46 -04:00 |
|
tustin2121
|
f3bddd1ea6
|
Fix typo
|
2022-10-06 19:36:01 -04:00 |
|
GriffinR
|
e293986fbb
|
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
|
2022-10-06 17:24:53 -04:00 |
|
GriffinR
|
c6e4c29ea3
|
Merge pull request #1792 from GriffinRichards/display-tiles
Add DISPLAY_TILE_* constants
|
2022-10-05 20:44:28 -04:00 |
|
GriffinR
|
cefbf5986c
|
Merge pull request #1797 from AsparagusEduardo/pret/pr/item
Removed unused functions in item header
|
2022-10-04 22:42:42 -04:00 |
|
Eduardo Quezada
|
a20334f79a
|
Removed unused functions in item header
|
2022-10-04 22:06:07 -03:00 |
|
Eduardo Quezada
|
e8ed0bd9f2
|
Changed ballMultiplier to account for future Hisuian ball multipliers
|
2022-10-04 20:39:45 -03:00 |
|
Eduardo Quezada
|
6bcaaad8a3
|
Ordered Gen 8 egg moves
|
2022-10-03 16:12:32 -03:00 |
|
Eduardo Quezada
|
7d7c0927a2
|
Ordered Gen 7 egg moves
|
2022-10-03 16:07:35 -03:00 |
|
Eduardo Quezada
|
38ef41a827
|
Ordered Gen 6 egg moves
|
2022-10-03 14:46:49 -03:00 |
|
Eduardo Quezada
|
167889c54e
|
Ordered Gen 5 egg moves
|
2022-10-03 14:37:33 -03:00 |
|
Eduardo Quezada
|
8e7fa2097f
|
Ordered Gen 4 egg moves
|
2022-10-03 14:29:11 -03:00 |
|
Eduardo Quezada
|
dfe2ea3a43
|
Ordered Gen 3 egg moves
|
2022-10-03 14:25:01 -03:00 |
|
Eduardo Quezada
|
4407437029
|
Ordered Gen 2 egg moves
|
2022-10-03 12:59:01 -03:00 |
|
Eduardo Quezada
|
7fd91264c0
|
Ordered form cries
|
2022-10-03 12:54:50 -03:00 |
|
Eduardo Quezada
|
ed2f69d3ef
|
Fixed compiling when disabling species
|
2022-10-03 12:43:06 -03:00 |
|
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 |
|