 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
|
a2ad860ae4
|
Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3
|
2021-12-11 19:11:13 -08:00 |
|
|
ultima-soul
|
f4af5ea206
|
Merge conflict resolution trick.
|
2021-12-11 18:52:39 -08:00 |
|
|
ultima-soul
|
a5afdac0ae
|
Resolved review suggestions for upstream Battle Engine sync.
|
2021-12-08 12:08:16 -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
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17: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
|
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
|
ce4375a10c
|
Ported new Ball catch rate modifier effects from Item Expansion.
|
2021-10-06 10:28:18 -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
|
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 |
|
|
ultima-soul
|
d3ea25ee7f
|
Synchronize with pokefirered pokedex.c.
|
2019-08-24 11:17:11 -07:00 |
|
|
ultima-soul
|
07015aa7ae
|
Fix tabs.
|
2019-07-30 17:25:19 -07:00 |
|
|
ultima-soul
|
9a152f8fe6
|
Decompile data/use_pokeblock.s
|
2019-07-30 17:21:17 -07:00 |
|
|
ultima-soul
|
c77dc74410
|
Match TryInterruptEventObjectSpecialAnim without asm hack.
|
2019-07-29 17:52:01 -07:00 |
|
|
ultima-soul
|
cc18cdb977
|
Fix some icons.
|
2019-04-11 10:16:55 -07:00 |
|
|
ultima-soul
|
21722d9931
|
Fix formatting
|
2019-04-08 17:29:44 -05:00 |
|
|
ultima-soul
|
2c432c314a
|
Match sub_8159308
|
2019-04-08 17:29:44 -05:00 |
|
|
ultima-soul
|
64da3d051e
|
Fix formatting.
|
2019-04-03 21:15:45 -07:00 |
|
|
ultima-soul
|
91a94a0ca1
|
Try to get closer to matching.
|
2019-04-03 21:13:26 -07:00 |
|
|
ultima-soul
|
48d27c035a
|
Remove pokemon_3.h
|
2019-04-03 15:15:08 -07:00 |
|
|
ultima-soul
|
02651f6177
|
Attempt to decompile menu_specialized. 2 NONMATCHING
|
2019-04-02 19:18:36 -07:00 |
|
|
ultima-soul
|
552c032f5c
|
Match sub_8166A34
|
2019-03-24 15:34:49 -05:00 |
|
|
ultima-soul
|
eb48cc2f7e
|
Decompile through sub_8167930.
|
2019-02-23 09:08:07 -08:00 |
|
|
ultima-soul
|
72720204da
|
Fix stuff
|
2019-01-27 20:54:21 -08:00 |
|
|
ultima-soul
|
d633ee6f58
|
Minor changes
|
2019-01-27 20:48:18 -08:00 |
|
|
ultima-soul
|
f828823bf0
|
Make changes
|
2019-01-27 20:21:30 -08:00 |
|
|
ultima-soul
|
b8ff71e65e
|
Fix build conflicts.
|
2019-01-06 14:11:31 -08:00 |
|
|
ultima-soul
|
284751e761
|
Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.
|
2019-01-06 13:41:18 -08:00 |
|
|
ultima-soul
|
2ca482dc24
|
Committing progress so far.
|
2019-01-06 13:38:31 -08:00 |
|
|
ultima-soul
|
f966b65849
|
Through sub_80DC028, sub_80DC0F4 non-matching.
|
2019-01-06 13:32:48 -08:00 |
|
|
ultima-soul
|
76510d58bb
|
Matched up to sub_80DBF68, sub_80DBF90 WIP.
|
2019-01-06 13:32:47 -08:00 |
|
|
ultima-soul
|
a00eb2f5d8
|
Added new battle items.
|
2018-12-13 09:31:47 -08:00 |
|
|
ultima-soul
|
857ac33adb
|
Fixed a typo.
|
2018-09-05 17:25:44 +00:00 |
|
|
ultima-soul
|
f505ba1bc7
|
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent.
|
2018-09-05 01:13:17 +00:00 |
|