ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,390 Commits 1 Branch 0 Tags 235 MiB
98ebd7ef5a
Commit Graph

110 Commits

Author SHA1 Message Date
Kurausukun
98ebd7ef5a
fix indentation 2018-11-17 21:29:46 -05:00
Kurausukun
a98ecc08aa fix Aurora Veil's name 2018-11-17 21:16:33 -05:00
Kurausukun
c798d0f1d1 mud-slap should be special, not physical 2018-11-17 16:48:22 -05:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Slawter666
bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
DizzyEggg
bc42de5f60 Aurora Veil, Revelation Dance, Diamond Storm 2018-11-03 14:35:45 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
Deokishisu
94bec0b8db Fix Double Underscores 
Whoops.
 2018-10-14 16:14:01 -04:00
Deokishisu
d7ba8a306c Rename OW Sprites 
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
 2018-10-14 15:49:55 -04:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
DizzyEggg
6b5c52e926 Flower Shield and protect moves 2018-10-06 15:50:35 +02:00
DizzyEggg
de9e9072fc Rototiller and 2 turn moves 2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff Bestow 2018-09-30 12:27:51 +02:00
DizzyEggg
65a48e16ee
Merge pull request #19 from LOuroboros/patch-11 
Update move_names.h
 2018-09-30 11:43:57 +02:00
DizzyEggg
eb4a8b8748
Merge pull request #20 from LOuroboros/patch-12 
Update battle_moves.h
 2018-09-30 11:43:49 +02:00
DizzyEggg
7623eabdee After you 2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe Psycho Shift, Power Trick, Flame Burst 2018-09-29 18:40:14 +02:00
LOuroboros
0621d5ceb7
Update battle_moves.h 
When I made the Gen. 7 moves data, I screwed up Spirit Shackle's effect. I should have gave it EFFECT_PLACEHOLDER as it will probably need a new effect.
 2018-09-29 12:39:27 -03:00
DizzyEggg
ada76cbe4f Synchronoise and Smack Down 2018-09-29 15:43:56 +02:00
LOuroboros
258f1ea606
Update move_names.h 
Decapped move names and fixed U-Turn's,
 2018-09-29 10:06:10 -03:00
DizzyEggg
597299136f Add Pollen Puff effect 2018-09-29 14:10:53 +02:00
DizzyEggg
b8440f4a03
Merge pull request #17 from LOuroboros/patch-9 
Update move_names.h
 2018-09-29 13:49:58 +02:00
DizzyEggg
38fe5011ad
Merge pull request #18 from LOuroboros/patch-10 
Update move_descriptions.h
 2018-09-29 13:49:50 +02:00
DizzyEggg
3f2beff554 Defog 2018-09-23 19:03:53 +02:00
LOuroboros
aa7fab8b66
Update move_descriptions.h 
-Added 4 move descriptions that were missing (Darkest Lariat, Ice Hammer, Anchor Shot and Power Trip).
-Added the table with the pointers for the Gen. 7 moves descriptions.
 2018-09-23 01:41:12 -03:00
LOuroboros
80523b4257
Update move_names.h 
Gen. 7 moves' names
 2018-09-23 01:01:57 -03:00
DizzyEggg
19e1606595 Add Copycat 2018-09-22 18:37:03 +02:00
DizzyEggg
fafcedc722 Clean gen7 moves data merge 2018-09-22 17:35:30 +02:00
DizzyEggg
ef4b74d934
Merge pull request #16 from LOuroboros/patch-8 
Update battle_moves.h
 2018-09-22 17:32:57 +02:00
DizzyEggg
cbaf2d6b86
Merge pull request #15 from LOuroboros/patch-7 
Update move_descriptions.h
 2018-09-22 17:28:53 +02:00
DizzyEggg
db44a7e25a Techno Blast and Autotomize 2018-09-22 17:27:51 +02:00
LOuroboros
3c6b405dd8
Update battle_moves.h 
Gen. 7 moves data.
 2018-09-22 12:24:47 -03:00
DizzyEggg
9474254e4d Final Gambit, Dragon Tail 2018-09-22 16:15:00 +02:00
DizzyEggg
fd15e23419 Placeholder entries for gen7 moves 2018-09-22 14:04:15 +02:00
DizzyEggg
bf11c35eaf Add gen7 learsnets for pokemon 2018-09-22 13:52:38 +02:00
LOuroboros
fff4336a63
Update move_descriptions.h 
Fixed Magma Storm's description. Sorry, I didn't know that it was working like in Gen. 5+
 2018-09-22 08:03:39 -03:00
DizzyEggg
c5831d5f3e
Merge pull request #14 from LOuroboros/patch-6 
Update move_descriptions.h
 2018-09-22 12:24:59 +02:00
DizzyEggg
ca9876b0b4 Updated Wrap Mechanics, Infestation, stat changing move effects 2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4 Shell Smash move effect 2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1 Last Resort, Fangs and Flare Blitz/Volt Tackle 2018-09-22 10:45:43 +02:00