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

Implemented OW_IGNORE_EGGS_ON_HEAL #4888

Merged
merged 4 commits into from
Jul 4, 2024
Merged

Implemented OW_IGNORE_EGGS_ON_HEAL #4888

merged 4 commits into from
Jul 4, 2024

Conversation

pkmnsnfrn
Copy link
Collaborator

@pkmnsnfrn pkmnsnfrn commented Jun 30, 2024 •
edited
Loading

Implemented https://github.com/pret/pokeemerald/wiki/Pokecenters-Disregard-Eggs with permission from @ghoulslash.

Description

I have added this as a gen toggle to mimic vanilla behavior. The default is Gen 3, as is currently customary. I also changed u8 and u16 to u32 in the functions that I touched.

Images

Old

old.mp4

New

new.mp4

The weird Pokeball showing up for a frame is related to followers.

People who collaborated with me in this PR

@ghoulslash

Discord contact info

pkmnsnfrn

@AlexOn1ine
Copy link
Collaborator

If this is a new gen behavior shouldn't it be set to latest?

@pkmnsnfrn
Copy link
Collaborator Author

If this is a new gen behavior shouldn't it be set to latest?

9ca4a23

@AlexOn1ine AlexOn1ine merged commit 2a5e434 into rh-hideout:upcoming Jul 4, 2024
1 check passed
laserXdolphin added a commit to laserXdolphin/pokeemerald-dbe that referenced this pull request Aug 8, 2024
@laserXdolphin
Squashed commit of the following:
8a66f5e 
commit 742f35358fc2ed15e4b70c79710628a3bcd5054a
Merge: a1d42cfd4 28949702e
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 8 14:05:18 2024 +0200

    Merge branch 'dev-scripts' into develop

commit a1d42cfd44c60830d2fcdf32f6814eaa2f7452f0
Merge: 3b00e20ca b326ede97
Author: laserXdolphin <[email protected]>
Date:   Wed Aug 7 15:40:27 2024 +0200

    Merge branch 'dev-poke' into develop

commit 3b00e20ca9d8a06f7d5ac790e27c85b001b870b3
Merge: 6837950f5 46329876b
Author: laserXdolphin <[email protected]>
Date:   Wed Aug 7 15:40:21 2024 +0200

    Merge branch 'dev-scripts' into develop

commit b326ede975df25c7bc06527e66a585b7de26dbf5
Author: laserXdolphin <[email protected]>
Date:   Sun Aug 4 14:40:12 2024 +0200

    Rebalanced Levelcurve to be closer to base emerald

commit 6837950f5a7fb05f3ed6b40b18b7618c3013c67a
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 18:39:11 2024 +0200

    Merging fixes and updated config

commit fad5db230c17406babce65acbabff621a882cc0f
Merge: f4390373a 14d594930
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 17:19:30 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit f4390373a3753dd0942dfeb959ed75b8a284fa3f
Merge: 2598c6c6f 4d2127a7b
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 16:52:32 2024 +0200

    Merge branch 'dev-poke' into develop

commit 14d594930cbad0ffbec257d4d7d2e38323618f75
Merge: 555ab4078 32ac904ae
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 16:50:12 2024 +0200

    Merge branch 'develop'

commit 32ac904ae43329ba7d57bd73ddface295b0ac9a7
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 16:15:22 2024 +0200

    Fixed show IV/EVs in summary screen bug

    Due to update from gNatureStatTable to gNaturesInfo in rhh expansion 1.9.0

commit 555ab40780a91257b264b8c4bb0df2fac4bc5ad3
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 16:09:49 2024 +0200

    Removed Switching Keyboard and Move Pokemon

    Were implemented in RHHs expansion v1.9.0

commit 3361a678d2f9c53ec8625d419eace82da3b618d3
Merge: 6b47891c4 512c44b69
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 15:29:09 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 4d2127a7beb6656ffb88e069eebb9a5ffca3aaa7
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 15:15:27 2024 +0200

    Changed T Wave to nuzzle for wally and wattson

commit 2598c6c6fb641b968aedfa75e96247a5d5cf4aab
Merge: 7babf07cb 84e31cabd
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 11:00:39 2024 +0200

    Merge branch 'dev-scripts' into develop

commit 7babf07cbb215f4b21c382fadfff35a7c920134b
Merge: c68dee106 feeed1cf4
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 11:00:33 2024 +0200

    Merge branch 'dev-poke' into develop

commit feeed1cf417c3a1ac7bc2524688d726f2570f8c0
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 10:59:34 2024 +0200

    Edited Wildmons up to 3. Gym

commit 327dd66618ce0f64e512162d56b206ceda7b0add
Author: laserXdolphin <[email protected]>
Date:   Fri Aug 2 10:41:10 2024 +0200

    Edited Trainers up to Wattson

commit 512c44b6986fa822a63e132fa053a59a705dc6c4
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 17:04:48 2024 -0400

    Start 1.9.1 cycle

commit a2685d0d087acd9e90fd9195b4bc398627dd4371
Merge: 483121dfc 7ec24b89c
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 20:09:06 2024 -0400

    Version 1.9.0 (#5076)

commit 483121dfc09f66108186b130d874fd00c46df7f7
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 19:52:29 2024 -0400

    Version 1.8.6 (#5005)

commit 7ec24b89c8ca8ec6c600aa062c4ef75d868348e3
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 16:58:19 2024 -0400

    Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0

commit f95322628d6863bcaa8567ad05fc7bae2f68e87a
Merge: 483121dfc 57fc0fd3b
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 16:47:50 2024 -0400

    Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0

commit 57fc0fd3b92eec84e6bf4307a15f49209beda7d6
Merge: 8450268b7 de8002e9e
Author: Eduardo Quezada <[email protected]>
Date:   Thu Aug 1 08:36:11 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

commit c68dee106ad86ffa65cdacd4066d5dd1deab547c
Merge: ed0b7ad2b da8812226
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 13:25:15 2024 +0200

    Merge branch 'dev-poke' into develop

commit ed0b7ad2bc7ff0e528f07beadf831e9455f3fc45
Merge: d6949188e 073563de6
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 13:25:10 2024 +0200

    Merge branch 'dev-scripts' into develop

commit da8812226f3def5aed9873ba81459950fff176b4
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 12:57:02 2024 +0200

    Updates for Route 110 trainers

commit de8002e9e0caeef9daed9f0f3b2d9bbec69e50bb
Author: Alex <[email protected]>
Date:   Thu Aug 1 09:58:14 2024 +0200

    Removes unnecessary checks for Shield Dust and Covert Cloak (#5073)

    * Removes unnecessary checks for Shield Dust and Covert Cloak

    * remove redundant include

    * Update test/battle/ability/shield_dust.c

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

    * Update test/battle/hold_effect/covert_cloak.c

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

    ---------

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

commit d6949188ed36b55a785dd8cecf75d0f0e1539a9e
Merge: 0b312f2e2 cf511042c
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 09:38:19 2024 +0200

    Merge branch 'dev-poke' into develop

commit 0b312f2e2fcd303ca4cbcf3209a76bf739545e4c
Merge: 16eac6275 dfcb24387
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 09:38:13 2024 +0200

    Merge branch 'dev-scripts' into develop

commit cf511042c0cfd5ed159b3f88c4a16c2f34ed4da4
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 09:23:52 2024 +0200

    Made altering cave Ditto cave

commit 8aefbc846739ef0f8914bee9bebeffdcc97693a6
Author: laserXdolphin <[email protected]>
Date:   Thu Aug 1 09:20:53 2024 +0200

    Trainer Parties up to Route 110

commit 8450268b74136d78b00d1a849f6c4fef2ecaeb73
Merge: 3b9ea5b54 e6175b5b8
Author: Eduardo Quezada <[email protected]>
Date:   Wed Jul 31 18:13:19 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	src/data/battle_anim.h

commit 3b9ea5b54c44d21631389df25e62db60598e9c54
Author: Alex <[email protected]>
Date:   Thu Aug 1 00:04:21 2024 +0200

    Adds battle frontier conversion script (#5040)

    Adds script to convert battle frontier mons to new format
    Fixes existing battle frontier mons to match vanilla

commit 05ff7cef1ced59fafafc05d1799433e1f28a053e
Author: tertu <[email protected]>
Date:   Wed Jul 31 12:51:47 2024 -0500

    Tweak IV generation slightly (#4876)

    With HQ_RANDOM on, this means that the generator now only consumes one RNG output when generating IVs.
    Without HQ_RANDOM on, IV generation should be unchanged.

commit 16eac6275ffd3321d8f7da893d4b278839f73e25
Merge: 153fecef0 a246482c3
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 31 18:20:17 2024 +0200

    Merge branch 'dev-scripts' into develop

commit 153fecef01d10fd034c575e5a2b5e80bb96c4f50
Merge: 6882581de f40aeb1b7
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 31 18:20:12 2024 +0200

    Merge branch 'dev-poke' into develop

commit f40aeb1b78dd06f2bc34d493781b210bd4a55c95
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 31 18:18:46 2024 +0200

    Updated Route 110 Wild Mons

commit 281062c2d45c56930fca4465f00b985e180fe7a8
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 31 16:52:05 2024 +0200

    Updated Wildmons and Trainers up to Slateport

commit aac1cbe7c93d546da81c4faed46204faeca613b7
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 31 15:48:53 2024 +0200

    Updated Fishing Encounters up to 2. Gym

commit e6175b5b84ad206d65dff5c1c323c90cba125af1
Author: Alex <[email protected]>
Date:   Wed Jul 31 12:20:57 2024 +0200

    Fixes spread damage in double battles (#5064)

    * Fixes spread move damage in doubles

    * add DoubleBattle check

    * add additional check to test

    * restore trainer party

commit a89fc9de699ca0f4eb84005438cc03cade9ed2c8
Author: nooT <[email protected]>
Date:   Tue Jul 30 21:36:35 2024 +0200

    Added AI Flags Documentation To Directory For New Documentation Site (#5057)

    * Ported the wiki file ai flags to the /docs directory for the new documentation site

    * Revised AI flag documentation based on reviewer feedback

    * New comparitive clauses for; AI_FLAG_STRONGEST_MOVE and AI_FLAG_TRY_TO_FAINT

    * Added an entry to the navigation menu for the AI Flags docs

    * Added an entry to the navigation menu for the AI Flags docs

commit 6882581de17a2d611dfc25ea901f459207c80e9e
Merge: a2a27bb2c 66dca86b0
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:43:22 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit 66dca86b0a2ab92163b6e270fcae1b7d89c52e9b
Merge: 5068ebd7f 6b47891c4
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:42:30 2024 +0200

    Merge branch 'develop'

commit 6b47891c409cee4759e85834ca820d53bbef8a29
Merge: b53273b21 ab9f8e69f
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:42:17 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit a2a27bb2c2480c05a3a37323d6fa9ff24b51856d
Merge: c11100676 b6360dc23
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:40:20 2024 +0200

    Merge branch 'dev-poke' into develop

commit c11100676985195670fdee3fde138b322f295d82
Merge: 6533d7fbd 20f9df2c9
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:39:34 2024 +0200

    Merge branch 'dev-scripts' into develop

commit b6360dc23b3235f8bd659e7c4f583e8c3d502e92
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:36:25 2024 +0200

    Enabled Mugshots for Gym Leaders

commit 3de0f4c53e6cd494bc6fefab0071b08949769bb7
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:33:50 2024 +0200

    Swapped Mudkip for Totodile in Regional Dex

commit cfdbd31e6d5649223b128bbc9ac106f3389b88c5
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:32:22 2024 +0200

    Updated Wildmons up to 2. Gym

commit 04b624d72458491dc9860641fdb1f2fd6b2f13e3
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:30:40 2024 +0200

    Updated Starter Movepool for better gameplay

commit 297549102aa340dac4a98183562aaef73b78115d
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:25:00 2024 +0200

    Trainer Partys up to 2. Gym

commit 4cfa2b48d87e44a095a5fa931bd970895c0c314c
Author: laserXdolphin <[email protected]>
Date:   Tue Jul 30 20:24:24 2024 +0200

    Changed Rustboro Trade from Seedot to Cottonee

commit ab9f8e69fb5401ceab744d98451fdf0ea8683d6c
Author: PhallenTree <[email protected]>
Date:   Tue Jul 30 09:36:22 2024 +0100

    Fixes Stalwart/Propeller Tail, Life Orb on confusion, Remove Status wrong battlescripts (#5061)

    * Fix swapped BattleScripts in MoveEffectRemoveStatus for Freeze/Frostbite

    * Fix Life Orb damaging the user if they hit themselves in confusion

    * Fix Stalwart/Propeller Tail not ignoring redirection from Storm Drain/Lightning Rod

    * Parametrize Species

commit 74220518d4b74f560bd4ecc8650288c8364d3f7e
Author: hedara90 <[email protected]>
Date:   Mon Jul 29 19:34:19 2024 +0200

    Fixed the animation tables being different sizes (#5063)

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

commit 337250343056bf1df15eddadf1a824f9be2e7314
Author: Eduardo Quezada <[email protected]>
Date:   Mon Jul 29 12:41:03 2024 -0400

    Added OBJ_EVENT_GFX_SPECIES_SHINY macro (#5049)

    * Added OBJ_EVENT_GFX_SPECIES_SHINY

    * Update src/event_object_movement.c

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

    ---------

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

commit 54c19af03724e85f3ff747ddec79b62a79e0bcad
Author: Eduardo Quezada <[email protected]>
Date:   Mon Jul 29 10:28:32 2024 -0400

    Fixed B_HEAL_BELL_SOUNDPROOF checking for Gen9+ instead of Gen8+ (#5060)

commit b4eca0a6ec0be3f440284ef1b2e88a8e841c94d3
Merge: 18aff2db3 a89820fa9
Author: Eduardo Quezada <[email protected]>
Date:   Mon Jul 29 09:36:16 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	data/battle_anim_scripts.s
    #	src/battle_util.c

commit a89820fa960f64f114b5f5606e2eacec600b3873
Author: hedara90 <[email protected]>
Date:   Mon Jul 29 13:45:14 2024 +0200

    Fixed Hidden Power damage category for PSS < GEN_4 (#5053)

    * Fixed Hidden Power damage category for PSS < GEN_4

    * Fixed category display regression

    * Wrapped GET_MOVE_TYPE

    ---------

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

commit b54226dde3084cac0e6d90b5f873b1ddca2af945
Merge: 1cf2592a9 904d59220
Author: hedara90 <[email protected]>
Date:   Sun Jul 28 20:03:34 2024 +0200

    Add Axe Kick animation (#5039)

commit 904d59220dfc2e49ea4e3023bf71b10087fb77cb
Author: kittenchilly <[email protected]>
Date:   Sun Jul 28 11:55:57 2024 -0500

    Shorten squish anim

commit 9979fe01ac226c9a4fc1143493db91b56f24bc75
Author: kittenchilly <[email protected]>
Date:   Sun Jul 28 11:47:49 2024 -0500

    Update battle_anim_scripts.s

commit f22666c2a35756a4db488e2c0d2d74ec47d33cfa
Merge: b4792d3f7 1cf2592a9
Author: kittenchilly <[email protected]>
Date:   Sun Jul 28 11:46:14 2024 -0500

    Merge branch 'master' into axekick-anim

commit 6533d7fbd238ed05110f5c47f2da862147e9a789
Merge: 0f9f1a5bb 4460eb79b
Author: laserXdolphin <[email protected]>
Date:   Sun Jul 28 18:00:54 2024 +0200

    Merge branch 'dev-scripts' into develop

commit 0f9f1a5bb789d2b74c156cdef9fee2ab611ff0f9
Merge: b98eb9c79 6b12f2a47
Author: laserXdolphin <[email protected]>
Date:   Sun Jul 28 17:35:29 2024 +0200

    Merge branch 'dev-scripts' into develop

commit b98eb9c79f3493b664471e011360cd8bc6e38fb6
Merge: 89ea83ccb 1c148705f
Author: laserXdolphin <[email protected]>
Date:   Sun Jul 28 17:35:23 2024 +0200

    Merge branch 'dev-poke' into develop

commit 1c148705fd6563f48909f79451479423f2dce3d0
Author: laserXdolphin <[email protected]>
Date:   Sun Jul 28 17:31:59 2024 +0200

    Updated Movepool of Tyrogue

commit 9b78aea775597463e37c970f286924b66974c4dc
Author: laserXdolphin <[email protected]>
Date:   Sun Jul 28 17:31:10 2024 +0200

    Updated 1. Gym abilities and mons

commit 18aff2db3bf310d703cd548c167f9aa447a319ca
Merge: bb471746d 1cf2592a9
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 27 16:26:37 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	asm/macros/battle_anim_script.inc
    #	data/battle_anim_scripts.s
    #	include/constants/battle_anim.h
    #	src/battle_anim.c
    #	src/data/battle_anim.h

commit bb471746d67ec34c864f521b9ee8082975945819
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 27 15:41:05 2024 -0400

    Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM (#5046)

commit 1e8773356c040239e48b54a8fc4b4d731b604fe5
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 27 14:48:59 2024 -0400

    Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047)

    * Changed EVO_OVERWORLD_STEPS to use an EWRAM variable

    * Fixed PC swapping not resetting the follower steps

commit 89ea83ccbb2aa73bfff07375e6afff66869ed937
Merge: 789172b27 bd76104fe
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:58:24 2024 +0200

    Merge branch 'dev-scripts' into develop

commit 789172b270c8e397ecc9847971cd57f35ab5169c
Merge: 41f96b03f c6ff39b94
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:42:55 2024 +0200

    Merge branch 'dev-poke' into develop

commit 41f96b03fe8c85b836fd52c331fc30eded5aedd5
Merge: 969c26242 5068ebd7f
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:42:43 2024 +0200

    Merge branch 'pokeemerald-base-master' into develop

commit 5068ebd7ff9f17c46b9cdbca39d8a8392f6c5bba
Merge: dfac3995f b53273b21
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:38:35 2024 +0200

    Merge branch 'develop'

commit b53273b21f5892e1f6985c6514667a1cda21108c
Merge: e395f1a98 1cf2592a9
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:37:00 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit c6ff39b94081eeebecf39e21ff0b4002e8302b24
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 17:31:23 2024 +0200

    Changed Wildmons up to Roxanne

commit 83a78eefb5f1e94a71afed6638fcc276d02aeb30
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 16:36:49 2024 +0200

    Edited Trainers up to Roxanne

commit 1cf2592a9be79081f644a0aa186132d769a61640
Merge: 3c1fbbb06 c603e1131
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 27 10:17:07 2024 -0400

    Pret Merge (27th of July) (#5045)

commit c603e11310f65e4259f146ab264f158c142f3634
Merge: 3c1fbbb06 30f8ccfe6
Author: Bassoonian <[email protected]>
Date:   Sat Jul 27 12:01:39 2024 +0200

    Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july

commit ed3251a2aa8cb43f7b25bb43d9fe7a3af9076dc7
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 11:11:21 2024 +0200

    Made all fights beside the first, double battles

commit 7064ca07c6e99278d550b316d65f934121139fda
Author: laserXdolphin <[email protected]>
Date:   Sat Jul 27 10:54:55 2024 +0200

    Updated Ai Flags for all trainers

commit 30f8ccfe6e936694e1e26b66f66cd0a8f3b96460
Merge: 7316e5416 91b48a10d
Author: Martin Griffin <[email protected]>
Date:   Sat Jul 27 07:26:40 2024 +0100

    Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant

    Added constant for NUM_SNOWFLAKE_SPRITES

commit 91b48a10d4f0b4c85ffa0363c19f6979b34889c9
Author: pkmnsnfrn <[email protected]>
Date:   Fri Jul 26 21:57:42 2024 -0700

    Added constant for NUM_SNOWFLAKE_SPRITES

commit 7316e54161f0562ebd50071e4c1c7b0faf7b5b16
Merge: 550e6688a 3d2b86143
Author: luckytyphlosion <[email protected]>
Date:   Fri Jul 26 19:22:58 2024 -0400

    Merge pull request #2016 from luckytyphlosion/master

    Fix WSL1 install instructions

commit e82e3b4198cca732ee7299bc98385683ca840f71
Author: DizzyEggg <[email protected]>
Date:   Fri Jul 26 23:46:33 2024 +0200

    Allow flags in trigger scripts (#4900)

commit 3c1fbbb06e2f939d2d1fcd9aa0f9e713032f9a03
Merge: b0b63f66b 5dd10a4af
Author: Pawkkie <[email protected]>
Date:   Fri Jul 26 15:57:01 2024 -0400

    Fixes cantBeSurpressed ability check for breakable abilities (#5043)

commit 909f510a3dee4c13473b41fa8f43bbf8370c64f3
Author: laserXdolphin <[email protected]>
Date:   Fri Jul 26 21:48:58 2024 +0200

    Updated First(Route 103) Rival Fight and removed items from all trainers

commit 5dd10a4af11685b9cba3cd0013fa66fe4fcbfc10
Author: AlexOn1ine <[email protected]>
Date:   Fri Jul 26 21:34:20 2024 +0200

    forgot abilityShield check

commit dfd63fd34f894c4ad46f9a93bb351e09ce70d3a5
Author: AlexOn1ine <[email protected]>
Date:   Fri Jul 26 21:30:41 2024 +0200

    func CanBreakThroughAbility

commit 89563cb9b124e4b9a6329091e23ad4463b8690c3
Author: AlexOn1ine <[email protected]>
Date:   Fri Jul 26 21:11:16 2024 +0200

    check for breakable ability

commit e31755f7e097aae7b1a0947912d696cc0471ee5f
Author: laserXdolphin <[email protected]>
Date:   Fri Jul 26 20:59:23 2024 +0200

    Updated Regional Pokedex

commit 8b2774e07d5a907fbbd191e138b0427c9d5133eb
Author: AlexOn1ine <[email protected]>
Date:   Fri Jul 26 20:19:58 2024 +0200

    Fixes cantBeSurpressed ability check for breakable abilities

commit b0b63f66b91afb4a03aa909dc23d2cd8df377599
Author: hedara90 <[email protected]>
Date:   Fri Jul 26 18:06:44 2024 +0200

    Added Ivy Cudgel Animation (#5034)

    * Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command

    * Make the 20 year old compiler not complain

    * Maybe better cudgel

    * Moved animation

    ---------

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

commit cc00446eb80180670da41bbbabee2d48cb2d77d2
Merge: a372035fc 3d65141db
Author: Eduardo Quezada <[email protected]>
Date:   Fri Jul 26 09:42:52 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	src/data/graphics/pokemon.h
    #	src/data/pokemon/species_info/gen_9_families.h

commit 3d65141db892930a456168e043592248557774d1
Author: hedara90 <[email protected]>
Date:   Fri Jul 26 00:07:43 2024 +0200

    Fixed Sandile sprite (#5038)

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

commit a16448c081995257cd09a6a1193ef529a7d5f8cd
Author: kittenchilly <[email protected]>
Date:   Thu Jul 25 17:07:11 2024 -0500

    Update and clean up Battle Debug (#4643)

    * Update battle debug with new stuff

    * Fix status not showing up

    * Update hold effects as well

    * Update battle_debug.c

    * Update battle_debug.c

commit b4792d3f7e3149d2d30e6560db590aa844cea366
Author: kittenchilly <[email protected]>
Date:   Thu Jul 25 14:06:02 2024 -0500

    Add Axe Kick animation

commit a372035fc8d09709b851c5d661f511c04b801531
Merge: c69107a14 5b251b614
Author: hedara90 <[email protected]>
Date:   Thu Jul 25 19:46:14 2024 +0200

    Trainerproc: Support Ogerpon (#5035)

commit c69107a14adfd21e94e1c75b87653aca41134c2d
Merge: 062856cc6 7ae6b1d22
Author: psf <[email protected]>
Date:   Thu Jul 25 08:37:02 2024 -0700

    Fix fishing minigame (#5031)

    Fixed issue from #4343 where `GEN_3` minigame was not correctly working.

commit 5b251b614cca11d0cda71799039b40aab168e8e8
Author: Martin Griffin <[email protected]>
Date:   Thu Jul 25 14:50:32 2024 +0100

    trainerproc: Support Ogerpon

commit 062856cc6c0a9c951a13cbd8493c427975a309e7
Author: Pawkkie <[email protected]>
Date:   Thu Jul 25 07:57:42 2024 -0400

    Add Memento to Risky AI flag (#5032)

commit 7ae6b1d22acc2165e52d02efdb6c98385d76800d
Author: cawtds <[email protected]>
Date:   Thu Jul 25 00:58:21 2024 +0200

    fix fishing minigame

commit 7f6ddcf9d9f09842ea1446eb28902f30a2af7f93
Author: kittenchilly <[email protected]>
Date:   Wed Jul 24 15:53:37 2024 -0500

    Update all level up learnsets to Indigo Disk (#5023)

    * Update all movesets to Indigo Disk

    * Also update past gens for gen 9 mons

    * Update gen_1.h

commit 298ee34097673ed396eba5a84dc750e676651f35
Author: sneed <[email protected]>
Date:   Wed Jul 24 21:37:46 2024 +0300

    fix givemon not giving Cherish Ball (#5022)

commit 7b2914c0464f6cc1d6aaac529425c9259389a8c9
Author: PhallenTree <[email protected]>
Date:   Wed Jul 24 18:36:55 2024 +0100

    Fix Mold Breaker-like abilities, AI Move Accuracy function, Fury Cutter with Parental Bond (#5030)

    * Fix GetBattlerAbility not checking correct battler's action

    * Fix Fury Cutter counter being incorrectly incremented on 2nd hit of Parental Bond + test

    * Fix AI_SetMoveAccuracy only using attacker's ability

    * Review

commit e395f1a986007924685c77869dfd16df4e7f7c44
Merge: 9d32b861c 7a4df80f8
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 24 11:58:47 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 9d32b861cc4d889bffeb10031f0f60163215d7bb
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 24 11:58:02 2024 +0200

    Set Default Options
    Text Speed = Fast
    Sound = Stereo
    Battle Style = Set

commit ed0ba149b0c897d3df22f4fd2423f1ee3d8a2df7
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 24 11:16:57 2024 +0200

    Implemented Move Pokémon as first PSS option
    https://www.pokecommunity.com/showpost.php?p=10065761

commit 3d2b861436a522c83dce702961587dc5486d7fdc
Author: luckytyphlosion <[email protected]>
Date:   Tue Jul 23 17:53:19 2024 -0400

    Fix WSL1 install instructions

commit 3f4b4adae5f5ebbfe021e10fdbf7de0748d01e5e
Author: hedara90 <[email protected]>
Date:   Tue Jul 23 20:09:32 2024 +0200

    Updated reference to config location to new location (#5026)

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

commit 7a4df80f891c0273afe737a62f93eb8ad8a0d69d
Author: hedara90 <[email protected]>
Date:   Tue Jul 23 17:55:07 2024 +0200

    Added Ogerpon Tera Sprites (#4996)

    * Added Ogerpon Tera Sprites

    * Updated references to Ogerpon Tera forms

    * Fixed back sprite offsets and color indices for Hearthflame Tera

    * Removed Ogerpon data duplicates

    ---------

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

commit ae48293806919bb58557aa29c2582f3b282d53d3
Merge: 84e249f98 305c1ba55
Author: Eduardo Quezada <[email protected]>
Date:   Mon Jul 22 23:06:44 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	src/battle_ai_util.c

commit 305c1ba55eea5a8d559128805528b4a2cc608e56
Merge: 67551dba0 30ff2fa33
Author: tertu <[email protected]>
Date:   Mon Jul 22 15:05:23 2024 -0500

    Fix random IVs for givemon (#5021)

commit 84e249f98adae0b3baff4511e264382e7edaf1c2
Author: hedara90 <[email protected]>
Date:   Mon Jul 22 20:43:17 2024 +0200

    Some tera tests (#5020)

    * Added tests for Terapagos/tera interactions

    * Fixed missed things

    * Fixed Terapagos Stellar boost (by Alex)

    ---------

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

commit 30ff2fa337e0a68e4840fb3b3d7b2e37cbeb8eb1
Author: cawtds <[email protected]>
Date:   Mon Jul 22 17:18:22 2024 +0200

    fix givemon random ivs

commit 67551dba044ad227611bf400727b349744ce2287
Merge: 0bcd6a543 19fff8116
Author: ghoulslash <[email protected]>
Date:   Mon Jul 22 08:20:16 2024 -0400

    Fixes AI not being aware during calcs (#4992)

commit 0bcd6a5435c56ace14338da02b18a5f21e315a24
Author: kittenchilly <[email protected]>
Date:   Mon Jul 22 06:39:32 2024 -0500

    Make Snow Warning description respect config (#5018)

    * Make Snow Warning description respect config

    * Update src/data/abilities.h

    ---------

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

commit aac6ebd3d72162e3131f71fa2f5c395d3da7e311
Author: PhallenTree <[email protected]>
Date:   Sun Jul 21 20:24:05 2024 +0100

    Fixes Sleep Talk, Toxic Debris and Jaboca/Rowap Berry issues; Adds Sleep Talk tests (#5009)

    * Fix Sleep Talk failing with choice item; Added some Sleep Talk tests

    * Fix Jaboca, Rowap berries recording Rocky Helmet Effect; Fix Toxic Debris not checking side's toxic spikes count properly in Doubles

commit 3fa6bf46db06b95549ce8eac12ba77f13360c4a2
Author: sneed <[email protected]>
Date:   Sun Jul 21 22:20:39 2024 +0300

    Test battlers always have their forced abilities (#4707)

    * Test battlers always have their forced abilities

    * indentation

commit 0b02527e5c406c988e819d8962024255a89fca99
Merge: 5ccf3e268 7e509c440
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jul 21 13:36:07 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	test/test_runner.c

commit 7e509c440b8e73cc76625bb1ee1e52e1c404cfd2
Author: hedara90 <[email protected]>
Date:   Sun Jul 21 08:17:31 2024 +0200

    Added Terapagos Stellar Sprite (#5008)

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

commit 01831a30b911e5d5b703fbb0e1e95b63a2a2f486
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 20 12:23:47 2024 -0400

    Temporarely revert regional form inheritance (#5004)

commit 9d5e253867a7f56b31b14d4596d0fa595c0be1c7
Author: Eduardo Quezada <[email protected]>
Date:   Sat Jul 20 12:22:40 2024 -0400

    Improved Test Runner Summary (#4641)

    * Filename in list (no proper sorting yet)

    * Line number and message in error list + removed sorting

    * Style adjustment

    * Added missing file/line number to "expected N passes/successes"

    * Fixed Known Failing Passing test list

    * Separated test list from totals

    * Assumption fails list

    * Better names

    * Filename for KNOWN_FAILINGs passing

    * Moved total back to the bottom

    * Spaces correction

    * Fixed test list count

    * Source file for Alloc fails on tests

    * Moved sourceLine from BattleTest to Test struct

    * Fixed assumptions failed "and more" counter

    * Fixed ASSUMPTION block not printing their line numbers

    * Fixed when stopLine is printed

    * Renamed stopLine to failedAssumptionsBlockLine

commit 5ccf3e2688efe8b15e7d4fdd2f93fb7b4c119f65
Merge: 98eb4e502 5dda4b846
Author: tertu <[email protected]>
Date:   Fri Jul 19 09:48:14 2024 -0500

    Fix chain fishing shiny rolls (#4906)

commit 98eb4e5027afbaac9e1c61af06fea56b3bc84d21
Merge: 62640456e f2311b4c9
Author: Eduardo Quezada <[email protected]>
Date:   Fri Jul 19 09:20:05 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	asm/macros/battle_script.inc
    #	include/constants/battle_string_ids.h
    #	src/battle_ai_switch_items.c
    #	src/battle_main.c
    #	src/battle_script_commands.c
    #	src/battle_util.c
    #	src/frontier_util.c
    #	test/battle/ai/ai.c

commit f2311b4c975e1f55622631bf9cb5d6542532869a
Author: Bassoonian <[email protected]>
Date:   Fri Jul 19 12:30:06 2024 +0200

    Add trainer class ball test (#4999)

commit 296bd05f53e57be082504235487234187bef12eb
Author: Bassoonian <[email protected]>
Date:   Fri Jul 19 11:58:42 2024 +0200

    Fix tests not compiling outside of CI (#4998)

commit 9ff30ee87ae5c0af11d33206c4f8f4eaa77c7447
Author: Bassoonian <[email protected]>
Date:   Fri Jul 19 11:46:25 2024 +0200

    Fix frontier ineligibility fix (#4997)

commit 552e2768daa85e5a11078c72ebd3593d7640ccdd
Author: Alex <[email protected]>
Date:   Fri Jul 19 11:01:46 2024 +0200

    Fixes to Opportunist and Mirror Herb adjustments (#4928)

    * Replace Opportunist todo tests with proper tests

    * add failing test

    * desc

    * Fixes to Opportunist and Mirror Herb adjustments

    * more tests

    * some fixes

    * first turn events switch

    * simple enum + revert test desc

commit 93ee3a91979f85a01cd60466ea67ffb3e56a59ac
Author: Bassoonian <[email protected]>
Date:   Thu Jul 18 21:51:21 2024 +0200

    Fix Psycho Shift Frostbite interaction (#4995)

commit 62640456e78c9944967dac20e1d3e550663a64fc
Author: Alex <[email protected]>
Date:   Thu Jul 18 12:48:23 2024 +0200

    Fixes residual damage order. #4945 Follow up. (#4993)

commit b21ffa1f9b7ceaa40a30d7a2f915c0f016977581
Author: Alex <[email protected]>
Date:   Wed Jul 17 23:36:15 2024 +0200

    Changes score adjustments to tempScore increases (#4987)

commit 0625c90277c9e1f577618d2468c8c3d6003c36bb
Author: fakuzatsu <[email protected]>
Date:   Wed Jul 17 22:23:52 2024 +0100

    fix tests when B_USE_FROSTBITE is TRUE (#4986)

commit 2ad81d344642180f9d6eced09da4ac095e3cebaf
Author: Martin Griffin <[email protected]>
Date:   Wed Jul 17 21:40:19 2024 +0100

    Deprecate agbcc (#4989)

    * Deprecate agbcc

    * Update Makefile

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

    * Update Makefile

    ---------

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

commit 19fff811604c41d637d9a3dd482fd8aa5534d345
Author: AlexOn1ine <[email protected]>
Date:   Wed Jul 17 22:13:09 2024 +0200

    Fixes AI not being aware during calcs

commit 23aa9f043392afa3a3bf1f0d886a8aebce75d0ca
Author: Martin Griffin <[email protected]>
Date:   Wed Jul 17 20:41:52 2024 +0100

    trainers.h (#4990)

commit fa27e809c77150f2b802bcc4a7ed4edf3b5e4f3d
Merge: 819741b63 cfcac0b0f
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 16:46:34 2024 +0200

    Merge remote-tracking branch 'upstream/master' into develop

commit 819741b63283693077537b2c6abcebf6bd5d77dd
Merge: 5609d11a8 950df26e9
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 16:38:59 2024 +0200

    Merge branch 'master' into develop

commit 5609d11a8941233e3d98b064726d81eae66d5ac2
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 16:19:21 2024 +0200

    Implemented Map Based Trainer Music
    https://github.com/pret/pokeemerald/wiki/Map-Based-Trainer-Battle-Music

commit f999be59c69ec9fb4909c8c2bcb3f3aecdbd94fe
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 15:57:39 2024 +0200

    Implemented Speedy Nurse and fixed Badge Mart Items
    https://github.com/pret/pokeemerald/wiki/Speedy-Nurse-Joy

commit b5c241dccf91a2f3b2ebefd60a2d4d9ee602cabb
Merge: b902da27e 56095f833
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 15:39:06 2024 +0200

    Merge branch 'mart_badges' of https://github.com/ghoulslash/pokeemerald into develop

commit b902da27e06eed26894c71b7292657221b8d0785
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 15:34:57 2024 +0200

    Implemented Keyboard Auto Case Switch
    https://github.com/pret/pokeemerald/wiki/Automatically-make-the-keyboard-switch-to-lowercase-after-the-first-character/

commit 899ea4a5f7d5e98d9cb491494fdc7e281784ea41
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 15:29:17 2024 +0200

    Implemented Remove the extra save confirmation
    https://github.com/pret/pokeemerald/wiki/Remove-the-extra-save-confirmation

commit d8145641351c3d43f4ae9bb4eb86772463d153e6
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 15:19:21 2024 +0200

    Implemented Disabling Union Room check when entering Pokémon Centers
    https://github.com/pret/pokeemerald/wiki/Disabling-Union-Room-check-when-entering-Pok%C3%A9mon-Centers

commit 953749956ff722a9795912c84896d1a2f6feb779
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 14:40:18 2024 +0200

    Implemented Custom Battle Music Via Scripting - Anon822
    https://www.pokecommunity.com/threads/simple-modifications-directory.416647/page-13#post-10341282

commit d333f9f06617a1e746d6c6e1f5beb6240c9a71d1
Author: innocenthedgehog <[email protected]>
Date:   Wed Jul 17 12:46:44 2024 +0100

    Fix typos in trainers.party documentation (#4988)

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

commit 0e82eab078dc2d4a7140c034a092492602920b2e
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 11:29:16 2024 +0200

    Implemented faster surfing
    https://www.pokecommunity.com/threads/simple-modifications-directory.416647/page-3#post-10137446

commit 6adc0a41671f5a937d0fdbd8c71e6dc12cbc39ce
Merge: 7ef137f19 754991e76
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 11:20:17 2024 +0200

    Merge branch 'gen4_bike_alt' of https://github.com/LOuroboros/pokeemerald into develop

commit 7ef137f194876d2c8ba41c7606bf6ae62a9b899d
Author: laserXdolphin <[email protected]>
Date:   Wed Jul 17 11:10:44 2024 +0200

    Implemented Move Item
    https://www.pokecommunity.com/threads/pokeemerald-move-items-in-party-menu.492745/

commit 7703cb314b85b7e6bd6cd2c590c1ab6dab052375
Author: hedara90 <[email protected]>
Date:   Tue Jul 16 18:50:31 2024 +0100

    trainerproc documentation (#4734)

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

commit 0e21e0debfcd0642b6e46e5e0e92a1f3b1eb7bb4
Author: iriv24 <[email protected]>
Date:   Mon Jul 15 13:41:23 2024 -0400

    replace gTransformedPersonalities[battlerAtk] in HandleLoadSpecialPokePic with personalityValue in HandleSpeciesGfxDataChange (#4975)

commit 7b3b635c6798e562415f45e21e9824b89514fe3a
Author: psf <[email protected]>
Date:   Mon Jul 15 10:06:01 2024 -0700

    Add AUTO_LOWERCASE_KEYBOARD (#4976)

    * Added SwapKeyboardToLowerAfterFirstCapitalLetter and AUTO_LOWERCASE_KEYBOARD

    * Fixed tabs and spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/4976/files\#r1677868397

    * Removed semicolon found by https://github.com/rh-hideout/pokeemerald-expansion/pull/4976\#discussion_r1678105502

commit 0d0100d8f81121b88b1b26e4df63f26b7eb75cc0
Author: Alex <[email protected]>
Date:   Mon Jul 15 17:18:03 2024 +0200

    Reduces AI_WhoStrikesFirst to the most essential parts (#4978)

    * Reduces AI_WhoStrikesFirst to the most essential parts

    * abgcc

    * add stall check + minor clean up

    * add comment

commit 684e8af181a912f9c69108faea1f0933a76e56cd
Author: iriv24 <[email protected]>
Date:   Mon Jul 15 11:01:36 2024 -0400

    Vanilla species names fit in health box without narrowing (#4979)

commit cfcac0b0f94eb6a30b309ae61894b75e208e31d7
Author: Bassoonian <[email protected]>
Date:   Mon Jul 15 16:25:25 2024 +0200

    Clean up battle scripts (#4839)

    * Clean up battle and anim scripts

    * Revert anim cleanup

commit b5a71858412e9d7937aecc381d24587ef6b8e09d
Author: Pawkkie <[email protected]>
Date:   Mon Jul 15 03:19:41 2024 -0400

    Fix U-Turn With Ace Mon (#4748) (#4972)

    * Fix U-Turn With Ace Mon

    * ASSUME for test

commit 2b40e79ac3bbd84d61c5a281cc617ae516774e2b
Merge: 6aa308e1d b084dcd8d
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jul 14 22:44:00 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	include/battle_util.h
    #	src/battle_ai_main.c

commit b084dcd8d3e8ae1653de2a4d52420e2c181d8697
Author: Pawkkie <[email protected]>
Date:   Sun Jul 14 16:00:51 2024 -0400

    Fix Upper Hand being used blindly (#4973)

commit 6aa308e1d8a5ba33f951fa539d494946a21bfbc7
Author: sneed <[email protected]>
Date:   Sun Jul 14 16:35:11 2024 +0300

    EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves (#4923)

commit 5c38532281d97f9a51e383dce134c38f6e11d8ba
Author: psf <[email protected]>
Date:   Sun Jul 14 05:46:04 2024 -0700

    Add B_ENEMY_THROW_BALLS, B_PLAYER_THROW_BALLS_SOUND, and B_ENEMY_THROW_BALLS_SOUND (#4953)

    * First proof of concept works

    * Added B_THROW_BALLS_SOUND

    * Made generic MonSendOut

    * Changed magic number to constant

    * added acute e and changed to GEN_LATEST

    * Removed tabs

    * Undef'd HIBYTE and removed extra bool32

    * Made functions inline per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1675397114
    Split into B_THROW_BALLS_SOUND B_PLAYER_THROW_BALLS_SOUND and B_ENEMY_THROW_BALLS_SOUND per https://github.com/rh-hideout/pokeemerald-expansion/pull/4953/files\#r1676143761

    * Reset debug script

    * Removed static assert per Discord conversation with Alex

commit 0b9cdf4716b84b41508fcef08f0fd7942e1afb97
Author: Bassoonian <[email protected]>
Date:   Sun Jul 14 11:59:58 2024 +0200

    Update README.md (#4966)

commit 9c1a85ef0fd3297d9efe93cdf983ed456ad7d289
Author: Martin Griffin <[email protected]>
Date:   Sun Jul 14 10:28:05 2024 +0100

    trainerproc: use -traditional-cpp to preserve Unicode characters (#4969)

commit d410f56a8ca80a3e5236031ec996f1600a8f19b0
Author: psf <[email protected]>
Date:   Sun Jul 14 02:23:49 2024 -0700

    Add P_CAN_FORGET_HIDDEN_MOVE (#4968)

    * Added P_CAN_FORGET_HMS

    * Renamed to can forget hidden move

    * Bypass IsLastMonThatKnowsSurf

    * Fixed typo

    * Moved P_CAN_FORGET_HIDDEN_MOVE

    * Update src/party_menu.c per https://github.com/rh-hideout/pokeemerald-expansion/pull/4968#discussion_r1677033837

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

    ---------

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

commit c721f1b04ab83562dde227ee0f1d1f3a4af4e056
Author: Pawkkie <[email protected]>
Date:   Sun Jul 14 02:29:27 2024 -0400

    Smarter Focus Punch and Substitute (#4952)

    * Smarter Focus Punch

    * Smarter Substitute, review feedback

    * Use HasAnyKnownMove instead of isFirstTurn

    * When are we removing agbcc again

    * Use HasMoveEffect

commit f6d2b2861a3535916026a7958a5903598b936bf8
Author: Bassoonian <[email protected]>
Date:   Sat Jul 13 23:08:43 2024 +0200

    Fix Tera indicators (#4960)

    * Fix Tera indicators

    * Better fix

commit 45275fee1707385480de6e9373d58829e0086586
Author: Alex <[email protected]>
Date:   Sat Jul 13 22:38:06 2024 +0200

    Fix Infinite Tera Orb racharging  (#4863)

    * Fix Infinte Tera Orb charges

    * trainer_parties.h

commit 385b7017f352592a42e083e34d5884590dde000e
Author: Bassoonian <[email protected]>
Date:   Sat Jul 13 21:20:55 2024 +0200

    Fix fake RTC being on by default (#4965)

commit 5e2e2e9fce292c69d325249dd0d39ccf0d9aa66a
Author: Alex <[email protected]>
Date:   Sat Jul 13 20:56:18 2024 +0200

    Minor shouldUseGimmick refactor (#4962)

commit 3e03419bdb7b33ea11763fb83c448d5a7560d569
Author: psf <[email protected]>
Date:   Sat Jul 13 11:44:27 2024 -0700

    Add OW_FLAG_PAUSE_TIME, pausefakertc, resumefakertc and togglefakertc (#4954)

    * First concept

    * Fixed config file and added static assert

    * Reset debug scripts

    * Cleaned up overworld config

    * Renamed new Rtc pausing functions per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1675393121

    * Added tabs instead of spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4954\#discussion_r1676791279

    * Update include/config/overworld.h

    ---------

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

commit e480f73e5a19adf77e172c1369dbe57acfd5d20c
Merge: deb2b69a7 50f368ece
Author: Martin Griffin <[email protected]>
Date:   Sat Jul 13 19:00:10 2024 +0100

    Pret Merge (13th of July) (#4964)

commit 50f368eceb2aa153dfc57f3c4460989d12c17339
Merge: deb2b69a7 550e6688a
Author: Bassoonian <[email protected]>
Date:   Sat Jul 13 19:42:29 2024 +0200

    Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge13july

commit 550e6688aa3b511a9aa9ea851c49ba4d90c7708a
Author: Philipp AUER <[email protected]>
Date:   Sat Jul 13 19:26:33 2024 +0200

    Support C-Style `enum` in preproc (#1984)

    * [preproc] C-style enums

    - asm files parseable from stdin
    - 2nd preproc pass
    - add parser for C-style `enum`
    - positional arguments at end of command

    ---------

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

commit d224db43c8baccccba0803ee3c7d4aa10d0eba96
Author: Frank DeBlasio <[email protected]>
Date:   Sat Jul 13 08:44:22 2024 -0400

    Consolidated Lilycove Contest Lady's values into one struct (#4951)

    * Consolidated Lilycove Contest Lady's values into one struct

    * Converted Lilycove Lady strings to COMPOUND_STRINGS

commit edc883d03899b19f6671fe9c9a817c69b8056a5c
Author: Alex <[email protected]>
Date:   Sat Jul 13 12:12:40 2024 +0200

    Refactors residual damage (#4945)

    * Refactors damage non types

    * correction

    * Refactor weather damage script

    * new line

    * correction

    * there was a hail test already

    * ndebug

    * add sandstorm test

    * Update src/battle_script_commands.c

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

    ---------

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

commit 522a8ba3f7b8d1736cf003c55bc529a015946bdc
Author: psf <[email protected]>
Date:   Sat Jul 13 02:16:34 2024 -0700

    Allow users to increase MAX_MONEY (#4943)

    * Added GetMaxNumMoneyDigits and GetMoneyBoxHorizontalPosition to header
    Replaced use of PrintMoneyAmount

    * Added define for MAX_MONEY_DIGITS
    Removed GetMaxNumMoneyDigits
    Converted uses of ConvertIntToDecimalStringN that called for 7 money digits to use MAX_MONEY_DIGITS
    Replaced 6 money digits in PrintMoneyAmount with MAX_MONEY_DIGITS

    * Use preproc and MAX_MONEY_DIGITS to increase the width of the sell item money box

    * Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS

    * Added GetItemSoldMoneyHorizonalPosition and fixed ConvertInt in PrintMoneyAmount to use MAX_MONEY_DIGITS

    * Removed width and tilemap changes

    * Modified CountDigits to count digits greater than 1
    Fixed PrintMoneyAmount to work with large digits

    * Added an early return to PrependFontIdToFit

    * First prototype working

    * Updated GetMoneyBoxHorizontalPosition with amount

    * Updated GetMoneyBoxHorizontalPosition with amount

    * Got version working with one space before

    * Got version working with one space before

    * Got version working with all spacingOC

    * cleaned up PrintMoneyAmount

    * Created CalculateleadingSpacesForMoney

    * Cleaned up for PR

    * Changed tabs to spaces per https://github.com/rh-hideout/pokeemerald-expansion/pull/4943\#issuecomment-2223023365

commit deb2b69a7671d4fb1d1676b13a0fb3dacd719e29
Author: Bassoonian <[email protected]>
Date:   Thu Jul 11 15:28:38 2024 +0200

    Fix Diamond Storm's effect (#4947)

commit f85bff6e303b11095e7b63008288865ee7b7434a
Author: Bassoonian <[email protected]>
Date:   Thu Jul 11 15:07:39 2024 +0200

    Fix Basculegion's gen9 level up learnset (#4948)

commit 7c23a39c5e63484352a2918e3009300a525b61ec
Merge: 9e0af6c84 ef76a6b21
Author: ghoulslash <[email protected]>
Date:   Thu Jul 11 08:51:38 2024 -0400

    Disable OW followers by default (#4720)

commit 9e0af6c84d0c67d39def73d01649f4bc3911e085
Merge: e953a809f b695ddfe3
Author: Eduardo Quezada <[email protected]>
Date:   Thu Jul 11 08:36:45 2024 -0400

    Merrp's follower merge (11th of July) (#4944)

commit ef76a6b21b93cd91122082a7ff0b5408539c1b83
Merge: f4c890df1 e953a809f
Author: Bassoonian <[email protected]>
Date:   Thu Jul 11 14:08:55 2024 +0200

    Merge branch 'upcoming' into disablefollowersbydefault

commit b695ddfe37b325657a6fc0614f34fc3b997bf0aa
Merge: e953a809f 88cfd9e26
Author: Bassoonian <[email protected]>
Date:   Thu Jul 11 09:57:03 2024 +0200

    Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge11july

commit 88cfd9e2673e462bd1f0bee058c20443ccadda3b
Author: Ariel A <[email protected]>
Date:   Thu Jul 11 00:01:45 2024 -0400

    fix: Removed `LoadSpriteSheetByTemplate` offset's dependence on EWRAM memory layout

commit 7b6ff1b560533ff9dd36a23422622e5eb6c47bbe
Author: Alex <[email protected]>
Date:   Wed Jul 10 22:29:26 2024 +0200

    Fixes Trace turn order (#4941)

    * Fixes Trace turn order

    * Update battle_script_commands.c

    * Update test/battle/ability/trace.c

    ---------

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

commit e953a809ff359cbcdfa1bf870674354eff64eba2
Author: psf <[email protected]>
Date:   Wed Jul 10 11:58:01 2024 -0700

    Added OW_USE_FAKE_RTC and OW_ALTERED_TIME_RATIO (#4910)

    * Added OW_USE_FAKE_RTC, OW_ALTERED_TIME_RATIO and src/fake_rtc.c

    * Changed ALTERED_TIME_RATIO to GEN_LATEST

    * Changed spaces to tabs per https://github.com/rh-hideout/pokeemerald-expansion/pull/4910/files\#r1667111624

commit fb708b7ed32dc8ff2681e4258b40cd733e97e211
Merge: b5160b7ec 0613af560
Author: Eduardo Quezada <[email protected]>
Date:   Wed Jul 10 10:05:10 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

commit 0613af56045041dd2f7f9ef72435fe16ac09087a
Author: Eduardo Quezada <[email protected]>
Date:   Wed Jul 10 09:47:35 2024 -0400

    Untag

commit c0eb9af2e61fd068a10920f9d5b67658681752fe
Author: Eduardo Quezada <[email protected]>
Date:   Wed Jul 10 09:44:55 2024 -0400

    Version 1.8.5 (#4921)

    * Version 1.8.5

    * Updated up to PR 4926 (squash)

    * Fixed descriptions (squash)

    * Updated up to PR4939 (squash)

commit 76d760041c3dc10c185b2d720af1381cd25adb5c
Author: hedara90 <[email protected]>
Date:   Wed Jul 10 13:58:32 2024 +0200

    Flame Burst + Substitute fix (#4939)

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

commit b5160b7ec889eb35c2ffc2519afa3028efdce1f1
Author: Eduardo Quezada <[email protected]>
Date:   Tue Jul 9 19:22:25 2024 -0400

    Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields (#4937)

commit e1d8ef819066959425f875cc4b44dfbd72a61ee3
Author: ghoulslash <[email protected]>
Date:   Tue Jul 9 07:50:48 2024 -0400

    Dynamic AI Functions (#4908)

    * dynamic ai func

    * add AI_TagBattlePreferFoe as an example

    * Update src/battle_ai_main.c

    * Update src/battle_ai_main.c

    ---------

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

commit e1a68766003b19379be5d0fed663ad13f888fe01
Author: kleeenexfeu <[email protected]>
Date:   Mon Jul 8 23:37:40 2024 +0200

    Bitter Malice description fix (#4933)

    It always lowers the foe's attack

commit 49e93799d1de4f52a2b668774f793a2f565ec35a
Author: ghoulslash <[email protected]>
Date:   Mon Jul 8 14:49:13 2024 -0400

    Battle Anim Debug Check (#4930)

    * battle anim scripts check uncleared Task_UpdateMonBg after anims

    ---------

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

commit 0f21415130231b75a7e792c321a4f495681d6082
Author: Pawkkie <[email protected]>
Date:   Mon Jul 8 14:15:12 2024 -0400

    Minor AI flag fixes / cleanup (#4924)

    * AI flag fixes / cleanup

    * Review feedback

commit eea736c2102303f6b87378742c4ccacc9a632d37
Merge: cc0a9acc7 40950b63f
Author: tertu <[email protected]>
Date:   Mon Jul 8 11:39:46 2024 -0500

    shop menu allows for 6 digits item prices (#4929)

commit 40950b63f741ce06a9de3424a4eaa500aff639a3
Author: DizzyEggg <[email protected]>
Date:   Mon Jul 8 18:12:48 2024 +0200

    shop menu allows for 6 digits item prices

commit 8ec3a85706ca3d45d16c064c2eeb1139ade3c1be
Author: Bassoonian <[email protected]>
Date:   Mon Jul 8 18:10:25 2024 +0200

    Fix safari zone player healthbox (#4927)

commit 637a7072f092d5cbbbeb2d3fe22cc007137f56b2
Author: Alex <[email protected]>
Date:   Mon Jul 8 12:05:32 2024 +0200

    Add missing adjust scores (#4925)

    * Add missing adjust scores

    * ai log made the test fail

commit cc0a9acc7f1a28e7d35b2d6123d025a84f6e8f82
Author: Alex <[email protected]>
Date:   Mon Jul 8 11:47:30 2024 +0200

    Fixes wrong nature on partner (#4926)

commit 4ddae0745105a187cb8b48e4f920dde5a043b051
Author: psf <[email protected]>
Date:   Mon Jul 8 02:38:52 2024 -0700

    Removed AI_FLAG_HELP_PARTNER (#4918)

commit 805a6300c75f98ff8d5a9a72262d12013b9e10f7
Author: psf <[email protected]>
Date:   Mon Jul 8 01:08:07 2024 -0700

    Fixed B_TRANSITION_SHRED_SPLIT from softlocking the game (#4919)

    * Added B_ENABLE_SHRED_SPLIT
    Created preproc define to remove ShredSplit_BrokenCheck

    * Removed config per https://github.com/rh-hideout/pokeemerald-expansion/pull/4919\#issuecomment-2211690039

commit 6404241c40208a2472625f2b0c46a29f1b8a23bb
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jul 7 07:18:16 2024 -0400

    Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 (#4922)

commit de609a2f5b45cc26672456dc8f917faf4fdf10f1
Author: Eduardo Quezada <[email protected]>
Date:   Sun Jul 7 03:52:59 2024 -0400

    Added missing redirect abilities Gen 3-4 config (#4920)

    * Added missing redirect abilities Gen 3-4 config

    * Combined 3 Battle Script Natives into 1

    * Cleaner FindMonThatAbsorbsOpponentsMove

commit 5dda4b846e3151d29339134550bff79bee769f05
Author: cawtds <[email protected]>
Date:   Sat Jul 6 15:18:51 2024 +0200

    fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length

commit 60c7588532278f1971fc50daa13cbcf2497c7750
Author: sneed <[email protected]>
Date:   Sat Jul 6 10:41:19 2024 +0300

    IsFinalStrikeEffect uses effect instead of move (#4917)

    * IsFinalStrikeEffect uses effect instead of move

    * Update test/battle/ability/parental_bond.c

    ---------

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

commit 3babd7f1306f8ff45a99a33ed72e39ea49f85aaf
Author: cawtds <[email protected]>
Date:   Sat Jul 6 02:10:30 2024 +0200

    shiny roll calc as separate function

commit 93f5ca24817d7c8778a3a1f41e42076aff6a2b59
Merge: 8168dd7be 31ee8fec8
Author: Bassoonian <[email protected]>
Date:   Fri Jul 5 23:55:33 2024 +0200

    Pret Merge (5th of July) (#4915)

commit 31ee8fec80f7f7f3c0d08bedd760e4e04e4107b5
Author: Bassoonian <[email protected]>
Date:   Fri Jul 5 20:49:18 2024 +0200

    Fix 2006 regression

commit a7f786009ec7ecb56b70c5f5b36f76536fc95cb8
Merge: 8168dd7be a0a02f973
Author: Bassoonian <[email protected]>
Date:   Fri Jul 5 20:44:29 2024 +0200

    Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july

commit fcdc9ed65a8b02748e079a50c9c2c35d2e3aa04a
Merge: 3660a054a 13b8daf36
Author: Eduardo Quezada <[email protected]>
Date:   Fri Jul 5 14:25:25 2024 -0400

    Merge branch '_RHH/master' into _RHH/upcoming

    # Conflicts:
    #	src/battle_util.c
    #	src/data/pokemon/species_info/gen_7_families.h
    #	test/battle/ability/download.c
    #	test/battle/ability/intimidate.c
    #	test/battle/ability/supreme_overlord.c
    #	test/battle/ability/zero_to_hero.c
    #	test/battle/ai/ai.c
    #	test/battle/move_effect/plasma_fists.c

commit 8168dd7be9c283222c2311fe03eca27ce9876550
Author: kleeenexfeu <[email protected]>
Date:   Fri Jul 5 19:21:30 2024 +0200

    Shed tail rounds up, not down (#4913)

    * Shed tail rounds up, not down

    * Label

commit 3660a054a2ed89650091b4405080a6f074226191
Author: Pawkkie <[email protected]>
Date:   Fri Jul 5 12:41:29 2024 -0400

    Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING (#4911)

commit a0a02f9733f3963ea50f76bd03b39130e3cc2f2f
Merge: 502eedaed 47533e3a7
Author: GriffinR <[email protected]>
Date:   Thu Jul 4 15:02:58 2024 -0400

    Merge pull request #2012 from DizzyEggg/patch-1

    Berry blender's Task_HandleOpponent small fixes

commit 47533e3a7ebd60e54b34c6ef3a367bf19b5dd96f
Author: DizzyEggg <[email protected]>
Date:   Thu Jul 4 20:56:22 2024 +0200

    Berry blender's Task_HandleOpponent small fixes

commit 3df7e770dfc484a7d357eeb9bbd4846cefa5bf13
Merge: 2a5e4343c 699c96afa
Author: ghoulslash <[email protected]>
Date:   Thu Jul 4 10:05:20 2024 -0400

    Remove SetBattlerData from AI_CalcDamage (#4881)

commit 2a5e4343c8e0bc3c9b412aef1a6d59d4a1d54b50
Author: psf <[email protected]>
Date:   Thu Jul 4 07:03:42 2024 -0700

    Implemented OW_IGNORE_EGGS_ON_HEAL (#4888)

    * Implemented OW_IGNORE_EGGS_ON_HEAL

    * Removed videos and change nPokemon to u32

    * Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486

    * Update include/config/overworld.h

    Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436

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

    ---------

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

commit 13b8daf36b130120a53bfd97a103283644da3073
Author: Alex <[email protected]>
Date:   Wed Jul 3 22:53:41 2024 +0200

    Supersweet Syrup wrong ability desc (#4902)

commit dd7b73521141a2c252ffc31ce80e941f4e27994b
Author: Alex <[email protected]>
Date:   Wed Jul 3 22:53:15 2024 +0200

    Fixes Grassy Terrain heal turn duration (#4903)

commit 91550eb75fce23c86a7719bcefbec3e7f5db83f8
Author: cawtds <[email protected]>
Date:   Wed Jul 3 17:02:12 2024 +0200

    chain fishing refactored

commit 26395fe60041aef03150228045e9e2d576ff72d5
Author: cawtds <[email protected]>
Date:   Wed Jul 3 16:51:16 2024 +0200

    fix fishing encounter rolls

commit 594633aa1502409d8883d9c06d936498a14d97ae
Author: Alex <[email protected]>
Date:   Wed Jul 3 10:48:31 2024 +0200

    Remove Duplicate ai code from battle_ai_util.c (#4883)

    * Remove Duplicate ai code from battle_ai_util.c

    * Add GetBattlerAbility in toxic self check

commit 47426406c312eef4df1242dd01a5120950617eb0
Author: Pawkkie <[email protected]>
Date:   Tue Jul 2 11:49:04 2024 -0400

    Ai tests folder (#4898)

    * AI folder for tests

    * Move sequence switching tests

commit d81662daa2666736c9b2df140f3ec5e6dfde9c94
Author: DizzyEggg <[email protected]>
Date:   Tue Jul 2 14:39:41 2024 +0200

    Add parentheses to species egg macro (#4899)

commit 80a6a216b2ff823d878a4b5a8f6cf6c75f7a96bf
Author: laserXdolphin <[email protected]>
Date:   Mon Jul 1 18:02:31 2024 +0200

    Wrapping Summary Screen
    https://www.pokecommunity.com/showpost.php?p=10060875

commit 1d428aaa5b63bd52edc4acfa36aed9769b87de5e
Author: laserXdolphin <[email protected]>
Date:   Mon Jul 1 15:56:19 2024 +0200

    Update README.md

commit 9487c3ec5462e613c649675f6cf78db276e9ee9f
Author: laserXdolphin <[email protected]>
Date:   Mon Jul 1 15:53:55 2024 +0200

    Showing IVs/EVs in Summary Screen
    https://www.pokecommunity.com/showpost.php?p=10161688

commit 9dc2780f4701994eeb7cf7f490ee7eec4e95e196
Merge: 072c57808 6957fc70c
Author: laserXdolphin <[email protected]>
Date:   Mon Jul 1 14:44:52 2024 +0200

    Merge branch 'rh-hideout:master' into develop

commit 7e167f0b3c9e23eba98f294622c5fc7967072820
Author: Pawkkie <[email protected]>
Date:   Mon Jul 1 02:53:07 2024 -0400

    Add AI_FLAG_SEQUENCE_SWITCHING (#4878)

    * AI_FLAG_BAD_SWITCHING

    * Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly

    * Fix U-Turn etc. tests

    * Test overhaul with Egg's suggestions

    * Add EFFECT_HIT_SWITCH_TARGET to tests

    * Review feedback

    * Re-review feedback

commit 502eedaed88e9a1c9ced007de536dd97dfa864a0
Merge: cb1a14c9f 779855ee0
Author: GriffinR <[email protected]>
Date:   Sat Jun 29 16:31:56 2024 -0400

    Merge pull request #2009 from abcboy101/berry-blender

    Decode unused JP text in berry_blender.c

commit c3634db0ea5eed79fb93a66e36f54ad82cebb85e
Author: Frank DeBlasio <[email protected]>
Date:   Sat Jun 29 16:11:49 2024 -0400

    Fixed Mud Sport/Water Sport reduction value (#4874)

    * Fixed Mud Sport/Water Sport reduction value

    * Removed define

commit 103ed85b8328683899a573f051ad120af1017790
Author: Frank DeBlasio <[email protected]>
Date:   Sat Jun 29 16:07:14 2024 -0400

    Added config to prevent unobtainable Pokemon from being shiny (#4735)

    * Added config to prevent unobtainable Pokemon from being shiny

    * Added config for disabling shinies if the player has no Poke Balls

    * Removed check for adventure started flag

commit 779855ee02226cb4da16ab6d7a7822a8b0a6e3be
Author: abcboy101 <[email protected]>
Date:   Sat Jun 29 13:59:30 2024 -0400

    Decode unused JP text in berry_blender.c

commit 699c96afa334ceef7794f5930ffc021b88d136ef
Author: Alex <[email protected]>
Date:   Fri Jun 28 19:36:09 2024 +0200

    Remove SetBattlerData from AI_CalcDamage

    Since #4156 SetBattlerData and RestoreBattlerData were moved out of `AI_CalcDamage`. I assume this was a bad merge somewhere

commit d1ca1f667f6fb4623197151a0565f7c56357d123
Author: Pawkkie <[email protected]>
Date:   Fri Jun 28 03:04:24 2024 -0400

    Smarter Choice AI for Status Moves (#4872)

    * Smarter choice item usage

    * Clarify test name / line ending

    * Review feedback

    * Review feedback pt. 2

commit 55c13a80bc90054733e8c3a6fbd234c972ac07f6
Author: Alex <[email protected]>
Date:   Wed Jun 26 18:38:14 2024 +0200

    Force species in tests (#4810)

    * Force species in tests

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    * Update include/config/test.h

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

    ---------

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

commit f19948312ee2759c066f8247a5c9e2c6ca05e8b1
Author: Frank DeBlasio <[email protected]>
Date:   Wed Jun 26 04:45:27 2024 -0400

    Allowed double battles to occur with only one Pokemon by talking to the trainers (#4848)

commit 41583673a55acd5b665fb0a3605df14109ca19d3
Author: ghoulslash <[email protected]>
Date:   Wed Jun 26 04:41:14 2024 -0400

    Zero Enemy Data at end of battles (#4867)

    * zero enemy data in FreeResetData_ReturnToOvOrDoEvolutions

    * only run through FreeBattleResources once at end of battle in FreeResetData_ReturnToOvOrDoEvolutions

    …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexOn1ine AlexOn1ine AlexOn1ine 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.
2 participants
@pkmnsnfrn @AlexOn1ine