Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dynamax #2417

Merged
merged 104 commits into from
Oct 19, 2023
Merged

Dynamax #2417

merged 104 commits into from
Oct 19, 2023

Commits on Oct 27, 2022

  1. merge kyogre, groudon, rayquaza battle types

    @AgustinGDLV
    AgustinGDLV committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    7981887 View commit details
    Browse the repository at this point in the history

  2. added data for max moves

    @AgustinGDLV
    AgustinGDLV committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    056048d View commit details
    Browse the repository at this point in the history

  3. added data and graphics for gigantamax mons

    @AgustinGDLV
    AgustinGDLV committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    caaec99 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. removed duplicate sprites and changed folder format for gmax

    @AgustinGDLV
    AgustinGDLV committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    2139e13 View commit details
    Browse the repository at this point in the history

  2. merged regi battle type into BATTLE_TYPE_LEGENDARY

    @AgustinGDLV
    AgustinGDLV committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    0663510 View commit details
    Browse the repository at this point in the history

  3. merged physical and special max moves

    @AgustinGDLV
    AgustinGDLV committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    ae7cbc2 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. added base functionality for max moves

    @AgustinGDLV
    AgustinGDLV committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    87a9150 View commit details
    Browse the repository at this point in the history

  2. added longer 'used move' messages for max moves

    @AgustinGDLV
    AgustinGDLV committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    d69de9f View commit details
    Browse the repository at this point in the history

  3. implemented max move functionality for dynamic type moves

    @AgustinGDLV
    AgustinGDLV committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    07fd952 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. pulled rhh master, i hate merge conflicts

    @AgustinGDLV
    AgustinGDLV committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    38f4625 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Merge branch 'upcoming' into dynamax

    @AgustinGDLV
    AgustinGDLV committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    b4ec273 View commit details
    Browse the repository at this point in the history

  2. fixed tests

    @AgustinGDLV
    AgustinGDLV committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    503aad9 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. implemented G-Max Stonesurge, G-Max Steelsurge

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    4d19659 View commit details
    Browse the repository at this point in the history

  2. implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max V… 

    …olcalith
    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    a36c35a View commit details
    Browse the repository at this point in the history

  3. implemented G-Max Foam Burst, G-Max Tartness

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    e32936d View commit details
    Browse the repository at this point in the history

  4. implemented G-Max Wind Rage

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    c6c92da View commit details
    Browse the repository at this point in the history

  5. reorganized max move functionality to remove redundant move effects

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    92c8503 View commit details
    Browse the repository at this point in the history

  6. implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    05fe62c View commit details
    Browse the repository at this point in the history

  7. implemented G-Max Resonance

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    93d8efd View commit details
    Browse the repository at this point in the history

  8. max move effects don't apply if the move didn't land

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    9ef7717 View commit details
    Browse the repository at this point in the history

  9. changed max move power calc from table to formula

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    ad54b0d View commit details
    Browse the repository at this point in the history

  10. bringing back gMaxMovePowers to temp. fix exceptions

    @AgustinGDLV
    AgustinGDLV committed Feb 27, 2023
    Configuration menu
    Copy the full SHA
    6890690 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite work… 

    …s on Max Moves
    @AgustinGDLV
    AgustinGDLV committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    0908129 View commit details
    Browse the repository at this point in the history

  2. implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash… 

    …, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite
    @AgustinGDLV
    AgustinGDLV committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    da24b71 View commit details
    Browse the repository at this point in the history

  3. implemented G-Max Chi Strike, finished G-Max Gold Rush

    @AgustinGDLV
    AgustinGDLV committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    3cdcf2a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2023

  1. implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Fi… 

    …nale
    @AgustinGDLV
    AgustinGDLV committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    7c853ef View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. fixed potential G-Max Chi Strike, Court Change bugs

    @AgustinGDLV
    AgustinGDLV committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    e937482 View commit details
    Browse the repository at this point in the history

  2. reworked scripts to remove jumpifnotally / jumpiftargetabsent

    @AgustinGDLV
    AgustinGDLV committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    7de7599 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. added Gigantamax check + move display and tint when dynamaxed

    @AgustinGDLV
    AgustinGDLV committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    ac649a4 View commit details
    Browse the repository at this point in the history

  2. fixed doubles target bug

    @AgustinGDLV
    AgustinGDLV committed Mar 8, 2023
    Configuration menu
    Copy the full SHA
    6083a22 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. added basic Dynamax-in-battle

    @AgustinGDLV
    AgustinGDLV committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    76073fa View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. Dynamaxed pokemon now have increased HP

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    06bf934 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    ec4b330 View commit details
    Browse the repository at this point in the history

  3. Max Guard actually protects / Max Moves bypass protect

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    06151cf View commit details
    Browse the repository at this point in the history

  4. added Dynamax trigger sprite

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    317b52f View commit details
    Browse the repository at this point in the history

  5. not entirely confident implementation of Dynamax indicator

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    4293dc8 View commit details
    Browse the repository at this point in the history

  6. fixed typo with HP multiplier

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    28ffffa View commit details
    Browse the repository at this point in the history

  7. Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/… 

    …AsparagusEduardo/pokeemerald into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    b708da3 View commit details
    Browse the repository at this point in the history

  8. dynamax indicator shares palette with alpha/omega

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    89e7782 View commit details
    Browse the repository at this point in the history

  9. implemented Gigantamax form change

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    c823e19 View commit details
    Browse the repository at this point in the history

  10. fixed redundancy in g-max form change

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    f679c41 View commit details
    Browse the repository at this point in the history

  11. actually fixed it

    @AgustinGDLV
    AgustinGDLV committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    d0dc564 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. added some 'test' tests

    @AgustinGDLV
    AgustinGDLV committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    ca75fcb View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. added first set of Dynamax tests

    @AgustinGDLV
    AgustinGDLV committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    4c28b63 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. added most Dynamax immunities/interactions + tests + fixed some move … 

    …selection bugs
    @AgustinGDLV
    AgustinGDLV committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    7d70222 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2023

  1. Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/… 

    …AsparagusEduardo/pokeemerald into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    5a9e1de View commit details
    Browse the repository at this point in the history

  2. updated Gigantamax form changing + tests

    @AgustinGDLV
    AgustinGDLV committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    4ceb61b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    69fd63a View commit details
    Browse the repository at this point in the history

  4. added HP-based damage/healing interactions with Dynamax Pokemon

    @AgustinGDLV
    AgustinGDLV committed Mar 21, 2023
    Configuration menu
    Copy the full SHA
    7886423 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. more tests + fixed hp reversion issues

    @AgustinGDLV
    AgustinGDLV committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    6233627 View commit details
    Browse the repository at this point in the history

  2. added tests for status1/status2 effects + bug fixes for them

    @AgustinGDLV
    AgustinGDLV committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    a3c8b97 View commit details
    Browse the repository at this point in the history

  3. Disable, Heal Block, Torment, and Imprison don't prevent move selection

    @AgustinGDLV
    AgustinGDLV committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    019b39c View commit details
    Browse the repository at this point in the history

  4. finished G-Max Move tests

    @AgustinGDLV
    AgustinGDLV committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    0386495 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. added check for AI to use Dynamax on last pokemon

    @AgustinGDLV
    AgustinGDLV committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    40102fe View commit details
    Browse the repository at this point in the history

  2. level reappears in healthbox and form reversion occurs correctly when… 

    … Dynamax ends
    @AgustinGDLV
    AgustinGDLV committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    6dc3c7a View commit details
    Browse the repository at this point in the history

  3. goodbye gMaxMovePowers table

    @AgustinGDLV
    AgustinGDLV committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    2b86044 View commit details
    Browse the repository at this point in the history

  4. compile fix + placeholder animations (Wyrmwind broken?)

    @AgustinGDLV
    AgustinGDLV committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    7988c53 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. Tabs to spaces

    @AsparagusEduardo
    AsparagusEduardo committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    bbff30d View commit details
    Browse the repository at this point in the history

  2. Refactored Max Move power to be based on effect

    @AsparagusEduardo
    AsparagusEduardo committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    4e2e3b5 View commit details
    Browse the repository at this point in the history

  3. CanDynamax rewrite, level-up + misc. bug fixes

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    2bcfaf8 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'AgustinGDLV/dynamax' into RHH/pr/test/d… 

    …ynoTweaks

# Conflicts:
#	src/battle_dynamax.c
    @AsparagusEduardo
    AsparagusEduardo committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    cf6f9de View commit details
    Browse the repository at this point in the history

  5. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    5d508f7 View commit details
    Browse the repository at this point in the history

  6. fixed double HP multiplier application + slapped KNOWN_FAILING on RNG… 

    …-based tests
    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    886bee2 View commit details
    Browse the repository at this point in the history

  7. fixed Dynamax bypassing selection prevention

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    9f306c6 View commit details
    Browse the repository at this point in the history

  8. Max Moves cannot target allies

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    1acddfa View commit details
    Browse the repository at this point in the history

  9. Dynamaxed Pokemon do not get an -ate boost, TODO: write tests

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    60720c0 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dynamax' into RHH/pr/test/dynoTweaks

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    e3f29fa View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1 from AsparagusEduardo/RHH/pr/test/dynoTweaks 

    Refactored GetMaxMovePower
    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    0e79697 View commit details
    Browse the repository at this point in the history

  12. current HP increases on level up

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    7d4a666 View commit details
    Browse the repository at this point in the history

  13. gave Max Wyrmwind a placeholder anim

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    f633d16 View commit details
    Browse the repository at this point in the history

  14. added cries for Gigantamax forms

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    a383fab View commit details
    Browse the repository at this point in the history

  15. fixed Gigantamax and level bugs + lots of clean-up and debug removal

    @AgustinGDLV
    AgustinGDLV committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    fff0f78 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2023

  1. opponents properly revert Gigantamax + understand Max Guard

    @AgustinGDLV
    AgustinGDLV committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    e1c819a View commit details
    Browse the repository at this point in the history

  2. fixed terrain effects

    @AgustinGDLV
    AgustinGDLV committed Mar 26, 2023
    Configuration menu
    Copy the full SHA
    aac4ef4 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpe… 

    …cies
    @AgustinGDLV
    AgustinGDLV committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    aa80e3f View commit details
    Browse the repository at this point in the history

  2. changed Dynamax animation

    @AgustinGDLV
    AgustinGDLV committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    8a963ca View commit details
    Browse the repository at this point in the history

  3. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    504ec36 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    131e455 View commit details
    Browse the repository at this point in the history

  2. removed .yml file

    @AgustinGDLV
    AgustinGDLV committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    bd4d164 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed May 12, 2023
    Configuration menu
    Copy the full SHA
    aec51b5 View commit details
    Browse the repository at this point in the history

  2. updated tests

    @AgustinGDLV
    AgustinGDLV committed May 12, 2023
    Configuration menu
    Copy the full SHA
    3b6389e View commit details
    Browse the repository at this point in the history

  3. moved tryfaintmon back, no bugs?

    @AgustinGDLV
    AgustinGDLV committed May 12, 2023
    Configuration menu
    Copy the full SHA
    dceefac View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. mid converting script commands to callnative

    @AgustinGDLV
    AgustinGDLV committed May 14, 2023
    Configuration menu
    Copy the full SHA
    e47eca1 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed May 17, 2023
    Configuration menu
    Copy the full SHA
    d133564 View commit details
    Browse the repository at this point in the history

  2. fixed RandomElement

    @AgustinGDLV
    AgustinGDLV committed May 17, 2023
    Configuration menu
    Copy the full SHA
    34abc44 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2023

  1. Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-… 

    …expansion into dynamax
    @AgustinGDLV
    AgustinGDLV committed May 28, 2023
    Configuration menu
    Copy the full SHA
    3d4789c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2023

  1. updated anim macros

    @AgustinGDLV
    AgustinGDLV committed May 29, 2023
    Configuration menu
    Copy the full SHA
    f91cbe9 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. 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
    @AsparagusEduardo
    AsparagusEduardo committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    9230139 View commit details
    Browse the repository at this point in the history

  2. Fixed 2 protection tests

    @AsparagusEduardo
    AsparagusEduardo committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    0a84072 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Fixed erroneous species and item checks for Dynamax

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    ed2d28b View commit details
    Browse the repository at this point in the history

  2. Frostbite NonDynamaxMaxHP to mimic Burn

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    8f4c1e9 View commit details
    Browse the repository at this point in the history

  3. Fixed Max Overgrowth test

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    070ce21 View commit details
    Browse the repository at this point in the history

  4. Gigantamax Flag

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    644fba2 View commit details
    Browse the repository at this point in the history

  5. Applied trigger fix from upstream

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    92a0b04 View commit details
    Browse the repository at this point in the history

  6. GMAX -> GIGANTAMAX

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    f830b07 View commit details
    Browse the repository at this point in the history

  7. Undid flag

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    4d4d566 View commit details
    Browse the repository at this point in the history

  8. Style fixes

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    1acc0ba View commit details
    Browse the repository at this point in the history

  9. Removed hard-coded order for sGMaxMoveTable + failsafe for sMaxMoveTable

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    c61d187 View commit details
    Browse the repository at this point in the history

  10. gBattleCommunication ids

    @AsparagusEduardo
    AsparagusEduardo committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    3cb29f8 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2023

  1. Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax 

    # Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
    @AsparagusEduardo
    AsparagusEduardo committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    c0540a3 View commit details
    Browse the repository at this point in the history

  2. Fixed compile on modern + tests

    @AsparagusEduardo
    AsparagusEduardo committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    6e1d4b4 View commit details
    Browse the repository at this point in the history

  3. Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage,… 

    … Hail, Sandstorm
    @AsparagusEduardo
    AsparagusEduardo committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    ca101e9 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Merge pull request #3 from AsparagusEduardo/RHH/pr/upcoming/dynamax 

    Updated Dynamax branch to Upcoming + Fixes
    @AgustinGDLV
    AgustinGDLV committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    8b83528 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upcoming' into dynamax

    @AsparagusEduardo
    AsparagusEduardo committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d153947 View commit details
    Browse the repository at this point in the history