Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

12991 Commits

Author SHA1 Message Date
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
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
LOuroboros
f521bec102 Added the 7 Apricorns' data. 2019-04-30 14:09:51 -03:00
LOuroboros
b1ab37820b Dawn, Dusk, Shiny and Ice Stones data. 2019-04-30 13:39:58 -03:00
LOuroboros
c5f6f5e588 Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense. 2019-04-30 13:06:08 -03:00
LOuroboros
8e3f2d1e2d Sweet Heart and Big Malasada data. 2019-04-30 12:38:51 -03:00
DizzyEggg
e9a104a0c1 Merge with master 2019-04-30 17:05:09 +02:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00
DizzyEggg
f19b56404b Fix Meowstic f anim 2019-04-23 18:19:46 +02:00
DizzyEggg
2d670fa803 Rotom forms and meowstic female 2019-04-23 13:00:40 +02:00
Fontbane
901a83d249 Fix some labels and include decorations.h 
Include decorations.h in shop.c

Include decorations.h in event_scripts.s
 2019-04-22 17:23:59 -05:00
Fontbane
6cf06d5f95 Doc some event scripts 
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
 2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
DizzyEggg
0666da6145 Merge branch 'master' into pokemon_expansion 2019-04-22 14:12:18 +02:00
DizzyEggg
f1e420ff69 Move tutor and tms compatibility for all mons 2019-04-22 14:10:40 +02:00
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up 
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
 2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus 
Re-PR'd due to excess "merges"
 2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon 
Baneful Bunker + King's Shield
 2019-04-20 08:42:35 +02:00
Papa Cancer
e310d0f10e Core Enforcer 
New code - uses Gastro Acid script instead through own move effect
 2019-04-18 12:10:18 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield 
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
 2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop 
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
 2019-04-17 13:52:25 +01:00
DizzyEggg
50eeddfec6 Evolution stone item effects 2019-04-17 13:05:19 +02:00
DizzyEggg
896d99f919 Merge with master 2019-04-17 12:58:05 +02:00
Marcus Huderle
b8d5c5fb76 Match sub_81D199C 2019-04-16 18:15:03 -05:00
Marcus Huderle
90e555d23e Match sub_81A1224 2019-04-16 16:11:59 -05:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
DizzyEggg
912b87564f Compact item data, make descriptions easier to read 2019-04-16 11:25:26 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
DizzyEggg
b06090fe02 Icons for gen7 mons 2019-04-16 12:31:35 +02:00
DizzyEggg
17cf13beef Merge with master 2019-04-16 11:14:50 +02:00