ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,160 Commits 1 Branch 0 Tags 235 MiB
389a38b3cd
Commit Graph

85 Commits

Author SHA1 Message Date
LOuroboros
ce7815ebcc
Update pokemon.h 2021-12-28 15:11:52 -03:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -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
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
GriffinR
1548e902cd Add MonCoods size macro 2021-11-08 09:41:23 -05:00
BuffelSaft
7d10097684 Replace IsTwoStrikesMove with FLAG_TWO_STRIKES 
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
 2021-11-04 17:11:56 +13:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
GriffinR
6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04: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
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
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
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
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
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
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07: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
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08: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
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -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
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -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
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
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00