5206 Commits

Author SHA1 Message Date
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
Added Egg breeding species overrides.
2022-07-22 14:05:14 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge
Pokémon Expansion pret merge
2022-07-22 14:01:27 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back 2022-07-18 09:41:04 +01:00
Eduardo Quezada D'Ottone
c69275f373 Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
#	include/battle_anim.h
#	include/pokemon.h
#	src/data/pokemon/base_stats.h
2022-07-12 17:20:49 -04:00
sphericalice
167353223c Use MAX_MON_MOVES in Cmd_trysetencore 2022-07-11 15:23:23 +01:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01:00
Martin Griffin
c9958e3087 Simplify GetBattleTransitionTypeByMap 2022-07-05 14:17:46 +01:00
Martin Griffin
4e76ffb4ca Identify a % 16 2022-07-04 21:25:19 +01:00
ghoulslash
ade935f6cf
Merge pull request #2167 from LOuroboros/ampedSyntax
Syntax fixes for Toxel's evo methods
2022-07-01 15:29:06 -04:00
LOuroboros
e2cc269b43 Updated syntax 2022-07-01 16:19:35 -03:00
ghoulslash
fc2cfd8c9d
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
2022-07-01 09:22:55 -04:00
GriffinR
650f033c2b
Merge pull request #1695 from GriffinRichards/update-gfromh
Update some GF rom header names
2022-06-29 11:59:43 -04:00
GriffinR
8950a41bfd Update some GF rom header names 2022-06-21 18:31:09 -04:00
GriffinR
c2a08cc84d
Merge pull request #1689 from GriffinRichards/task-ub
Remove UBFIX related to task destruction
2022-06-21 16:33:17 -04:00
sphericalice
5d7140fa83
Fix missing COPYWIN_FULL constant use 2022-06-19 13:33:47 +01:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
2022-06-18 10:22:58 -04:00
Kurausukun
d3c8346a67 fix type, add bugfix 2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a document design oddity, use constants, correct comment 2022-06-17 21:52:58 -04:00
GriffinR
7a6b417b8e Remove UBFIX related to task destruction 2022-06-17 21:01:23 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix 2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting 2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2022-06-17 18:16:14 -03:00
Colton G. Rushton
e42498ab40
Add bugfix from bugs_and_glitches.md to BUGFIX
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
2022-06-17 18:06:37 -03:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
95f075ec90 Remove erroneous bugfix 2022-06-13 15:01:04 -04:00
GriffinR
dec54e6e92 Additional constant usage 2022-06-13 03:21:20 -04:00
LOuroboros
5070d5b605 Syntax fixes for Toxel's evo methods 2022-06-10 08:00:45 -03:00
LOuroboros
7470a56d44 Untangled CheckPartnersMonForRibbons 2022-06-09 15:08:58 -03:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
GriffinR
ceaff148f7 Shift to multiply 2022-06-09 10:52:19 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
sneed
af6bf17930 Include config.h in siirtc.c 2022-06-03 21:04:14 +03:00
sphericalice
284e46927a Use the FREE_AND_SET_NULL macro where appropriate 2022-06-03 15:56:11 +01:00
sphericalice
d03756dfd2 Use the TRY_FREE_AND_SET_NULL macro where appropriate 2022-06-03 15:42:53 +01:00
GriffinR
a8437493c1 Document generic argument names in battle anim palettes 2022-06-01 12:25:01 -04:00
GriffinR
5e6d8a77e4 Document some generic argument names 2022-05-31 14:34:25 -04:00
BlackShark
75a44fdd79 use more true & false constants 2022-05-27 02:18:52 +02:00
Martin Griffin
1cc59acca9 Static assertion for size of save structs 2022-05-25 19:48:42 +01:00
sneed
a913191323 Document DrawPagination 2022-05-25 16:12:16 +03:00
sneed
5c92062c23 Update pokemon_summary_screen.c 2022-05-25 08:37:36 +03:00
sneed
c316b11739 chanceCommon to chanceNotRare 2022-05-24 00:53:09 +03:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
sneed
248863239b repair sawssuck abilities 2022-05-23 04:10:18 +03:00
sneed
b71fbec130 repair meteor minior stats 2022-05-23 03:29:01 +03:00
sneed
c8d78706ba add dex colors to castform forms 2022-05-23 02:53:01 +03:00
sneed
ce468a0903 add macros for handling form base stats 2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone
f2c509eab7
Merge pull request #2151 from Sneed69/dummy_abilities
Add dummy abilities to make base stats header smaller
2022-05-22 13:27:27 -04:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
GriffinR
f756e60455
Merge pull request #1663 from GriffinRichards/castform-pal
Generalize usage of castformPalette
2022-05-21 23:45:01 -04:00