ravepossum
1b1ee8d6c8
small fixes to python install instructions ( #4288 )
...
Co-authored-by: ravepossum <ravepossum@example.com>
2024-03-21 14:57:07 +01:00
Eduardo Quezada
26ba65c7a7
Fixed species flag padding ( #4291 )
2024-03-21 14:56:29 +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
d662409cda
Disable Tera Type on summary screen by default ( #4289 )
2024-03-18 17:40:05 -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
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_3_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03: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
Eduardo Quezada
37c44ae763
Fix README.md ( #4285 )
2024-03-17 21:10:44 +01:00
Eduardo Quezada
1ff7cb6a7b
Merge branch '_RHH/master' into _RHH/upcoming
2024-03-17 14:55:12 -03:00
Eduardo Quezada
6b28350649
Non-tagged
2024-03-17 13:19:32 -03:00
Eduardo Quezada
107bcdf623
Version 1.8.0 ( #4259 )
2024-03-17 12:45:58 -03:00
Eduardo Quezada
331efedf7e
Version 1.8.0
2024-03-16 19:56:31 -03:00
DizzyEggg
f692244ce7
Improve error message with unsupported cpp ( #4272 )
...
* Improve error message with unsupported cpp
* Update include/metaprogram.h
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
---------
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-03-16 18:31:58 -03: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 3e07bd378b
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 53462c4088051a93058c
2024-03-11 07:46:16 -03:00
LOuroboros
927f098cf5
Renamed setmodernfatefulencounter and checkmodernfatefulencounter for consistency reasons
2024-03-11 01:46:59 -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
DizzyEggg
82f8636502
Simplify division in berry_crush and field weather functions
2024-03-09 20:06:58 +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
9e67594dce
Simplify weirdly matching division/substraction code
2024-03-08 16:19:04 +01:00
Eduardo Quezada
3697363198
Pret merge 07.03.2024 ( #4255 )
2024-03-08 08:57:27 -03:00
DizzyEggg
48d49b40c5
Merge branch 'master' of https://github.com/pret/pokeemerald into upcoming
2024-03-07 20:57:07 +01:00
GriffinR
82c3e4af14
Merge pull request #1981 from DizzyEggg/patch-3
...
Make sure gHeap is always aligned
2024-03-07 10:33:52 -05:00
Ariel A
3486097ee9
Merge branch 'followers' into followers-expanded-id
2024-03-06 22:13:07 -05:00
Jaizu
ad839d0333
Lower followers gfx
2024-03-06 19:10:51 -08:00
DizzyEggg
95270e5400
gHeap can go in the middle of ram ( #4253 )
2024-03-06 22:27:21 +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
DizzyEggg
7da5cb421e
Make sure gHeap is always aligned
2024-03-06 16:13:06 +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
Eduardo Quezada
5acc770f00
Fixed config comment ( #4237 )
2024-03-03 09:07:47 +01:00
Eduardo Quezada
d811614f60
Merge branch '_RHH/master' into _RHH/upcoming
2024-03-02 11:04:48 -03:00
