ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,591 Commits 1 Branch 0 Tags 235 MiB
a128192bfe
Commit Graph

2644 Commits

Author SHA1 Message Date
BuffelSaft
55b279ba0a Fix several move effects 
Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.
 2021-11-13 16:29:12 +13:00
GriffinR
ef935f6f4a
Merge pull request #1544 from GriffinRichards/romheadergf 
Split headers from crt0.s
 2021-11-09 23:54:57 -05:00
BuffelSaft
e2599c2469 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-10 14:31:32 +13:00
GriffinR
54b254a829 Add CRY_MODE constants 2021-11-07 13:33:05 -05:00
ghoulslash
41bf1dc2f4 merge w be 2021-11-06 10:40:57 -04:00
LOuroboros
5f458c9cd3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-05 10:58:53 -03:00
BuffelSaft
ee83d1142c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1 2021-11-05 21:40:05 +13:00
cbt6
32aaf6912f Rename movement scripts to use Faster over Fastest 2021-11-05 02:22:28 +08:00
LOuroboros
4f251e6ec2 Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN 2021-11-04 12:13:55 -03:00
BuffelSaft
cecd341011 Fix Tar Shot 
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
 2021-11-04 20:47:45 +13:00
BuffelSaft
3baf2aa331 Remove trynextdart, update waitmessage 0x40 
Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.
 2021-11-04 20:19:18 +13:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit 
Full credit to Nunuchu42 and cfmnephrite for this code.
 2021-11-04 19:50:54 +13:00
LOuroboros
b931e34172 Handled Mimicry's interaction with Steel Roller's effect 2021-11-03 23:23:28 -03:00
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
LOuroboros
af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
ghoulslash
98b4b821dc merge with be 2021-11-01 13:55:55 -04:00
ghoulslash
a1e64fce4f handle simple beam, gastro acid 2021-11-01 13:50:57 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
GriffinR
dac4192fd3 Split headers from crt0 2021-10-31 16:39:54 -04:00
GriffinR
13cd2a41f0 Better braille support 2021-10-30 16:19:10 -04:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
a77f058146 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-10-28 14:24:43 -03:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections 
Also repositioned VARIOUS_JUMP_IF_SPECIES.
 2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
LOuroboros
8c35a68060 Quick syntax tweaks 2021-10-27 11:19:39 -03:00
LOuroboros
fc7f1acf20 Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser 2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
LOuroboros
a6315ffc75 Implemented Plasma Fists 2021-10-19 09:50:18 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
LOuroboros
dcea8e45ed Fixed jumpifspecies 2021-10-17 10:51:55 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b Fix Battle Bond 
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
 2021-10-14 16:18:11 +13:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00
ghoulslash
25a4da71fe remove unused macro 2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04:00
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
ghoulslash
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
ExpoSeed
5a5c257f68 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-09-02 21:43:20 -05:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07: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
ultima-soul
3f75a58137 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-11 16:55:29 -07:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07: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
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock 
Fix some object lock names
 2021-07-03 11:21:10 -04:00
Xhyzi
c2bd046ea6 Shell Trap 2021-06-15 20:22:50 +02:00
Xhyzi
155e9b6332 Court Change 2021-06-15 20:14:10 +02:00
Xhyzi
0202b75822 Beak Blast 2021-06-15 19:57:21 +02:00
Xhyzi
7799e49e3a Corrosive Gas 2021-06-15 19:45:24 +02:00
ExpoSeed
c8fc141287 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-06-10 11:54:20 -05:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07: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
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ExpoSeed
6a977bdbfc Document second parameter of playbgm 2021-05-21 15:08:00 -05:00
GriffinR
4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07: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
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04: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
GriffinR
21fd6827b0
Merge pull request #1394 from GriffinRichards/fix-bgevent 
Fix bg event macros
 2021-04-01 14:22:48 -04:00
GriffinR
038505984c Fix bg event macros 2021-04-01 02:42:02 -04:00
GriffinR
f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07: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
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
ExpoSeed
4a8e18cea2
Merge pull request #1336 from LOuroboros/cries_PE_redux 
Various tweaks related to Pokémon cries
 2021-02-03 11:26:44 -06:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers 
Document battle controllers, misc other battle
 2021-02-02 00:24:16 -05: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
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05: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
LOuroboros
0da2fd0dcb Renamed cry_not and cry2_not macros 2021-01-18 11:43:34 -03:00
Evan
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -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
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Evan
a0b9ece980 merge with BE 2020-12-20 16:39:50 -07:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -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
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -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
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
752aca7698 finish z move anims 2020-11-29 09:22:31 -05:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion 
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
 2020-11-28 14:56:01 -03:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -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
Aaron B-D
151aca8365 Changed how scripted wild encounters work to include double battles 
Removed the old commands for scripted wild double encounters
 2020-11-17 03:13:00 -05:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
Aaron B-D
b83a87c8e8 Added scripted double wild battles 2020-10-19 14:47:32 -04:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -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
ExpoSeed
3860551777 Mark unused script commands 2020-09-25 13:41:17 -05:00
Kurausukun
f4a49dcd1d Make all arguments for audio macros required 2020-09-17 19:56:55 -04:00
Kurausukun
b9644e9583 Update Audio Macros 
Information: Our current audio macros preclude the definition of root
key and pan (applicable when used in drumsets, aka "keysplit_all") for
GB channels. However, this functionality does exist in m4a--Pokemon
Emerald just happens not to use it. However, for the sake of people
working with custom music, I believe these values should be modifiable
by users.

Additionally, given the recent events that have occurred with this repo,
I would like to make something fully clear: I have indeed looked at the
GBA SDK before, which contains notes on how these sounds are defined;
therefore, I cannot blame you if you reject this PR on the grounds that
the information is "tainted." However, this information is readily
available and matches the same macros used for directsound--it's hardly
information that one would need the source to know.
 2020-09-17 03:12:19 -04: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
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248 Document contest AI commands 2020-08-21 02:36:48 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
DizzyEggg
43359f39c3 Merge with master 2020-07-27 15:28:03 +02:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
DizzyEggg
3a220d0733 ai tweaks 2020-07-26 13:48:25 +02:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
ec4c73711e Rest Sleep Talk wake up awaraness 2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
DizzyEggg
ff5fc97859 Merge with master 2020-07-11 14:07:10 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
Ryuhouji
8e2128f22c
Fix indentation 2020-07-09 15:36:22 -04:00
Ryuhouji
d261374044
Made documentation more readable 
This change will make the script command documentation more user-friendly to read.
Additionally, provided the information on the 'delay' macro. I have confirmed that this
is indeed Frames and not Milliseconds. Updated the macro respectively.
 2020-07-09 15:16:37 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup (#454) 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
 2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9 Rocky Helmet before Knock Off 2020-06-25 16:15:11 +02:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine 
add animations for all moves
 2020-05-29 12:53:17 +02:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363) 
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
 2020-05-28 10:38:27 +02:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -06:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
DizzyEggg
0ed8b9337e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-04-29 09:04:28 +02:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
738d92e39d Infiltrator affects mist safeguard 2020-04-23 11:29:19 +02:00
DizzyEggg
40ce053ce1 Adrenaline Orb 2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion (#306) 
* Status move poisoning for Steel and Poison types.

* Can poison itself with Toxic Orb.

* Secondary effect poisoning now working.

* Created a function that checks if abilities can bypass type immunities.

* Created macro to handle typeimmunity

* Applied review changes.

* Applied review requests.

* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
 2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa Ally Switch, tbd 2020-04-20 20:05:04 +02:00