ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,902 Commits 1 Branch 0 Tags 235 MiB
f39f48fc51
Commit Graph

613 Commits

Author SHA1 Message Date
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
5e6d8a77e4 Document some generic argument names 2022-05-31 14:34:25 -04:00
sneed
c316b11739 chanceCommon to chanceNotRare 2022-05-24 00:53:09 +03:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
LOuroboros
059dc02aef
Update pokemon.c 2022-05-18 11:03:57 -03:00
AgustinGDLV
e9669ccbfe
Update src/pokemon.c 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-05-16 17:41:18 -07:00
AgustinGDLV
2d25cd56b9
Apply suggestions from code review 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-05-16 16:58:08 -07:00
AgustinGDLV
d385b838c8 fixed exp resetting 2022-05-16 15:53:42 -07:00
AgustinGDLV
6cb152e452 removing nonessential stuff 2022-05-16 13:51:28 -07:00
AgustinGDLV
793e8ef5a4 fixed learning moves 2022-05-16 13:12:41 -07:00
AgustinGDLV
03c21c3b71 implementation of EXP candies 2022-05-15 21:28:23 -07:00
ghoulslash
7dd6988b2b fix args to GetMonData 2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e prevent overwriting wild mon held items 2022-05-13 20:05:52 -04:00
Eduardo Quezada D'Ottone
b43dfd5976
Quick formatting 2022-05-09 17:04:28 -04:00
AgustinGDLV
502ce4bb33 fixed graphics bug and reverted last commit 2022-05-08 21:16:16 -07:00
AgustinGDLV
e50d5661cd removed unneccesary preproc 2022-05-08 20:57:12 -07:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
AgustinGDLV
03c48b4f3f compatibility with evo_battle 2022-05-05 15:46:53 -07:00
AgustinGDLV
7d42f93861 added special overworld evo changes 2022-05-05 11:55:31 -07:00
Eduardo Quezada D'Ottone
cb9cace04f Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-04-27 12:05:33 -04:00
ghoulslash
7bc50392d0
Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone 
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
 2022-04-27 08:51:37 -04:00
TheXaman
c54bf21b01 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2022-04-16 23:18:35 +02:00
Eduardo Quezada D'Ottone
16283b47c7 Fixed compile. I had these changes in a testing branch but forgot to add them back here. 2022-04-16 15:57:38 -04:00
Eduardo Quezada D'Ottone
a6175d2622 Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs 2022-04-16 13:01:15 -04:00
LOuroboros
3ca9ac5b37 Post merge corrections 2022-04-03 14:27:33 -03:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone
054f667446 Config for Kadabra ignoring Everstone upon evolving 2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone
ed1ea69759 Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone 2022-02-26 21:40:20 -03:00
sphericalice
40efac0ddf Rename GetBattlePyramindTrainerEncounterMusicId to fix typo 2022-02-22 19:13:17 +00:00
GriffinR
30d9704418 Specify unsigned in spot comment 2022-01-17 17:27:17 -05:00
GriffinR
313f14ed63 Add Spinda spot color constants 2022-01-17 17:00:18 -05:00
GriffinR
177863da47 Fix typo 2022-01-17 16:04:02 -05:00
GriffinR
225147a94f Document Spinda spot algorithm 2022-01-17 15:34:18 -05:00
Eduardo Quezada D'Ottone
b86694876c
Merge pull request #1508 from Scott-Bonner/get_ability 
Handle GetAbilityBySpecies edge cases
 2022-01-15 12:56:50 -03:00
GriffinR
d4111d5520 Add comment about pokedex reordering 2022-01-05 14:50:19 -05:00
Eduardo Quezada D'Ottone
3bbaf5a15d Optimized SpeciesHasGenderDifference into Base Stat flag 2022-01-01 19:24:34 -03:00
LOuroboros
3f010d9aa8 Tweaked GiveBoxMonInitialMoveset 
Otherwise, Pokémon would be generated with their evo moves learned.
 2021-12-26 17:13:36 -03:00
LOuroboros
86ed53997b
Update src/pokemon.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-26 12:39:56 -03:00
LOuroboros
96012ba065
Update src/pokemon.c 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-12-26 12:39:45 -03:00
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
18afd06f6d Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06: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
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
 2021-12-10 09:41:54 -08: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
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
ultima-soul
a5afdac0ae Resolved review suggestions for upstream Battle Engine sync. 2021-12-08 12:08:16 -08:00
ultima-soul
d408b56549 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-12-01 20:18:57 -08:00
ultima-soul
a68a39e35f Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-12-01 20:17:49 -08:00
ultima-soul
23bf41713c Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-12-01 20:17:08 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00
TheXaman
5780560007 fixed some bugs, thanks to cbt 2021-11-28 20:28:54 +01: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
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
Eduardo Quezada D'Ottone
fa995894b7 Added Nature evolution methods 2021-11-27 20:46:19 -03:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone
84921d7236 Fixed posion 2021-11-21 14:02:50 -03:00
Eduardo Quezada D'Ottone
d3831a8ab3 Added Gen 7 Form animations (minus Oricorio, Lycanroc, Wishiwashi and Necrozma) 2021-11-21 11:48:57 -03:00
BuffelSaft
a82d0681da Implement Mr. Dollsteak's animations 
Add animation data provided by Mr. Dollsteak for all gen 1-6 Pokémon (barring megas).
 2021-11-21 11:28:46 -03: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
ultima-soul
06f36595d6 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-10-05 19:25:52 -07: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
Eduardo Quezada D'Ottone
4fbe4da7d0 Sitrus Berry Gen4+ heal. Credit to SBird1337 2021-09-26 18:46:34 -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
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -05:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ultima-soul
d30ab7760f Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-06-07 13:52:08 -07:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
Scott
265cdcdc12 Handle GetAbilityBySpecies edge cases 2021-05-23 16:17:43 -04: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
Eduardo Quezada D'Ottone
d1d95df409 Fixed B_X_ITEMS_BUFF boosting 2 stages only in Gen 7 2021-05-21 11:29:13 -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
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -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
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
bee60f4c64 Document battler sprite affine anims, default pokeball throw 2021-04-25 02:18:34 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
GriffinR
e5f0d2f736 Doc storage - releasing, some cursor 2021-04-16 04:30:09 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim 
Document Pokémon animation
 2021-04-13 01:36:15 -04:00
GriffinR
72ba8cf58d Document pokemon animation types 2021-04-10 00:50:28 -04:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
ExpoSeed
f8dfd8f353 Remove special casing 2021-03-09 11:53:01 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
GriffinR
a5852d57d1 Use TASK_NONE constant 2021-02-24 11:03:25 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00