Commit graph

5707 commits

Author SHA1 Message Date
psf
8d6cb9692a
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
2023-11-23 21:31:33 +01:00
Alex
71fd95e6d4
Fixes Protosynthesis and Quark Drive ability pop up (#3595) 2023-11-23 19:49:21 +01:00
Bassoonian
a7beed5b25
Dynamax messages (#3581)
* Dynamax messages

* Convert various to callnative

* Remove battler argument from callnatives

* Rename i variable

* Fix missing else
2023-11-21 19:18:18 +01:00
Alex
b9edbb429b
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 <iasperbassoonian@gmail.com>
2023-11-21 16:23:22 +01:00
Alex
be42d4eafb
Increase score of secondary effects only at 100% chance (#3583)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 11:30:20 +01:00
Bassoonian
cb245a00c6
Includes older item and move names as variants (#3580)
* Item name variants

* Updated move names

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-11-20 18:35:00 +01:00
Bassoonian
59a7d2cb92 Update colors and add config 2023-11-19 18:30:18 +01:00
Alex
4cb03d4add
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 <iasperbassoonian@gmail.com>
2023-11-19 17:45:58 +01:00
Frank DeBlasio
42076897d3
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 <iasperbassoonian@gmail.com>
2023-11-18 16:53:56 +01:00
Alex
5fa1bffa8d
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 <iasperbassoonian@gmail.com>
2023-11-18 15:19:38 +01:00
SnorlaxMonster
190e77e9c8 Rename HITMARKER_IGNORE_SAFEGUARD
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
   (i.e. whether it was inflicted by a move or Ability)

I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:57:50 +11:00
Frank DeBlasio
efe4929ce2
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 <eduardo602002@gmail.com>
2023-11-18 00:54:13 +01:00
ghoulslash
bf8c9609ae
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 <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-17 16:04:41 +01:00
Eduardo Quezada D'Ottone
c46f9ec6a5
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 <iasperbassoonian@gmail.com>
2023-11-17 00:09:43 +01:00
kittenchilly
85e75a72c6
Update affection mechanics to gen 8+ (#3495)
* Update affection mechanics to gen 8+

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-14 21:29:38 +01:00
Eduardo Quezada D'Ottone
93c7a70caa
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 <iasperbassoonian@gmail.com>
2023-11-14 16:40:26 +01:00
kittenchilly
c1cdc320bb
Implement Rotom Catalog and Zygarde Cube (#3284)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-13 17:46:25 -03:00
Pawkkie
b93dfb9d59
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

* (766a1a27a7) 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 <jajkodizzy@wp.pl>
2023-11-11 14:37:35 +01:00
Martin Griffin
3fc47d137a
Defines for Expansion version number (#3454) 2023-11-10 08:08:36 -03:00
hedara90
7ccdd4b5b3
Added Teal Mask item graphics + updated install instructions (#3527)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-09 21:57:04 -03:00
Frank DeBlasio
b5b67973bd
Fixes Stantler's evolution's boolean (#3548)
* Stantler's evolution now has the proper gen boolean

* Fixed comment for new evo methods
2023-11-10 00:11:29 +01:00
Frank DeBlasio
33815079ae
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
2023-11-09 23:29:22 +01:00
Alex
e79583be63
Remove function GetMoveDamageResult (#3536)
* Remove function GetMoveDamageResult

* fix test

* test clean up

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-09 20:53:14 +01:00
Alex
4b3c96a89b
Adds ability Zero to Hero (#3542) 2023-11-09 08:25:46 -03:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
Document datahpupdate
2023-11-07 12:25:26 -05:00
Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration 2023-11-06 13:49:02 -03:00
Eduardo Quezada
57c1dd97bb Merge branch 'RHH/master' into RHH/upcoming 2023-11-03 21:59:08 -03:00
kittenchilly
90471741e9
Add Fairy Feather sprite (#3520) 2023-11-03 16:32:12 -03:00
Eduardo Quezada D'Ottone
820be61c9f
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4 2023-11-02 21:32:23 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration 2023-11-02 21:28:53 -04:00
Alex
53b7e4bf66
Remove powerfulMoveEffects array (#3515)
* Remove powerfulMoveEffects array

* Solar Beam test
2023-11-02 08:44:23 +01:00
kittenchilly
244ca0be95
Add custom female icon sprites for Pikachu and Wobbuffet (#3506)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-01 18:49:44 -03:00
DizzyEggg
47341f3f30
Fix Anger Shell activation (#3508) 2023-11-01 14:55:50 +01:00
DizzyEggg
7eb1b12224
Fix Knock Off healing berries (#3509) 2023-11-01 14:47:31 +01:00
Alex
64ba52d214
Remove redundant AI score increases (#3504)
* Remove redundant AI score increases

* review applied

* fix score
2023-10-31 13:41:22 +01:00
Eduardo Quezada
e281103575 Reverted PR3455 2023-10-31 07:33:53 -03:00
Eduardo Quezada D'Ottone
2dfae911aa
Added config for Weak Armor's Gen 5-6 effect (#3498) 2023-10-30 17:18:00 -03:00
kittenchilly
c0c100d90d
Base friendship Gen 8+ config (#3491)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-30 16:45:52 -03:00
DizzyEggg
0c8fdce1a4
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
2023-10-30 11:39:41 +01:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms (#3469)
* Alcremie form sprites

Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>

# Conflicts:
#	graphics/pokemon/alcremie/lemon_cream/front.png
#	graphics/pokemon/alcremie/matcha_cream/back.png
#	graphics/pokemon/alcremie/matcha_cream/front.png
#	graphics/pokemon/alcremie/mint_cream/front.png
#	graphics/pokemon/alcremie/ruby_cream/front.png
#	graphics/pokemon/alcremie/salted_cream/front.png
#	include/graphics.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/footprint_table.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon.c

* Fixed cries

* Removed Todos

* Temp: all forms use the same icon

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

* Added missing data for form changes and back animations

* Grouped defines together

* Fixed compile

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Bassoonian
ab25e6bfa5
Fixes Synchronize's OW effect and adds configs (#3480) 2023-10-28 23:24:20 -03:00
Bassoonian
0dd22305a4
Adds Illuminate's Gen9 effect (#3482)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-28 23:22:41 -03:00
Eduardo Quezada
ae1266e077 Automatically change dex number digits based on NATIONAL_DEX_COUNT 2023-10-28 22:15:21 -03:00
Bassoonian
f472d768dd Rename Undiscovered to No Eggs Discovered 2023-10-28 16:32:55 +02:00
kittenchilly
5087095aae
Obedience levels now increase per badge (#3475) 2023-10-27 19:17:17 -03:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
leo60228
a505afac1d
address review 2023-10-26 18:57:06 -04:00
kittenchilly
d9ccc80b31
Sprites 2023-10-26 17:34:21 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff 2023-10-26 17:34:18 -04:00
kittenchilly
86917f1453
Update species.h 2023-10-26 17:33:20 -04:00
leo60228
5f2b6f57f7
Merge branch 'upcoming' into gen9-species-nomigration 2023-10-26 17:31:31 -04:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
leo60228
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
2023-10-23 17:36:42 -03:00
Philipp AUER
4aabd09ab3
Fix test_runner.c modern warning (#3451) 2023-10-23 19:41:59 +02:00
Eduardo Quezada
ed3e2f8e09 Gen 9 form order 2023-10-23 13:30:32 -03:00
Bassoonian
5592706a71 Fix Synchronize devnote + Gen9 behaviour 2023-10-23 17:59:07 +02:00
Eduardo Quezada
174ad11535 SPECIES_GIMMIGHOUL_CHEST 2023-10-23 12:09:44 -03:00
Eduardo Quezada
2e9e157cf8 SPECIES_DUDUNSPARCE_TWO_SEGMENT 2023-10-23 11:45:15 -03:00
Eduardo Quezada
be921c57fc SPECIES_TATSUGIRI_CURLY 2023-10-23 11:26:50 -03:00
Eduardo Quezada
82bb758d19 SPECIES_PALAFIN_ZERO 2023-10-23 11:08:06 -03:00
Eduardo Quezada
792aee86ea SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73 Maushold Family of Three define 2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c Oinkologne Male define 2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df Fixed Paldean Tauros Combat Breed order and data names 2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248)
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435)
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303)
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
2023-10-23 10:08:36 +01:00
Martin Griffin
b0b6e16042 Separate ASSIGN_TEST from NEXT_TEST
Silences a warning about an invalid pointer when building with modern.
2023-10-23 07:58:45 +01:00
kittenchilly
3755155e9d
Update friendship evo threshold to gen 8+ with config (#3376) 2023-10-22 18:05:54 -03:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440)
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
2023-10-22 21:15:07 +02:00
Eduardo Quezada D'Ottone
7fdc4aacda
Fixed Cheat Start not initiating time-based events (#3446) 2023-10-22 21:03:54 +02:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
voloved
ebdf14c620
Push B in wild battle moves to Run (#3362)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-21 12:45:40 -03:00
GriffinR
5712777dc2 Correct dynamic type flag name 2023-10-20 12:57:36 -04:00
GriffinR
ffdc2456cb Document datahpupdate 2023-10-20 12:50:32 -04:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Eduardo Quezada D'Ottone
d153947aa2
Merge branch 'upcoming' into dynamax 2023-10-18 19:37:09 -03:00
leo60228
87a03c3c73
Fix Paldean form order 2023-10-18 14:44:30 -04:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
leo60228
920fd481e7
Regional Dex numbers are always 3 digits 2023-10-18 14:37:28 -04:00
Eduardo Quezada
6cc2a1ef03
4 digits option for dex numbers
(cherry picked from commit 9bad51cbc6)
2023-10-18 14:37:28 -04:00
leo60228
b3e5c3179f
Revert "reorder species.h"
This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.
2023-10-18 14:37:27 -04:00
leo60228
3e1ecec800
revert SPECIES_DARMANITAN_GALARIAN_* renames 2023-10-18 14:37:27 -04:00
leo60228
61d3cdd8da
revert separate SPECIES_UNOWN 2023-10-18 14:37:21 -04:00
Eduardo Quezada D'Ottone
6df433735e
reorder species.h 2023-10-18 14:37:01 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
(cherry picked from commit 6dc58dcc17)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
(cherry picked from commit e081d2b773)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
Add gen 9 Pokémon data

(cherry picked from commit cd3e65f5c9)
2023-10-18 14:33:56 -04:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
sbird
b77bc71862 fix -Warray-parameter, -Waddress, -Warray-bounds warnings
those are introduced by some compiler between gcc 10 and gcc 13
when using -Wall
2023-10-16 09:36:36 +01:00
Eduardo Quezada
ca101e9952 Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage, Hail, Sandstorm 2023-10-15 09:42:56 -03:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
2023-10-15 00:30:00 -03:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
Martin Griffin
45897cefbc
Move battle tests off the heap (#3414) 2023-10-13 16:31:10 -03:00
Bassoonian
231ebea3f0
Tests for 6 more abilities (#3399)
* Tests for 6 more abilities

* Fix most of Egg's comments

* Update Purifying Salt and Leaf Guard

* Parenthesis fixes
2023-10-13 20:50:48 +02:00
Martin Griffin
cbdba65218
Move battle tests off the heap (#3413)
* Catch OOM in tests

* Alias gBattleTestRunnerState with sBackupMapData

Reverts #3398 "Fix Broken Move Anims in Tests" which moved the AI logs
to statically-allocated EWRAM_DATA instead of being part of
gBattleTestRunnerState.
2023-10-13 20:29:30 +02:00