ExpoSeed
|
8b83d88e75
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion
|
2020-10-11 00:07:10 -05:00 |
|
Evan
|
5ab17cc713
|
Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine
|
2020-10-09 09:13:17 -06:00 |
|
GriffinR
|
65a4e06737
|
Add ITEM6_HEAL constants, change move flags to shifts
|
2020-10-05 18:48:51 -04:00 |
|
ExpoSeed
|
c3113b43bb
|
Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion
|
2020-10-04 02:36:07 -05:00 |
|
ExpoSeed
|
5794fc69e8
|
Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion
|
2020-10-04 02:35:23 -05:00 |
|
GriffinR
|
66bd1e6d3f
|
Use constants for item digits
|
2020-09-25 11:18:52 -04:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
DizzyEggg
|
97d0643110
|
Merge with master
|
2020-09-08 12:48:28 +02:00 |
|
DizzyEggg
|
448599f53c
|
Merge with master
|
2020-09-08 12:01:20 +02:00 |
|
DizzyEggg
|
271219f962
|
Merge with master
|
2020-09-08 12:00:51 +02:00 |
|
PokeCodec
|
3d87a88067
|
Make battle pyramid defines into enums
|
2020-09-04 19:49:53 -04:00 |
|
PokeCodec
|
3a2a2b6ba9
|
Fix issues according to feedback
|
2020-09-04 19:49:53 -04:00 |
|
PokeCodec
|
d4158e490a
|
Match more functions
|
2020-09-04 19:49:53 -04:00 |
|
PikalaxALT
|
135ed6a162
|
Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
|
2020-09-04 19:44:33 -04:00 |
|
GriffinR
|
f5495d1220
|
Give proper names to underwater maps
|
2020-09-01 03:03:14 -04:00 |
|
GriffinR
|
afb3472282
|
Minor battle_anim_throw cleanup
|
2020-08-30 15:11:44 -04:00 |
|
GriffinR
|
a9719c92bf
|
Merge pull request #1160 from kiliwily/master2
add MAX_LEVEL_UP_MOVES macro
|
2020-08-28 19:18:03 -04:00 |
|
kiliwily
|
c68c2b66e8
|
add more macros
|
2020-08-29 01:02:20 +02:00 |
|
GriffinR
|
09cfed64b5
|
Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
|
2020-08-28 16:14:21 -04:00 |
|
kiliwily
|
5e7b6a089c
|
add MAX_LEVEL_UP_MOVES macro
|
2020-08-28 20:36:07 +02:00 |
|
Thomas Winwood
|
58786a7ac0
|
Add MAX_PER_STAT_EVS macro
|
2020-08-28 02:25:02 +01:00 |
|
DizzyEggg
|
f70a9ce153
|
Merge with master
|
2020-08-27 12:01:28 +02:00 |
|
DizzyEggg
|
c2733236be
|
Merge with master
|
2020-08-27 11:36:35 +02:00 |
|
DizzyEggg
|
35559d6b71
|
Merge with master
|
2020-08-27 10:58:31 +02:00 |
|
GriffinR
|
fbb70b3727
|
Document contest AI scripts
|
2020-08-21 14:57:17 -04:00 |
|
GriffinR
|
ee72696b53
|
Sync encounter musics with encounter music types
|
2020-08-20 21:03:24 -04:00 |
|
GriffinR
|
d356e35b64
|
Fix incorrect pike curtain SE names
|
2020-08-20 20:23:08 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
6c34effda9
|
Merge pull request #1138 from GriffinRichards/doc-contest
Document contest
|
2020-08-20 16:03:47 -04:00 |
|
PokeCodec
|
e27975afaa
|
Match battle script commands by correcting a function and the pokemon struct
|
2020-08-18 22:05:01 -04:00 |
|
GriffinR
|
503dafd210
|
Fix wallys parents misnamed as uncle/aunt
|
2020-08-18 17:51:41 -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
|
2749948eeb
|
Clean up contest doc
|
2020-08-16 05:52:17 -04:00 |
|
GriffinR
|
e98e4652fd
|
Document contest live updates
|
2020-08-16 05:18:09 -04:00 |
|
GriffinR
|
70851d9083
|
Add MAP_SCRIPT descriptions
|
2020-08-11 15:50:09 -04:00 |
|
GriffinR
|
8b95e1964b
|
Merge pull request #1121 from GriffinRichards/doc-roulette
Document roulette
|
2020-08-10 17:18:09 -04:00 |
|
GriffinR
|
078c341b2b
|
Merge pull request #1122 from GriffinRichards/clean-battlemsg
Add stat stage constants, clean up misc battle msg data
|
2020-08-10 14:29:27 -04:00 |
|
LOuroboros
|
d37896d51b
|
Merge branch 'pokemon_expansion' of https://github.com/dizzyeggg/pokeemerald into deoxys
|
2020-08-09 20:55:28 -03:00 |
|
GriffinR
|
5e8ffff62f
|
Add stat stage constants
|
2020-08-04 20:38:57 -04:00 |
|
PikalaxALT
|
03eba6a62c
|
Merge pull request #1116 from GriffinRichards/doc-slotmachine
Document slot machine
|
2020-08-01 09:56:44 -04:00 |
|
GriffinR
|
22b5b6b074
|
Start documenting roulette
|
2020-07-30 19:37:16 -04:00 |
|
GriffinR
|
7ada56f039
|
Merge pull request #1085 from GriffinRichards/doc-overworld
Document field effects / misc overworld
|
2020-07-28 17:54:25 -04:00 |
|
GriffinR
|
1f4813bfd2
|
Document slot machine funcs
|
2020-07-28 17:38:05 -04:00 |
|
DizzyEggg
|
43359f39c3
|
Merge with master
|
2020-07-27 15:28:03 +02:00 |
|
DizzyEggg
|
11c2207839
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2020-07-27 14:54:32 +02:00 |
|
DizzyEggg
|
0066640a1e
|
Merge with master
|
2020-07-27 14:51:39 +02:00 |
|
GriffinR
|
36a4764a78
|
Document some slot machine data
|
2020-07-26 02:15:59 -04:00 |
|
GriffinR
|
2439f42de4
|
Add warnings to generated files
|
2020-07-24 03:43:37 -04:00 |
|
GriffinR
|
aca50c87be
|
Continue new contest documentation
|
2020-07-24 00:14:53 -04:00 |
|
GriffinR
|
52a4428ba6
|
Begin new contest documentation
|
2020-07-23 17:55:40 -04:00 |
|