ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-17 19:18:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,090 Commits 1 Branch 0 Tags
Commit Graph

1672 Commits

Author SHA1 Message Date
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
DizzyEggg
54bc7d329e Cherrim 2019-06-16 09:27:42 +02:00
DizzyEggg
eba97fb3e1 Add Cherrim form in a better way 2019-06-15 14:31:43 +02:00
DizzyEggg
54150e3794 Revert "Cherrim sun form gfx" 
This reverts commit cd09047c4f6400fa4b150350198efabbc648a6bc.
 2019-06-15 14:16:11 +02:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
cd09047c4f Cherrim sun form gfx 2019-06-10 11:16:52 +02:00
DizzyEggg
fffeefd0e2
Merge pull request #159 from LOuroboros/patch-2 
Update base_stats.h
 2019-06-09 11:50:12 +02:00
LOuroboros
68b744b3e4
Update base_stats.h 
Corrected the label of the Razor Claw in 3 instances, so people can comment things out more easily.
 2019-06-07 08:25:15 -03:00
LOuroboros
7cb5ebcb8d
Update evolution.h 
Fixed a typo and corrected the label of the Shiny and Dusk Stones in 2 instances, so people can comment things out more easily.
 2019-06-07 08:14:16 -03:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
0eaddd251c Merge branch 'master' into item_expansion 2019-06-03 11:06:09 +02:00
DizzyEggg
c81d06b712 Fix EV wings 2019-06-03 11:05:03 +02:00
DizzyEggg
832c452f0b
Merge pull request #148 from LOuroboros/item_expansion 
Added the data, sprites and sprites data of the Wings.
 2019-05-28 10:22:38 +02:00
DizzyEggg
453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics 
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
 2019-05-22 21:10:16 -05:00
DizzyEggg
e9829c16c4 Correct effect for seed flare 2019-05-20 09:18:49 +02:00
DizzyEggg
7ec9123b0a Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:16:13 +02:00
DizzyEggg
a70dceefb2
Merge pull request #154 from LOuroboros/patch-1 
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
 2019-05-20 09:15:58 +02:00
DizzyEggg
88bbdc494b Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:14:32 +02:00
DizzyEggg
09c0a195ac Merge branch 'master' into battle_engine_v2 2019-05-20 09:05:12 +02:00
LOuroboros
a14016240a
Razor Leaf is a Physical move, not a Special one. 2019-05-20 03:34:13 -03:00
LOuroboros
f81daeab45
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance 
Title is self-explanatory. As of Gen. 5, Healing Wish and Lunar Dance are affected by Snatch.
 2019-05-19 23:32:59 -03:00
AJ Fontaine
ba27907f98
Fix some typos in item names 2019-05-17 21:07:44 -04:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
LOuroboros
c8a7f2a32c Oops. I've put the .secondaryId field for the Muscle Wing twice. 2019-05-17 07:56:54 -03:00
LOuroboros
2592d38303 Added the data, sprites and sprites data of the Wings. 2019-05-17 07:52:41 -03:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
ca51bc23bf Merge branch 'master' into item_expansion 2019-05-17 09:36:35 +02:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -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
26e4b52fe8 Dummy learnsets for forms 2019-05-16 10:16:00 +02:00
DizzyEggg
6367269ce9 Add dummy learnsets 2019-05-15 13:47:33 +02:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
DizzyEggg
6f5e9a1944 Merge branch 'master' into item_expansion 2019-05-14 14:02:07 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
DizzyEggg
9abdf224cb Coords for megas 2019-05-12 08:49:57 +02:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
a22495d7cb Gen4 mon animations 2019-05-05 10:09:52 +02:00
DizzyEggg
5b23f3787e Tweak up batle item's secondary ids 2019-05-04 09:15:10 +02:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00