AgustinGDLV
536e4a8fb9
fixed psychic type tera icon ( #4435 )
2024-04-24 18:08:20 +02:00
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
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB ( #4355 )
...
* Change Frostbite abbreviation from FSB to FRB
* Melted the ice is actually the one used
* Update moves_info.h
* Update moves_info.h
* Update items.h
2024-04-10 09:16:32 +02: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
c3a8edae32
Sprites and fixes
2023-08-11 13:36:01 -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
Bassoonian
d5fb13ca17
Fix status icons
2023-04-26 23:33:22 +02:00
Bassoonian
623e7c5f25
Add Frostbite status
2023-04-22 18:23:08 +02:00
AgustinGDLV
c823e19705
implemented Gigantamax form change
2023-03-11 10:48:21 -08:00
AgustinGDLV
89e778225c
dynamax indicator shares palette with alpha/omega
2023-03-11 10:47:23 -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
306c4565a0
merge
2023-03-06 15:32:28 +01:00
DizzyEggg
d3d99c3f8c
alpha omega indicator sprites use the same palete
2023-03-06 15:22:28 +01:00
LOuroboros
db02cd05f6
Purged the bKGD warning once and for all
2023-02-24 02:01:55 -03:00
Jaizu
c6811fb692
Ability popup fixes
2023-01-21 18:12:12 +01:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
1707f82992
Combine/colorize status graphics
2023-01-13 12:53:08 -05:00
Eduardo Quezada
e0802f13a2
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
...
# Conflicts:
# include/link_rfu.h
2023-01-03 15:40:33 -03:00
SphericalIce
09d20bd634
Rename ball_display_unused_extra
2022-12-26 11:30:12 +00:00
ghoulslash
f2ee9f3ba0
tweak z indicator position relative to healthbox
2022-07-18 09:44:04 -04:00
ghoulslash
18affe8c1a
new z move indicator, credits to blackforest
2022-07-18 09:21:59 -04:00
ExpoSeed
f50a406b18
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2022-03-22 12:56:23 -05:00
ultima-soul
86089ce935
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2022-02-28 22:13:14 -08:00
GriffinR
01af8e877f
Move starter choose out of interface/misc
2022-01-11 17:49:08 -05:00
GriffinR
0a78cb5c9e
Fix some battle dome graphics names
2022-01-11 10:04:47 -05:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
...
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03: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
7a7c6afc39
larger ability popup, fix ability name printing/clearing, and config for longer ability names
2021-11-29 12:42:01 -05: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
41ecae91f8
Label remaining symbols in graphics.c
2021-10-27 13:47:18 -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
GriffinR
d8e65fc4b6
More battle doc, add battle window ids
2021-10-09 03:01:10 -04:00
LOuroboros
91a68cd5db
Implemented Primal Reversion
2021-10-09 00:36:41 -03:00
ghoulslash
3f34fec42f
change last ball graphic based on config. replace saveblock field with ewram field
2021-09-23 12:03:01 -04:00
froggestspirit
f8a24cdd6f
Identify unknown healthbox GFX
2021-09-06 10:42:05 -04:00
ghoulslash
c06029bc72
add last used ball
2021-06-25 13:37:59 -06:00
Evan
348d70b309
z move indicator and some data
2020-11-26 15:56:18 -05:00
DizzyEggg
013f9b6a17
merge wiith masteer and summary screen change
2020-05-29 12:50:54 +02:00
SBird
67e9309415
gfx: fix hpbar_anim.png visual palette
2020-05-01 20:51:29 +02:00
DizzyEggg
b4ac979600
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2
2019-11-10 12:09:43 +01:00
Marcus Huderle
01e6fb6dd0
Document some battle_bg-related things
2019-11-07 18:24:04 -06:00
DizzyEggg
d0f91a996d
Tweak up mega evo
2019-05-02 23:10:01 +02:00
DizzyEggg
7fa55704b2
merge with master
2018-11-30 20:46:09 +01:00
Slawter666
3b501cb470
Document battle ui
2018-11-22 01:10:50 +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
a69af8f2f5
Merge with master
2018-09-22 00:22:13 +02:00
