Commit Graph

7406 Commits

Author SHA1 Message Date
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
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
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
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
GriffinR
f756e60455
Merge pull request #1663 from GriffinRichards/castform-pal
Generalize usage of castformPalette
2022-05-21 23:45:01 -04:00
GriffinR
6d772a5e30
Merge pull request #1662 from GriffinRichards/door-gfx
Clean up door animations
2022-05-21 16:07:02 -04:00
GriffinR
c9c754be06
Merge pull request #1661 from GriffinRichards/fix-inconsistent-static
Fix inconsistent static s/g names
2022-05-20 19:38:02 -04:00
GriffinR
7f64bf58d6
Merge pull request #1660 from GriffinRichards/doc-contest-bar
Document Task_UpdateContestResultBar
2022-05-19 12:52:44 -04:00
GriffinR
91baf08638 Generalize usage of castformPalette 2022-05-18 22:11:51 -04:00
GriffinR
c2dc4a5dea Some field door comments 2022-05-18 13:03:02 -04:00
GriffinR
5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
GriffinR
67d73ee36f Clean up door animation functions 2022-05-17 17:13:29 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
GriffinR
71ea78cc32 Document Task_UpdateContestResultBar 2022-05-16 15:01:06 -04:00
GriffinR
8a921bb680
Merge pull request #1659 from cbt6/step-functions
Use ARRAY_COUNT in sStepTimes for step functions
2022-05-15 10:19:06 -04:00
cbt6
6d6dac3add Use ARRAY_COUNT in sStepTimes for step functions 2022-05-15 21:44:04 +08:00
LOuroboros
1d75f3ffde Moved order of defined header files in include/global.h 2022-05-13 10:51:49 -03:00
LOuroboros
12d956872b Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge 2022-05-13 03:18:37 -03:00
GriffinR
ed1cc203c6
Merge pull request #1654 from Kurausukun/better_dinfo
Don't Build Modern with -g by Default
2022-05-12 22:41:15 -04:00
Kurausukun
7d224197c0
Update INSTALL.md 2022-05-12 22:33:17 -04:00
Kurausukun
1c13335d16
Update INSTALL.md 2022-05-12 22:05:44 -04:00
GriffinR
1842af7570
Merge pull request #1655 from GriffinRichards/fix-berry-id
Fix math in CreateBerrySprite
2022-05-12 18:04:30 -04:00
Eduardo Quezada D'Ottone
a896f9aed7
Merge pull request #2133 from Sneed69/cobaberry
Coba berry fix
2022-05-12 13:39:50 -04:00
sneed
0c0bea33c7 Update items.h 2022-05-12 18:39:10 +03:00
Eduardo Quezada D'Ottone
7b53a4646c
Merge pull request #2122 from Sneed69/confuseberry_item
Update Confuse Berry Hold Effect (Item Expansion)
2022-05-08 09:02:36 -04:00
sneed
eebfed20ad #elif 2022-05-08 09:58:06 +03:00
sneed
d8256663e3 fix syntax 2022-05-07 22:12:10 +03:00
sneed
5592fa434a catch < gen7 with engine 2022-05-07 22:01:35 +03:00