14635 Commits

Author SHA1 Message Date
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
DizzyEggg
dfb9a1fa16 Add all new cries 2019-05-14 10:58:11 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
Fontbane
d9115ada86 Use species constants for VAR_TEMP_1 before givemon 2019-05-13 10:16:28 -05:00
LOuroboros
bf15bb097a Added the Safety Goggles' palette because I'm a very dumb person. 2019-05-12 11:31:34 -03:00
huderlem
08c8ca8287
Merge pull request #630 from PikalaxALT/dodrio_berry_picking
Dodrio berry picking
2019-05-12 07:09:16 -05:00
DizzyEggg
9abdf224cb Coords for megas 2019-05-12 08:49:57 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
PikalaxALT
fc72b74e6c Fix building 2019-05-08 17:06:39 -05:00
PikalaxALT
657068359d Better dependency handling for wild_encounters 2019-05-08 17:06:39 -05:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
Marcus Huderle
483648e372 Create jsonproc tool
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
2019-05-08 17:06:39 -05:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +02:00
DizzyEggg
3994d8089e Add cry files 2019-05-05 10:18:14 +02:00
DizzyEggg
a22495d7cb Gen4 mon animations 2019-05-05 10:09:52 +02:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
DizzyEggg
5b23f3787e Tweak up batle item's secondary ids 2019-05-04 09:15:10 +02:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
DizzyEggg
62a54449c6
Merge pull request #143 from LOuroboros/item_expansion
Added the data, sprites and sprites data of all the items that were missing mentioned under Issues.
2019-05-03 17:33:07 +02:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
LOuroboros
eaafcd539d Fixed the Power Items' hold effects. 2019-05-02 15:47:43 -03:00
LOuroboros
fbdcbfd33d Fixed Silvally's Memory items' hold effects. 2019-05-02 15:39:47 -03:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
LOuroboros
713e660666 Updated the price tags of the X Items to their USUM standard. 2019-05-02 15:19:30 -03:00
LOuroboros
4e3516e2d8 Removed the copy of the Safety Goggle's sprite that I somehow left in by accident. 2019-05-02 15:12:00 -03:00
LOuroboros
36d8371950 Added the sprites and the data for the missing items. 2019-05-02 15:11:06 -03:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
LOuroboros
90e94f50d9 Defined a hold effect for every battle-related item, and added all the missing items' data. 2019-04-30 22:07:43 -03:00
LOuroboros
e77960d2f3 Updated the effects of the Sea and Lax Incenses, and added the item data of the Gen. 4 incenses. 2019-04-30 20:07:12 -03:00
LOuroboros
cda17700c3 Defined a lot of hold effects and added more items data. 2019-04-30 19:41:10 -03:00
LOuroboros
71472b1439 Power items data. 2019-04-30 16:07:48 -03:00
LOuroboros
a48c8f6aba Sachet and Whipped Dream data. 2019-04-30 15:42:36 -03:00
LOuroboros
3316427728 Dubious Disc, Reaper Cloth, Razor Claw, Razor Fang and Prism Scale data. 2019-04-30 15:34:38 -03:00
LOuroboros
e0540dff46 Oval Stone, Protector, Electirizer and Magmarizer data. 2019-04-30 15:00:51 -03:00
LOuroboros
850c93ec64 Rare Bone data. 2019-04-30 14:44:39 -03:00
LOuroboros
3d12e76411 Added Oricorio's Nectars' data. 2019-04-30 14:25:52 -03:00