AgustinGDLV
84a9d4ffcf
Terastallization ( #4110 )
...
* wrote foundational terastal tests
* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves
* added tests and func. for Stellar type, more tests for Tera Blast
* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof
* implemented tera blast, expanded stellar type func., fixed tests
* last set of Tera/Tera Blast tests for checklist, protean fix
* implemented in-battle Terastallization, WIP stellar indicator and tera animation
* fixed bad merge
* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary
* fixed type indicators
* added tera logic to AI
* implemented code review changes, added B_TERA_ORB_NO_COST
* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling
* fixed Tera Blast split choice occuring when not Terastallized
* fixed Tera Blast using Last Respects BP calcs
* added tera type to TrainerMon, code review tweaks
2024-04-24 11:17:46 +02:00
DizzyEggg
6137db102e
Ally Switch ( #3533 )
...
* ally switch move animation
* Ally Switch anim done
* ally switch test and improve animation
* derp
* add ally switch known failing test for ally targeting moves
* moves which targetted ally fail after ally switch
* ally switch works like protect
---------
Co-authored-by: root <root@LAPTOP-3SNV7DEQ>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-20 15:26:28 +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
kittenchilly
48d6fe2e64
Merge branch 'upcoming' into ultraburst
2023-08-26 14:43:31 -05:00
voloved
2a2cd77cf4
Allow Cycling Through Balls in the Last Ball Used Menu ( #3039 )
2023-08-24 19:23:26 -04:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
AgustinGDLV
aec51b5b04
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-11 20:02:06 -07:00
Jaizu
0f958806ea
Remove unused battle funcs
2023-04-10 14:39:14 +02:00
AgustinGDLV
c823e19705
implemented Gigantamax form change
2023-03-11 10:48:21 -08:00
AgustinGDLV
4293dc8a24
not entirely confident implementation of Dynamax indicator
2023-03-10 23:03:51 -08:00
AgustinGDLV
317b52f3f6
added Dynamax trigger sprite
2023-03-10 22:05:23 -08:00
DizzyEggg
d3d99c3f8c
alpha omega indicator sprites use the same palete
2023-03-06 15:22:28 +01:00
DizzyEggg
4bdca43dbd
refactor mega evolution indicator sprite
2023-02-26 12:51:35 +01:00
Eduardo Quezada
7c86bd5d08
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
...
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
2022-08-26 22:23:37 -04:00
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -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
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -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
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
LOuroboros
d9b8e11a9c
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE
2021-10-19 07:47:42 -03:00
ghoulslash
bbd09fdcf7
add wandering spirit
2021-10-12 10:32:51 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
ghoulslash
c06029bc72
add last used ball
2021-06-25 13:37:59 -06:00
ghoulslash
d89e2c1775
merge with be
2021-04-02 08:55:54 -06:00
Evan
6139b12a49
fix hp boxes not dissapearing
2021-02-02 23:30:08 -07:00
Evan
e70e2bcd65
merge with be
2020-12-14 09:09:51 -07:00
Evan
348d70b309
z move indicator and some data
2020-11-26 15:56:18 -05:00
Evan
ef43596a79
toggleable manual ability popup destruction
2020-11-19 15:16:27 -07:00
DizzyEggg
f19ba68cb9
Fix mega indicator sprite overwriting ram
2020-06-24 12:55:08 +02:00
DizzyEggg
c97869018d
Fix Mega Indicator appearing and priority
2019-08-25 15:33:28 +02:00
DizzyEggg
d0f91a996d
Tweak up mega evo
2019-05-02 23:10:01 +02:00
DizzyEggg
e54dd6a02b
Merge with master
2018-12-22 13:53:07 +01:00
Marcus Huderle
d1e6e705cc
Decompile battle_anim_effects_1.c
2018-12-16 11:39:22 -06:00
DizzyEggg
65036b9a09
Merge with master
2018-11-15 21:53:32 +01:00
Slawter666
6fcf878e2f
Tidy up header files
2018-11-13 22:28:46 +00:00
DizzyEggg
731ff38067
Ability pop-up functionality is done
2018-09-29 12:47:35 +02:00
DizzyEggg
6b7a171dbe
Ability pop-up fail, maybe will do something about it later
2018-09-23 14:24:06 +02:00
DizzyEggg
d05875dd04
New mega trigger sprite
2018-09-20 20:59:00 +02:00
DizzyEggg
602c1322e4
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
DizzyEggg
add1f4910c
Add mega trigger png
2018-09-17 22:40:49 +02:00
DizzyEggg
38c89b9d0f
Bank to battler
2018-09-01 18:36:08 +02:00
DizzyEggg
272b98da6c
document party status summary
2018-06-28 21:06:32 +02:00
DizzyEggg
94752d4207
document battle bars
2018-06-19 00:43:15 +02:00
camthesaxman
c3dc14ba66
more renaming
2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e
more renaming
2018-02-06 13:48:02 -06:00
