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 Floral Healing + Tests #3604

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Fixes Floral Healing + Tests #3604

merged 1 commit into from
Nov 29, 2023

Conversation

AlexOn1ine
Copy link
Collaborator

Fixes #3598

cfmnephrite
cfmnephrite approved these changes Nov 27, 2023
View reviewed changes
Copy link

@cfmnephrite cfmnephrite left a comment

Choose a reason for hiding this comment

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

Looks good to me and tests all pass fine

@Bassoonian Bassoonian merged commit 4bde378 into rh-hideout:master Nov 29, 2023
1 check passed
halabi232 added a commit to halabi232/Pokemon-NeoYellow that referenced this pull request Dec 4, 2023
@halabi232
Squashed commit of the following:
c067898 
commit 4fdbcbbcaea1015592d7233f7f43e50aff07ab52
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 21:10:42 2023 -0300

    Family toggles in mon graphcis (By Jasper/Bassoonian)

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

commit ac582b36585cdf06db1c130c8592c197e884201c
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 19:42:28 2023 -0300

    Fixed missing Calyrex data

commit 84fa25a2f8d1d97bc6d78f2135a735709cee14be
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 19:31:21 2023 -0300

    Fixed Minior Graphics

commit e3a22a955b3da72a2b566ff055bdc0593ef0703d
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 19:18:02 2023 -0300

    Fixed Flabébé family graphics

commit fd85fd946c8a63e3fdd46520f5c56fdc39a9a483
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 19:11:55 2023 -0300

    Fixed Genesect palettes

commit e85b95fcbbb04dface37de3950bc03684f6cb4c7
Merge: 22dd135ac3 d076193b9f
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 16:52:26 2023 -0300

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

commit d076193b9f669f70868ee7dacb86172820824197
Merge: d1a69d7e04 6b1ea33be8
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 16:39:32 2023 -0300

    Merge branch 'RHH/master' into RHH/upcoming

commit 22dd135ac3d2080487a69f86cee7d84bac75c421
Author: Eduardo Quezada <[email protected]>
Date:   Sun Dec 3 16:19:21 2023 -0300

    Form species id tables use family toggles + added missing Ursaluna form species id table

commit 5262dc676a5da9fdf4b64af0ac19c31a72decc8c
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 23:16:54 2023 -0300

    Fixed missing data for Komala and Marshadow

commit 4782b7b0f8b27c82855023b3a7a2befdf1f8dd22
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 23:02:38 2023 -0300

    Finished moving Gen 9 data in macros (by Alex)

commit 28521f9f10d9d4758ba6c12c9331d1b9ab60bd5e
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 22:13:22 2023 -0300

    Expanded Alcremie macro

commit 3c45ed3ae859056d5f17dbd8fc8bdff2ad16e562
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 21:43:21 2023 -0300

    Finished moving Gen 8 data in macros (by Alex)

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

commit adc4ce7bdc1858765f3367e3b92d4f99c33976a5
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 19:10:52 2023 -0300

    Automatic ASSUMPTION_FAIL when used species are disabled

commit 6b1ea33be8cf533f343ad938a43edfd13d03a67b
Author: LOuroboros <[email protected]>
Date:   Sat Dec 2 19:09:09 2023 -0300

    Fixed Trace (#3623)

    * Applied Alex's fix for ABILITYEFFECT_TRACE

    * Added Trace tests written by Alex/Rainonline

    * Updated Trace's target-choosing capabilities and added a double battle test for it
    Credits to Alex/Rainonline.

    * Removed 2 of the 3 'Trace on opponent's switch-in' tests

    * Added another Trace test

commit 02db8ca6f7adaca33888df1f5a394a7ebd53b8c7
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 16:36:54 2023 -0300

    Added P_NEW_EVOS_IN_REGIONAL_DEX setting

commit d2e5495c457c29fe18a7378a713f48b2104b2399
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 15:53:33 2023 -0300

    Fixed Yanmega's cry ignoring the P_GEN_4_CROSS_EVOS setting

commit 0b7fe387e5baa99aed823f2e6a16b635f71d6bdd
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 14:05:07 2023 -0300

    Removed P_GEN_x_POKEMON from form_change_tables.h

commit f49464d722e391d58cef5f4845006daedd4ba93b
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 12:57:24 2023 -0300

    Cries are now properly excluded from the rom when disabling species

commit fbc45430b01c001203162e2c22a3cb09a2b903fc
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 12:56:38 2023 -0300

    Ultra Necrozma is now included in the fusion forms define

commit d442b43e329030e0cefe6f975a18e706a977aad5
Author: Eduardo Quezada <[email protected]>
Date:   Sat Dec 2 09:58:11 2023 -0300

    Finished moving Gen 7 data in macros (by Alex)

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

commit f2841801239d43b6ae7b7bffffb464c831bef207
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 1 17:25:30 2023 -0300

    Fixed Gen 9 sound data

commit c7a461c5aa065c17cba69f839377efbf4f4e27fe
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 1 16:59:54 2023 -0300

    Gen 9 without macros

commit ff808490f8fb7780347543080bead532f4c62568
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 1 16:59:39 2023 -0300

    Gen 8 without macros

commit 1192c5904224027da569c0bccc2a5455112dd8e6
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 1 15:13:11 2023 -0300

    Gen 7 without macros

commit ff0351ca702cc304b8a97414f8072733aeafc64b
Author: Eduardo Quezada D'Ottone <[email protected]>
Date:   Fri Dec 1 12:41:33 2023 -0300

    Ask users for credits in README.md (#3619)

    * Ask users for credits in README.md

    * Consistently refer to the repo as pokeemerald-expansion

    ---------

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

commit 0ad56f2a686ced4c6247d157076c37cca84367ed
Author: Eduardo Quezada <[email protected]>
Date:   Fri Dec 1 09:40:33 2023 -0300

    Moved Gen 6 data to gSpeciesInfo

commit d1a69d7e044af3feb79199690bc04479ac2b31f7
Author: Alex <[email protected]>
Date:   Fri Dec 1 00:01:21 2023 +0100

    fix new line (#3621)

commit 6e669a954d4eefa2f5bb40c99475e99319a94a35
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 30 13:34:42 2023 -0300

    Fixed `CanEvolve`

commit 131bb94d7385e71838171ef3513782c61882bfe6
Author: Pawkkie <[email protected]>
Date:   Thu Nov 30 06:37:19 2023 -0500

    Extend AI_FLAG_SMART_SWITCHING for Encore / hazards / lowered attacking stats (#3557)

    * Consider Encore / lowered stats / hazards

    * Fix poorly thought out Return FALSE

    * Incorporate Egg's feedback

    * Tests for hazards and stats, and some fixes

    ---------

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

commit 2b1d36db46ec59ab3934580be295db91870c5603
Author: psf <[email protected]>
Date:   Wed Nov 29 14:08:36 2023 -0800

    Fix issue where Sky Battles cause upcoming not to compile when debug menu is turned off (#3617)

    * Moved Sky Battle error message outside of debug.inc
    https://github.com/rh-hideout/pokeemerald-expansion/issues/3615\#issue-2015546179

    * Update data/scripts/debug.inc

    Made changes from Jasper's review

    https://github.com/rh-hideout/pokeemerald-expansion/pull/3617/files/625f0077416c5fa919b4999fc4be9c715d031875

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

    ---------

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

commit 8554a1fd18655dfa3f91217bfa706f6c204d860f
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 29 18:43:55 2023 -0300

    Fixed capitalization for front pic anims

commit 09396ea2cda1cd08d39f7f1a17119ddaa5f1617d
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 29 18:22:26 2023 -0300

    Renamed PLACEHOLDER_TWO_FRAME_ANIMATION to PLACEHOLDER_ANIM_TWO_FRAMES

commit 3d414023ea25ac1a1e0c53b79627bc719386d9d3
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 29 18:20:10 2023 -0300

    Using PLACEHOLDER_ANIM_SINGLE_FRAME when needed (same hash)

commit b1565b89619e75796ab6563f998232948aa4a8e0
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 29 17:53:57 2023 -0300

    Moved Gen 5 data to gSpeciesInfo

commit 05ba16fd70b6dc2521ac91acbcae156cf5df660a
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 29 14:17:58 2023 -0300

    Fixed compile in agbcc

commit 4bde378c0d13704ecdc46d26304eaecdc9ba8e23
Author: Alex <[email protected]>
Date:   Wed Nov 29 13:57:29 2023 +0100

    Fixes Floral Healing + Tests (#3604)

commit 913bc6c9d0602dbb61c096520b5424af4599fd89
Author: Alex <[email protected]>
Date:   Wed Nov 29 11:05:06 2023 +0100

    Adds White Herb tests (#3611)

commit 8c3fd00c86a8aeb053cde715a7bb59cac7ce536e
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 21:18:36 2023 -0300

    Gen 4 dex descriptions as compound strings

commit 41c1059c7b8e0e2bec1b30b6f566be5afd36ceef
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 17:06:18 2023 -0300

    Gen 3 dex descriptions as compound strings

commit ea8cd064493e17fe54c7dcc88f57176761863dfa
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 16:45:29 2023 -0300

    Gen 2 dex descriptions as compound strings

commit 07a687075acae0aad3ed004b2c718932f1e50cfa
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 16:18:38 2023 -0300

    Gen 1 dex descriptions as compound strings

commit 37ed39ca4cea115f491fd5ead9ab90d3f4ac38bf
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 15:01:17 2023 -0300

    Fixed missing Mr. Rime data

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 12397559b6dbca250664c6e713127bb1c386d80a
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 13:08:01 2023 -0300

    Gen 3 & 4 family toggles for dex entries

commit d260b44c69b4d069576988f6c5e09059f8fc9988
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 12:58:03 2023 -0300

    Added 3 more toggles for Fusions, Primal Reversions and Ultra Burst

commit 6456c7ce34d757ab2c2f16e0de3c56de62e0bb2d
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 11:22:47 2023 -0300

    gFrontierBannedSpecies now checks IsSpeciesEnabled

commit a5b1b8330b2da6d606af54a80de954a94cf3e253
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 11:19:25 2023 -0300

    Fixed National dex number offset

commit 23e5d9c3cad71c3ba50380b942ce81f242e631e1
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 11:16:29 2023 -0300

    Reordered mon graphics by family

commit 9b127c264624a9dcbc132a1609acc77a14c28218
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 09:59:51 2023 -0300

    Removed need to define mon graphics in include/graphics.h

commit 4c5bd48eb8b2d7c216e4364aef452a9d9dad42d3
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 09:51:08 2023 -0300

    Reading form change table from gSpeciesInfo

commit 489708ebee0c326ff7d042cffa0b8b81f88263cf
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 09:40:36 2023 -0300

    Fixed button label inconsistency in pokémon debug menu

commit 12848e27e9b86655507ff5037d8056fac3acf1d2
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 09:40:05 2023 -0300

    Reading form table from gSpeciesInfo

commit b0fd8423a06b25b123d9b1015b86854b76f0e9d2
Merge: 8b95250610 b72581985c
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 09:00:59 2023 -0300

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

commit 8b952506102c8cd5502afc4d563ac97b59b227c9
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 08:51:03 2023 -0300

    Reading Evolutions from gSpeciesInfo

commit 8fddd3eb186d8ce47f60a1d155c31de558099103
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 28 08:06:01 2023 -0300

    Reading Enemy Mon Elevation from gSpeciesInfo

commit 7e5c6ccc33d4e064fb480a8bb432226910d51be9
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 22:25:20 2023 -0300

    Reading National Dex Number from gSpeciesInfo

commit 55570787d322e66d0659cda48f6436a5603d29a2
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 22:15:15 2023 -0300

    Reading Teachable Learnsets from gSpeciesInfo

commit 6c2805a1131e7d4acb235b41d88f535b11cc9ab5
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 22:04:53 2023 -0300

    Reading Level Up Learnsets from gSpeciesInfo

commit 47dae3fa5b03ee7d2cfc456135716d9e4689409d
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 21:41:54 2023 -0300

    Separate mon pic sizes for female mon

commit af35710ecc1114ae52a301a7656e660331cf7fef
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 21:35:26 2023 -0300

    Reading Mon Pic sizes from gSpeciesInfo

commit a2326cdff9bf9cb689f85e9bdaa29ff9825131d9
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 17:37:02 2023 -0300

    Reading Footprints from gSpeciesInfo

commit a26b978d4ca36857408294f5a662fd50964cb6c0
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 17:31:02 2023 -0300

    Reading Icon Palette IDs from gSpeciesInfo

commit 704dd0217148ada26ca0e0d1e220733f7c406554
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 17:17:33 2023 -0300

    Reading Icon Sprites from gSpeciesInfo

commit 58871ee0e3b7f94314ba20c5aaa90d28dbf54adc
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 16:28:14 2023 -0300

    Reading Animation Frames from gSpeciesInfo

commit 526df9ba8fab35b99434352e0ed12c252fa27f19
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 16:12:46 2023 -0300

    Reading back anim Id from gSpeciesInfo

commit 6144820f2f86cf92b9b6f4c161c006b8180087d5
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 16:04:43 2023 -0300

    Reading front anim Id from gSpeciesInfo

commit 6e382cdcf034d2fd46114ad65ea045ce57ac728d
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 15:21:41 2023 -0300

    Fixed Pokémon Debug Menu not reading animation delay

commit 6986227dc050e2bb54ef71c5a6822421c2fbadb9
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 15:05:58 2023 -0300

    Reading animation delay from gSpeciesInfo

commit 630fd85ecf41e718c9116ed4ddc2c3fcb8e0c068
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 14:38:03 2023 -0300

    Reading palettes from gSpeciesInfo

commit d2a4f884bcc2d04471445bd043f1d081ab18c593
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 14:17:25 2023 -0300

    Updated uses of GetMonSpritePalStruct to allow loading the data directly instead of reading the struct

commit 0355fe2aa1eba7f21b7859a50081fe86ec712543
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 12:40:06 2023 -0300

    Reading Back Pics gSpeciesInfo

commit d2b44c73dd0757c63003a18a2b9452ca6510489f
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 12:33:22 2023 -0300

    Reading Front Pics gSpeciesInfo

commit dcb462fff187d0e7d6c95dcaf30c6128341e5489
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 12:16:15 2023 -0300

    Cleaned up mon graphic decompression function

commit 419d6392596c21e0eb667c2120ec63e9fa121a22
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 12:00:31 2023 -0300

    Reading Pokédex Size data from gSpeciesInfo

commit 39dbfbad0e48dbec3e5f7a741f31e1b981fdc783
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 10:15:30 2023 -0300

    Fixed data type for GetSpeciesHeight/Weight

commit 61a4795292cba093e9eb3a19b5d36ba0aad22c7c
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 09:59:47 2023 -0300

    HGSS dex properly shows form sprites

commit d428ad2cf0221a509390726df1eb4b68b3ada1f8
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 27 09:35:22 2023 -0300

    Moved Gen 4 data to gSpeciesInfo

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 00a533b9cf3b9ec72a740b4f8f42e3234780726b
Author: Eduardo Quezada <[email protected]>
Date:   Sun Nov 26 23:07:29 2023 -0300

    Moved Gen 3 data to gSpeciesInfo

commit e5d79aa3e366b35767c4f9e08b69114b6a1d807b
Author: Eduardo Quezada <[email protected]>
Date:   Sun Nov 26 20:50:14 2023 -0300

    Moved Gen 2 data to gSpeciesInfo + fixed Ursaluna Bloodmoon not producing Teddiursa eggs

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 85b4bca05cd97efa0d7be19774eb983fdef26041
Author: Eduardo Quezada <[email protected]>
Date:   Sun Nov 26 13:22:26 2023 -0300

    Moved Gen 1 data to gSpeciesInfo

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 503236529a85dcb1f76cc2733ce2c4648ab53ac3
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 11:35:41 2023 -0300

    Removed unused data from pokedex_entries.h

commit 7858ec3b3bebd84c7f8663860d1144389355d067
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 11:31:12 2023 -0300

    Read category from gSpeciesInfo

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

    Fix fusions (#3602)

commit 55d9c5fa89dd37487152384e07c6c74773d54bd7
Merge: eb2cf5f554 c8b0545d20
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 00:57:45 2023 -0300

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

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 eb2cf5f5541437e8e428b7da6352c9bccaa8a4a8
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 00:39:51 2023 -0300

    Obtains Height/Weight from gSpeciesInfo

commit 360e605a02329a40903d15e57777a5b1852b28b5
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 25 00:26:58 2023 -0300

    Sandshrew to Dugtrio Families

commit 42489128ea28dfbee4fc209906891017ab0cbb82
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 23:47:59 2023 -0300

    Macros for Front, Back, Palette and Learnsets

commit f609649f94f5b5fc478212017ea6cfd2a41d85f4
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 22:31:00 2023 -0300

    Added female pic sizes

commit 70716b204de887ab2da3a3f1e9edee686d6fbf58
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 20:13:14 2023 -0300

    Moved Bulbasaur to Raichu Family data do gSpeciesinfo

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 5e9e20e5c9b7387d4dc7b95d20301f4edab8f937
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 11:09:20 2023 -0300

    Fixed erroneous copy-paste

commit ede5cc847025c564950e0999cfeadb5f08b80801
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 11:08:17 2023 -0300

    Reading species names from gSpeciesInfo

commit 9c0d472d55ae2d46ef0314509bdfe89ebe8b78fd
Author: Eduardo Quezada <[email protected]>
Date:   Fri Nov 24 09:47:05 2023 -0300

    Pokédexes reads text from gSpeciesInfo

commit 2062bc65bcceeb2d052f749e2e674df401c7575b
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 23 20:00:34 2023 -0300

    Beginning support for moving data to gSpeciesInfo

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 167b308c5e93b096b04519f19b34955bde30c294
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 23 17:10:29 2023 -0300

    Form table pointers

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 2769ecfb43f0d5ac29710eb914ad47e58cb2378d
Merge: 2964801807 b5cb92f0e2
Author: Eduardo Quezada <[email protected]>
Date:   Sat Nov 18 22:09:47 2023 -0300

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

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 29648018077b55d614cc2e2383fc7cbcec089d80
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 13 00:59:25 2023 -0300

    Changed cry table to use assignable IDs

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 b538404a45a02d6914cf90fec4a85c3beb7310ea
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 21:29:40 2023 -0300

    Gen 2 dex entries

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 89566cb1118174c9e925afc27f3e7dd15dd780a4
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 18:29:06 2023 -0300

    Cross-evo configs

commit 6ada5270ccd75051a2688051da01e136e69d634e
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 18:06:09 2023 -0300

    Corrected imprementation of evolution prevention

    It could potentially overwrite items by accident

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 428fa55da3e4bcb41cee89b2daa53a906f66f49c
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 14:09:53 2023 -0300

    Prevent Pokémon offspring if they're disabled

commit fe1bf03a987a03a30c5107d0ffc657cc327285ca
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 14:09:28 2023 -0300

    Prevent Pokémon from being affected by Eviolite if their evolution is disabled

commit c6929312efc07807757eea53e0a1f46842d6cdd7
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 14:08:55 2023 -0300

    Prevent Pokémon from evolving if their evolution is disabled

commit 390a66f1f48831533be7333abd696e319efbd454
Merge: 9ca6f24195 85e75a72c6
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 13:50:21 2023 -0300

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

commit 9ca6f24195841944e185550c85c0f6f938f1fc57
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 11:49:32 2023 -0300

    Renamed file to species_enabled.h

commit 9589cb4ef27965ee3d27dfa16eaf4393ca68560c
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 10:25:22 2023 -0300

    Gen 1 Dex entries

commit 02874a4125d94da700d274c1299971ce449ff96f
Author: Eduardo Quezada <[email protected]>
Date:   Thu Nov 16 10:25:09 2023 -0300

    Moved P_GEN_x_POKEMON settings to the species_families file

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 16f83f3d19171c8f7cec84ac361b935489cd5575
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 15 13:16:17 2023 -0300

    Missing Pikachu ifdef comments

commit cd834ff3185e5b0af051f69e6f295ea68d0e64e7
Author: Eduardo Quezada <[email protected]>
Date:   Wed Nov 15 13:13:10 2023 -0300

    Reordered Paradox flag

commit 4c23cdc69ee017406a2169b44d488efdcaaa2c19
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 14 23:23:39 2023 -0300

    Dex text

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 ac62575dd65b6ebc0d42feacef64952638fab3b3
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 14 14:10:56 2023 -0300

    Pikachu form config

commit 041f00e222e7c04c37ab797a43835ef70b118d04
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 14 14:07:28 2023 -0300

    Added padding after flags

commit 5abf54a0f598a3f754ec17dd5d93f82b1f474e06
Author: Eduardo Quezada <[email protected]>
Date:   Tue Nov 14 10:06:50 2023 -0300

    Converted species flags to agbcc bit flags

commit 2ad730fc675875674167038175038eb30966b06b
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 13 12:47:25 2023 -0300

    Renamed gigantamax to isGigantamax

commit e201e69434f9c5713c126e364bee21b3381c1eba
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 13 12:28:48 2023 -0300

    Added missing comments

commit d2c778d24d2a8874ce6dbbb8743f0e7de7f41e03
Author: Eduardo Quezada <[email protected]>
Date:   Mon Nov 13 10:42:35 2023 -0300

    Added SpeciesInfo fields

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 1467ffa3d8ca71b8b91da815dcf120421…
PCG06 added a commit to PCG06/pokeemerald that referenced this pull request Dec 8, 2023
@PCG06
Fixes Floral Healing + Tests (rh-hideout#3604)
69b1c3f 
Credits to AlexOn1ine
@AlexOn1ine AlexOn1ine deleted the floralHealing branch April 19, 2024 12:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cfmnephrite cfmnephrite cfmnephrite approved these changes

@Bassoonian Bassoonian Bassoonian approved these changes

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

Successfully merging this pull request may close these issues.

Floral Healing is unaffected by Grassy Terrain
3 participants
@AlexOn1ine @Bassoonian @cfmnephrite