18156 Commits

Author SHA1 Message Date
GriffinR
b926fa6b07 Document thunderstorm 2021-04-04 00:44:20 -04:00
GriffinR
1494a83035 Sync drought with pokefirered, add weather tags 2021-04-03 22:47:58 -04:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect
And updated its description.
2021-04-03 23:47:10 -03:00
GriffinR
fe1b757af5 Some constant use in WallyHandleActions 2021-04-03 16:37:00 -04:00
GriffinR
b6711441f5 Fix AI Guard Spec use, and Specs->Spec 2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
e5c8e841dc
Merge pull request #1449 from ExpoSeed/master
item expansion ci
2021-04-02 22:46:46 -07:00
ultima-soul
b831d2a16b
Merge pull request #1448 from ExpoSeed/master
pokemon expansion ci
2021-04-02 22:46:34 -07:00
ultima-soul
5073be0a0b
Merge pull request #1447 from ExpoSeed/master
battle engine ci
2021-04-02 22:46:19 -07:00
ExpoSeed
579ff8aeaf newline 2021-04-03 00:38:15 -05:00
ExpoSeed
77d5699072 new workflow 2021-04-03 00:26:55 -05:00
ultima-soul
f518ec911c
Merge pull request #1428 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-04-02 22:18:42 -07:00
ultima-soul
4517196c3f
Merge pull request #1427 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-04-02 22:18:05 -07:00
ultima-soul
17bdabaf54
Merge pull request #1426 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2021-04-02 22:17:43 -07:00
LOuroboros
4d773ef40c Removed the BattleScript from Inner Focus
Any questions shall be directed to Mr. Junichi Masuda.
2021-04-03 00:17:30 -03:00
LOuroboros
480e6a1ffc Tweaked Ability PopUp for Inner Focus 2021-04-02 21:04:04 -03:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
ghoulslash
5e948e746b add dexnav 2021-04-02 12:28:00 -06:00
AmbientDinosaur
d310edda4b
Keen Eye evasion ignoring effect from Gen 6 2021-04-02 19:25:07 +02:00
GriffinR
677b4fc394
Merge pull request #1396 from GriffinRichards/fix-guards
Add missing include guard suffixes
2021-04-02 13:06:18 -04:00
GriffinR
1b8d405b5e Add missing include guard suffixes 2021-04-02 12:54:40 -04:00
ghoulslash
42c7a5fea2 fix z move move IDs 2021-04-02 10:28:08 -06:00
ghoulslash
4b02f26e73 Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps 2021-04-02 10:10:58 -06:00
ghoulslash
3f98ee25f2 add ifndef to MEScrCmd_addtrainer 2021-04-02 09:23:19 -06:00
Evan
ef6c4ddbb1 remove 1000ish bytes with ramscript (thx griffinR for advice) 2021-04-02 09:17:10 -06:00
Evan
741f62fc0b merge 9fd576f37e021f119513a38d3d6e39a2c64f85ec 2021-04-02 09:17:00 -06:00
ghoulslash
5636706386 fix battle move data 2021-04-02 09:08:08 -06:00
ghoulslash
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
GriffinR
a836bd1085 Add missing trainer constant use 2021-04-02 02:17:36 -04:00
GriffinR
87430a1ebc Add WAIT_TIME battle script constants 2021-04-02 02:16:01 -04:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b Document Contest Lady TV Show 2021-04-02 01:49:38 -04:00
LOuroboros
5106867116
Update battle_util.c 2021-04-02 04:10:20 +00:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred
Document intro and credits sequences
2021-04-01 23:13:59 -04:00
ghoulslash
42cc81a0b9 DoBobbingFieldEffect declaration 2021-04-01 20:26:21 -06:00
GriffinR
51970f97b0
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend
Document Dewford Trend and match_call.c
2021-04-01 22:19:48 -04:00
Evan
09c5e27a90 syntax fix 2021-04-01 20:15:58 -06:00
Evan
13c5f15e56 cherry pick 53731a7fc7579e61d5ee7d32d0e06f1cbe5a085d 2021-04-01 20:15:51 -06:00
Evan
7b9f308547 fix trigger tiles at end of sideways stairs (thx spherical ice for bug report) 2021-04-01 20:15:15 -06:00
Evan
01d08d3cee fix sand onto sideways stairs bug 2021-04-01 20:15:02 -06:00
Evan
397da3736c follower movement and slow stairs 2021-04-01 20:14:55 -06:00
Evan
a23f716209 add slow stair movement back 2021-04-01 20:14:47 -06:00
Evan
598f5dd914 cherry pick 8960588d0b0b9e31c8971173396f6e631930229b 2021-04-01 20:14:32 -06:00
Evan
d3d29d7cb5 cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d 2021-04-01 20:12:43 -06:00
Evan
3f94abf03d fix collision freezing 2021-04-01 20:11:16 -06:00
Evan
7d4545c088 fix same-level movement on stairs 2021-04-01 20:11:09 -06:00