 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 |
|
|
ultima-soul
|
356cf96654
|
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
|
2021-12-15 19:33:35 -08:00 |
|
|
ultima-soul
|
a2ad860ae4
|
Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3
|
2021-12-11 19:11:13 -08:00 |
|
|
ultima-soul
|
00b536f9ca
|
Merge branch 'pret/enigma_berry_2' into ie/enigma_berry_2
|
2021-12-11 18:54:18 -08:00 |
|
|
ultima-soul
|
f4af5ea206
|
Merge conflict resolution trick.
|
2021-12-11 18:52:39 -08: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 |
|
|
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
|
d99ac2e44a
|
Resolved review suggestions for upstream Pokemon Expansion sync.
|
2021-12-09 09:51:28 -08:00 |
|
|
ultima-soul
|
a5afdac0ae
|
Resolved review suggestions for upstream Battle Engine sync.
|
2021-12-08 12:08:16 -08:00 |
|
|
ultima-soul
|
349262ebc3
|
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
|
2021-12-03 17:31:02 -08:00 |
|
|
ultima-soul
|
7369f60c06
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-12-03 17:30:45 -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 |
|
|
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 |
|
|
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 |
|
|
ultima-soul
|
fd4d0db912
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into ball_effects
|
2021-11-10 18:02:00 -08:00 |
|
|
ultima-soul
|
c74e19c062
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
|
2021-11-09 20:58:19 -08:00 |
|
|
ultima-soul
|
69e3719f75
|
Add back TM Case, Bicycle, and Vs. Seeker. Add Poké Radar.
|
2021-11-09 19:19:48 -08:00 |
|
|
ultima-soul
|
8e25d314bb
|
Fix Safari Ball disappearing while capturing and restore Timer Ball's third frame usage.
|
2021-10-12 11:43:48 -07:00 |
|
|
ultima-soul
|
ce4375a10c
|
Ported new Ball catch rate modifier effects from Item Expansion.
|
2021-10-06 10:28:18 -07: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 |
|
|
ultima-soul
|
ce867cd0e0
|
Remove unused species variable from TryItemUseFormChange functions.
|
2021-10-03 10:58:14 -07: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 |
|
|
ultima-soul
|
50ab03e9c1
|
Assign FORM_ITEM_USE constants to secondaryId for appropriate items.
|
2021-10-03 09:39:26 -07:00 |
|
|
ultima-soul
|
de35894669
|
Enable Mental Herb description toggling based on B_MENTAL_HERB config.
|
2021-09-27 14:26:07 -07:00 |
|
|
ultima-soul
|
5cb73a012c
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
|
2021-08-30 11:57:27 -07:00 |
|
|
ultima-soul
|
43e8f76338
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:55:48 -07:00 |
|
|
ultima-soul
|
4c3ed52c2f
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:39:11 -07: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
|
840e2bc3f9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-08-16 16:33:34 -07:00 |
|
|
ultima-soul
|
76a7a2720d
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-16 16:10:59 -07:00 |
|
|
ultima-soul
|
b620349da0
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-08-16 15:43:27 -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 |
|
|
ultima-soul
|
ad8cfda831
|
Add and rearrange Key Items.
|
2021-07-06 17:03:46 -07:00 |
|
|
ultima-soul
|
2d8d38f44c
|
Add TM51 through TM100.
|
2021-07-05 18:11:57 -07:00 |
|
|
ultima-soul
|
53e900a643
|
Rearranged rest of item ids except for Key Items.
|
2021-07-02 22:43:50 -07:00 |
|
|
ultima-soul
|
9e0b866f09
|
Rearranged Poke Ball item ids.
|
2021-06-18 21:46:20 -07:00 |
|
|
ultima-soul
|
bca67ac683
|
Refactor Poke Ball code to not rely on Master Ball being the first item internally.
|
2021-06-11 18:22:50 -07:00 |
|
|
ultima-soul
|
b7706f1b99
|
Remove ball catch rate modifier effects.
|
2021-06-10 21:59:13 -07:00 |
|
|
ultima-soul
|
425746763a
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-06-07 20:08:43 -07: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
|
11a8517320
|
Add back NUM_SPECIES to sSpeciesToBackAnimSet definition.
|
2021-06-07 15:04:41 -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
|
cf19635a80
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-06-07 13:15:46 -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 |
|
|
ultima-soul
|
e864c39a5d
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-05-04 10:04:35 -07: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 |
|
|
ultima-soul
|
2b8d13b88e
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 22:10:32 -07:00 |
|
|
ultima-soul
|
f1423bb78f
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 22:10:07 -07: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 |
|
|
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 |
|
|
ultima-soul
|
46e853c13b
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-02-03 16:23:23 -08: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 |
|
|
ultima-soul
|
fdc6156f83
|
Add Form Species ID tables and entries for new mons and forms.
|
2021-01-20 12:07:29 -08:00 |
|
|
ultima-soul
|
9663ed0d3c
|
Merge branch 'form_species_tables' into form_species_tables_pe
|
2021-01-20 12:06:59 -08:00 |
|
|
ultima-soul
|
d3b0e98325
|
Merge branch 'form_species_tables' into form_species_tables_be
|
2021-01-20 11:40:48 -08:00 |
|
|
ultima-soul
|
f571c8af2a
|
Merge branch 'form_species_tables' into form_species_tables_ie
|
2021-01-20 11:34:59 -08:00 |
|
|
ultima-soul
|
267900bdcb
|
Add Form Species ID tables and functions to access them.
|
2021-01-20 11:31:20 -08:00 |
|
|
ultima-soul
|
9c5ec33aa7
|
Sync Crown Tundra and renamed moves Battle Engine defines.
|
2021-01-12 14:22:33 -08:00 |
|
|
ultima-soul
|
3cb09b6507
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
|
2021-01-11 15:19:11 -08:00 |
|
|
ultima-soul
|
767f26b73c
|
Corrected defines for Item Expansion-introduced items for Gen 8 species data.
|
2021-01-08 19:06:20 -08:00 |
|
|
ultima-soul
|
3c8194c612
|
Add Fairy-type icon to fix Fairy TM info icon being blank.
|
2021-01-02 21:30:41 -08:00 |
|
|
ultima-soul
|
b58a8390f3
|
Add Fairy-type icon to fix Fairy TM info icon being blank.
|
2021-01-02 21:21:52 -08:00 |
|
|
ultima-soul
|
c2a3c5687b
|
Add Fairy-type icon to fix Fairy TM info icon being blank.
|
2021-01-02 21:11:47 -08:00 |
|
|
ultima-soul
|
9c34121a50
|
Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon.
|
2021-01-02 14:03:46 -08:00 |
|
|
ultima-soul
|
6a0939cd4e
|
Remove special handling for Deoxys.
|
2020-12-21 22:39:19 -08:00 |
|
|
ultima-soul
|
ad67068f7e
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data
|
2020-12-16 13:28:42 -08:00 |
|
|
ultima-soul
|
c675c92a1d
|
Add Gen 8 Pokemon data.
|
2020-12-16 12:57:36 -08: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
|
63bd0ec836
|
Remove Cacophony and fix some Gen 8 ability descriptions to fit.
|
2020-11-16 15:42:09 -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 |
|
|
ultima-soul
|
9ee5db6a96
|
Expand ability ids to u16. Thanks to ghoulslash for some assistance!
|
2020-05-18 14:54:12 -07:00 |
|
|
ultima-soul
|
332aa80a33
|
Resolve review comments and encapsulate Unburden check and set.
|
2019-12-23 09:25:26 -08:00 |
|
|
ultima-soul
|
5786745d15
|
Merge branch 'battle_engine' into unburden
|
2019-12-23 09:01:16 -08:00 |
|
|
ultima-soul
|
1146de4561
|
Implement Unburden.
|
2019-12-21 23:09:06 -08:00 |
|
|
ultima-soul
|
029ab67ff4
|
Implement Leaf Guard.
|
2019-12-16 00:29:20 -08:00 |
|