Commit Graph

11549 Commits

Author SHA1 Message Date
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
sneed
023feb4350 Update party_menu.c 2022-06-05 17:02:55 +03:00
sneed
1d19c0dc9f Update battle_util.c 2022-06-05 16:38:37 +03:00
ghoulslash
c694e0cb90 merge w be 2022-06-05 08:22:24 -04:00
ghoulslash
15fe85902f
Merge pull request #2164 from Sneed69/battle_engine
Heal Block stops Synthesis
2022-06-05 08:18:03 -04:00
sneed
bf1025ac16 Update battle_util.c 2022-06-05 05:09:06 +03:00
sneed
f419fc3ae7 fix terrain move softlock 2022-06-04 18:36:18 +03:00
ghoulslash
24af1d5c1b
Merge pull request #2162 from Sneed69/IsMoveWithoutAnimation
Remove IsMoveWithoutAnimation
2022-06-04 08:38:45 -04:00
BuffelSaft
b5e75a536b
Merge pull request #2157 from Sneed69/berry-trees-fix
Add missing berry tree spritesheet rules
2022-06-04 14:51:12 +12:00
GriffinR
bc2dbd772e Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -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
GriffinR
78b0c20738
Merge pull request #1674 from Sneed69/master
Include config.h in siirtc.c
2022-06-03 14:45:10 -04:00
sneed
af6bf17930 Include config.h in siirtc.c 2022-06-03 21:04:14 +03:00
GriffinR
817fcb1c34
Merge pull request #1673 from sphericalice/try-free-and-set-null
Use the TRY_FREE_AND_SET_NULL macro where appropriate
2022-06-03 11:07:38 -04: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
Sneed69
c60de5055d remove IsMoveWithoutAnimation 2022-06-03 17:42:42 +03:00
GriffinR
7bea8c58e7
Merge pull request #1672 from sphericalice/create-region-map-player-icon-arg-names
Correct CreateRegionMapPlayerIcon's argument names
2022-06-03 10:22:03 -04:00
sphericalice
380cb46919
Correct CreateRegionMapPlayerIcon's argument names
Correct CreateRegionMapPlayerIcon's argument names in include/region_map.h
2022-06-03 15:04:52 +01:00
sneed
e1c57e4071 move_none does not benefit from stab 2022-06-01 22:45:50 +03:00
sneed
5934acbdc5 IS_BATTLER_OF_TYPE ignores 3rd type if mystery 2022-06-01 22:21:32 +03:00
sneed
86b436782a trap move related code cleanup 2022-06-01 22:01:50 +03: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
sneed
bcf9ed3fb8 Update spritesheet_rules.mk 2022-05-30 03:11:56 +03:00
sneed
2e855b204a ai accounts for a third type 2022-05-29 04:55:37 +03:00
GriffinR
a7b6dfee3a
Merge pull request #1669 from Bl4ckSh4rk/boolean
Use more TRUE & FALSE constants
2022-05-26 21:19:47 -04:00
BlackShark
75a44fdd79 use more true & false constants 2022-05-27 02:18:52 +02:00
GriffinR
b59fb7637a
Merge pull request #1668 from mrgriffin/static-assert-save-structs
Static assertion for size of save structs
2022-05-25 15:25:49 -04:00
Martin Griffin
1cc59acca9 Static assertion for size of save structs 2022-05-25 19:48:42 +01:00
GriffinR
2a6e57c082
Merge pull request #1667 from Sneed69/summary_enum
Document DrawPagination
2022-05-25 10:15:21 -04:00
sneed
a913191323 Document DrawPagination 2022-05-25 16:12:16 +03:00
GriffinR
12a0920c3b
Merge pull request #1666 from Sneed69/summary_enum
Minor summary screen clarification
2022-05-25 01:51:17 -04:00
sneed
5c92062c23 Update pokemon_summary_screen.c 2022-05-25 08:37:36 +03:00
GriffinR
09ea1c84f9
Merge pull request #1665 from Sneed69/master
Rename chanceCommon to chanceNotRare in SetWildMonHeldItem
2022-05-23 18:59:09 -04:00
sneed
c316b11739 chanceCommon to chanceNotRare 2022-05-24 00:53:09 +03:00
GriffinR
0fb4163f20
Merge pull request #1664 from Sneed69/itemCommon_itemRare
Rename BaseStats.item1 and item2 to provide context
2022-05-23 17:12:10 -04:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04: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
sneed
5b0afffd91 popup and flower gift description fixes 2022-05-22 13:10:51 +03:00
GriffinR
f756e60455
Merge pull request #1663 from GriffinRichards/castform-pal
Generalize usage of castformPalette
2022-05-21 23:45:01 -04:00
sneed
fe42eacdf0 tabs over spaces 2022-05-22 05:23:06 +03:00
BuffelSaft
d29293f715 Prevent infinite Bide loop with Parental Bond
Prevent infinite loop from Bide + Parental Bond until this interaction can be implemented properly.
2022-05-22 13:05:45 +12:00