18854 Commits

Author SHA1 Message Date
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
7c034684bd Merge branch 'master' of https://github.com/pret/pokeemerald into rock-climb 2021-04-02 10:10:04 -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
Evan
492683eeb6 fix stairs north dir bug 2021-04-01 20:11:01 -06:00
Evan
228b76e136 finish conditional slow stairs movement, clean up code a bit 2021-04-01 20:10:41 -06:00
Evan
e4674ccd03 fully working walk/run/mach bike/acro bike regular movement 2021-04-01 20:10:30 -06:00
Evan
31e9f97d52 cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab 2021-04-01 20:10:21 -06:00
Evan
33dfa321b0 init branch 2021-04-01 20:09:12 -06:00
GriffinR
691c680908 Delete unreferenced palette 2021-04-01 14:32:23 -04:00
GriffinR
21fd6827b0
Merge pull request #1394 from GriffinRichards/fix-bgevent
Fix bg event macros
2021-04-01 14:22:48 -04:00
ghoulslash
dfce7f1548 add auto read signposts 2021-04-01 09:45:17 -06:00
GriffinR
1ff6aaf57d Add constant use for match call text ids 2021-04-01 04:21:26 -04:00
GriffinR
f58465a274 Document match_call.c 2021-04-01 03:29:15 -04:00
GriffinR
038505984c Fix bg event macros 2021-04-01 02:42:02 -04:00
BuffelSaft
20a7dec070 Fix Thousand Arrows vs. Flying Type
Should ignore type modifiers against flying types that aren't grounded. Previous code just negated the targets' flying typing.
2021-04-01 17:23:47 +13:00
LOuroboros
ed74430d26 Added a variation of BattleScript_NotAffected
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
LOuroboros
da24b9c251 Tweaked Oblivious
-Made it unaffected by a foe's taunt.
-Changed the Battle Script it calls when a foe tries to infatuate.
2021-03-31 21:20:00 -03:00