ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-22 03:10:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,024 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

7024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
aec4d78bd4 Fixed edge case with givemon 2021-11-04 21:22:03 -03:00
Eduardo Quezada D'Ottone
af5ff05338 Fixed FORM_ITEM_HOLD_ABILITY check 2021-10-05 21:25:56 -03:00
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
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
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
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
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
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
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
Eduardo Quezada D'Ottone
d32df119a2
Merge pull request #1650 from LOuroboros/unown 
Fix SPECIES_UNOWN
 2021-09-20 21:14:11 -03:00
LOuroboros
acf755fb9c Fixed SPECIES_UNOWN 2021-09-11 04:35:16 -03:00
BuffelSaft
4aa7c096b7 Show gender differences in evo scene 2021-09-11 16:30:09 +12:00
BuffelSaft
db928a1329 Data entry for new sprites 
Add sprite defines, entries to gender tables, etc.
 2021-09-11 14:12:41 +12:00
BuffelSaft
0f5444d331 Add sprites and icons for major gender differences 
Credit to MrDollSteak for the sprites - I palette swapped the hippos and made some of the icons, but everything else is MrDS!
 2021-09-11 13:52:09 +12:00
ultima-soul
fd6f7eadbb
Merge pull request #1645 from BuffelSaft/sandshrew 
Add alolan Sandshrew line to gSpeciesToNationalPokedexNum
 2021-09-09 19:13:06 -07:00
BuffelSaft
b598efa956 Add alolan Sandshrew line to gSpeciesToNationalPokedexNum 2021-09-10 13:47:53 +12:00
ghoulslash
4f5c98d5b1
Merge pull request #1631 from LOuroboros/milotic 
Fix Milotic's shiny palette
 2021-09-07 06:34:15 -06:00
DizzyEggg
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints 
Added footprints for Gen. 6 species
 2021-09-06 10:36:46 +02:00
LOuroboros
7725ea0878 Fixed Milotic's shiny palette 
Credits to Jaizu.
 2021-09-06 04:13:45 -03:00
ghoulslash
03e21bb27e
Merge pull request #1591 from BuffelSaft/mienshao 
Fix Mienshao's front sprite
 2021-09-01 05:58:51 -06:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species 
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
 2021-08-23 08:28:58 -03:00
LOuroboros
4b88b99e1b Fixed Hoopa's footprint 2021-08-23 06:45:04 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
ExpoSeed
a6f6be4e54
Merge pull request #1598 from LOuroboros/bronzor 
Corrected Bronzor's evo level
 2021-08-22 21:29:59 -05:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
ExpoSeed
5493333ff5
Merge pull request #1594 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-08-16 19:47:41 -05:00