ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,629 Commits 1 Branch 0 Tags 235 MiB
180aa839c4
Commit Graph

1229 Commits

Author SHA1 Message Date
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
DizzyEggg
52d1e69591 Add AI support for newly added moves 2018-12-02 23:50:51 +01:00
DizzyEggg
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
DizzyEggg
d46c3ebe5b Fix Future Sight 2018-12-02 18:47:39 +01:00
Melody
862265b73a defines register_matchcall macro 2018-12-02 06:04:59 -05:00
Melody
c557ac61ae adds constants, cleans up callstd and msgbox code 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
 2018-12-02 03:37:46 -05:00
DizzyEggg
6ae949e360 Psychic Terrain blocks priority moves 2018-12-01 11:35:49 +01:00
DizzyEggg
1a8859b1d8 Add Dazzling 2018-11-30 22:12:18 +01:00
DizzyEggg
0329175f06 Add Protean 2018-11-30 21:21:43 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py 2018-11-27 11:40:29 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
DizzyEggg
a0699dba52 Add Aromatic Mist 2018-11-25 12:59:22 +01: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
DizzyEggg
cc635c5e6d Custom wild multi battles functionality 2018-11-24 17:31:45 +01:00
DizzyEggg
1c8e574646 Custom Multi Battles - fix defeat msg 2018-11-24 17:06:48 +01:00
DizzyEggg
d52016bc31 Mon creation in custom multi battles 2018-11-24 13:29:10 +01:00
DizzyEggg
539b05ff73 Begin working on custom multi battles 2018-11-24 01:02:02 +01:00
LOuroboros
9d93817319
Update battle_anim_scripts.s 2018-11-21 18:27:35 -03:00
LOuroboros
67375ba3c8
Update battle_anim_scripts.s 
New mega evolution animation.
 2018-11-19 21:45:15 -03:00
DizzyEggg
e4fba4bc7e make it assemble 2018-11-19 20:49:38 +01:00
DizzyEggg
a5df797804 Merge branch 'master' into battle_engine_v2 2018-11-19 20:42:07 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
c9f57a3b7b
Merge pull request #28 from PALPATlNE/battle_engine_work 
Fixed U-turn
 2018-11-17 23:20:43 +01:00
PALPATlNE
f7cd950b69 Fixed U-turn 2018-11-17 23:17:41 +01:00
DizzyEggg
dff968d1f1
Merge pull request #26 from PALPATlNE/battle_engine_work 
Battle engine work
 2018-11-17 23:04:00 +01:00
PALPATlNE
4284816d81 Fixed Createsprite command arguments 2018-11-17 21:16:48 +01:00
PALPATlNE
fe8c70b9f8 Fix 2018-11-17 19:59:03 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
DizzyEggg
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
65036b9a09 Merge with master 2018-11-15 21:53:32 +01:00