Commit graph

13959 commits

Author SHA1 Message Date
Frank DeBlasio
f356bb1cee
Added B_UPDATED_MOVE_DATA checks against Acid/Crunch's descriptions (#3586)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-11-20 20:07:34 +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
Eduardo Quezada
13a65a21ad Adds configable nature colors (#3582)
* Colored stats depending on nature

* Fix bug

* Update colors and add config

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-19 21:11:38 -03:00
Eduardo Quezada
341bbb30ef Revert "Adds configable nature colors (#3582)"
This reverts commit 9311911413.
2023-11-19 21:10:21 -03:00
Bassoonian
9311911413
Adds configable nature colors (#3582)
* Colored stats depending on nature

* Fix bug

* Update colors and add config

---------

Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-19 23:18:47 +01:00
Bassoonian
59a7d2cb92 Update colors and add config 2023-11-19 18:30:18 +01:00
Bassoonian
8a772b729a Merge branch 'nature_color' of https://github.com/DizzyEggg/pokeemerald into naturecolors 2023-11-19 18:23:47 +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
Katy
b5cb92f0e2
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 <93446519+AlexOn1ine@users.noreply.github.com>
2023-11-18 23:48:02 +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
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
LOuroboros
efe9f6d8ab
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
2023-11-17 13:14:37 +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
Frank DeBlasio
8981897c9b
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 <eduardo602002@gmail.com>
2023-11-16 21:36:04 +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
a8564cf8a9 Merge branch 'RHH/master' into RHH/upcoming 2023-11-14 12:54:16 -03: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
ravepossum
89f346345b
Adding clock offset init to debug menu cheat start (#3561)
Co-authored-by: ravepossum <ravepossum@example.com>
2023-11-14 16:24:46 +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
Martin Griffin
934fe46008
Performance improvement for specific tests (#3559) 2023-11-13 15:35:08 +00:00
Zhengwen Jiang
74de34c8b8 improve the performance for specific tests
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
2023-11-13 01:53:39 -06:00
LOuroboros
87aaeca623
Fixed IS_DITTO macro (#3558) 2023-11-12 10:42:33 -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
Eduardo Quezada D'Ottone
b29538f23d
Species Simplifier™ - Part 1 (#3544)
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-09 11:43:35 -03:00
Martin Griffin
96361a85e0
Added -Woverride-init Makefile flag (#3535) 2023-11-09 14:12:05 +00:00
Eduardo Quezada
ec304cbb0f Added -Woverride-init Makefile flag 2023-11-09 13:32:41 +00:00
Philipp AUER
11e8407958
[audio] resample oversampled cries to 13379Hz (#3359)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-09 09:04:29 -03:00
Alex
4b3c96a89b
Adds ability Zero to Hero (#3542) 2023-11-09 08:25:46 -03:00
Alex
954f67a29f
Fixes Dragon Tail and Pumpkaboo spelling (#3541) 2023-11-07 18:19:46 +01:00
Frank DeBlasio
23e8937fc4
Added Gen 3-4 Mega Evo back sprite coordinates back (#3539) 2023-11-06 20:55:43 -03:00
Eduardo Quezada D'Ottone
4e4fb4fe61
Add Generation 9 species (#3249) 2023-11-06 14:14:48 -03:00
Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration 2023-11-06 13:49:02 -03:00
Frank DeBlasio
182d1f5b26
Fixed GetNextBall (#3534) 2023-11-06 16:57:42 +01:00
Alex
2b9f6b350e
Move animations. Credits to Captain-Ford (#3529)
Co-authored-by: DizzyEggg <16259973+DizzyEggg@users.noreply.github.com>
2023-11-06 12:31:43 +01:00
LOuroboros
ee0222c0ec
Updated the holdEffectParam of the items that double the amount of money gained in battle (#3528) 2023-11-06 10:18:45 +01:00
Eduardo Quezada D'Ottone
3004fd588a
CI fix test (#3530) 2023-11-05 22:46:22 +01:00
leo60228
b4b4e3cf2b
import oct 31 pokecommunity sprites 2023-11-04 11:04:02 -04:00
leo60228
4863fb8a6b
wrap ogerpon dex entry to 4 lines 2023-11-03 22:18:55 -04:00
leo60228
01c9b7c20a
hgss dex fixes 2023-11-03 22:16:01 -04:00
Eduardo Quezada
57c1dd97bb Merge branch 'RHH/master' into RHH/upcoming 2023-11-03 21:59:08 -03:00
DizzyEggg
8b359c2ca4
fix psychic terrain blocking moves it shouldnt block (#3521) 2023-11-03 21:01:02 +01:00
kittenchilly
90471741e9
Add Fairy Feather sprite (#3520) 2023-11-03 16:32:12 -03:00
Kaitlyn
eeed9612b4
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
2023-11-02 21:34:02 -04:00