BuffelSaft
910fdfa94a
Revert "Fix multi target moves"
...
This reverts commit b5293cc3e2
.
2021-10-19 16:25:01 +13:00
Eduardo Quezada D'Ottone
3c6101d957
Clear gStatuses4 data
2021-10-18 21:55:16 -03:00
GriffinR
24b4e898ad
More mauville_old_man clean up
2021-10-18 14:40:04 -04:00
GriffinR
b31bddddca
Clean up metatile_behavior
2021-10-18 12:54:29 -04:00
ghoulslash
91e6c8fb0e
Merge pull request #1784 from LOuroboros/gravAppleAI
...
Small AI improvement related to Grav Apple
2021-10-18 09:18:25 -04:00
LOuroboros
25255475a7
AI will now take Grav Apple's new effect in consideration
2021-10-18 10:05:19 -03:00
GriffinR
7590bacec1
Label remaining symbols in field_specials
2021-10-18 02:14:29 -04:00
GriffinR
46dd10c87b
Clean up trainer_pokemon_sprites
2021-10-18 01:56:24 -04:00
GriffinR
db8ce5d7f9
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare
...
Updated Glare
2021-10-17 22:11:33 -04:00
GriffinR
ed6fdd743f
Some pokemon_icon clean up
2021-10-17 22:04:08 -04:00
GriffinR
a950f9c771
Clean up international_string_util
2021-10-17 21:51:11 -04:00
GriffinR
f2e0c9ec9d
Some pokedex clean up
2021-10-17 21:32:09 -04:00
GriffinR
371a13e9f9
Clean up in save_location
2021-10-17 17:38:52 -04:00
Eduardo Quezada D'Ottone
e3252a68cd
Merge pull request #1545 from MissingNoL/PLG
...
Implemented PLG move effects
2021-10-17 18:30:50 -03:00
GriffinR
c70ec9748a
Some union_room_chat clean up
2021-10-17 17:27:32 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG
2021-10-17 17:38:54 -03:00
GriffinR
164590e37d
Merge pull request #1512 from GriffinRichards/minor-constants
...
Add some misc constants/usage
2021-10-17 11:32:30 -04:00
LOuroboros
e7ad7319e3
Updated Glare
2021-10-17 12:03:35 -03:00
LOuroboros
dcea8e45ed
Fixed jumpifspecies
2021-10-17 10:51:55 -03:00
Eduardo Quezada D'Ottone
aa344aa0a2
Merge pull request #1781 from LOuroboros/dynaCannon
...
Set the right .effect to Dynamax Cannon
2021-10-17 10:17:18 -03:00
LOuroboros
5d0350cdbc
Set the right .effect to Dynamax Cannon
2021-10-17 10:08:30 -03:00
Eduardo Quezada D'Ottone
df817fb2ab
Merge pull request #1772 from LOuroboros/gravApple
...
Added Grav Apple's power boost
2021-10-17 09:51:29 -03:00
LOuroboros
d6304099ac
Review optimization
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-10-17 09:42:31 -03:00
LOuroboros
59cfbe55c1
Gave Grav Apple a move effect of its own
2021-10-17 09:27:35 -03:00
GriffinR
ff594ccb82
Fix leftover icon_shadow names
2021-10-17 03:22:55 -04:00
GriffinR
ece7ef3410
Correct usage of MysteryEvent to MysteryGift
2021-10-17 03:00:48 -04:00
GriffinR
d0455485c3
Clean up mystery gift headers
2021-10-17 02:18:24 -04:00
GriffinR
3cd27acbea
Document wonder news
2021-10-17 02:09:31 -04:00
GriffinR
5f9069628d
Clean up mevent2
2021-10-17 01:35:26 -04:00
GriffinR
c7d550e96c
Clean up wonder card/news view
2021-10-17 01:15:16 -04:00
GriffinR
356e6d7f08
Clean up mystery gift menu
2021-10-16 23:58:11 -04:00
GriffinR
845a5e99cc
General mystery gift documentation, finish mystery gift client/server/scripts
2021-10-16 23:35:17 -04:00
Eduardo Quezada D'Ottone
9ebc436a9d
Merge pull request #1776 from ghoulslash/move_target
...
Expand move target field to u16
2021-10-16 18:27:29 -03:00
ghoulslash
964e7efba9
fix MOVE_TARGET_ALL_BATTLERS and other u8 vars
2021-10-16 16:23:17 -04:00
Eduardo Quezada D'Ottone
d8400416ac
Merge pull request #1773 from ghoulslash/prankster
...
Redo Prankster
2021-10-16 17:15:29 -03:00
ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
ghoulslash
b7dcbca871
remove atkCancelerTracker reset
2021-10-16 11:25:20 -04:00
ghoulslash
611076c24d
move prankster to ABILITYEFFECT_MOVES_BLOCK
2021-10-16 10:15:15 -04:00
LOuroboros
c2e25272b0
Added Grav Apple's power boost
2021-10-16 07:02:26 -03:00
BuffelSaft
df2223a5bc
Merge pull request #1745 from LOuroboros/retaliate
...
Implemented Retaliate's effect
2021-10-16 22:49:32 +13:00
LOuroboros
3b6ceb1dfa
Turned Retaliate into a side timer
2021-10-16 06:04:04 -03:00
BuffelSaft
4861f2eea2
Merge pull request #1755 from ghoulslash/prankster_fix
...
Fix protect struct fields being set during ai calcs
2021-10-16 17:59:30 +13:00
BuffelSaft
791f4164a2
Fix PP being checked when HITMARKER_NO_PPDEDUCT is set
...
This fixes multi target moves and seems like it should be done anyway,
2021-10-16 17:31:27 +13:00
BuffelSaft
b5293cc3e2
Fix multi target moves
...
Only run CANCELLER_PRANKSTER when moving to the next target of a multi target move. If more cancellers are needed they can be added/moved after CANCELLER_PRANKSTER.
2021-10-16 17:04:36 +13:00
GriffinR
e1900efe1e
Merge branch 'master' into doc-miscbattle
2021-10-15 22:46:43 -04:00
GriffinR
1f39c34ca4
Merge branch 'master' into minor-constants
2021-10-15 22:44:49 -04:00
GriffinR
a4a3c1c9e5
Merge pull request #1511 from GriffinRichards/doc-union
...
Document link_rfu / Union Room
2021-10-15 22:44:01 -04:00
Eduardo Quezada D'Ottone
724eb7279a
Merge pull request #1768 from ghoulslash/ballthrow
...
Config for Catching Semi-Invulnerable Mons
2021-10-15 17:27:26 -03:00
ghoulslash
1f176242aa
add missing func definition
2021-10-15 16:06:50 -04:00