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

Fixes Syrup bomb, new Octolock script, some Intim changes + Tests #3437

Merged
merged 14 commits into from
Oct 27, 2023
Merged

Fixes Syrup bomb, new Octolock script, some Intim changes + Tests #3437

merged 14 commits into from
Oct 27, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Oct 19, 2023 •
edited
Loading

  • Syrup Bomb fixes based on the review from Skeli (Credit for the script that I ended up using for both Syrup Bomb and Octolock with some changes.) in PR Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel #3402. Syrup Bomb also needs a special anim when the stat drop happens. I created an issue for this and kept the normal stat drop anim for now.
  • New Octolock script, made a callnative for it and tests
  • Some minor intim script changes (moved the checks that were left to battle_script_commands
  • Hyper Cutter tests

Minor note: The test Shuffle randomizes the array [Shuffle16] fails with this PR on four threads but passes just fine on two (/Edit: This should be fixed by PR #3433)

please squash

Bassoonian
Bassoonian requested changes Oct 21, 2023
View reviewed changes
test/battle/ability/hyper_cutter.c Outdated Show resolved Hide resolved
test/battle/move_effect/octolock.c Show resolved Hide resolved
test/battle/move_effect/octolock.c Outdated Show resolved Hide resolved
AsparagusEduardo
AsparagusEduardo requested changes Oct 22, 2023
View reviewed changes
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial review

asm/macros/battle_script.inc Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
@mrgriffin mrgriffin added this to the 1.7.0 milestone Oct 25, 2023
@AlexOn1ine AlexOn1ine mentioned this pull request Oct 25, 2023
Merged
@AlexOn1ine
Copy link
Collaborator Author

Ready for re-review

@AsparagusEduardo AsparagusEduardo merged commit db00839 into rh-hideout:upcoming Oct 27, 2023
1 check passed
@AlexOn1ine AlexOn1ine mentioned this pull request Oct 27, 2023
Closed
halabi232 added a commit to halabi232/Pokemon-NeoYellow that referenced this pull request Dec 4, 2023
@halabi232
Squashed commit of the following:
603c543 
commit 8c4058c7a85345a9c580b706e32b12765fd5286d
Author: ghoulslash <[email protected]>
Date:   Tue Nov 28 12:57:11 2023 -0500

    add HITMARKER_DISABLE_ANIMATION for bug bite consumeberry (#3607)

    Co-authored-by: ghoulslash <[email protected]>
    Co-authored-by: Bassoonian <[email protected]>

commit b72581985cc3d62165dab03b86271a84592e9a43
Author: Bassoonian <[email protected]>
Date:   Mon Nov 27 12:42:53 2023 +0100

    Add bad poison downgrade config (#3605)

    Co-authored-by: Alex <[email protected]>

commit fe16a2cdee053e708839e483548a1754f3be0de7
Author: psf <[email protected]>
Date:   Sun Nov 26 09:58:43 2023 -0800

    Port pokefirered's Vs. Seeker to pokeemerald (#3256)

    * First version of Vs. Seeker

    * Update movement.inc

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/98f7e9978d8cd16083ea1bc7857f4f0235a9f1af#r1306721924

    * Update field_effect_scripts.s

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004

    * Update field_effect_scripts.s

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024

    * Update item_use.h

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401

    * Update movement_action_func_tables.h

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828

    * Update event_object_movement.c

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887

    * Update overworld.c

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396

    * Update vs_seeker.h

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158

    * Update vs_seeker.c

    Addressed some cleanup comments from SBird

    * Update UpdateRandomTrainerRematches
    Fixed typo in ClearAllTrainerRematchStates
    Fixed types in GetRematchableTrainerLocalId

    * Updated UseVsSeekerEffect_2

    * Updated UseVsSeekerEffect_3

    * Updated UseVsSeekerEffect_4

    * Fixed bug that allowed Vs Seeker to be used indoors in correct places
    Moved VsSeeker function declarations into header

    * Refactored FieldUseFunc_VsSeeker

    * Added curly braces to else case in FieldUseFunc_VsSeeker

    * renamed data[x] in Task_ResetObjectsRematchWantedState

    * Refactored Task_ResetObjectsRematchWantedState

    * Refactored VsSeekerResetObjectMovementAfterChargeComplete

    * Refactored ResetMovementOfRematchableTrainers

    * Refactored GatherNearbyTrainerInfo

    * Refactored Task_VsSeeker_3

    * CanUseVsSeeker

    * Refactored GetVsSeekerResponseInArea

    * GetCurVsSeekerResponse refactored

    * Cleaned up GetTrainerFlagFromScript

    * Gave sensible names to Task_VsSeeker

    * Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater

    * Renamed UseVsSeeker Functions

    * Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
    Removed extra VsSeeker animation code

    * Addressed PR feedback

    * Fixed issue with building non-modern

    * Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId

    * Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
    Removed the check to see if a map was not indoors to improve readability
    Made IsValidLocationForVsSeeker into a static function

    * Added changes in response to Jasper's feedback
    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522

    * Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392

    * Removed ifdef tags around the repo unless needed
    https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files/b5dc744cedc8e14c88d461afbbdc693c4f54e950

commit 493478e94b6cc2652c66a92f66d176f4b25c04d3
Author: psf <[email protected]>
Date:   Sun Nov 26 07:59:44 2023 -0800

    Added support for XY's Sky Battles (#2950)

    * Original implementation from Phlayne

    * Moved Sky Battle Flag / Var into a config

    * Optimized existing code and fixed existing bugs

    Added error message for when sky battle var and flag are not set
    Merged CanDoSkyBattle and PrepareSkyBattle into one special

    * Added compatibility for Gen7+

    * Commented out Volt Crash from banned moves

    * Cleaned up debug scripts from testing

    * Fixed bug where player did not white out even if they had no healthy Pokémon and only an egg
    Zeroed out both Sky Battle configs

    * Removed extra include from src/field_specials.c
    Removed extra line break in src/battle_script_commands.c

    * Added FLAG_DISABLED_IN_SKY_BATTLE
    Added FLAG_DISABLED_IN_SKY_BATTLE to appropriate moves

    * Changed DoesSkyBattleCancelCurrentMove to look at move flags

    * Fixed alignment and spacing in battle_moves.h

    * Added FLAG_DISABLED_IN_SKY_BATTLE to Sticky Web

    * Added FLAG_DISABLED_IN_SKY_BATTLE to Steel Roller

    * Disabled the ability to change Battle Terrain when Sky Battle is happening
    Stopped Ceaseless Edge from spawning Spikes when Sky Battle is happening
    Added B_SKY_BATTLE_STRICT_MECHANICS config

    * Fixed bug with SKY_BATTLE_STRICT_MECHANICS where conditions were not consistently being applied

    * Add rulesVariants to the BattleStruct
    Added skyBattle check in AllocateBattleResources

    * Replaced B_FLAG_SKY_BATTLE checks with rulesVariants.skyBattle checks

    * Fixed debug script

    * Reverted include/config/battle.h

    * Fixed spacing and placement of functions

    * Fixed debug script omission
    Fixed bug where Spikes did not set from Ceaseless Edge and Stone Axe

    * Added FLAG_DISABLED_IN_SKY_BATTLE to Psychic Terrain

    * Addressed DizzyEgg PR feedback

    * Forgot a file in last commit

    * Addressed feedback from DizzyEggg

    * Address Lunos' PR feedback

    * Update specials.inc

    Added an empty line at the end of data/specials.inc

    * Fixed spacing

    * Apply suggestions from code review

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

    * Updated skyBattleBanned and HandleBattleVariantEndParty to use correct names

    * Removed STRICT_MOVES and STRICT_MECHANICS

    * Fixed minor spacing issues with merge

    * Merged in upcoming

    * Implemented feedback from Jasper
    https://github.com/rh-hideout/pokeemerald-expansion/pull/2950/files/5da6117d1bc725900c6386e62ab719f8e1695027

    ---------

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 0fe203c7f57a5c140e3c095cd3fcd215871b4df4
Author: Bassoonian <[email protected]>
Date:   Sat Nov 25 13:56:41 2023 +0100

    Fix fusions (#3602)

commit c8b0545d2074c51b790db78457cdd9932e3c7f6d
Merge: 74bb0f05f5 71fd95e6d4
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 00:51:33 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 74bb0f05f529535fccaec42cff1cd66d7f1f6eb3
Author: Bassoonian <[email protected]>
Date:   Fri Nov 24 16:19:32 2023 +0100

    Battle Dome Automation (#3596)

    * MOVE_POINTS_STRONG

    * MOVE_POINTS_POWERFUL

    * MOVE_POINTS_LOW_PP

    * MOVE_POINTS_STAT_RAISE

    * Removed duplicate function

    * MOVE_POINTS_STAT_LOWER

    * MOVE_POINTS_DMG

    * MOVE_POINTS_ACCURATE

    * MOVE_POINTS_HEAL

    * MOVE_POINTS_DEF

    * MOVE_POINTS_RISKY

    * MOVE_POINTS_EFFECT

    * MOVE_POINTS_LUCK

    * MOVE_POINTS_POPULAR

    * MOVE_POINTS_STATUS

    * MOVE_POINTS_RARE

    * MOVE_POINTS_COMBO

    * Apply review suggestions

    * More implemented review suggestions

    ---------

    Co-authored-by: Eduardo Quezada <[email protected]>

commit b7cd6502d42de3bcdb0a9591881c1f9ac3299756
Author: Frank DeBlasio <[email protected]>
Date:   Fri Nov 24 09:57:08 2023 -0500

    Add config for times of day (#3579)

    * Added initial config for times of day

    * Changed TIME_DUSK/DUSK_EVO to EVENING

    * Added morning and evening to Gens 3/4

    * Renamed *_EVO_HOUR_BEGIN/END to just *_HOUR_BEGIN/END

    * Incorporated comments

commit b6ff973f3821dc2fc0508d0c912b6b838819d7d2
Author: kittenchilly <[email protected]>
Date:   Thu Nov 23 15:59:51 2023 -0600

    Add support for legendary fusion (#3274)

    * Legendary Mon Fusion Evolution Compatibility Added

    Kyurem, Calyrex, and Necrozma Fusions have been implemented, however, the animation for the the process is incomplete, the party menu screen needs to be updated while the screen is whited out and it has proved beyond me right now. Smh

    * Added Fusion Move Prompts

    Handles cases for learning the fusion moves from the other fused mon and deleting the move when you unfuse (plus learning confusion (well a set choice in the data struct) if there are no moves left after deleting one)

    * Fix Bug With Fusion Mon Move Learning

    If the main fusion came after the fused mon in the party order it would try to teach the move to the next member in the party

    * Apply suggestions from code review

    Co-authored-by: LOuroboros <[email protected]>

    * Fix build

    * Fix fusion items being used up

    * Fixed animations

    * RefreshPartyMenu

    * Apply suggestions from code review

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

    * Apply suggestions

    * Update form_change_tables.h

    * Fix animation and simplify fusion tables

    * Fix party full message

    * Remove trailing whitespaces

    * Update party_menu.c

    * Update party_menu.c

    * Make IsFusionMon better

    * Apply suggestions from code review

    Co-authored-by: Bassoonian <[email protected]>

    ---------

    Co-authored-by: TeamAquasHideout <[email protected]>
    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>
    Co-authored-by: LOuroboros <[email protected]>
    Co-authored-by: Bassoonian <[email protected]>

commit 8d6cb9692aa680fa701dacafbb4870d08b3557bc
Author: psf <[email protected]>
Date:   Thu Nov 23 12:31:33 2023 -0800

    Improved Repel / Lure Menu (#3594)

    * First draft of repel lure

    * Updated all lure and repel scripts

    * Optimized inc file

    * Updated y coord

    * optimized sprays.c

    * Removed spray.inc

    * Updated cosnt use

    * Removed dead repel and lure code

    * Updated debug for testing

    * testing new inc file

    * turn on debug and options

    * playground generated inc file without ifs

    * pory generated inc with ifdef complete

    * Updated spray.c with new inc

    * reverted item config

    * Reverted event scripts

    * Reverted event scripts

    * Revert config

    * Added testing scripts for debug

    * Added back specials

    * reverted debug scripts

    * Updated use of constants

    * Addressed tabs > spaces feedback
    https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#discussion_r1402917676

    * Updated constant names to avoid confusion
    Made inc file changes
    https://github.com/rh-hideout/pokeemerald-expansion/pull/3594\#pullrequestreview-1746418044

    * Updated constant name of NUM_SPRAY_TYPES to NUM_SPRAY_STRENGTH to be more accurate

commit 71fd95e6d46d255c3fec0dfadd7407d36fc6cdfb
Author: Alex <[email protected]>
Date:   Thu Nov 23 19:49:21 2023 +0100

    Fixes Protosynthesis and Quark Drive ability pop up (#3595)

commit d6ded280a3c70766db98b22ae5b49be76ce76204
Author: Bassoonian <[email protected]>
Date:   Thu Nov 23 19:23:10 2023 +0100

    Reflect Ivy Cudgel type in interfaces (#3590)

    * Reflect Ivy Cudgel type in interfaces

    * Use GetSideParty

commit c0bc6979c7b507ce66a224e0f5e4324153d69b0e
Merge: c9c0827ba2 ca39889587
Author: ghoulslash <[email protected]>
Date:   Wed Nov 22 17:42:36 2023 -0500

    Fixes Howl activating if partner has Soundproof (#3593)

commit ca39889587281cfda54d2dd554cebbd9f00f7e67
Author: Alex <[email protected]>
Date:   Wed Nov 22 21:55:08 2023 +0100

    Fixes Howl

commit a7beed5b256f29809aaa1599e5889280a39c2738
Author: Bassoonian <[email protected]>
Date:   Tue Nov 21 19:18:18 2023 +0100

    Dynamax messages (#3581)

    * Dynamax messages

    * Convert various to callnative

    * Remove battler argument from callnatives

    * Rename i variable

    * Fix missing else

commit b9edbb429b7821923e8699463e5b97bd5afd4672
Author: Alex <[email protected]>
Date:   Tue Nov 21 16:23:22 2023 +0100

    Adds combined pledge move effects (#3336)

    * Adds combined pledge move effects

    * added pledge status and various other fixes

    * leftover

    * fix triple arrow test tag

    * pledge moves can not be redirected by absorbing abilities

    * more pledge changes

    * remove duplicate test

    * Stab boost, Rainbow anim and new SeaOfFire anim

    * leftover

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit be42d4eafb41f85410004d11e202b25417dadade
Author: Alex <[email protected]>
Date:   Tue Nov 21 11:30:20 2023 +0100

    Increase score of secondary effects only at 100% chance (#3583)

    Co-authored-by: Bassoonian <[email protected]>

commit 4c783e2ae191fdc2376d2205fb521428f56fda5b
Merge: 34c608724d 5be62225ec
Author: ghoulslash <[email protected]>
Date:   Mon Nov 20 22:02:22 2023 -0500

    Indexes for Type Effectiveness table (#3374)

commit 5be62225ec9e4d2869c04725e2d1f11db5595eba
Merge: 098bc118b8 34c608724d
Author: ghoulslash <[email protected]>
Date:   Mon Nov 20 21:45:37 2023 -0500

    Merge branch 'upcoming' into RHH/pr/upcoming/typeEffectiveness

commit 34c608724d19cbbcd53f0fca876ac1d4fabb3831
Merge: f356bb1cee 428a23d313
Author: ghoulslash <[email protected]>
Date:   Mon Nov 20 14:39:50 2023 -0500

    Clean up time of day code (#3585)

commit 428a23d31399887fafe77d5324776f9293fc0025
Merge: 41e65357b8 f356bb1cee
Author: Alex <[email protected]>
Date:   Mon Nov 20 20:20:04 2023 +0100

    Merge branch 'upcoming' into timefunctionfixes

commit f356bb1cee18244f246c859d3846d93179c643a5
Author: Frank DeBlasio <[email protected]>
Date:   Mon Nov 20 14:07:34 2023 -0500

    Added B_UPDATED_MOVE_DATA checks against Acid/Crunch's descriptions (#3586)

    Co-authored-by: Alex <[email protected]>

commit 41e65357b888c56e7d4e342b8fb34dc5d0cc697c
Merge: f6f305ef1d cb245a00c6
Author: ghoulslash <[email protected]>
Date:   Mon Nov 20 14:04:19 2023 -0500

    Merge branch 'upcoming' into timefunctionfixes

commit c9c0827ba2031602c948549be0478c1d234dd504
Author: Bassoonian <[email protected]>
Date:   Mon Nov 20 19:33:06 2023 +0100

    Fix 3568 (#3569)

commit cb245a00c6c9176b2a7ba01ba74b1cf56b6e3301
Author: Bassoonian <[email protected]>
Date:   Mon Nov 20 18:35:00 2023 +0100

    Includes older item and move names as variants (#3580)

    * Item name variants

    * Updated move names

    ---------

    Co-authored-by: Alex <[email protected]>

commit f6f305ef1d6599bb38e74b53830ac8f79b280436
Author: Bassoonian <[email protected]>
Date:   Mon Nov 20 11:06:20 2023 +0100

    Clean up time of day code

commit 13a65a21adc6084ed0bcb0008e66bc3333ba8774
Merge: 341bbb30ef 59a7d2cb92
Author: Eduardo Quezada <[email protected]>
Date:   Sun Nov 19 21:11:03 2023 -0300

    Adds configable nature colors (#3582)

    * Colored stats depending on nature

    * Fix bug

    * Update colors and add config

    ---------

    Co-authored-by: DizzyEggg <[email protected]>

commit 341bbb30efb5717b994fe9d967e046dbad89ef12
Author: Eduardo Quezada <[email protected]>
Date:   Sun Nov 19 21:10:21 2023 -0300

    Revert "Adds configable nature colors (#3582)"

    This reverts commit 9311911413cd3233e84934b925c4c5457c4ac1e9.

commit 9311911413cd3233e84934b925c4c5457c4ac1e9
Author: Bassoonian <[email protected]>
Date:   Sun Nov 19 23:18:47 2023 +0100

    Adds configable nature colors (#3582)

    * Colored stats depending on nature

    * Fix bug

    * Update colors and add config

    ---------

    Co-authored-by: DizzyEggg <[email protected]>

commit 59a7d2cb92a89395c11181ee38f3895ad2b47908
Author: Bassoonian <[email protected]>
Date:   Sun Nov 19 18:30:18 2023 +0100

    Update colors and add config

commit 8a772b729a357e916717c16efebb29723a49f4b7
Merge: 4cb03d4add c904d1c2bd
Author: Bassoonian <[email protected]>
Date:   Sun Nov 19 18:23:47 2023 +0100

    Merge branch 'nature_color' of https://github.com/DizzyEggg/pokeemerald into naturecolors

commit 4cb03d4add60b4653edfb04374225ec86a785370
Author: Alex <[email protected]>
Date:   Sun Nov 19 17:45:58 2023 +0100

    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 <[email protected]>

commit b5cb92f0e29c3de89c1c57ea4010adff63ecb54b
Author: Katy <[email protected]>
Date:   Sat Nov 18 16:48:02 2023 -0600

    Gen 6 Sprites/Animations For Species (#3543)

    * Bunnelby Spritework

    + New pal + new animation

    * Fletchling Spritework

    New front sprite, animation and palettes

    * Fletchinder + Talonflame Changes

    New animation for Fletchinder
    Spritework + animations for Talonflame

    * Flabebe, Floette + Florges Changes

    + Touched up Flabebe
    + Fixed Floettes normal forms sprite
    + Added second frame to Eternal form for Floette
    + Animations changed

    * Amaura Spritework

    New second frame + animation (frame-by-frame)

    * Chespin Spritework

    Touched up chespins sprites + changed the animation.

    ---------

    Co-authored-by: Alex <[email protected]>

commit 42076897d3c77e461b9b181be482c610d5981a94
Author: Frank DeBlasio <[email protected]>
Date:   Sat Nov 18 10:53:56 2023 -0500

    Made function for time-based evolutions (#3369)

    * Made function for time-based evolutions

    * Incorporated Edu's comments and time variables

    * Moved time of day begin/end variables to rtc.h

    * Fixed if/else statement to pass building with modern

    * Added morning

    * Added ability to check if end time > beginning time

    * Updated times to match SwSh

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit 5fa1bffa8df6ba925220b009e91a2f2720e9cb69
Author: Alex <[email protected]>
Date:   Sat Nov 18 15:19:38 2023 +0100

    Adds Glaive Rush, fixes for Plasma Fists and Relic Song  (#3476)

    * Adds Glaive Rush

    * Fixes: Glaive Rush status is removed until users next turn

    * Glaive Rush no affect

    * simplify glaive rush script

    * simlify script further

    * leftover

    * Fix Plasma Fists and Relic Song + tests

    * Callnative for Plasma Fists

    * Use Status Field Ion Deludge for Plasma Fists

    * add assumes for flinch_status

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit efe4929ce217b60942c61959aff0544ee76cbad0
Author: Frank DeBlasio <[email protected]>
Date:   Fri Nov 17 18:54:13 2023 -0500

    Added Japan-only Walda PC icons (#3550)

    * Added Japan-only Walda PC icons

    * Added a config for the Japanese icons

    * Update overworld.h with suggestions

    ---------

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit bf8c9609ae735d7188ad5418bad78de2727e41d9
Author: ghoulslash <[email protected]>
Date:   Fri Nov 17 10:04:41 2023 -0500

    add battle pyramid wild reqs (#2581)

    * add battle pyramid wild reqs

    * fix comment

    * fix ice type round to match vanilla. move config to overworld

    * some fixes

    * BATTLE_PYRAMID_RANDOM_ENCOUNTERS define to FALSE defualt

    * fix GetSpeciesName

    * fix GetTotalBaseStat define, gEvolutionTable targetSpecies call

    * fix wildMons call

    * fix call to CheckBattlePyramidEvoRequirement

    * fix arg 2 in CheckBattlePyramidEvoRequirement

    * free->Free and fix evoItems ptr

    * move sBurningMoves

    * fix comment

    fix ice type round to match vanilla. move config to overworld

    some fixes

    BATTLE_PYRAMID_RANDOM_ENCOUNTERS define to FALSE defualt

    fix GetSpeciesName

    fix GetTotalBaseStat define, gEvolutionTable targetSpecies call

    fix wildMons call

    fix call to CheckBattlePyramidEvoRequirement

    fix arg 2 in CheckBattlePyramidEvoRequirement

    free->Free and fix evoItems ptr

    move sBurningMoves

    BATTLE_PYRAMID_RANDOM_ENCOUNTERS defaults to false

    * fix errors

    * initial movesCount, abilitiesCount

    ---------

    Co-authored-by: ghoulslash <[email protected]>
    Co-authored-by: Bassoonian <[email protected]>

commit 508332a93f1f04eacdc3a4128310851378463ea5
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 17 11:59:34 2023 -0300

    Reverted PR template tests

commit 8f3eb1c9a55763346970a4348a208af7b134f111
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 17 11:53:25 2023 -0300

    PR template test 2

commit 5f24bf6e776ea6955963515e7aa425b9306ded6d
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 17 11:49:01 2023 -0300

    PR template test

commit efe9f6d8abe7492a19253c23f379b3b04d6678b8
Author: LOuroboros <[email protected]>
Date:   Fri Nov 17 09:14:37 2023 -0300

    Added battle tests for Embargo (#3555)

    * Added Embargo battle tests

    * Expanded Embargo doesn't prevent Primal Reversion to avoid CI failure

    * Applied corrections to some of the Embargo tests

commit c46f9ec6a5e66a43004ddfd9223ce6b7f2af2dab
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 16 20:09:43 2023 -0300

    Form changing method for Shaymin Sky into Land at night (#1690)

    * Form changing method for Shaymin Sky into Land at night

    * Ordered form change tables

    * Refactored form change type to support both night and day

    * Removed added space

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit b33c4952af2ef864ec76d8cced05b5da976f75be
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 16 19:32:58 2023 -0300

    Clarify project's description to avoid people cloning vanilla pokeemerald (#3570)

commit 8981897c9b03320676e90bc327d95a5c1834cc19
Author: Frank DeBlasio <[email protected]>
Date:   Thu Nov 16 15:36:04 2023 -0500

    Fixed logic to allow Shadow Tag to work (#3549)

    * Fixed logic to allow Shadow Tag to work

    * Fixed which boolean is changed

    * Reverted boolean change and updated B_SHADOW_TAG_ESCAPE comparison

    ---------

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 99f1a8208d27caf6336fb8c41f59db2ed212dc09
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 16 07:30:58 2023 -0300

    Point to the configs easier (#3564)

commit 85e75a72c649481b4d64f889d2927327e8158cfa
Author: kittenchilly <[email protected]>
Date:   Tue Nov 14 14:29:38 2023 -0600

    Update affection mechanics to gen 8+ (#3495)

    * Update affection mechanics to gen 8+

    * Update battle.h

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit a8564cf8a9b33c138b82110f641a7525cb91c426
Merge: 93c7a70caa 934fe46008
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 14 12:54:16 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 93c7a70caa72b830ee420373e08652e3dddda04f
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Tue Nov 14 12:40:26 2023 -0300

    Species Simplifier™ - Part 2 (#3546)

    * Gen 1 and 2 families + fixes

    - Fixed mixed identation.
    - Fixed Azurill being Normal/Water type in Pre-Gen6 setting.
    - Fixed Wobbuffett being before Wynaut
    - Fixed Dudunsparce's macro being out of order

    * Updated macros of Megas that shared held item with base forms

    * Gen 3 families

    * Separated Latis macro

    * Gen 4 families

    * Moved Misc Info to the top of arrays

    * Renamed FAMILY_x to P_FAMILY_x

    * Gen 5 families

    * Gen 6 families

    * Gen 7 families

    * Gen 8 families

    * Gen 9 families

    * Mega Evolutions

    * Gigantamax Form toggles

    * Alolan Forms

    * Galarian Forms

    * Added missing comments

    * Hisuian Forms

    * Paldean Forms

    * Fixed missing Paldean form flags

    * Fixed order

    ---------

    Co-authored-by: Bassoonian <[email protected]>

commit 89f346345b5b9557de25537d1c17035af3630640
Author: ravepossum <[email protected]>
Date:   Tue Nov 14 10:24:46 2023 -0500

    Adding clock offset init to debug menu cheat start (#3561)

    Co-authored-by: ravepossum <[email protected]>

commit c1cdc320bb8f6ea65cb7d37281a0b9101818d38f
Author: kittenchilly <[email protected]>
Date:   Mon Nov 13 14:46:25 2023 -0600

    Implement Rotom Catalog and Zygarde Cube (#3284)

    Co-authored-by: Martin Griffin <[email protected]>
    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 934fe460082f67c21a85cba70433dcdc1809ece0
Merge: 87aaeca623 74de34c8b8
Author: Martin Griffin <[email protected]>
Date:   Mon Nov 13 15:35:08 2023 +0000

    Performance improvement for specific tests (#3559)

commit 74de34c8b8a4eb0e5067ddc37fdca6fdb15b632a
Author: Zhengwen Jiang <[email protected]>
Date:   Mon Nov 13 01:48:47 2023 -0600

    improve the performance for specific tests

    Co-authored-by: Martin Griffin <[email protected]>

commit 87aaeca623864793b606b9c33dfac479b83bc375
Author: LOuroboros <[email protected]>
Date:   Sun Nov 12 10:42:33 2023 -0300

    Fixed IS_DITTO macro (#3558)

commit b93dfb9d5980de2a72d3e45faae471a153c808c4
Author: Pawkkie <[email protected]>
Date:   Sat Nov 11 08:37:35 2023 -0500

    Smarter SwitchAI Mon Choices | HasBadOdds Switch Check (#3253)

    * SwitchAI makes much smarter mon choices

    * Add HasHadOdds check to ShouldSwitch decision

    * Remove early return

    * Rework Baton Pass check as per discussion with Alex

    * Forgot to adjust a comment

    * Don't program before breakfast lol (if / else if fix)

    * Switch AI_CalcDamage for AI_DATA->simulatedDmg in HasBadOdds

    Thanks Alex! :D

    * Typo in a hitToKO comparison

    * Remove and replace AI_CalcPartyMonBestMoveDamage and IsAiPartyMonOHKOBy from https://github.com/rh-hideout/pokeemerald-expansion/pull/3146

    See https://discord.com/channels/419213663107416084/1144447521960251472 for details

    * Major refactor, new struct, switchin considers damage / healing from hazards / status / held item / weather

    * Forgot Snow exists and heals Ice Body, haven't played Switch games lol

    * (https://github.com/rh-hideout/pokeemerald-expansion/commit/766a1a27a7298e50dd89c5fecc1989b3dd8b8ce3) Compatibility, use new struct field instead of function call

    * Fixing oversight from previous upstream merge

    * Improve TSpikes handling to make GetSwitchinHazardDamage more applicable

    Small fixes:
    - EFFECT_EXPLOSION typo (!= to ==)
    - Order of if statements near bestResistEffective
    - Spacing of terms in big HasBadOdds if statements

    * Forgot to uncomment blocks disabled for debugging what turned out to be vanilla behaviour lol

    * Remove another holdover from debugging, sorry :/

    * Lastly, undoing my debug trainer

    * Type matchup based on species type rather than current type

    Suggested by BLourenco on Discord, the idea is that a mon that's had its type affected by a move like Soak will still have moves as though it was its regular typing, and so prioritizing the temporary typing wouldn't be ideal.
    https://discord.com/channels/419213663107416084/1144447521960251472/1146644578141736970

    * gActiveBattler upcoming merge fixes

    * Egg changes part 1

    * Egg changes part 2, just need to address EWRAM still

    * Move SwitchinCandidate struct to AiLogicData

    * Consider Steel type when checking TSpikes

    * Comment about CanBePoisoned compatibility

    * Changes for Egg's 2nd review

    * Put period back in comment, whoops lol

    * Latest upcoming merge fixes

    * Missed a few u32 updates

    * Combine GetBestMonIntegrate functions / flags, some modularization

    * Fix merge error

    * Make modern fixes

    * Two tests done, two to go

    * Accidentally pushed reference test, removing it

    * Type matchup switching tests

    * Tests for defensive vs offense switches

    ---------

    Co-authored-by: DizzyEggg <[email protected]>

commit 3fc47d137abcb0f9a41e0117269408fa947d31c7
Author: Martin Griffin <[email protected]>
Date:   Fri Nov 10 11:08:36 2023 +0000

    Defines for Expansion version number (#3454)

commit 7ccdd4b5b3efa4bdb8fb8999e1d9a738e8fa738a
Author: hedara90 <[email protected]>
Date:   Fri Nov 10 01:57:04 2023 +0100

    Added Teal Mask item graphics + updated install instructions (#3527)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit b5b67973bdb3d9fde47093cd890e4a866c071b35
Author: Frank DeBlasio <[email protected]>
Date:   Thu Nov 9 18:11:29 2023 -0500

    Fixes Stantler's evolution's boolean (#3548)

    * Stantler's evolution now has the proper gen boolean

    * Fixed comment for new evo methods

commit 33815079ae1a2bc3aa9ed348e14611d077340ea5
Author: Frank DeBlasio <[email protected]>
Date:   Thu Nov 9 17:29:22 2023 -0500

    Added missing cross-gen evolutions (#3547)

    * Added missing cross-gen evolutions

    * Added forms for evos

    * Converted some EVO_NONEs into EVO_MOVE

    * Moved Ursaring's evolution up

    * Added evolution methods for Dudunsparce and Maushold

commit e79583be63f5a7182ae050b54560aced23a9804c
Author: Alex <[email protected]>
Date:   Thu Nov 9 20:53:14 2023 +0100

    Remove function GetMoveDamageResult (#3536)

    * Remove function GetMoveDamageResult

    * fix test

    * test clean up

    ---------

    Co-authored-by: DizzyEggg <[email protected]>

commit b29538f23d1e7f296875b59d5249de54e0f5a81f
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 9 11:43:35 2023 -0300

    Species Simplifier™ - Part 1 (#3544)

    Co-authored-by: DizzyEggg <[email protected]>

commit 96361a85e08f3f27f08174fa272911ec695e5f4f
Merge: 11e8407958 ec304cbb0f
Author: Martin Griffin <[email protected]>
Date:   Thu Nov 9 14:12:05 2023 +0000

    Added -Woverride-init Makefile flag (#3535)

commit ec304cbb0fda1b16a25bc895517361277d3371d1
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 6 16:45:51 2023 -0300

    Added -Woverride-init Makefile flag

commit 11e840795801310b5bbfaaf8ff551b00998a3662
Author: Philipp AUER <[email protected]>
Date:   Thu Nov 9 13:04:29 2023 +0100

    [audio] resample oversampled cries to 13379Hz (#3359)

    Co-authored-by: sbird <[email protected]>
    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 4b3c96a89bf33e703405c7c1c3eb8f9c14f65f9a
Author: Alex <[email protected]>
Date:   Thu Nov 9 12:25:46 2023 +0100

    Adds ability Zero to Hero (#3542)

commit 954f67a29f1a0ceb413762b2f025a8660afcdec2
Author: Alex <[email protected]>
Date:   Tue Nov 7 18:19:46 2023 +0100

    Fixes Dragon Tail and Pumpkaboo spelling (#3541)

commit 23e8937fc4fa52297fd79c96749b1a585256a220
Author: Frank DeBlasio <[email protected]>
Date:   Mon Nov 6 18:55:43 2023 -0500

    Added Gen 3-4 Mega Evo back sprite coordinates back (#3539)

commit 4e4fb4fe61bde741241b8e44018dffda4a573f64
Merge: 182d1f5b26 4aa14355d7
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Mon Nov 6 14:14:48 2023 -0300

    Add Generation 9 species (#3249)

commit 4aa14355d73b6ae397ce4f0fd25c712c8f48bbbd
Merge: b4b4e3cf2b 182d1f5b26
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Mon Nov 6 13:49:02 2023 -0300

    Merge branch 'upcoming' into gen9-species-nomigration

commit 182d1f5b264223290dcf78fd8b3a8266f07421a1
Author: Frank DeBlasio <[email protected]>
Date:   Mon Nov 6 10:57:42 2023 -0500

    Fixed GetNextBall (#3534)

commit 2b9f6b350e49b41803af7ac5084cbaa5fb2098cc
Author: Alex <[email protected]>
Date:   Mon Nov 6 12:31:43 2023 +0100

    Move animations. Credits to Captain-Ford (#3529)

    Co-authored-by: DizzyEggg <[email protected]>

commit ee0222c0ecf40106b491a3b816f5c752edf8cffe
Author: LOuroboros <[email protected]>
Date:   Mon Nov 6 06:18:45 2023 -0300

    Updated the holdEffectParam of the items that double the amount of money gained in battle (#3528)

commit 3004fd588aa4afe17a3bfd297978c0b932b45fef
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Sun Nov 5 18:46:22 2023 -0300

    CI fix test (#3530)

commit b4b4e3cf2b548d746056af62ab646d0d6e3965a8
Author: leo60228 <[email protected]>
Date:   Sat Nov 4 11:04:02 2023 -0400

    import oct 31 pokecommunity sprites

commit 4863fb8a6b70b9f3cb40eb8bd7fc45fea826d626
Author: leo60228 <[email protected]>
Date:   Fri Nov 3 22:18:55 2023 -0400

    wrap ogerpon dex entry to 4 lines

commit 01c9b7c20a98da2e4773943c5f1051d6a1cc227f
Author: leo60228 <[email protected]>
Date:   Fri Nov 3 22:16:01 2023 -0400

    hgss dex fixes

commit 57c1dd97bb6dbfe99abeac64d7f0aeff88b17b18
Merge: 90471741e9 8b359c2ca4
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 3 21:59:08 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 8b359c2ca4a9e17931ef542637563ff7b4fde139
Author: DizzyEggg <[email protected]>
Date:   Fri Nov 3 21:01:02 2023 +0100

    fix psychic terrain blocking moves it shouldnt block (#3521)

commit 90471741e9e0630456f974827884f42a9a4598ce
Author: kittenchilly <[email protected]>
Date:   Fri Nov 3 14:32:12 2023 -0500

    Add Fairy Feather sprite (#3520)

commit eeed9612b453b42580a2cce39f62e466003d2c1d
Author: Kaitlyn <[email protected]>
Date:   Wed Nov 1 23:31:44 2023 -0500

    Mon Sprite Fixes

    - Quaquaval: Pal + Sprite fix
    - Oinkologne Male: Pal fix, recommend redoing back sprite.
    - Oinkologne Female: Pal + Sprite fix
    - Rellor: Pal + Sprite index and shading + Pal fix

commit 820be61c9fde40acbf663d80b6522cd1a5c27b94
Merge: 5ccef18a6f 24bde64ddb
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 2 21:32:23 2023 -0400

    Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4

commit 5ccef18a6f29ff76bf9bc058e59dd474bdef3676
Author: kittenchilly <[email protected]>
Date:   Mon Oct 30 12:12:14 2023 -0500

    friendship = 50 -> friendship = STANDARD_FRIENDSHIP

commit eccd2c4a659cd472a3ea583b4d1ac750e60a59ce
Merge: 392a65dec0 1467ffa3d8
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Nov 2 21:24:35 2023 -0400

    Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration

commit 90d9334f0b7b3859595ed5657f6950539bed9304
Author: DizzyEggg <[email protected]>
Date:   Thu Nov 2 11:43:06 2023 +0100

    Fix Sap Sipper not blocking Bullet Seed (#3516)

    * Fix Sap Sipper not blocking bullet seed

    * add defiant sticky web test

commit 53b7e4bf6605da35764bfdb6619b177bec5483fc
Author: Alex <[email protected]>
Date:   Thu Nov 2 08:44:23 2023 +0100

    Remove powerfulMoveEffects array (#3515)

    * Remove powerfulMoveEffects array

    * Solar Beam test

commit 244ca0be95b730fd1bba87b20009372db58f5f8a
Author: kittenchilly <[email protected]>
Date:   Wed Nov 1 16:49:44 2023 -0500

    Add custom female icon sprites for Pikachu and Wobbuffet (#3506)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 6cce1b1873a79b6aa0426cb6279b0c37aca434c9
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Wed Nov 1 16:45:03 2023 -0300

    Fixed Dynamax's indicator not disappearing after Dynamax ends (#3510)

commit 47341f3f305bd26a1a84525ecfb122fa3881862c
Author: DizzyEggg <[email protected]>
Date:   Wed Nov 1 14:55:50 2023 +0100

    Fix Anger Shell activation (#3508)

commit 7eb1b122245bc06448cf7a0ed669a3e3dda5de06
Author: DizzyEggg <[email protected]>
Date:   Wed Nov 1 14:47:31 2023 +0100

    Fix Knock Off healing berries (#3509)

commit 24bde64ddbf2dcf60b62278b8ae19d96c2747907
Merge: 64ba52d214 e281103575
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 31 14:43:19 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 64ba52d2142051146af38df73c4c14c205641879
Author: Alex <[email protected]>
Date:   Tue Oct 31 13:41:22 2023 +0100

    Remove redundant AI score increases (#3504)

    * Remove redundant AI score increases

    * review applied

    * fix score

commit e2811035752b8db36ad8a85be35b72260b5c63b8
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 31 07:33:53 2023 -0300

    Reverted PR3455

commit 6dc534f8071b78398fa8de2a9204e1f625ea2f58
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Tue Oct 31 07:28:47 2023 -0300

    Version 1.6.2 (#3503)

commit 392a65dec0e7ea06e0862c6d2f4fd71c45c2bf0b
Author: leo60228 <[email protected]>
Date:   Mon Oct 30 23:20:24 2023 -0400

    cry fixes

commit 2dfae911aa6473260f9ced5918504c269799df41
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Mon Oct 30 17:18:00 2023 -0300

    Added config for Weak Armor's Gen 5-6 effect (#3498)

commit e28d0c627a3fbc94c342c73725d6471327376990
Merge: c0c100d90d 72dad4d7c6
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 16:51:04 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit c0c100d90d889603fc072773a9f390c1da75aced
Author: kittenchilly <[email protected]>
Date:   Mon Oct 30 14:45:52 2023 -0500

    Base friendship Gen 8+ config (#3491)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 72dad4d7c6959d2430e828923def10e2a5a190ab
Author: DizzyEggg <[email protected]>
Date:   Mon Oct 30 20:44:42 2023 +0100

    Fix Weak Armor interrupting multi hit moves (#3497)

commit 3788d844394b08c3882b0ea7d944ba3bebbc6acc
Merge: 71ba501b94 242d68487a
Author: DizzyEggg <[email protected]>
Date:   Mon Oct 30 18:51:51 2023 +0100

    Additional Weak Armor tests (#3493)

commit 242d68487a51a61dbc3d703c0505c1e8a38849a9
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 14:31:28 2023 -0300

    Weak Armor tests

commit a7e604e953b14d9908cab9a968bbb7f5c66cdb41
Author: leo60228 <[email protected]>
Date:   Mon Oct 30 12:31:18 2023 -0400

    correct iron leaves dex entry

commit 1a6acad3cf301a8f5c46cdfaa3a521a01f103360
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Mon Oct 30 12:13:32 2023 -0300

    Added Match Call to togglable options in debug menu (#3489)

    * Added Match Call to togglable options in debug menu

    * Added badge flags to Cheat Start

    * Fixed potential Fly and badge flag mismatch using the debug options

    * Added Fly flags to Cheat Start

commit 908af87846b848e2c9671d0c06c85152ace2a6c1
Merge: 15e038cd30 71ba501b94
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 11:00:24 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 71ba501b94c7fabc1ddb65b323b3cc6568bec84c
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 10:58:30 2023 -0300

    Fixed tests on modern

commit 15e038cd30b70af335cb32c9ab6d6de09cc7cc14
Author: Bassoonian <[email protected]>
Date:   Mon Oct 30 14:53:26 2023 +0100

    Decapitalise Alcremie file names (#3488)

commit 24de138eb54566d2657003c94ae6f46e4dc00a53
Author: AaghatIsLive <[email protected]>
Date:   Mon Oct 30 17:51:17 2023 +0530

    Add dark mode for Hoenn dex mode (HGSS) (#3479)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 349e05daa8280b62aef4b7fc7472ae7ab82b043c
Merge: f461bc3256 fe91f08b26
Author: DizzyEggg <[email protected]>
Date:   Mon Oct 30 12:29:44 2023 +0100

    Debug menu cleanup (#3390)

commit fe91f08b2606a0ea8b9ed5487cd65376a05ac4c5
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 08:10:23 2023 -0300

    Restore comments for now

commit 661becc3b67b9430a438395ae4b3f8462829cedb
Merge: 4f0802f96e f461bc3256
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 30 08:05:14 2023 -0300

    Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2

commit f4be01f0acc2b563f53eb1c2a3d8664c1a71fc43
Author: DizzyEggg <[email protected]>
Date:   Mon Oct 30 11:58:15 2023 +0100

     Fix strength sap on substitute (#3486)

    * tests for strenth sap

    * fix strength sap on substitute

    ---------

    Co-authored-by: ghoulslash <[email protected]>

commit 0c8fdce1a4c6b8fe92184f0bd45a16afd81b45fa
Author: DizzyEggg <[email protected]>
Date:   Mon Oct 30 11:39:41 2023 +0100

    New tests + Sheer Force / Last Resort minor bug fixes (#3378)

    * tests for intimidate defiant

    * sheer force fix + tests

    * white herb tests

    * tests for stealth rock, weak armor and last resort fix

    * style changes to weak armor test

commit f461bc3256ee9deefbe92e1b52996e0a6767a8a8
Author: Alex <[email protected]>
Date:   Mon Oct 30 10:04:59 2023 +0100

    AI_CompareDamagingMoves changes to increase the score by 1 for best moves  (#3382)

    * Further optimizes AI_CompareDamagingMoves

    * viableMove name change + 2 tests

    * some issues

    ---------

    Co-authored-by: DizzyEggg <[email protected]>

commit 7be2c62d982460432abac5f005d0357b929cd11f
Author: leo60228 <[email protected]>
Date:   Sun Oct 29 23:18:45 2023 -0400

    add teal mask cries (but none tweaked yet)

commit 1467ffa3d8ca71b8b91da815dcf120421759793c
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Sun Oct 29 16:30:56 2023 -0300

    Added missing Alcremie forms (#3469)

    * Alcremie form sprites

    Co-authored-by: Blackforest92 <[email protected]>

    * Fixed cries

    * Removed Todos

    * Temp: all forms use the same icon

    * Grouped form data + Fixed missing Level up and Teachable learnsets

    * Added missing data for form changes and back animations

    * Grouped defines together

    * Fixed compile

    ---------

    Co-authored-by: Alex <[email protected]>

commit 9d9b43f4de6b19c3ecef8dc9ef8f7f93feff2958
Merge: efae521646 bd71946372
Author: Eduardo Quezada <[email protected]>
Date:   Sun Oct 29 10:03:58 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit efae5216460faeb5e81932770f042b2b7a4da982
Author: Katy <[email protected]>
Date:   Sat Oct 28 21:47:58 2023 -0500

    Gen7 Sprites/Animations For Species (#3426)

commit ab25e6bfa5109dc052920cf53f7c5d026266e30a
Author: Bassoonian <[email protected]>
Date:   Sun Oct 29 03:24:20 2023 +0100

    Fixes Synchronize's OW effect and adds configs (#3480)

commit 0dd22305a4bba21835b1167f375d8b32213eae19
Author: Bassoonian <[email protected]>
Date:   Sun Oct 29 03:22:41 2023 +0100

    Adds Illuminate's Gen9 effect (#3482)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit ae1266e0772ca2ea7be631fedac05aaefff0373e
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 22:14:48 2023 -0300

    Automatically change dex number digits based on NATIONAL_DEX_COUNT

commit c74ad8251d0e5962d244fbeb23ff956874a8724e
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 17:00:00 2023 -0300

    Rearranged dex scrolling list UI to accomodate 4 digits and 12 character names

commit b484a215fb5be35a0930b9aa2349fdb041efa80f
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 15:22:07 2023 -0300

    Scrollbar moved to the left

commit 659bff4c0b7f94db727bc0a22a845da542329af0
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 13:48:26 2023 -0300

    Seen/Owned 4 digits in HGSS dex

commit 6d128a71b23d3ca14cdd3eb68647886eef01b46a
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 10:54:20 2023 -0300

    Fixed compile when Gen 9 is disabled

commit 6108d092d1d5af4d97b072d0b54c86a7cda61dce
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 28 10:38:46 2023 -0300

    Updated Save Menu, main menu, match call and trainer card to use 4 digits

commit c9619b03b166cf0b74151de6c4826a36c85bb8e3
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 27 22:59:46 2023 -0300

    Shows 4 digits on the main Pokédex page

commit 5087095aaea2e3fc8e40f8ad0ae42778d49c008f
Author: kittenchilly <[email protected]>
Date:   Fri Oct 27 17:17:17 2023 -0500

    Obedience levels now increase per badge (#3475)

commit f2fddf4ee1e722236f202881dddcd77e781a654c
Author: Alex <[email protected]>
Date:   Sat Oct 28 00:14:45 2023 +0200

    Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474)

commit 9d2be9f3a65ea6e2d6d1c1288734fc5df8a22871
Author: kittenchilly <[email protected]>
Date:   Fri Oct 27 11:54:55 2023 -0500

    Remove all trailing whitespace (upcoming) (#3473)

commit bd71946372775f44743390fa0f6a30f95051491a
Author: kittenchilly <[email protected]>
Date:   Fri Oct 27 11:52:44 2023 -0500

    Remove all trailing whitespace (master) (#3472)

commit db00839d64014779170df2625e8e7c949373a7f0
Merge: 5e67625e05 25a57d48d9
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Fri Oct 27 12:25:55 2023 -0300

    Fixes Syrup bomb, new Octolock script, some Intim changes + Tests (#3437)

commit 5e67625e05be22397ef74dfadbb29df58270ec28
Merge: 57a99e9be6 8e0991475c
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Fri Oct 27 11:35:03 2023 -0300

    It was a dark and spooky merge... 🎃 (pret merge 2023/10/27) (#3471)

commit 8e0991475cf288f2bc9f269e5bc5faa11db34d9c
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 27 11:04:10 2023 -0300

    Incorporated upstream fixes

commit 7ae37ab79cd347d050a7658401c7b69f039661f3
Merge: 57a99e9be6 2304283c3e
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 27 11:02:34 2023 -0300

    Merge branch 'pret_master' into RHH/upcoming

commit 57a99e9be6312631567b3eb901af7b71b3fffa29
Author: Alex <[email protected]>
Date:   Fri Oct 27 15:38:40 2023 +0200

    Fixes dynamax move target and canceling in doubles (#3470)

commit b5607209f3f2d55c8ef062b5ece8324242aeb5b9
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 27 09:16:39 2023 -0300

    Fixed G-Max Finale test

commit 59c0de0967efb81d78d28849e988ee8b638a4071
Merge: a8632f0fc5 591ef71e3b
Author: Eduardo Quezada <[email protected]>
Date:   Fri Oct 27 09:16:21 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 7e3f11709d1a63c74df97389e23a25ad87392a97
Author: leo60228 <[email protected]>
Date:   Fri Oct 27 01:33:31 2023 -0400

    kitakami dex entries

commit 5a705559154e013f21a65fbc1b9836bb14159e7a
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 21:52:39 2023 -0400

    Try to better abbreviate >10 character names

commit fca19a03f1dfba888c0be4db3ebd466a4d6a6ef4
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 21:45:21 2023 -0400

    downsample cries (like #3359)

commit a505afac1d2ea0ae1eab587f538d02e4d80de0f1
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 18:57:06 2023 -0400

    address review

commit 1762b286967015762b47727e1e74cd9346432b30
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 17:48:01 2023 -0400

    Ursaluna-Bloodmoon fixes

commit 2304283c3ef2675be5999349673b02796db0827d
Merge: c169b856d4 a5c2ac5e49
Author: GriffinR <[email protected]>
Date:   Thu Oct 26 17:42:41 2023 -0400

    Merge pull request #1935 from GriffinRichards/bugfixfix

    Use BUGFIX in assembly files

commit 144ed150c0213e97d07f36b78f7253807d60d952
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 17:42:14 2023 -0400

    update cry tables

commit 1acaf7f8699094fb003d1a07fbe07934a28148ab
Author: kittenchilly <[email protected]>
Date:   Thu Oct 26 15:35:38 2023 -0500

    Fixed icons

commit ad210c517023c2f3b572209891fd055b523d8416
Author: kittenchilly <[email protected]>
Date:   Thu Oct 26 15:15:40 2023 -0500

    Update icon.png

commit 91b4659d5c9eadbf3cd16f5c2dbe06002d6cce47
Author: kittenchilly <[email protected]>
Date:   Thu Oct 26 14:58:40 2023 -0500

    Ogerpon sprites

commit d9ccc80b31c8f18f919d690819f5861486a974c2
Author: kittenchilly <[email protected]>
Date:   Wed Oct 25 00:40:23 2023 -0500

    Sprites

commit 8fefdbe9145380d53ab686372be4b786eceee76b
Author: kittenchilly <[email protected]>
Date:   Tue Oct 24 23:24:43 2023 -0500

    Evo and form changes

commit 3a9172de065344aff9d161fad0b09197b1eb27a1
Author: kittenchilly <[email protected]>
Date:   Tue Oct 24 22:59:11 2023 -0500

    It can build now

commit bb855f965c680f20f785705ec786f0696ddd2400
Author: kittenchilly <[email protected]>
Date:   Tue Oct 24 15:45:01 2023 -0500

    Almost done with data

commit 5cbcf60c7e84d19bcb4950855dc4244fd9ade06c
Author: kittenchilly <[email protected]>
Date:   Mon Oct 23 18:48:42 2023 -0500

    Begin some stuff

commit 86917f1453a732128b83d300107262d8e31336e8
Author: kittenchilly <[email protected]>
Date:   Mon Oct 23 14:48:25 2023 -0500

    Update species.h

commit 5f2b6f57f7474f91f02f1bef3dc2c98f6d2eb10a
Merge: 95aa3028bb a8632f0fc5
Author: leo60228 <[email protected]>
Date:   Thu Oct 26 17:31:31 2023 -0400

    Merge branch 'upcoming' into gen9-species-nomigration

commit a8632f0fc52d2630e9973541718748a4e998aaab
Author: kittenchilly <[email protected]>
Date:   Thu Oct 26 15:45:33 2023 -0500

    Update PLA Pokemon data to correct values (#3458)

    * Fix PLA Pokemon data to use correct values

    * oops, cant forget basculin white stripe

    * Update level_up_learnsets.h

    * Update species_info.h

commit c169b856d42cbf8e42c2bc157a82f9f9700e142c
Merge: 3a8df46832 333523e5f7
Author: GriffinR <[email protected]>
Date:   Thu Oct 26 10:09:00 2023 -0400

    Merge pull request #1937 from kittenchilly/removewhitespace

    Remove all trailing whitespace

commit 3a8df46832e09f297837a30539211adb7cf3f23d
Merge: ad0c28df70 25d6f8ba74
Author: GriffinR <[email protected]>
Date:   Thu Oct 26 10:08:25 2023 -0400

    Merge pull request #1938 from AsparagusEduardo/pret/pr2/ndebugModern

    Fix mini_printf encoded string -Werror=pointer-sign warning

commit bb9d3208b00632f24ee8dfbc1ea0b0aa1382b92c
Author: Bassoonian <[email protected]>
Date:   Thu Oct 26 15:52:43 2023 +0200

    Frontier ban refactor (#3465)

    Co-authored-by: Eduardo Quezada D'Ottone <[email protected]>

commit 25d6f8ba74997a8694a7dbf150a86a402934702d
Author: Eduardo Quezada <[email protected]>
Date:   Thu Oct 26 09:25:50 2023 -0300

    Fix mini_printf encoded string -Werror=pointer-sign warning

commit cb38f3bee6422a814bddea0cdc6d7eca04df4661
Author: Alex <[email protected]>
Date:   Wed Oct 25 17:06:25 2023 +0200

    Fixes legendary backgrounds (#3464)

    * Fixes legendary backgrounds

    * missed one

    * forgot break

commit 25a57d48d962b00fde758949a49e2f7f82f1105b
Author: Alex <[email protected]>
Date:   Wed Oct 25 10:18:59 2023 +0200

    fixes tests

commit f6781a77d4388172abdd402473fb931f9fe1db43
Merge: bf56ea8a8b 81cbbdb185
Author: Alex <[email protected]>
Date:   Wed Oct 25 09:42:19 2023 +0200

    merge rhh/upcoming

commit 591ef71e3b8b11f33e2b8aac098367e844884208
Author: Alex <[email protected]>
Date:   Wed Oct 25 09:33:43 2023 +0200

    Fixes form change when using switch moves  (#3463)

    * Fixes form change with switch moves

commit 95aa3028bbeaa9da1d5816c1cad691852b2d30c6
Author: leo60228 <[email protected]>
Date:   Wed Oct 25 00:23:22 2023 -0400

    updated great tusk sprite

commit f6e5076dc0c115ee8377605ca33353c6ccf2225e
Author: leo60228 <[email protected]>
Date:   Tue Oct 24 23:20:59 2023 -0400

    add new sprites

commit 176dec6e6f755aa3db99806ded0bb99ce2873202
Author: leo60228 <[email protected]>
Date:   Mon Oct 23 18:19:37 2023 -0400

    new tinkaton sprite

commit 95e0dabfa382c1ad325cbad55de0e8efb7cafd6a
Author: leo60228 <[email protected]>
Date:   Mon Oct 23 18:16:48 2023 -0400

    icon/palette fixes

commit 1359df7f86b6a0f83ebf82621fbda1a2ac9a08e0
Author: leo60228 <[email protected]>
Date:   Mon Oct 23 17:53:25 2023 -0400

    new iron bundle and tinkatink sprites

commit 2edd20c5f75d326ffcb70c34ccfde7c171cd803a
Author: leo60228 <[email protected]>
Date:   Mon Oct 23 16:26:00 2023 -0400

    correct quaxwell and palafin-hero back sprite coordinates

commit 60d746729d15851d638aa8449847677bd51b92dc
Author: leo60228 <[email protected]>
Date:   Mon Oct 23 16:18:56 2023 -0400

    enable floragato icon and tinkatuff shiny palette

commit 0756dc1d4acf14fb9f99864fdb6834bef5fde836
Author: Alex <[email protected]>
Date:   Mon Oct 23 20:26:21 2023 +0200

    coords and roaring moon

commit d1165c04713913bd0a0b7ce112ffe0bad0930fe5
Author: Alex <[email protected]>
Date:   Mon Oct 23 17:07:33 2023 +0200

    A few better sprites

commit 333523e5f7b0a8c3c40ffedc8d7234a0eb14eb88
Author: kittenchilly <[email protected]>
Date:   Mon Oct 23 13:24:38 2023 -0500

    Remove all leading whitespace

commit 5660ac949528b88197beeb4e83567fd6f9ee4be4
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 14:19:40 2023 -0300

    Added new mon to pokedex orders

commit ed3e2f8e0905fc34a40697ee67b64f97576c5f01
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 12:57:13 2023 -0300

    Gen 9 form order

commit 174ad11535e9ebc4f9caa93d2aab5af5135aac63
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 12:09:44 2023 -0300

    SPECIES_GIMMIGHOUL_CHEST

commit 7b089a3aa1cb29343736ffc5f1e7836438ad6a90
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 12:04:49 2023 -0300

    Fixed Palafin Hero's Sp. Defense

commit 2e9e157cf8a069f41874ed784619a2b90a17fcc1
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 11:45:15 2023 -0300

    SPECIES_DUDUNSPARCE_TWO_SEGMENT

commit be921c57fcd7f57cc8b6e1244455121cdbeae3fc
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 11:26:50 2023 -0300

    SPECIES_TATSUGIRI_CURLY

commit 82bb758d19b7273edab0a7839114e0c7b47324f7
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 11:08:06 2023 -0300

    SPECIES_PALAFIN_ZERO

commit 792aee86eabb8751b7a0690436a5797f83e2cfdf
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 10:55:16 2023 -0300

    SPECIES_SQUAWKABILLY_GREEN_PLUMAGE

commit d69ac7ab4c37145b6a466f319b8ad8110451108d
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 10:27:51 2023 -0300

    Fixed Maushold Family of Four icon

commit ff60b7ff73f2e132d65fae53a7b17d48492e20df
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 10:24:47 2023 -0300

    Maushold Family of Three define

commit e6c5077d7c6d46113d0da40e8cec3ae0278fafb8
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 10:12:55 2023 -0300

    Oinkologne Male define

commit a92a3256df08996a5770f9d249a855acbe6829ac
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 09:33:37 2023 -0300

    Fixed Paldean Tauros Combat Breed order and data names

commit f570d14f2d307d161818f6a1be8afe8c297f6b80
Merge: fcc18c2ef0 26971fc3ac
Author: Eduardo Quezada <[email protected]>
Date:   Mon Oct 23 09:23:32 2023 -0300

    Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration

commit fcc18c2ef022c9a0f5762957093dd5b082261815
Author: leo60228 <[email protected]>
Date:   Sun Oct 22 19:15:55 2023 -0400

    correct paldean wooper type

commit 14c225436aeac6a11e07e07e6fd35fae95603cfe
Author: leo60228 <[email protected]>
Date:   Sun Oct 22 19:15:25 2023 -0400

    remove leftover cry

commit bf56ea8a8bdc17ecc4382351b59726af9b0deee6
Author: Alex <[email protected]>
Date:   Sun Oct 22 19:46:31 2023 +0200

    apply suggestions

commit 783ec0e957af43b96a893d82a796120f229a3518
Author: Alex <[email protected]>
Date:   Fri Oct 20 22:51:30 2023 +0200

    fixes tests

commit 123fd45d8ecd1fd108fa64e9d0d364a8409c7702
Author: Alex <[email protected]>
Date:   Fri Oct 20 18:53:49 2023 +0200

    last hyper cutter test

commit a5c2ac5e49207fea321dff74003bca81ee1a55f0
Author: GriffinR <[email protected]>
Date:   Thu Oct 19 23:37:04 2023 -0400

    Use BUGFIX in assembly files

commit 6daea655e56c74feebe9bdea6c0493e1eeccb7d4
Author: Alex <[email protected]>
Date:   Fri Oct 20 12:33:56 2023 +0200

    fix line alignment

commit ab6c5bafe9e47651b9cae2ece93c1c4a06ee16b6
Author: Alex <[email protected]>
Date:   Fri Oct 20 12:29:55 2023 +0200

    New function to check ability stat loss

commit f3580aa3f56005917aed8ed350b76d9078069777
Author: Alex <[email protected]>
Date:   Thu Oct 19 21:31:04 2023 +0200

    tabs

commit 535768838f142f9a8ba53dc1a13db3652e5c1c10
Author: Alex <[email protected]>
Date:   Thu Oct 19 21:28:27 2023 +0200

    Hyper Cutter tests

commit ceb6beb25484098e709a9daee0cb84650bf6f1c6
Merge: 876341105b b0e572b385
Author: Alex <[email protected]>
Date:   Thu Oct 19 12:30:55 2023 +0200

    merge upcoming

commit 876341105bcf003e6cdc309830f1289ef3f6ef64
Author: Alex <[email protected]>
Date:   Thu Oct 19 11:32:58 2023 +0200

    parantheses

commit 354f84be21e90cd6468e05524cb6159ed8e54651
Author: Alex <[email protected]>
Date:   Wed Oct 18 22:14:49 2023 +0200

    intim changes

commit 87a03c3c733df60e8c94288e647d217ee60426be
Author: leo60228 <[email protected]>
Date:   Wed Oct 18 14:44:30 2023 -0400

    Fix Paldean form order

commit ba0534386dcf9fc45333bf210bbb75cf56e6ef44
Author: leo60228 <[email protected]>
Date:   Wed Oct 18 14:30:15 2023 -0400

    Address review

commit 920fd481e79cd80bbb671aeb59b9c24a2247a0be
Author: leo60228 <[email protected]>
Date:   Thu Sep 28 17:48:05 2023 -0400

    Regional Dex numbers are always 3 digits

commit d27e566b4bbecfa5cbf6124b8f0cf6a68d847214
Author: Eduardo Quezada <[email protected]>
Date:   Wed Dec 28 11:23:05 2022 -0300

    fix 4 digit spacing

    (cherry picked from commit a4538d606d32175323bc06928d55857e8d13b6d2)

commit 5831f9344cf581caa2e9e359a110e5ce2bfdb994
Author: Eduardo Quezada <[email protected]>
Date:   Wed Dec 28 09:34:33 2022 -0300

    4 digits in dex num in summary screen

    (cherry picked from commit 7175214663a817e72894bd4b594ba1f8cea701c3)

commit 6cc2a1ef03d873d85aae1443a6481e13c8d7127c
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 23 11:32:01 2022 -0300

    4 digits option for dex numbers

    (cherry picked from commit 9bad51cbc69786ecd2e6719f2bca201a961bff5e)

commit b3e5c3179f1d244242f796774fbfecbc10faddc9
Author: leo60228 <[email protected]>
Date:   Wed Aug 23 11:42:55 2023 -0400

    Revert "reorder species.h"

    This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.

commit 3e1ecec800c468602729bcd4ab2aaef465aacee0
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 20:27:21 2023 -0400

    revert SPECIES_DARMANITAN_GALARIAN_* renames

commit f1464bbab6728760acd7cf0d8c39ad2d75859552
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 19:58:36 2023 -0400

    fix icon palettes

commit 61d3cdd8daa0a7d165e639db94d96b2b75e33051
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 19:55:20 2023 -0400

    revert separate SPECIES_UNOWN

commit 6df433735e1838f1d0ac489ac1b7bf4dbc381e48
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Tue Aug 22 19:44:14 2023 -0400

    reorder species.h

commit 5113efa64ad64a9d73cd9009303af063888e4c45
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 18:37:22 2023 -0400

    cry fixes

commit 4e8ae5965e4a5b77db80d002d14e8e439e9c8f81
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 18:30:00 2023 -0400

    make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON

commit e10acf8b2d8532c3e141dec347959188a72c6db8
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 17:11:28 2023 -0400

    gen 9 form learnsets

commit 5e0ff4ab5264b7a5b378417e114b124a75f00f2d
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 16:52:29 2023 -0400

    gen 9 form learnset pointers

commit ca931d09e9a233fd9dca0b5201abe9bd0e490e99
Author: leo60228 <[email protected]>
Date:   Tue Aug 22 16:40:49 2023 -0400

    form species info

commit b5be823e3b4c4b084dbf91dde527452eaf860159
Author: leo60228 <[email protected]>
Date:   Fri Aug 18 17:59:52 2023 -0400

    gen 9 forms (learnsets still missing)

commit fed554a110851d54bfc3dbd9c7fdd2b32fbee7b0
Author: leo60228 <[email protected]>
Date:   Fri Aug 18 17:22:24 2023 -0400

    sSpeciesToNationalPokedexNum

commit a502427a7f5cc8371a87a7db6bb6633e2ca69ecb
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Wed Apr 26 12:42:08 2023 -0400

    Merge pull request #18 from AlexOn1ine/speciesReorderItems

    (cherry picked from commit 6dc58dcc1797f8b72170c2c104c9cdf9b53c7b50)

commit c221c6720204c941ed0a3773856163f2aff408c0
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Sun Mar 26 16:54:41 2023 -0300

    Merge pull request #16 from AlexOn1ine/speciesReorder

    (cherry picked from commit e081d2b7730d2a7554b88af3a39ba3a2c0f5ba01)

commit 133ffc7260ce079f688af852ba0507b244a81dc3
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Thu Mar 16 22:06:17 2023 -0300

    Merge pull request #15 from Bassoonian/rhhspeciesreorder

    Add gen 9 Pokémon data

    (cherry picked from commit cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)

commit 91b6722322727e2cc14b711176ba9c03b5bb2f71
Author: Alex <[email protected]>
Date:   Wed Oct 18 20:25:34 2023 +0200

    Octolock, more tests

commit 4f0802f96e916cd3c2df3773dab043151d6f4a19
Merge: 89321bd5e3 a936b78ad5
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 14 22:14:39 2023 -0300

    Merge branch 'RHH/upcoming' into RHH/pr/upcoming/debugCleanup2

commit 6ed8ab771b4ff629e1ed15f10854f649c26cd42b
Author: Alex <[email protected]>
Date:   Fri Oct 13 14:08:44 2023 +0200

    Fix Syrup Bomb and change Octolock

commit 89321bd5e3e404a3039605aea8f5b469816e537a
Author: Eduardo Quezada <[email protected]>
Date:   Wed Oct 11 12:36:28 2023 -0300

    Re-asigned bits

commit a34e0f6f6f9eedb56789b98decb346c53488e07d
Author: Eduardo Quezada <[email protected]>
Date:   Sat Oct 7 23:04:36 2023 -0300

    Debug menu cleanup

commit 098bc118b8084e8214e65023b08b12168f6be548
Author: Eduardo Quezada <[email protected]>
Date:   Tue Oct 3 13:31:29 2023 -0300

    Indexes for Type Effectiveness table

commit c904d1c2bdc549e3d539c506a0720c6ef4d81041
Merge: e325cd3044 d528d75af7
Author: DizzyEggg <[email protected]>
Date:   Fri May 29 13:14:48 2020 +0200

    Merge branch 'master' into nature_color

commit e325cd3044e02072dc2221efbc896d20d19ddb99
Merge: d6d0669882 922a8de78d
Author: DizzyEggg <[email protected]>
Date:   Tue Apr 21 11:22:45 2020 +0200

    Merge with master

commit d6d0669882d7dbf287ec61ec003bcbaaf220f45d
Author: DizzyEggg <[email protected]>
Date:   Mon May 27 11:58:17 2019 +0200

    Fix bug

commit f8a515194258722bbb38cb630eb37f792fe78b60
Author: DizzyEggg <[email protected]>
Date:   Mon May 27 11:47:39 2019 +0200

    Colored stats depending on nature
@AlexOn1ine AlexOn1ine deleted the Syrup_Bomb branch April 19, 2024 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LOuroboros LOuroboros LOuroboros left review comments

@Bassoonian Bassoonian Bassoonian approved these changes

@AsparagusEduardo AsparagusEduardo AsparagusEduardo approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.7.0
Development

Successfully merging this pull request may close these issues.
5 participants
@AlexOn1ine @AsparagusEduardo @LOuroboros @Bassoonian @mrgriffin