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

315 Commits

Author SHA1 Message Date
LOuroboros
d6a78f386f Implemented evolution moves 
Thanks to UltimaSoul and Sagiri/Zeturic
 2021-12-22 18:02:23 -03:00
ghoulslash
2736223b1b
Merge pull request #1698 from AsparagusEduardo/PE_FormChangeHoldItems 
Form changing by holding items
 2021-12-21 09:10:23 -05:00
ghoulslash
b4cc5e3cd8
Merge pull request #1952 from AsparagusEduardo/PE_natureEvo 
Added Nature evolution methods
 2021-12-20 14:08:47 -05:00
Eduardo Quezada D'Ottone
8b49f8f925
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems 2021-12-19 12:08:52 -03:00
Eduardo Quezada D'Ottone
9adbf3350e
Merge pull request #1965 from TheXaman/pokemon_expansion_debug 
Pokemon expansion debug
 2021-12-18 13:08:37 -03:00
ultima-soul
f0ffc749e9
Fix formatting for EVO_LEVEL_RAIN checks. 2021-12-16 16:05:51 -08:00
ghoulslash
bb9fb72436 fix evo_level_rain 2021-12-14 13:56:25 -05:00
TheXaman
a334f7f5e0 changed all missed ones to #if P_ENABLE_DEBUG == TRUE @LOuroboros 2021-12-13 18:58:13 +01:00
TheXaman
f6d9b74a1a Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into pokemon_expansion_debug 2021-12-10 16:48:46 +01:00
TheXaman
963642d309 added the option to change a sprites animation to check which animation fits the best 2021-12-10 16:18:39 +01:00
ultima-soul
a68a39e35f Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-12-01 20:17:49 -08:00
Eduardo Quezada D'Ottone
b6b74b1656
Oops 
Update src/pokemon.c

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-28 11:39:08 -03:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
Eduardo Quezada D'Ottone
fa995894b7 Added Nature evolution methods 2021-11-27 20:46:19 -03:00
ultima-soul
57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
Eduardo Quezada D'Ottone
262569845a
Comment capitalise 
Co-authored-by: BuffelSaft <buffalojuice@gmail.com>
 2021-11-05 17:01:15 -03:00
GriffinR
7f49f26331 Restore ModifyStatByNature bug notes 2021-10-27 22:38:48 -04:00
BuffelSaft
b2969b6782
Merge pull request #1699 from AsparagusEduardo/PE_ArceusAnimations 
Updated Arceus' forms' animations
 2021-10-19 16:35:03 +13:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
GriffinR
b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00
GriffinR
b8a44bf10a Calculate pokemon substruct size, missing MON_PIC_SIZE 2021-10-11 10:35:53 -04:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04: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
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
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
55b61313a4 PSS uses form change table for holding items. 
# Conflicts:
#	src/pokemon.c
 2021-09-29 02:13:44 -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
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04: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
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
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
LOuroboros
acf755fb9c Fixed SPECIES_UNOWN 2021-09-11 04:35:16 -03: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
b598efa956 Add alolan Sandshrew line to gSpeciesToNationalPokedexNum 2021-09-10 13:47:53 +12:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ExpoSeed
2ad251cec3
Merge pull request #1491 from surskitty/mega_evolution_hidden_abilities 
Pokemon with no ability recheck first ability slot.
 2021-05-22 14:59:06 -05:00
Eduardo Quezada D'Ottone
dff6a574f2
Merge pull request #1489 from LOuroboros/panchams_evo_method 
Fixed Pancham's evo method
 2021-05-21 11:38:22 -04:00
surskitty
ba42b4daf4 If a Pokemon's ability is set to ABILITY_NONE, try to set it to the first ability slot. #1490 2021-05-17 17:08:01 -04:00
Eduardo Quezada D'Ottone
76b99e66dc Added missing Treecko from animation list. 2021-05-16 20:46:58 -04:00
ultima-soul
50c2514267
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync 
Pokemon Expansion Upstream Sync
 2021-05-13 20:56:29 -07:00
LOuroboros
c94703e0bc Fixed Pancham's evo method 2021-05-10 20:54:42 -03:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00