Commit Graph

3828 Commits

Author SHA1 Message Date
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
Diegoisawesome
6acf6aed04
Merge pull request #391 from DizzyEggg/frontier
Clean up bss/common/ewram symbols and decompile mossdeep
2018-11-19 13:29:07 -06:00
DizzyEggg
58a1bba059 tabs to spaces 2018-11-19 20:25:09 +01:00
DizzyEggg
f0ec68c058 add include 2018-11-19 18:14:28 +01:00
DizzyEggg
9f8bcadad5 apprentice and factory screen common symbols 2018-11-19 18:06:15 +01:00
DizzyEggg
37d49b34e0 Move vars to battle_main.c 2018-11-19 17:36:39 +01:00
DizzyEggg
5d5b4b853c Merge branch 'master' into frontier 2018-11-19 17:32:32 +01:00
DizzyEggg
8a00334102 document mossdeep gym 2018-11-19 17:31:46 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01:00
DizzyEggg
6a5b20ee8a Fix fossil specials 2018-11-19 17:15:28 +01:00
Marcus Huderle
8f2ddf2997
Merge pull request #390 from huderlem/battle_anim_utility_funcs
Decompile all of battle_anim_utility_funcs
2018-11-19 09:42:43 -06:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
95d3c180cc clean up variables in files 2018-11-19 01:03:14 +01:00
DizzyEggg
b0c78065e5
Merge pull request #30 from Kurausukun/battle_engine_v2
Fix Aurora Veil's name, update Gen 1-3 moves to be consistent with Gen 7
2018-11-18 20:51:16 +01:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
Diegoisawesome
963989d760
Merge pull request #389 from DizzyEggg/num_stats
Use PARTY_SIZE and rename BATTLE_STATS_NO to NUM_BATTLE_STATS
2018-11-18 13:36:34 -06:00
DizzyEggg
f58cc47e17 USE RGB constants in hall of fame 2018-11-18 20:32:27 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve
Clean up save related files
2018-11-18 13:13:56 -06:00
Diegoisawesome
e8415c51d1
Merge pull request #387 from DizzyEggg/battle_pyramid
Battle pyramid
2018-11-18 13:09:19 -06:00
DizzyEggg
682e6c8512 Use RGB constants in save files 2018-11-18 20:09:11 +01:00
DizzyEggg
f2d3babd30 rename to mossdeep gym 2018-11-18 20:04:53 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
7ce3473b0e Clean up save related files 2018-11-18 19:37:18 +01:00
DizzyEggg
4803a31b84 Fix unk5 field 2018-11-18 17:54:15 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
6cb262aa20 un-static a function 2018-11-18 11:09:40 +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
DizzyEggg
c2a3cff814 Fix physical atk stat stage and third type 2018-11-17 23:47:35 +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
DizzyEggg
1abc024194
Merge pull request #27 from Kurausukun/battle_engine_v2
mud-slap should be special, not physical
2018-11-17 23:02:12 +01:00
DizzyEggg
40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
Kurausukun
c798d0f1d1 mud-slap should be special, not physical 2018-11-17 16:48:22 -05:00
PALPATlNE
4284816d81 Fixed Createsprite command arguments 2018-11-17 21:16:48 +01:00
PALPATlNE
a5ba055814 Added new move animations 2018-11-17 20:15:38 +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
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite
Update createsprite macro and rename BANK to BATTLER
2018-11-15 14:45:13 -06:00
Diegoisawesome
09d09122bc
Merge pull request #384 from garakmon/subdirs
Subdirectories in build
2018-11-15 14:25:21 -06:00
Diegoisawesome
39f54b346d
Merge pull request #382 from Slawter666/synchronise
Move field effects enum to defines
2018-11-15 14:24:22 -06:00
Diegoisawesome
216c388001
Merge pull request #385 from garakmon/nodep
fix dependency scanning
2018-11-15 14:19:57 -06:00