Commit Graph

3301 Commits

Author SHA1 Message Date
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
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 40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
DizzyEggg eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +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
garak c067c4e617 fix dependency scanning 2018-11-14 19:12:12 -05:00
garak 87ec71f71b subdirs in build 2018-11-14 17:59:30 -05:00
Slawter666 4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666 6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
garak c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak 269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
Slawter666 1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
Diegoisawesome f639c7c309
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
2018-11-12 14:05:40 -06:00
DizzyEggg b5ea69cf74 Fix conflicts 2018-11-12 19:22:23 +01:00
Diegoisawesome 54ad6794bc
Merge pull request #361 from Slawter666/synchronise
Synchronise with pokeruby
2018-11-12 11:37:18 -06:00
DizzyEggg 734403fdfa Merge branch 'master' into frontier_2 2018-11-12 15:42:44 +01:00
DizzyEggg 69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
Slawter666 1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Slawter666 be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00:00
DizzyEggg d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg 3b3cffac44 Decompile battle pike 2018-11-12 14:07:31 +01:00
DizzyEggg 4fb463377c Start battle pike 2018-11-12 00:46:02 +01:00
DizzyEggg a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg 81410fee17 Factory done 2018-11-11 16:44:27 +01:00
DizzyEggg 1437755cdd Start arena 2018-11-07 22:54:42 +01:00
Diegoisawesome 65f053fd89 Thanks Egg 2018-11-07 14:48:06 -06:00
Diegoisawesome a052e45f27
Merge pull request #379 from DizzyEggg/derp
ScriptMenu_MultichoiceGrid
2018-11-07 14:41:29 -06:00
DizzyEggg 01fdb01364 Diego pls 2018-11-07 21:09:54 +01:00
Diegoisawesome 7ab8ff0d81 Merge branch 'master' of github.com:pret/pokeemerald 2018-11-07 12:35:49 -06:00
Diegoisawesome 9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06:00