Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

7691 Commits

Author SHA1 Message Date
Bassoonian
b56a9e6286 Remove unused function 2024-01-04 16:04:00 +00:00
Frank DeBlasio
4d5c572d0c
Refactor trainer classes (#3875) 
* Created TrainerClass struct

* Added money multiplier to TrainerClass struct

* Added Poke Balls to struct

* Condensed gTrainerClasses

* Simplified trainer Poke Balls

* Moved trainer classes into battle_main.c

* Removed complicated ball macro

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-04 13:30:42 +01:00
Bassoonian
f94e65a400
Footprint config (#3902) 
* Footprint config

* Don't enable by default
 2024-01-03 21:24:45 +01:00
Alex
34f51da5f8
Merge branch 'upcoming' into feature/dynmulti-expansion 2024-01-03 15:54:39 +01:00
ghoulslash
91dfa93d3b
fix genie storm move anims for both targets, add AnimEllipticalGustCentered, AnimParticleInVortex handles multiple targets, add dynamic pals based on move target in UnpackSelectedBattlePalettes (#3895) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-01-02 23:46:07 +01:00
aronson
3c21e23555
Allocate initialized sections for EWRAM and IWRAM (#3892) 2024-01-02 14:24:52 +00:00
Martin Griffin
d1ab525552
Revert "Allocate initialized sections for EWRAM and IWRAM (#3877)" (#3891) 
This reverts commit f24deb930131819e5ff3be401742b41162e4829a.
 2024-01-02 13:54:42 +00:00
aronson
f24deb9301
Allocate initialized sections for EWRAM and IWRAM (#3877) 2024-01-02 13:46:01 +00:00
Nephrite
59d76c9321 A few fixes, added effects for Meteor Beam/Electro Shot 2024-01-02 20:27:50 +09:00
Nephrite
4556ecc71e Removed PRIMARY/SECONDARY macros; added flags 
Just a couple for now; cleaned up parts of setadditionaleffects
 2024-01-02 20:06:49 +09:00
Nephrite
ab75ad6d02
Ability flags update (#3886) 
* Added five ability flags

Omitted duplicate flags that are basically "can't copy" (Role Play, Receiver, Entrainment, Skill Swap), didn't bother adding Neutralizing Gas flag,

* Mold Breaker and Trace

* Gastro Acid, Simple Beam, Worry Seed

Decided to keep the Simple Beam/Worry Seed functions

* Entrainment done

* Skill Swap

* Doodle/Role Play + flag descriptions

Also adjusted Doodle test

* Wandering Spirit, Mummy, Neutralizing Gas

Neutralizing Gas really only needs to check for other mons with Neutralizing Gas, otherwise unsuppressable abilities are handled separately.

* Renamed flags
 2024-01-01 15:03:34 +01:00
Nephrite
0980253cce Merge branch 'upcoming' into secondary_effects_overhaul 2024-01-01 20:40:11 +09:00
kittenchilly
f6f287d637
Add Indigo Disk Pokemon data (#3878) 
* Archaludon?

* more archuladon stuff

* Hydrapple and Gouging Fire

* Raging Bolt

* Iron Boulder and Iron Crown

* Terapagos

* Pecharunt

* Update gen_9.h

* Pokedex orders
 2024-01-01 01:38:50 +01:00
Nephrite
923d22b42b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into secondary_effects_overhaul_merge 2024-01-01 03:50:36 +09:00
Ariel A
98221c4f70 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-12-31 02:48:37 -05:00
Ariel A
398a9ee8fa Merge branch 'followers' into followers-expanded-id 2023-12-31 01:49:56 -05:00
Ariel A
72c81db042 Merge branch 'followers' into lighting 2023-12-31 01:45:07 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
Ariel A
dcaaac92d9 Added support for compressed OW graphics. 
Added CpuSmartCopy macros (Credit: luckytyphlosion)
 2023-12-31 00:35:27 -05:00
Alex
15fa85ca2f
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-31 00:16:44 +01:00
Bassoonian
a32e2ccc88
Move Ability AI scores to gAbilities (#3862) 
* Ability refactor

* Adds abilities to RHH rom header

* Move Ability Ratings to gAbilities

* Add previously unknown ai ratings

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
 2023-12-30 23:07:18 +01:00
DizzyEggg
726c6f48e3
Fix weird stat drop anim (#3870) 
* Fix weird stat drop anim

* PACKED define
 2023-12-30 22:53:46 +01:00
DizzyEggg
b83b1f7e88
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-30 22:41:59 +01:00
Bassoonian
9e051aa058 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
Alex
cc32e378d6
Adds some Indigo Disk moves (#3853) 
* Burning Bulwark

* Fickle Beam

* Alluring Voice

* Electro Shot

* forgot sheer force flag for alluring voice

* review changes

* additional alluring voice test

* Simple Allruing Voice animation

* Update battle.h

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 20:20:12 +01:00
Nephrite
9dfa0d264f Merge branch 'upcoming' into secondary_effects_overhaul 2023-12-30 23:54:01 +09:00
Nephrite
60a0020833 Tweaked macro to be more appealing 2023-12-30 20:41:29 +09:00
Nephrite
ff51eb2b6c Removed unused move effects, various ids, and one script command 2023-12-30 20:35:48 +09:00
Nephrite
e34373effc Renamed seteffectwithchance to setadditionaleffects 
Function no longer has ability to apply effects from moveEffect - for that, seteffectprimary or secondary is now recommended. Removed EFFECT_RAMPAGE, updated a few tests
 2023-12-30 20:29:09 +09:00
kittenchilly
66a638f7b4
Change Ivy Cudgel to be based on Ogerpon form rather than held item (#3865) 
* Change Ivy Cudgel to be based on Ogerpon form rather than held item

* Update ivy_cudgel.c

* Address reviews

* Update test/battle/move_effect/ivy_cudgel.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 11:40:58 +01:00
Martin Griffin
ed850d3f6c
VSync BENCHMARKs and avoid AdvanceRandom in tests (#3866) 2023-12-30 11:10:40 +01:00
Martin Griffin
515aa367bf
VSync BENCHMARKs and avoid AdvanceRandom in tests (#3867) 2023-12-30 11:10:21 +01:00
Nephrite
b6da1a1e1d Tweaked helper functions 2023-12-30 17:42:53 +09:00
Nephrite
f5ae8e0686 Rapid Spin uses additional effects + test 2023-12-30 17:02:59 +09:00
Nephrite
e7de08eca2 Unified Sonic Boom & Dragon Rage 
Not really in scope, but what the hell
 2023-12-30 15:40:50 +09:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
Bassoonian
1662dc3478
Merge branch 'upcoming' into berryexpansion 2023-12-29 14:32:10 +01:00
Bassoonian
6bc0bf9f8b
Ability refactor (#3861) 
* Ability refactor

* Adds abilities to RHH rom header

---------

Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
 2023-12-29 14:25:24 +01:00
Nephrite
39773c0659 Burn Up and Double Shock 
Both working by applying an additional effect; added a generic "jumpifnotcurrentmoveargtype" type command to make it possible, relpacing secret power's function
 2023-12-29 12:44:38 +09:00
Nephrite
7c38056da7 Review fixes 
Added more move effect considerations to AI; redid way it calculates secondaryEffectChance; misc fixes
 2023-12-29 12:04:42 +09:00
Bassoonian
bc4d4d21e4
Fix 3851 (#3857) 2023-12-29 00:33:18 +01:00
Eduardo Quezada D'Ottone
0a40cd15d1
Non-tagged release 2023-12-28 19:54:06 -03:00
Bassoonian
d3f971f0e8
Version 1.7.1 (#3855) 2023-12-28 19:50:21 -03:00
kittenchilly
94a650a203
Add Fillet Away + Belly Drum tweaks (#3616) 
* Add Fillet Away

* Fillet Away and Belly Drum tests

* More tests

* Update fillet_away.c

* Update fillet_away.c

* Newlines

* Update battle_scripts_1.s

* Update belly_drum.c

* Address reviews

* Fix order

* Swords Dance assume

* Update belly_drum.c

* Try some stuff

* Fix hp not being halved in certain cases

* Update battle_scripts_1.s

* AI stuff
 2023-12-28 23:27:09 +01:00
kittenchilly
1e958ada8c
Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
Nephrite
417a02c95e Fixed Make it Rain 
To do: misc fixes here and there, maybe do Burn Up/Double Shock, Dragon Rage/SonicBoom...
 2023-12-29 01:40:43 +09:00
Bassoonian
fde3fc0a52
Metronome move fix (#3852) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Fix failing tests

* Disable Burning Bulwark for now
 2023-12-28 16:57:29 +01:00
Bassoonian
bc3737772a
Define new abilities (#3838) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 12:33:29 +01:00
Bassoonian
872ddf32c6
The Indigo Disk Moves (#3704) 
* Draft Indigo Disk move data

* Add basic defines (flags, targets and priority missing)

* Update move flags

* Temper Flare is Stomping Tantrum

* Forgot to push, please squash :D

* Fix failing tests
 2023-12-28 12:21:52 +01:00
kittenchilly
28f17772ec
Implement Pokemon Box Link functionality (#3837) 
* Implement Pokemon Box Link functionality

* Update item_use.c

* Update item_use.c

* Can only use box link if the map allows escape

* Revert "Can only use box link if the map allows escape"

This reverts commit be5b46b6c4420cd350ac1932d4c3562f7bfbebe5.

* Overworld_IsEscapingAllowed

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-12-28 11:47:00 +01:00