Commit Graph

13298 Commits

Author SHA1 Message Date
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
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
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
Eduardo Quezada D'Ottone
deb20552cd
Implement Ultra Burst (#3221) 2023-08-29 21:49:19 -04:00
ghoulslash
c55fee147b
Fixed B_ATK_TRAINER_NAME not working properly in tests (#3179) 2023-08-29 21:45:37 -04:00
kittenchilly
c427d96f3f Better Ultra Burst animation 2023-08-29 19:13:21 -05:00
kittenchilly
028536e2d3 Spaces 2023-08-29 17:12:09 -05:00
kittenchilly
d540eccbb1 Merge branch 'upcoming' into ultraburst 2023-08-29 16:17:35 -05:00
Eduardo Quezada
be152fbee8 Merge branch 'RHH/master' into RHH/pr/master/opponentName 2023-08-29 13:11:32 -04:00
ghoulslash
766a1a27a7
improve ai switching with bad moves (#3213) 2023-08-29 12:47:16 -04:00
DizzyEggg
0381ccdf32 remove more of gActiveBattler 2023-08-29 16:20:16 +02:00
DizzyEggg
156aa59f18 start removing gActiveBattler in controller emitters 2023-08-29 15:21:31 +02:00
DizzyEggg
00e1542cb8 Merge branch 'ai_switch_mon_fix' of https://github.com/DizzyEggg/pokeemerald into ai_switch_mon_fix 2023-08-29 10:42:07 +02:00
DizzyEggg
44acd287f1 solve conflicts 2023-08-29 10:41:05 +02:00
ghoulslash
326fb2605a
Some gActiveBattler Fixes (#3259)
* some gActiveBattler related fixes

* fix IsBattleSEPlaying gActiveBattler->battlerId

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-08-29 09:31:11 +02:00
ghoulslash
4490e9879a
Prevent certain status moves when item is known + Fake Out changes (#3219) 2023-08-28 17:12:29 -04:00
ghoulslash
ee8d930634
Simplify/Clean battle controllers code (#3202) 2023-08-28 17:08:39 -04:00
DizzyEggg
6ae1ba10da fix conflicts 2023-08-28 13:55:45 +02:00
Pawkkie
906ea4a5b0
Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove (#3218)
* Add missing absorbing abilities to FindMonThatAbsorbsOpponentsMove

* Use array to match ability to absorbing type

Previous implementation involving piggybacking on a conditional in a bit of a messy fashion to check for each ability type, this should be more readable and more easily modified by a novice. This is almost exactly BuffelSaft's inclement emerald implementation.

* Minor syntax fixes
2023-08-28 13:39:27 +02:00
GriffinR
d67914e114
Merge pull request #1912 from GriffinRichards/moves-mask
Handful of fixes related to MAX_MON_MOVES
2023-08-27 19:40:59 -04:00
GriffinR
dcaf03e360
Merge pull request #1918 from WhenGryphonsFly/key_intr_enable
Correct KEY_INTR_ENABLE
2023-08-27 17:23:16 -04:00
WhenGryphonsFly
5abeb6718d Correct KEY_INTR_ENABLE 2023-08-27 14:30:57 -05:00
kittenchilly
7ffd31f5de Update ultra_burst.c 2023-08-26 16:42:35 -05:00
kittenchilly
96e39cde0b Update ultra_burst.c 2023-08-26 16:14:24 -05:00
kittenchilly
ac67900c0a Fix test speed 2023-08-26 15:32:10 -05:00
kittenchilly
2e1b137183 Ultra Burst tests 2023-08-26 15:19:47 -05:00
kittenchilly
48d6fe2e64 Merge branch 'upcoming' into ultraburst 2023-08-26 14:43:31 -05:00
voloved
2784f701d8
Poké Ball shortcut tweaks (#3254) 2023-08-26 12:58:51 -04:00
Eduardo Quezada D'Ottone
76075ffe57
Revert unneeded sprite changes from 3051 (#3205) 2023-08-25 16:33:15 -04:00
Eduardo Quezada
1f72e6ac07 Merge branch 'RHH/master' into RHH/upcoming 2023-08-24 21:31:58 -04:00
Eduardo Quezada
d360deb3b6 1.5.3 in templates 2023-08-24 20:44:50 -04:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu (#3039) 2023-08-24 19:23:26 -04:00
Eduardo Quezada D'Ottone
9c937a945c
Pokemon sprite review pt.1 (#3235) 2023-08-23 22:43:42 -04:00
CyanSMP64
ef69021f0f some more tweaks by mrds 2023-08-24 13:00:31 +12:00
Philipp AUER
905fc6fd4d
Fixed Metronome Item damage multiplier (#3246)
Co-authored-by: sbird <sbird@no.tld>
2023-08-23 19:23:00 -04:00