ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,369 Commits 1 Branch 0 Tags 235 MiB
996bc6ba24
Commit Graph

234 Commits

Author SHA1 Message Date
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
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table 
Form change table
 2021-09-22 00:04:26 -03: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
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
64a48800c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-11 17:10:57 -07:00
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12: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
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
ExpoSeed
4bb33367df Newline 2021-06-04 19:35:16 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ExpoSeed
0e96b47584 Review comments 2021-06-04 18:50:11 -05:00
Scott
265cdcdc12 Handle GetAbilityBySpecies edge cases 2021-05-23 16:17:43 -04:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
ExpoSeed
db2b995bc6 Introduce NUM_ABILITY_SLOTS 2021-04-16 23:37:55 -05:00
ExpoSeed
27c6964a05 Merge branch 'num_ability_slots' into BE/num_ability_slots 2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338 Introduce NUM_ABILITY_SLOTS 2021-04-16 20:36:45 -05:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05: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
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
BuffelSaft
35add44a90 Thousand Arrows hits airborne targets 
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
 2021-03-31 23:05:30 +13:00
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -04: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
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
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
GriffinR
02c1fbd733 Document ribbon TV show, add new ribbon IDs/size 2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
c4c802162e A few more evo related changes. 
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
 2020-11-25 01:15:19 -03:00
LOuroboros
89f6036e77 Bumped EVOS_PER_MON from 8 to 10 2020-11-24 23:47:07 -03:00
LOuroboros
6f122ac8f8 Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility 2020-11-11 15:18:39 -03:00
Eduardo Quezada D'Ottone
ddb6142709 Review changes 3. 2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00
Eduardo Quezada D'Ottone
09a5d6c722 Implemented Wish Mega Evolution 2020-11-07 10:13:32 -03:00
Eduardo Quezada
7fbd64ec37 Moved Shiny Charm rerolls into config file 2020-10-17 01:26:51 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
90d4359aeb Fix constants 2020-10-12 19:11:41 -05:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
kiliwily
5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
Thomas Winwood
58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
c2733236be Merge with master 2020-08-27 11:36:35 +02:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
Eduardo Alvaro Quezada D'Ottone
e232f6bf03
Fix for Dark Type in party evolution. (#329) 2020-04-16 09:07:31 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276) 
* Shiny Charm Item

* Shiny Charm Rerolls
 2020-02-17 11:08:06 +01:00
Eduardo Alvaro Quezada D'Ottone
bc1524cf59 Fixed evolution constants (#264) 2020-02-09 11:05:01 +01:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
DizzyEggg
153d2ac823 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-08 15:42:14 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
DizzyEggg
7ff3f32a95 Merge 2019-11-29 21:05:44 +01:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
DizzyEggg
c65900b67a merge 2019-11-10 14:13:23 +01:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
DizzyEggg
4bbbbdc50a Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2019-10-19 15:30:14 +02:00
DizzyEggg
1d10d44a4d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-10-19 15:17:45 +02:00
garak
92d28c5daf add MIN_LEVEL define to pokemon constants 2019-10-14 18:12:03 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
DizzyEggg
4c462a726e Merge with master and learnsets 2019-10-06 15:57:33 +02:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
GriffinR
801ca37f04 Document day_care.inc and related 2019-09-25 18:46:25 -05:00
GriffinR
1ffa890d27 Consolidate remaining pokemon constants 2019-09-22 08:14:22 -05:00
GriffinR
80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
DizzyEggg
4881e48994 Merge with master 2019-08-04 23:57:53 +02:00
DizzyEggg
df1b804af8 Merge with master 2019-08-04 23:18:49 +02:00
DizzyEggg
fc84033e3d Merge with master 2019-07-12 11:20:24 +02:00
Gudf
75f165ed74 Use a constant instead of integer literals when checking for shinyness 2019-07-11 20:16:39 +02:00
DizzyEggg
473f84f31b Formatting 2019-05-17 10:42:14 +02:00
DizzyEggg
5b23f3787e Tweak up batle item's secondary ids 2019-05-04 09:15:10 +02:00
Fontbane
e430fe4b02 Add Dance flag 2019-04-13 21:15:00 -04:00
Papa Cancer
fc8e59403a Ability-ignoring moves 
Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.
 2019-04-07 13:03:40 +01:00
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
DizzyEggg
bf70861798 Powder moves on grass types 2019-03-02 13:08:50 +01:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
DizzyEggg
5fbeef860c Bulletproof and a couple of new moves 2018-08-05 13:39:22 +02:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00