11626 Commits

Author SHA1 Message Date
BuffelSaft
a82d0681da Implement Mr. Dollsteak's animations
Add animation data provided by Mr. Dollsteak for all gen 1-6 Pokémon (barring megas).
2021-11-21 11:28:46 -03:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
2021-11-21 08:12:21 -05:00
BuffelSaft
abb67e96e8 Finish Expanding Force
Hits both foes if the user is affected by Psychic Terrain. Modified targeting is also shown in the move selection screen.
2021-11-21 21:49:47 +13:00
BuffelSaft
bcaa17ffb3 Finish/tidy up Court Change
Use a macro to simplify timer and status updates, and swap things like reflectBattlerId to the opposing side - this is required for the effects to be properly swapped.
2021-11-21 17:20:45 +13:00
Eduardo Quezada D'Ottone
29172d6357
Merge pull request #1925 from ghoulslash/be/rampage
fix rampage cancelling
2021-11-21 00:15:53 -03:00
Eduardo Quezada D'Ottone
5500954129 Update to item descriptions based on configured effect. 2021-11-21 00:08:46 -03:00
Eduardo Quezada D'Ottone
31d7719429
Merge pull request #1913 from LOuroboros/healingItems
Changed I_LEGACY_HEALING_ITEMS
2021-11-20 23:37:24 -03:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
LOuroboros
8c014e94a3 Assigned a flingPower value to the Moon Stone 2021-11-20 20:34:52 -03:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
W1serV1ser
844a0217f7 Fixed spacing, added braces, and reverted comment 2021-11-20 12:04:21 -08:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08:00
kleeenexfeu
62b31aec55
syntax 2021-11-20 02:12:43 +01:00
kleeenexfeu
da20dae9c3
Only recalculate speed for battler choosing a move
Other actions have priority
2021-11-20 02:09:33 +01:00
kleeenexfeu
6402a7ab6e
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:42:20 +01:00
kleeenexfeu
c1743db19a
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:45 +01:00
kleeenexfeu
acddeeb1f9
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:33 +01:00
ghoulslash
cb0266fb86
Merge pull request #1920 from LOuroboros/vitamins
Fixed an incorrect #elif
2021-11-19 16:57:19 -05:00
LOuroboros
ad8582064b #elif without condition bad, #else good 2021-11-19 18:49:30 -03:00
Eduardo Quezada D'Ottone
377c313771
Merge pull request #1919 from ghoulslash/be/unseenfist
Fix unseen fist check
2021-11-19 18:48:58 -03:00
ghoulslash
fb468b6776 fix unseen fist check 2021-11-19 16:32:00 -05:00
kleeenexfeu
fa4d71817b
Spaces instead of tab 2021-11-19 22:30:30 +01:00
kleeenexfeu
03a9f3f413 Mega Evolution alters turn order 2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone
1696e60b9f
Merge pull request #1876 from ghoulslash/be/ai_updates
Some more CanAIFaintTarget checks and other AI updates
2021-11-19 17:33:21 -03:00
Eduardo Quezada D'Ottone
ef3f573cc2
Merge pull request #1917 from BuffelSaft/unseen_fist
Implement Unseen Fist
2021-11-19 17:29:25 -03:00
BuffelSaft
14a2e86313 Fix Scale Shot
Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.
2021-11-19 21:57:32 +13:00
BuffelSaft
48c91d03cd Fix terrain checks on DLC moves
Expanding Force and Rising Voltage now boost damage correctly. Expanding Force doesn't hit both targets yet however.
2021-11-19 20:20:16 +13:00
BuffelSaft
86efd69370 Finish/fix Beak Blast
This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.
2021-11-19 20:19:10 +13:00
BuffelSaft
98712e576e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2021-11-19 17:48:11 +13:00
GriffinR
42a83ee50e Use STR_VAR names for apprentice_buff and frontier_gettrainername 2021-11-18 23:20:05 -05:00
GriffinR
e66ea0cb99 Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BuffelSaft
16a4fc9062 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-11-19 16:33:24 +13:00
BuffelSaft
c4f27174c3 Implement Unseen Fist
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 16:21:33 +13:00
GriffinR
c57efdba5d Allow compare + goto_if/call_if as a single statement 2021-11-18 22:06:53 -05:00
GriffinR
6c6487dd7a Missing spaces to tabs in scripts files 2021-11-18 21:02:22 -05:00
GriffinR
591ab7241f Macro comment typo fix, Object->object 2021-11-18 17:24:43 -05:00
TheXaman
2f8896f2f0 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system 2021-11-18 15:13:04 +01:00
TheXaman
5104293344 Changed to TX_DEBUGGING define instead of makefile DEBUGGING option 2021-11-18 15:09:06 +01:00
GriffinR
c89dfd9f56 Finish updating macro comments 2021-11-18 01:47:58 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
1b35f9adad Use specific name limits for string limit functions 2021-11-17 22:11:03 -05:00
GriffinR
b9fa18bdd4 Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros 2021-11-17 22:03:37 -05:00
GriffinR
c4f8f4d11a Add STR_VAR_# ids to string buffer macros 2021-11-17 22:00:44 -05:00
Eduardo Quezada D'Ottone
0c448fdf6e
Merge pull request #1910 from LOuroboros/vitamins
Updated Vitamins cap
2021-11-17 22:25:59 -03:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
GriffinR
700425ef5f Index sMapHealLocations 2021-11-17 15:52:04 -05:00
GriffinR
c1970a4bc8 Remove dead sub references 2021-11-17 15:47:47 -05:00
GriffinR
cfb9ae40d7
Merge pull request #1557 from GriffinRichards/fix-calcrom-0
Fix calcrom's handling of 0s
2021-11-17 15:11:23 -05:00
GriffinR
ec97a21f95 Fix calcrom's handling of 0s 2021-11-17 15:04:42 -05:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
Document Pokénav
2021-11-17 14:47:34 -05:00