Commit Graph
226 Commits
Author SHA1 Message Date
LOuroboros b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
LOuroboros a506bf03c6 Corrected Flower Veil check 2021-10-01 02:14:46 -03:00
ghoulslash 761006a164 merge with be 2021-09-26 19:19:32 -04:00
GriffinR a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
ultima-soul fe6a11e5ec Update asm/macros/battle_script.inc 2021-09-23 12:26:36 -07:00
ghoulslashandultima-soul 767e25bfed Update asm/macros/battle_script.inc
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 13:19:12 -06:00
ghoulslash 2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash 94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash 13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
ghoulslash 0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash 9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash 9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash 60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash 7c53214dad merge with be 2021-09-02 15:33:42 -04:00
LOuroboros 9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ghoulslash c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ghoulslash 4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
ghoulslash c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
MissingNoL bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
MissingNoL f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
ghoulslash 5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ultima-soul 14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR 7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul 5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
Evan 6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
LOuroboros fc04c6974b Edit->Blank Operations->Trim Trailing Space for the win 2021-02-01 17:05:49 -03:00
Evan c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan dd51edd881 add eerie spell, surging strikes, jungle healing 2021-01-28 10:51:00 -07:00
GriffinR 4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
Evan 8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
Evan e61309dce6 merge with be 2021-01-20 17:34:24 -07:00
Evan 16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
Evan 10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan 7fffe23e63 add terrain seeds 2021-01-06 20:22:05 -07:00
Evan 0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
Evan a0b9ece980 merge with BE 2020-12-20 16:39:50 -07:00
Evan b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Evan d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan 39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
Evan 4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan 1c398c3d4b totem format fixes 2020-11-19 10:37:15 -07:00
Evan 99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00