Alex
4cb03d4add
Adds Raging Bull and various fixes ( #3552 )
...
* Adds Raging Bull and various fixes
* fix compiling on abgcc
* syrup bomb anim fix
* sticky syrup anim in link battles
* fix sticky syrup in link battles
* fix battler index
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-19 17:45:58 +01:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points ( #3342 )
...
* Add WIld Battles to test runner + exp tests
2023-09-27 08:35:05 +01:00
DizzyEggg
493c330cbd
merge with upcoming
2023-08-30 13:23:55 +02:00
kittenchilly
d540eccbb1
Merge branch 'upcoming' into ultraburst
2023-08-29 16:17:35 -05:00
DizzyEggg
156aa59f18
start removing gActiveBattler in controller emitters
2023-08-29 15:21:31 +02:00
DizzyEggg
9cf5376c96
use GetBattlerParty in LoadMonSprite
2023-08-21 09:43:01 +02:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
DizzyEggg
ce18df46e6
replace global usage of gActiveBattler in controller files
2023-08-07 12:51:58 +02:00
DizzyEggg
b8ba6139cb
health bar update
2023-08-07 10:29:02 +02:00
DizzyEggg
546b0c7e97
handle move anim
2023-08-07 09:26:03 +02:00
DizzyEggg
e8d6c99e6d
more controllers work
2023-08-07 01:05:09 +02:00
DizzyEggg
ef8024d8c5
draw trainer pic
2023-08-06 21:50:59 +02:00
DizzyEggg
a9483c361b
trainer intro ball throw
2023-08-06 12:41:36 +02:00
DizzyEggg
ffb0e20049
hide show party status summary
2023-08-05 23:27:56 +02:00
DizzyEggg
18db0cb3b7
controller string
2023-08-05 22:41:13 +02:00
DizzyEggg
f9e131b6ac
fix recorded, exp update the same for player partner
2023-08-05 21:34:17 +02:00
DizzyEggg
0b4c1aa275
more work on controllers
2023-08-05 20:42:19 +02:00
DizzyEggg
1793b9e1da
more controller functions
2023-08-05 14:11:25 +02:00
DizzyEggg
a505cd7fb9
simplify the get mon set mon data functions more
2023-08-05 12:53:14 +02:00
DizzyEggg
cbebdf044a
handle se, bgm and fainting cry
2023-08-05 12:13:50 +02:00
DizzyEggg
5a8b6c18ef
ball throw and start removing empty controller functions
2023-08-05 11:05:37 +02:00
DizzyEggg
c72bb27325
faint animation
2023-08-04 22:15:39 +02:00
DizzyEggg
7360a4a18a
up to return mon to ball
2023-08-04 17:29:29 +02:00
DizzyEggg
7ba8a0216f
more work on controllers
2023-08-04 13:42:40 +02:00
DizzyEggg
cc30d2fb53
start removing duplicate controller functions
2023-08-04 12:10:38 +02:00
AgustinGDLV
76073fab52
added basic Dynamax-in-battle
2023-03-10 10:20:27 -08:00
Eduardo Quezada
5403cd036e
Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902
...
# Conflicts:
# include/battle.h
# include/battle_controllers.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controllers.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2022-09-02 23:24:08 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.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_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
Eduardo Quezada D'Ottone
e791cf90ad
Merge tag 'pretmaster' into BE_pretmerge2
...
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
2022-07-15 12:58:46 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
GriffinR
fc15b0d5f0
Add controller buffer constants, finish misc battle doc
2021-10-13 16:21:39 -04: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
DizzyEggg
4b29ae39ad
Allow one mon double battles
2021-06-08 16:40:47 +02:00
DizzyEggg
4b744374c8
Allow larger exp gains
2021-06-03 23:17:44 +02:00
ghoulslash
c356ffaed4
merge with be. fix null ptr check in GetBattleMoveSplit
2021-05-24 10:46:53 -06: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
f4d8a91ba4
Misc battle script cleanup
2021-04-03 14:07:31 -04: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
0483114a05
merge and some fixes
2021-02-02 11:45:15 -07:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
