ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 13:45:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,056 Commits 1 Branch 0 Tags 235 MiB
7c9ddd23c1
Commit Graph

565 Commits

Author SHA1 Message Date
Kurausukun
13ea841e32 change pokemon types to use fairy type 2018-11-24 21:16:32 -05:00
DizzyEggg
434e257943 Add Acupressure 2018-11-24 21:06:53 +01:00
DizzyEggg
194139a35b Add Move Effect - Feint 2018-11-24 19:37:10 +01:00
Kurausukun
3ef247ce56 Merge branch 'battle_engine_v2' of https://github.com/Kurausukun/pokeemerald 2018-11-17 21:33:54 -05:00
Kurausukun
febb4a612a Update Gen 1-3 moves to be consistent with Gen 7 2018-11-17 21:32:03 -05:00
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
DizzyEggg
23a06c0836 Close combat effect 2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2 Growth gen6 effect 2018-09-22 01:01:13 +02:00
DizzyEggg
602c1322e4 almost full support for link battles mega evolution 2018-09-20 11:23:12 +02:00
LOuroboros
49cf3eb396
Update move_descriptions.h 
Descriptions for Roar of Time and Magma Storm. I think that I did things correctly, but please check before merging, just in case.
 2018-09-18 00:26:22 -03:00
DizzyEggg
1018b8f2a8
Merge pull request #13 from Tetrable/battle_engine_v2 
Add periods to the end of ability descriptions.
 2018-09-17 20:03:32 +02:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3 
Use pokeruby's formatting for move descriptions
 2018-09-17 10:11:12 -05:00
DizzyEggg
55f21c1776 Mega Evolution support is mostly done. 2018-09-16 18:55:32 +02:00
Tetrable
9397618d9d Missed a description 2018-09-16 16:40:02 +01:00
Tetrable
8d4d5b501c Add periods to the end of ability descriptions. 2018-09-16 16:36:47 +01:00
DizzyEggg
33b6ec8c0a Add move descriptions for moves 2018-09-16 15:59:17 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
c3a5001945 Add Ability Descriptions: credits to BluRose :3 2018-09-16 10:18:35 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master 
Document main_menu
 2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
DizzyEggg
c6c8b7b0fd Merge branch 'master' into battle_engine_v2 2018-09-10 14:49:24 +02:00
Tetrable
044ef98309 Document trainer animations, correct unused table labelling 2018-09-09 22:35:07 +01:00
Diegoisawesome
e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Slawter666
291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Slawter666
54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
Diegoisawesome
f8f7a8e300
Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Slawter666
0cd250a83e
Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
DizzyEggg
f9af3bec9b merge with master 2018-09-02 00:07:19 +02:00
DizzyEggg
5c7ca813e7 Add AI flags to trainers data 2018-09-01 21:25:19 +02:00
DizzyEggg
7ba59334d0 Revert testing trainer 2018-09-01 17:40:49 +02:00
DizzyEggg
f3e5c488a3 DONT SPAM HELPING HAND IN DOUBLES 2018-09-01 17:36:09 +02:00
DizzyEggg
490a4f993b Merge with master 2018-09-01 12:38:38 +02:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
Diegoisawesome
96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome
26ef40553c Move data from include to src 2018-08-23 02:32:34 -05:00
DizzyEggg
5dd1afd383 contest effect review changes 2018-08-16 22:55:36 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg
0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
DizzyEggg
cc145a45f7 merge with master 2018-08-12 22:37:28 +02:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets 
Plus fix Brendan's surfing and watering frame order.
 2018-07-29 17:29:36 +01:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
DizzyEggg
0148cc8b0c merge with master, gen6 move names 2018-07-28 00:01:34 +02:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05:00
DizzyEggg
7ea5dd7923 start fldeffect cut 2018-06-16 00:45:48 +02:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
ed245b677a Add remaining rodata to event_object_movement.c 2018-06-11 18:17:31 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00