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

5856 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
ff0aed31b3
Removed some hardcoded move IDs (#3982) 
* Removed EFFECT_HURRICANE in favor of using EFFECT_THUNDER

* Added EFFECT_BLIZZARD

* Helping the IDE a little

* Added EFFECT_RAIN_ALWAYS_HIT for Forces of Nature moves

* Removed MOVE_SELF_DESTRUCT and MOVE_EXPLOSION hardcoding

* Removed EFFECT_FRUSTRATION hardcoding

MOVE_SELF_DESTRUCT

* Cleaned up sPoints_MoveEffect

* Removed MOVE_AURA_WHEEL and MOVE_PRESENT hardcoding

* Fixed compile
 2024-01-12 22:41:46 +01:00
Eduardo Quezada D'Ottone
e5b58b04b6
Renamed healBlockBanned to healingMove (#3981) 
* Renamed healBlockBanned to healingMove

* Fix fix
 2024-01-12 18:41:45 +01:00
Nephrite
1ced2bf324
Converted EFFECT_x defines to enum (#3975) 
follow up PR

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-12 07:30:58 -03:00
Biffalo XIII
2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
 2024-01-11 19:51:11 -03:00
Nephrite
f6efc75c1a Move functions to battle_ai_util.c 2024-01-12 04:01:33 +09:00
Nephrite
baefa08bee Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-12 03:13:42 +09:00
Nephrite
a76e3c70ba Applied more review fixes 2024-01-12 03:02:48 +09:00
Nephrite
3c93f97166 Apply suggestions from code review 
Thanks, Edu

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-12 02:13:55 +09:00
Bassoonian
a8a504ef25
Refactor dex completion (again) (#3937) 
* Refactor dex completion

* Incorporate Alex's requests

* rename to dexForceRequired

* Revert GetPokedexRatingText argument type

* Apply suggestions from code review

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Revert "Revert GetPokedexRatingText argument type"

This reverts commit a9b0c280409196ee0e6cfe170104f45d9e0168a7.

* Fix HasAllMons

* Fix oops

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-11 13:35:31 -03:00
Bassoonian
ce48616477
Add power item config (#3961) 2024-01-11 09:34:19 +01:00
Nephrite
c4616739d8 Merge remote-tracking branch 'rhh/upcoming' into secondary_effects_overhaul 2024-01-11 00:35:35 +09:00
Nephrite
67e76f2b59 Some more review fixes + Fling fix 
Not the ideal solution but Fling now has a hardcoded check for Shield Dust and acts accordingly - a better long term solution inolves making a bunch of reusable MOVE_EFFECTS and rejigging attackcanceler but I didn't feel like doing that today...
 2024-01-11 00:27:06 +09:00
Alex
4dc1b1dda3
Revert "Update catch curve for pokeballs (#3685)" (#3955) 
This reverts commit 929ec54a3922915f9f4a0c8b822b99e70fb51d21.
 2024-01-09 21:20:51 -03:00
Alex
c56acb944b
New Feature: Level Caps (#3632) 
* New Feature: Level Caps

* B_LEVEL_CAP_EXP_UP and fixes

* 1 exp fix for hard level caps

* remove 1 exp hack

* Reviews applied

* fix u8/u16

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-09 18:47:23 +01:00
Alex
5498098438
Syrup Bomb / Sticky Syrup addition (#3948) 
* Syrup Bomb / Sticky Syrup addition

* Update test/battle/move_effect/syrup_bomb.c

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-09 13:37:07 +01:00
Biffalo XIII
4a3954ff34 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/birch_pc.c
#	src/main.c
 2024-01-09 09:19:12 -03:00
Bassoonian
d73c9b0b9d
Fix some ball multiplier configs (#3939) 
* Fix some ball multiplier configs

* Updated the comment of B_LURE_BALL_MODIFIER

* Specified the effects of B_LURE_BALL_MODIFIER in itsa state its effects in a more specific manner

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Corrected the comments of B_DREAM_BALL_MODIFIER, B_SPORT_BALL_MODIFIER and B_SAFARI_BALL_MODIFIER

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

* Turned the ternaries in the case for the Lure Ball's catch rate in Cmd_handleballthrow into a regular if/else if statement

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2024-01-08 18:26:05 -03:00
Bassoonian
7b0904c580 Fix extended berry stage palettes 2024-01-05 11:32:59 +01:00
Bassoonian
f9c21afb75
Dynamic regional dex rating (#3900) 2024-01-05 09:47:28 +01:00
Bassoonian
418e551960 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into berryexpansion 2024-01-05 00:32:21 +01:00
BiffaloXIII
8b80a54a7a
Removed footprint field when P_FOOTPRINTS is FALSE (#3925) 2024-01-04 21:54:03 +01:00
Bassoonian
1ee568ac6b Remove leftover code for myself 2024-01-04 16:12:39 +00:00
Bassoonian
b948accc80 Remove redundant table 2024-01-04 16:07:12 +00:00
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
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