10481 Commits

Author SHA1 Message Date
psf
8f2f6811fb
Added B_FAST_EXP_GROW (#4335)
Updated the denominator in MoveBattlerBar to be faster for more HP sizes
2024-04-03 21:25:55 +02:00
kittenchilly
e8c05debce
Add unique icons for all of Arceus's forms (#4329) 2024-04-03 20:40:45 +02:00
AgustinGDLV
c340ae04d7
Updated Knock Off (#4333)
* added config for updated Knock Off behavior, added tests

* fixed unused var

* added item check in tests

* fixed item checks
2024-04-03 10:13:39 +02:00
Alex
92e23415ab
Change freeze dry to allow easier extendebility (#4312)
* Change freeze dry to allow easier extensibility

* give body press the foul play treatment

* Tests
2024-03-31 19:15:18 +02:00
ghoulslash
5a986c6d04
Customizable FrontierMon Sets (#4313)
* more customization to struct FacilityMon, remove facility item ids, convert vanilla data, add CreateFacilityMon universal function

* fix some unused vars

* use TrainerMon struct instead of FacilityMon

* add dynamaxLevel, gigantamaxFactor to CreateFacilityMon

* some struct TrainerMon documentation

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-03-29 08:47:17 +01:00
Eduardo Quezada
b58ccac4bf
Master into upcoming merge (#4306) 2024-03-26 12:49:07 -03:00
ravepossum
68fa212738
Fix Receiving Zero Exp When Below Level Cap (#4305)
* fix logic for calculating exp from level cap when below cap

* Update src/level_caps.c

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2024-03-26 08:58:00 +01:00
Eduardo Quezada
88565970c8
Fixed unintended form behavior (#4299) 2024-03-24 12:19:24 +01:00
Eduardo Quezada
3623694789
Actually remove unused STATUS3_CANT_SCORE_A_CRIT (#4293) 2024-03-20 23:19:18 +01:00
AtariDreams
21ed70c007
Do not do VBlankIntrWait if using the wireless adapter (#3730)
* Do not do VBlankIntrWait if using the wireless adapter

Desynchronization can occur otherwise.

* Fix formatting

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2024-03-19 08:29:47 -03:00
Eduardo Quezada
f419de24d9
Removed Gen 9 settings for out-of-battle abilities (#4282)
* Removed Gen 9 settings for out-of-battle abilities

* Updated OW_SYNCHRONIZE_NATURE comment
2024-03-18 08:24:44 +01:00
kittenchilly
920289641a
Add evolution method for Gimmighoul, EVO_LEVEL_ITEM_COUNT_999 (#4261)
* Add evolution method for Gimmighoul, EVO_LEVEL_COLLECT_999

* Change to EVO_LEVEL_ITEM_COUNT_999

* Make logic use less duplicate code

* Update gen_9_families.h

* Update party_menu.c

* Address reviews
2024-03-17 22:03:40 +01:00
tertu
7ac8aac913
Add LocalRandomSeed (#4278) 2024-03-16 19:55:01 +00:00
Eduardo Quezada
7c25db5200
Fill data for placeholder species (#4281)
* Absolute IDs

* Mothim internal forms

* Scatterbug/Spewpa internal forms

* Fixed Mothim not having form tables

* Totem Alolan Raticate

* Moved shared dex text to its own folder

* Totem Mimikyu

* Added missing empty third-ability fields

* Totem Gumshoos + missing totem flags

* Renamed files to better match their contents

* Fixed Disguise on Totem Mimikyu

* Totem Vikavolt/Alolan Marowak + missing Gumshoos form table

* Totem Ribombee/Araquanid/Lurantis/Salazzle

* Totem Togedemaru/Kommo-O

* Partner Pikachu/Eevee

* Reintroduced shinyLocked species flag for convenience

* Revert "Reintroduced shinyLocked species flag for convenience"

This reverts commit 3e07bd378ba6a249effe0aed83a424d0c775f236.
2024-03-16 18:38:43 +01:00
LOuroboros
15aa909944
Updated OW_SYNCHRONIZE_NATURE statement in ScriptGiveMonParameterized (#4271)
Fixes an issue where the nature of a Deoxys would be randomized even if one was set at the time of calling givemon or the functions related to it.
2024-03-14 22:02:19 +01:00
Eduardo Quezada
6804e82c0a
Revert gSpeciesInfo "INFO" macros (#4230)
* Venusaur, Charizard, Blastoise

* Butterfree, Beedrill, Pidgeot

* Rattata, Raticate

* Expanded the rest of Gen 1 macros

* Expanded Gen 2 macros

* Expanded Gen 3 macros

* Expanded Gen 4 macros

* Expanded Gen 5 macros

* Expanded Gen 6 macros

* Expanded Gen 7 macros

* Expanded Gen 8&9 macros

* Removed trailing macro slashes

* Expanded macros for sprites, pals, icons and learnsets (using shasum)

* AMEND ME

* Gen 1 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 2 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 3 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 4 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 5 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 6 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 7 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 8 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 9 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-03-14 17:47:38 -03:00
Alex
b5af343dc4
Reverts additional move effect macros (#4277) 2024-03-14 17:20:13 -03:00
Eduardo Quezada
68e5c9f8cb Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	include/battle.h
#	src/pokedex.c
2024-03-14 11:41:27 -03:00
Eduardo Quezada
dbd7e2a7c8
Fixed DisplayCaughtMonDexPage graphical issue + cry (#4279) 2024-03-14 09:42:09 +01:00
Eduardo Quezada
3066216389
Type array tweaks (#4276)
* Using Z-Moves in type array

* Added Arceus form data
2024-03-12 12:32:06 +01:00
Eduardo Quezada
1568b0a424
Pre-1.8 tweaks (#4275)
* Moved BERRY_MUTATION_CHANCE to include/config/overworld.h and renamed it to OW_BERRY_MUTATION_CHANCE

* Move level_caps.h to config folder

* Multiple EV/IV refered as EVs/IVs

* Disabled decap by default

* Level up learnsetst comments
2024-03-12 12:21:03 +01:00
Frank DeBlasio
2f4203bc4c
Consolidate type properties (#4185)
* Moved gTypeNames into gTypes

* Added invalid move text to struct

* Added max move to struct

* Added icon palette to struct

* Added macros for invalid and max moves

* Swapped palette and max move order

* Renamed invalid to generic

* Renamed invalid to generic in struct definition

* Added zMoves and items to type struct

* Addressed comments

* Incorporated newer comments

* Updated comment format
2024-03-12 07:57:38 -03:00
Alex
a741e2e396
Couple things for 1.8 release (#4274)
* Couple things for 1.8 release

* revert EFFECT_VARY_POWER_BASED_ON_HP change

* Fix comment

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-03-12 07:51:37 -03:00
LOuroboros
cd650ae998
Corrected initial value of targetSpecies in GetEvolutionTargetSpecies (#4269) 2024-03-11 19:47:04 +01:00
MartyKen
ec73e28507
Gen 6 level up learnset update (#4267)
* Lvl up learnsets by generation

I think the title sums it up pretty nicely

* Update level_up_learnsets.h

forgot some newer pokemon

* divided the learnset file into generations

* Separated learnsets by generation

Separated the learnsets by generation, added a bit more documentation in the config file

* Update src/pokemon.c

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

* Update include/config/pokemon.h

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

* PLA aux item sprites

* Gen 6 lvl up Learnset update

Updates gen 6's level up learnsets to ORAS (previously XY)

* Revert "Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming"

This reverts commit 53462c4088926a813f216a7917b1dfeb5ef2ca25, reversing
changes made to 051a93058c83c691f8476fbb97035e64fcee38aa.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-03-11 07:46:16 -03:00
ghoulslash
0dabcfc966
fix repeated quick claw/quick draw checks (#4266)
* fix repeated quick claw/quick draw checks

* fix field names

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-03-10 22:49:00 +01:00
LOuroboros
ff482957bd
Made ScriptGiveMonParameterized recognize the state of P_FLAG_FORCE_SHINY and P_FLAG_FORCE_NO_SHINY (#4256)
* Made ScriptGiveMonParameterized recognize the state of the P_FLAG_FORCE_SHINY

* And made it respect P_FLAG_FORCE_NO_SHINY too
2024-03-08 23:26:25 +01:00
kittenchilly
b7f5ef3cd7
Add Paldean Wooper mini icon (#4260) 2024-03-08 23:25:59 +01:00
DizzyEggg
48d49b40c5 Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming 2024-03-07 20:57:07 +01:00
DizzyEggg
a36cfb1093
unify monSpritesGfx sprites/ptr and fix various compiler errors on o3/os/og (#4252) 2024-03-06 22:26:33 +01:00
DizzyEggg
3b45fda8e9
Use u32 in gflib functions and remove unused (#4250) 2024-03-06 22:22:05 +01:00
Eduardo Quezada
c91af31a26
Fixed P_FOOTPRINTS not compiling (#4251) 2024-03-06 16:54:44 +01:00
Eduardo Quezada
49ddefe84a Merge branch '_RHH/master' into _RHH/upcoming 2024-03-06 10:40:20 -03:00
Eduardo Quezada
1565171235
Fixed considering Mold Breaker but not Turboblaze/Teravolt for flinch-related decisions (#4244) 2024-03-05 18:08:02 +01:00
DizzyEggg
b9f715f114
Fix possible multi battle bug (#4240) 2024-03-04 22:31:05 +01:00
DizzyEggg
650f80d57e
remove some unused data (#4239) 2024-03-04 17:36:23 +01:00
Alex
8d58af4d33
Move most damage AI_BadMove checks to AI_CalcDamage (#4238)
* Move a couple damage AI_BadMove checks to AI_CalcDamage

* re-add effectivness score decrease

* reduce score for bad move in ai_checkviability

* review changes
2024-03-04 09:54:04 +01:00
LOuroboros
64b7cfeb29
Upgrading the debug menu's 'Poison Party' (#4235)
* Upgrading the debug menu's 'Poison Party'

* Optimized the 'No Pokémon' check in Debug_EventScript_InflictStatus1

* Killed a pointless function call in Script_SetStatus1

* Added Frostbite support to ¡inflict status1'
2024-03-01 19:55:54 +01:00
tertu
e3d9a19f45
Use a 32 bit seed for new game seeding in HQ mode. (#4218)
Also adjust some comments
2024-02-28 06:04:47 +00:00
Nephrite
e9b2f33084 Fixed Tangling Hair + Mirror Armor interaction 2024-02-27 13:38:38 +09:00
Nephrite
170070baef
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-26 23:59:15 +09:00
Nephrite
0aac57bf60 Renamed TestSheerForceFlag 2024-02-26 15:11:21 +09:00
Nephrite
46b67355a5 Merge remote-tracking branch 'rhh/upcoming' into battlemove_refactored 2024-02-26 14:23:53 +09:00
Nephrite
174c6fc999 Renamed "MoveHasMoveEffect" functions 2024-02-26 14:21:38 +09:00
DizzyEggg
d2e84afd03
AI sets up double flags correctly (#4228)
* Fix AI double flag not being set up

* ai vs ai doubles
2024-02-25 11:20:23 +01:00
Nephrite
9db03fb263 Removed GET_MOVE_EFFECT 2024-02-25 18:22:21 +09:00
Eduardo Quezada D'Ottone
8671da436b
Add LGPE+ Premier Ball Bonus config (#4191)
* Add LGPE+ Premier Ball Bonus config

* Capitalization

* Premier Ball count in message + only give the amount of Premier Balls possible

* Review changes

* Updated B_TELEPORT_BEHAVIOR to match Premier Ball config

* Update src/shop.c

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

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-25 10:13:26 +01:00
Nephrite
7592ec5973 Revert moves_info.h reorder 2024-02-25 17:49:13 +09:00
Eduardo Quezada D'Ottone
0522ec0247
Trainer data encapsulation (#4216)
* Moved existing sanitized trainer data functions to include/data.h

* Sanitized encounterMusic_gender

* Sanitized trainer class ID

* Sanitized trainer pic ID

* Sanitized trainer starting status

* Sanitized obtaining Trainer struct

* Sanitized trainer double battle flag

* Sanitized trainer party size

* Sanitized trainer mugshot data

* Sanitized trainer name

* Consolidated Dome Brain trainer data to the rest of the frontier data

* Sanitized trainer items

* Removed accidental test data

* Sanitized trainer party

* Sanitized trainer AI flags

* Final encapsulation bit
2024-02-22 14:22:57 +01:00
Eduardo Quezada
75ad61e5bf Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_ai_main.c
#	src/battle_ai_util.c
#	src/battle_tv.c
#	src/data/battle_moves.h
#	src/data/graphics/pokemon.h
2024-02-19 10:13:13 -03:00