Commit Graph

7409 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
2b54b48b04 Merge branch 'PokemonExpansion' into PE_FormChangeHoldItems
# Conflicts:
#	src/pokemon.c
2021-10-05 21:13:36 -03:00
ExpoSeed
7bce603039
Merge pull request #1714 from ultima-soul/form_change_table_fixes
Refactor Form Change Table Code
2021-10-05 15:37:51 -05:00
GriffinR
cacd6410bf Drop double underscore 'empty' macros 2021-10-05 08:54:15 -04:00
GriffinR
394c52a7be Clean up roamer.c 2021-10-04 18:32:04 -04:00
ultima-soul
ce867cd0e0 Remove unused species variable from TryItemUseFormChange functions. 2021-10-03 10:58:14 -07:00
ultima-soul
78d2215196 Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding. 2021-10-03 10:16:09 -07:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
GriffinR
739e7d3c31 Document summary screen sprite manager 2021-10-02 23:47:59 -04:00
Eduardo Quezada D'Ottone
4ba03a6d54 Fixed corruption bug when giving too many items from bag into boxes. 2021-09-30 22:47:25 -03:00
Eduardo Quezada D'Ottone
5593a83783 Fixed compile 2021-09-30 22:35:28 -03:00
Eduardo Quezada D'Ottone
5bf300f97c Fixed issue where by default mon would change into the last form due to the IE items being defined as ITEM_NONE 2021-09-30 22:12:02 -03:00
Eduardo Quezada D'Ottone
0fd9d2c0d5 Optimized so it only changes forms when moving items. 2021-09-30 21:55:21 -03:00
Eduardo Quezada D'Ottone
b60aab1f6a Fixed crash 2021-09-30 20:34:42 -03:00
GriffinR
001a25e49c
Merge pull request #1507 from GriffinRichards/doc-walda
Document Walda Phrase
2021-09-30 12:27:20 -04:00
GriffinR
27d69ea8e6
Merge pull request #1508 from Pokestia/master
Use compact weather macros
2021-09-30 11:23:13 -04:00
Pokestia
38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
Eduardo Quezada D'Ottone
f9b9e4ec33 Updated Arceus' forms' animations 2021-09-29 22:34:37 -03:00
Eduardo Quezada D'Ottone
e6c81d2862 Fixed form change when swapping items 2021-09-29 22:05:30 -03:00
Eduardo Quezada D'Ottone
9114f3d1dc Fixed lag and icons getting stuck when giving an item from the bag 2021-09-29 22:05:20 -03:00
Pokestia
e699965332 Use compact weather macros 2021-09-29 17:45:39 +02:00
Eduardo Quezada D'Ottone
1f559df27d Final function name 2021-09-29 02:14:32 -03:00
Eduardo Quezada D'Ottone
52781969ab Update icon in party menu 2021-09-29 02:14:23 -03:00
Eduardo Quezada D'Ottone
7c9a3f338a Updates icon in box menu 2021-09-29 02:14:13 -03:00
Eduardo Quezada D'Ottone
9ad505d7e8 Mosaic effect when changing forms 2021-09-29 02:14:02 -03:00
Eduardo Quezada D'Ottone
55b61313a4 PSS uses form change table for holding items.
# Conflicts:
#	src/pokemon.c
2021-09-29 02:13:44 -03:00
Eduardo Quezada D'Ottone
fdd284b50b Hold Item party menu 2021-09-29 02:06:03 -03:00
GriffinR
e270ee1a74
Merge pull request #1506 from GriffinRichards/single-doc
Document some single-remaining symbols
2021-09-29 00:10:09 -04:00
GriffinR
154e8a271a
Merge pull request #1505 from GriffinRichards/tag-none
Add TAG_NONE
2021-09-28 22:22:09 -04:00
GriffinR
8a79ca3818 Document walda_phrase 2021-09-26 17:01:39 -04:00
Eduardo Quezada D'Ottone
d220d25aab
Merge pull request #1666 from LOuroboros/bKGD_PE
Fix the 'bKGD: invalid index' error
2021-09-26 11:39:26 -03:00
Eduardo Quezada D'Ottone
c574825974
Merge pull request #1689 from LOuroboros/itemUseDay
Added a day time exclusive equivalent to `FORM_USE_ITEM`
2021-09-25 22:11:51 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
2021-09-25 22:00:10 -03:00
Eduardo Quezada D'Ottone
082dd1cb23
Merge pull request #1685 from LOuroboros/formIcon
Fixed form icon subpriority
2021-09-25 20:07:26 -03:00
LOuroboros
87bc1f502a Fixed form icon subpriority 2021-09-25 19:58:12 -03:00
GriffinR
db057eb86b Relocate battle_message comment 2021-09-24 17:33:18 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR
09fd4fc4c5
Merge pull request #1504 from LOuroboros/staticRegionMapSecIdToPopUpThemeIdMapping
Renamed gRegionMapSectionId_To_PopUpThemeIdMapping
2021-09-23 22:48:42 -04:00
LOuroboros
ac599589ec gRegionMapSectionId_To_PopUpThemeIdMapping -> sRegionMapSectionId_To_PopUpThemeIdMapping 2021-09-23 23:36:37 -03:00
GriffinR
9d0f9042fe
Merge pull request #1498 from LOuroboros/trailingSpaces
Removed trailing spaces in the most relevant files
2021-09-23 21:49:49 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
LOuroboros
6b2d756829 Fixed and pngcrush'd Bastiodon's icon
Thanks to Cynderquil for fixing it.
2021-09-23 20:40:33 -03:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
Form change table
2021-09-22 00:04:26 -03:00
LOuroboros
1c59586e67 Fixed the 'bKGD: invalid index' error 2021-09-21 22:06:01 -03:00
Eduardo Quezada D'Ottone
bf8d285eed
Merge pull request #1601 from LOuroboros/gen5_2nd_frames
Added missing 2nd frames for Gen. 5 species
2021-09-21 21:44:42 -03:00
LOuroboros
8e38d72293 Fix Male Unfezant's anim_front.png 2021-09-21 20:53:18 -03:00
LOuroboros
afc55994a9 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into gen5_2nd_frames 2021-09-21 20:45:17 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion
Port missing Gen8 icons from DPE
2021-09-20 22:48:57 -03:00
Eduardo Quezada D'Ottone
18d91cc935
Merge pull request #1647 from BuffelSaft/gender-diff-fixes1
Show gender differences in evo scene
2021-09-20 22:03:23 -03:00
Eduardo Quezada D'Ottone
d34c311566
Merge pull request #1646 from BuffelSaft/gender-diffs
Add sprites for major gender differences
2021-09-20 21:43:12 -03:00