Commit Graph

156 Commits

Author SHA1 Message Date
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
hondew
e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew
328aecc96e Document throwing pokeball
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
2020-08-30 14:08:06 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
DizzyEggg
62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
GriffinR
a583dfcc42
Merge pull request #1094 from DizzyEggg/rename
Give proper names to some functions
2020-07-14 19:56:46 -04:00
ghoulslash
8f669bb57d
Add critical capture (#402)
* add critical capture

* synax and format fixes
2020-07-14 17:47:15 +02:00
DizzyEggg
0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
DizzyEggg
2c9b4f4b17 Show targets in double battles while hitting multiple pokemon at once 2020-07-14 10:39:54 +02:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
Eduardo Quezada
7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
DizzyEggg
f05375112b Erase isEgg field from battlemon, ability num to 2 bits 2019-08-21 11:56:49 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +02:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
DizzyEggg
e79b6f747b Fix Controllers end command function names 2019-03-05 20:07:59 +01:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00