Evan
|
0483114a05
|
merge and some fixes
|
2021-02-02 11:45:15 -07:00 |
|
ultima-soul
|
2a20d50904
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-02-01 15:54:08 -08:00 |
|
Evan
|
39139323f6
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove
|
2021-01-20 17:36:37 -07:00 |
|
ghoulslash
|
71f18bfbf4
|
Merge pull request #1316 from ultima-soul/form_species_tables_be
Add Form Species ID Tables
|
2021-01-20 13:54:39 -07:00 |
|
ultima-soul
|
d3b0e98325
|
Merge branch 'form_species_tables' into form_species_tables_be
|
2021-01-20 11:40:48 -08:00 |
|
ultima-soul
|
267900bdcb
|
Add Form Species ID tables and functions to access them.
|
2021-01-20 11:31:20 -08:00 |
|
GriffinR
|
305ebdbc4a
|
Parentheses for GET_UNOWN_LETTER
|
2021-01-19 12:36:36 -05:00 |
|
GriffinR
|
bc20fda604
|
Use GET_UNOWN_LETTER macro
|
2021-01-19 04:03:16 -05:00 |
|
GriffinR
|
2da0c3436e
|
Make filler in PokemonSubstruct0 explicit
|
2021-01-15 00:14:46 -05:00 |
|
Evan
|
8ef6a2c80d
|
merge with be
|
2021-01-13 14:23:30 -07:00 |
|
ExpoSeed
|
7dadcb94b8
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-03 17:14:43 -06:00 |
|
GriffinR
|
769ddf22c2
|
Label remaining subs in battle_tower.c
|
2020-12-24 16:18:47 -05:00 |
|
Evan
|
2bfc7ea9b1
|
merge upstream
|
2020-12-01 15:42:04 -05:00 |
|
Evan
|
348d70b309
|
z move indicator and some data
|
2020-11-26 15:56:18 -05:00 |
|
ultima-soul
|
e15a86caae
|
Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8.
|
2020-11-17 10:32:24 -08:00 |
|
ultima-soul
|
e32659d4bb
|
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
|
2020-11-16 13:50:26 -08:00 |
|
ultima-soul
|
99fdc13e61
|
Merge branch 'master' into battle_engine_sync
|
2020-11-07 15:59:20 -08:00 |
|
Kurausukun
|
83846b913a
|
port sub_806F160 fakematch fix
|
2020-10-26 00:01:53 -04:00 |
|
Eduardo Quezada
|
b1903af8c1
|
Adapting move changes (part 1)
|
2020-10-17 23:08:39 -03:00 |
|
ExpoSeed
|
9e2c8a95c1
|
Sync bev2 with pret
|
2020-10-11 01:01:47 -05:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
PokeCodec
|
7f1827767c
|
Document size field of unknown struct
|
2020-09-09 16:09:31 -04:00 |
|
PokeCodec
|
d541002ab6
|
Type adjust
|
2020-09-09 15:54:24 -04: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
|
4c3f40a361
|
Merge with master
|
2020-07-11 12:59:23 +02:00 |
|
GriffinR
|
9190af73b7
|
Label union room battle trainer
|
2020-06-03 15:28:29 -04:00 |
|
ultima-soul
|
9ee5db6a96
|
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
|
2020-05-18 14:54:12 -07: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
|
4c9ea32d19
|
Merge with master
|
2019-12-30 18:52:23 +01:00 |
|
GriffinR
|
749965d56b
|
Document item_use.c
|
2019-12-21 21:39:30 -05:00 |
|
DizzyEggg
|
1d8cc9b741
|
Fix merge conflicts
|
2019-11-03 19:55:19 +01:00 |
|
GriffinR
|
aec7eb6089
|
Clean up party_menu doc
|
2019-10-31 14:11:55 -04:00 |
|
GriffinR
|
6db014cc32
|
Document party_menu first pass
|
2019-10-25 15:41:06 -04:00 |
|
DizzyEggg
|
bae5d2038f
|
Update with master
|
2019-10-10 16:18:48 +02: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 |
|
GriffinR
|
85d97542cd
|
Use MAX_MON_MOVES constants
|
2019-09-16 19:21:23 -05:00 |
|
DizzyEggg
|
d09c290eba
|
bool8 to u8
|
2019-08-22 16:46:33 +02:00 |
|
DizzyEggg
|
f05375112b
|
Erase isEgg field from battlemon, ability num to 2 bits
|
2019-08-21 11:56:49 +02:00 |
|
DizzyEggg
|
c219776034
|
Merge with master
|
2019-08-04 23:09:28 +02:00 |
|
DizzyEggg
|
fd07c608fc
|
Decompile pokemon unk 6
|
2019-07-25 18:56:08 +02:00 |
|
DizzyEggg
|
f22f7866ac
|
Merge with master, fix conficts
|
2019-05-17 09:52:20 +02:00 |
|
garak
|
60baf19d45
|
rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses
|
2019-05-16 17:10:13 -05:00 |
|
garak
|
daecd5ec40
|
name some trainer card related functions
|
2019-05-16 17:10:13 -05:00 |
|
DizzyEggg
|
4ae1e014bc
|
Change abilities in base stats to array
|
2019-05-16 17:09:43 -05:00 |
|
DizzyEggg
|
33979f0fa6
|
use ability num instead of alt ability
|
2019-05-16 17:09:43 -05:00 |
|
DizzyEggg
|
0518025b92
|
formatting
|
2019-05-16 09:43:19 +02:00 |
|
DizzyEggg
|
20841a9f87
|
Use PLAYER_NAME_LENGTH constant
|
2019-05-15 16:53:59 -05:00 |
|