kittenchilly
daf8e6ca0b
Merge branch 'master' into enigmaberry
2023-09-10 13:20:24 -05:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves ( #3290 )
2023-09-10 11:57:19 -03:00
LOuroboros
e75ed112d3
Added missing FONT_* labels in ItemUseOutOfBattle_ExpShare ( #3291 )
2023-09-10 11:52:50 -03:00
AaghatIsLive
49e791f128
Fixed some hisuian abilities ( #3292 )
2023-09-10 11:51:05 -03:00
Eduardo Quezada
b114baa07d
Updated Nosepass evolution with PLA's
2023-09-09 00:01:45 -03:00
kittenchilly
7a24167b4d
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
2023-09-08 11:47:35 -05:00
kittenchilly
73cbe9e37b
Merge branch 'master' into enigmaberry
2023-09-08 11:44:33 -05:00
Gabriel Cowley
d585c520ff
Fix Z effect descriptions being cut off ( #3286 )
2023-09-08 07:09:11 -03:00
Eduardo Quezada
6332870a3b
Crabominable can now evolve via Ice Stone
2023-09-08 00:30:10 -03:00
psf
75d06bb599
Generation 6 Experience Share ( #3276 )
2023-09-07 23:18:18 -03:00
kittenchilly
40ac214764
Fix enigma berry
2023-09-07 17:10:25 -05:00
kittenchilly
8f8705929a
Update battle_util.c
2023-09-07 15:37:58 -05:00
kittenchilly
b4db3b6a81
Add enigma berry effect
2023-09-07 15:32:26 -05:00
DizzyEggg
dd3334aa82
Battle bond tests and small fix ( #3279 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-07 17:23:43 -03:00
kittenchilly
e20383b0a4
Merge branch 'upcoming' into overworldsnow
2023-09-07 14:29:30 -05:00
Eduardo Quezada
3333395ff7
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
...
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
2023-09-07 15:54:55 -03:00
Eduardo Quezada
820113d883
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
2023-09-07 15:13:06 -03:00
citrusbolt
d31b168522
Add blockBoxRS field to struct BoxPokemon
2023-09-05 06:17:10 -06:00
Alex
c99b34fd89
Fix Magnet Rise animation ( #3280 )
2023-09-05 08:08:51 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests ( #3191 )
...
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-05 06:56:36 -03:00
ghoulslash
675aa5db41
fix GetBattleAnimMoveTargets logic ( #3278 )
...
* fix GetBattleAnimMoveTargets logic
* more efficient GetBattleAnimMoveTargets
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-09-05 09:21:14 +02:00
kittenchilly
1e10bbe007
Merge branch 'upcoming' into overworldsnow
2023-09-04 17:57:20 -05:00
kittenchilly
2fa4206bf1
Add new Substitute doll sprites ( #3263 )
2023-09-04 19:48:43 -03:00
ghoulslash
b90702918e
Get rid of the gActiveBattler variable ( #3262 )
2023-09-04 08:40:00 -04:00
DizzyEggg
d9677763e5
remove gActiveBattler replacement
2023-09-04 10:26:37 +02:00
DizzyEggg
7c2ad314d4
merge with upcoming
2023-09-04 09:40:48 +02:00
GriffinR
4439253f39
Add include guards for assembly constants files
2023-09-03 20:57:54 -04:00
kittenchilly
0a781217ea
Merge branch 'upcoming' into overworldsnow
2023-09-02 15:17:23 -05:00
Eduardo Quezada
66710ac22a
Updated various defines
2023-08-31 23:54:11 -04:00
Eduardo Quezada
c4553c71aa
5 more callnatives
...
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
2023-08-31 23:43:48 -04:00
Eduardo Quezada
4ac61ad15f
handleultraburst, handleprimalreversion, handlemegaevo
2023-08-31 22:34:57 -04:00
Eduardo Quezada
1513443c39
Fixed Ultra Burst + Mega Evolution test
2023-08-31 22:33:20 -04:00
Eduardo Quezada
35d7201935
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/battle_scripts.h
2023-08-31 20:46:53 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) ( #3268 )
2023-08-31 14:52:18 -04:00
Eduardo Quezada
842b9dc6c0
Incorporated bugfixes from upstream
2023-08-31 14:30:13 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
kittenchilly
9fcb1a8687
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
2023-08-31 11:56:12 -05:00
LOuroboros
d78d63e537
Fixed redundant calls in Teleport's battle script ( #3212 )
...
The battle script was originally making an extra call to attackcanceler and attackstring pointlessly whenever there was a jump to BattleScript_EffectBatonPass.
This commit addresses that by relocating BattleScript_EffectTeleport's own calls to attackcanceler and attackstring.
2023-08-31 09:07:06 +02:00
Eduardo Quezada D'Ottone
82c65d37e7
Fixed 2v1 handling when debug menu is enabled ( #3223 )
2023-08-31 09:00:59 +02:00
ghoulslash
d143d508e0
Ai vs ai rhh ( #3216 )
2023-08-30 21:30:34 -04:00
Philipp AUER
03f82a7a98
[Makefile] make -fanalyzer optional ( #3265 )
...
Co-authored-by: sbird <sbird@no.tld>
2023-08-30 19:16:02 -04:00
Alex
64ffc5a85d
Fixes Beat Up + Chloroblast ( #3264 )
2023-08-30 15:58:53 -04:00
DizzyEggg
aae4a0970c
merge with upcoming
2023-08-30 15:46:27 +02:00
DizzyEggg
493c330cbd
merge with upcoming
2023-08-30 13:23:55 +02:00
DizzyEggg
c29f8259f6
remove gActiveBattler entirely
2023-08-30 12:46:22 +02:00
DizzyEggg
a7615f9649
remove almost all usage of active battler
2023-08-30 11:21:10 +02:00
DizzyEggg
4683783a92
remove active battler from other files
2023-08-30 10:18:31 +02:00
DizzyEggg
77dd5150f5
remove gActiveBattler from battle_script_commands.c
2023-08-30 09:40:15 +02:00
kittenchilly
c8aac3407e
Merge branch 'upcoming' into overworldsnow
2023-08-29 21:02:33 -05:00
Eduardo Quezada D'Ottone
deb20552cd
Implement Ultra Burst ( #3221 )
2023-08-29 21:49:19 -04:00
