atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14501 commits 2 branches 40 tags 617 MiB
Commit graph

14501 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bassoonian
52eeca6e4e Replace berry descriptions with compound strings 2024-01-04 16:02:21 +00:00
Frank DeBlasio
bfe3e762ff
Fixed Battle AI debug screen shiny sprites (#3922) 
* Switched gBattleMons.isShiny to GetMonData

* Simplified getting party of Pokemon

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-04 15:39:26 +01: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
Frank DeBlasio
6cb89ef382
Update debug menu text (#3919) 
* Updated capitalization and abbrevations in debug menu

* Updated spacing in debug.c
 2024-01-03 22:49:11 +00:00
ravepossum
e9e46d8272
Fix debug menu flags not redrawing correctly after PR 3796 (#3916) 
* Fix debug menu flags not redrawing correctly after PR 3796

* Update src/debug.c

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

---------

Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-03 22:27:10 +00:00
LOuroboros
d7cdf41429
Added EV setters to the debug menu's "Give Pokémon Complex" (#3566) 
* Added EV setters to the debug menu's "Give Pokémon Complex"

Misc. Changes:
-Updated the text strings for the 2 "Give Pokémon" options used by the debug menu.

* Optimized DebugAction_Give_Pokemon_SelectShiny and made some debug functions use relevant constants

* Removed extra call to CalculateMonStats in DebugAction_Give_Pokemon_ComplexCreateMon

* Made the EV selection go back to the start if the sum of EV is > 510

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-03 21:28:55 +00:00
Bassoonian
f94e65a400
Footprint config (#3902) 
* Footprint config

* Don't enable by default
 2024-01-03 21:24:45 +01:00
Bassoonian
973dae73be
Fix HoF dex numbers (#3901) 2024-01-03 19:48:22 +01:00
Bassoonian
e7fac028b1
Fix summary screen nature colours after mints (#3898) 2024-01-03 17:48:09 +01:00
kaisermg5
e2c8edeaa6
Fix HGSS pokedex preevolutions (#3894) 
* Fix pre-evolution search in pokedex plus.

* Fix mega-evolution search in pokedex plus.

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-01-03 16:20:00 +00:00
kaisermg5
ef6e8ba2ea
Added Dugtrio's footprint and formSpeciedIdTable. (#3897) 2024-01-03 16:07:39 +00:00
Alex
cb89df82b5
Dynamic Multichoices (#3826) 2024-01-03 16:07:11 +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
Bassoonian
9f09309e0c
Remove comment from pokemon_icon.c (#3896) 2024-01-02 23:29:46 +01:00
Bassoonian
84d4009019
Merge branch 'upcoming' into berryexpansion 2024-01-02 22:47:32 +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 f24deb9301.
 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
Frank DeBlasio
d3b29406a5
Fixed Collision Course and Electro Drift PP (#3890) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-01-02 10:05:31 +01:00
lordraindance2
58a93a544f
Refactored SetMoveEffect Inner Focus Case (#3885) 
* Rollbacked SetMoveEffect Inner Focus logic

Co-authored-by: poetahto <walls.dk@gmail.com>

* Refactored else if

---------

Co-authored-by: poetahto <walls.dk@gmail.com>
 2024-01-02 09:44:15 +01:00
Nephrite
daeba066e0 Fixed SetMoveEffect + Sheer Force 2024-01-02 05:51:40 +09:00
Nephrite
7aaefe72fb
Receiver/Power of Alchemy (#3889) 2024-01-01 19:58:29 +01: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
Damon Murdoch
9191c22c63
Fixed genie signature moves (#3884) 
* Fixed genie signature moves

Fixed genie signature moves

* Condensed rain move checks into a single 'if'

Condensed rain move checks into a single 'if'
 2024-01-01 11:28:52 +01:00
Damon Murdoch
281cd0e20d
Removed battle frontier z-move usage restriction (#3883) 
Removed battle frontier z-move usage restriction
 2024-01-01 09:07:04 +01: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
Eduardo Quezada D'Ottone
c50777d88b
Fixed Egg graphical data not being properly read. (#3879) 2024-01-01 01:21:03 +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
Bassoonian
f31b4f3bab
Turn nature names into compound strings (#3871) 
* Turn nature names into compound strings

* Move nature names out of dedicated file
 2023-12-31 11:33:52 +01:00
Alex
15fa85ca2f
Merge branch 'upcoming' into feature/dynmulti-expansion 2023-12-31 00:16:44 +01:00
Alex
a3c25114b7
Fixes small ai bulldoze effect bug (#3872) 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 23:08:17 +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
a094266731
2023's last pret merge (#3869) 2023-12-30 22:40:29 +01:00
Katy
00e7038061
Pokemon GFX Upgrades/Fixes (#3805) 
* Tyrantrum GFX Upgrade

* Duraludon Pal Fixes

* Zigzagoon Sprite fixes

* Linoone Sprite Fixes

* Togepi Icon Fix

missing pixel

* Gen 9 Pokemon Icons

For #3553
Did a bunch of research (looking at how old icons generally look) to help decide specific icons to choose from.
Generally icons are more 'chibi' like, with large heads (exceptions being 'scary' fully evolved pokemon) and the animations usually move up and down with some character.
Some touches as well.

* Litwick Front Fix

Missing Pixel

* Krookodile Front Fix

Stray pixel

* Switch to Shiny pal

Switch to shiny pal on Tyrantrum’s back sprite png

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-12-30 22:29:32 +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
e132f26bea Merge corrections and fixes 2023-12-31 00:05:58 +09: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