Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Eduardo Quezada
0613af5604
Untag
2024-07-10 09:47:35 -04:00
Eduardo Quezada
c0eb9af2e6
Version 1.8.5 ( #4921 )
...
* Version 1.8.5
* Updated up to PR 4926 (squash)
* Fixed descriptions (squash)
* Updated up to PR4939 (squash)
2024-07-10 09:44:55 -04:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
Bassoonian
341fa3692c
Make Tandemaus only evolve at the end of battles ( #4759 )
2024-06-12 08:43:51 +02:00
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE ( #4738 )
2024-06-08 07:36:39 +02:00
Eduardo Quezada
069161b716
Untag release
2024-05-27 09:31:06 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 ( #4639 )
...
* Version 1.8.4
* Missing labels
2024-05-27 09:06:34 -04:00
Eduardo Quezada
9e72271c8e
Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526
...
# Conflicts:
# src/battle_anim_poison.c
# src/pokemon.c
# src/pokemon_icon.c
2024-05-26 18:34:26 -04:00
sneed
b592c6eae5
Add POKE_ICON_BASE_PAL_TAG to a header
2024-05-23 02:45:22 +03:00
Alex
635db6312c
AI respects partner when using spread moves in double battles ( #4518 )
...
* Fixes Earthquake AI in double battles
* earthquake_ai_fix
* Use CompareDamagingMoves to fix spread damage issue
2024-05-17 00:41:55 +02:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything ( #3949 )" ( #4525 )
...
This reverts commit e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.
# Conflicts:
# gflib/text.c
# include/config/decap.h
# src/battle_message.c
# src/item.c
2024-05-13 19:19:37 +02:00
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) ( #4516 )
...
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)
* forgot ndebug
* Restored EFFECT_MIND_BLOWN
* requested changes
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-12 11:41:18 -04:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type ( #4502 )
...
* Cramorant faint fix and add form change type
* Fixed formatting, renamed form change type, changed various to callnative
* Fix oops broke everything except gulp missile
* Improved condition order
* remove extra line
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* whitespace and alignment
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
* Added requested changes
---------
Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-07 06:44:17 -04:00
Eduardo Quezada
eca47fe209
Non-tagged release
2024-05-06 14:51:48 -04:00
Eduardo Quezada
7e43916e57
Version 1.8.3 ( #4499 )
...
* Moved changelogs to folders by minor version
* Version 1.8.3
2024-05-06 14:44:37 -04:00
PhallenTree
f07ef07855
Fixes various abilities' switch-in messages ( #4500 )
...
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages
* Fixed typo in Supreme Overlord's String Id
* Fixes spacing in battle_string_ids.h
2024-05-05 14:25:40 +02:00
kittenchilly
fc9d5c289a
Embody Aspect fixes ( #4439 )
...
* Embody Aspect fixes
* Fix tests
* Update battle_util.c
2024-04-27 19:35:42 +02:00
Alex
81a73deb76
Fixes Quash ( #4419 )
...
* Fixes Quash
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/move_effect/quash.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-21 15:40:35 +02:00
Alex
be093e7414
Couple comment changes ( #4409 )
...
* comment_change
* fix comment
* an other correction
* fix fix comment
* Update include/constants/battle_ai.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-19 16:34:44 +02:00
sneed
5f4d565c86
Combine AI smart switching with smart mon choices automatically and disable smart mon choices in double battles. ( #4405 )
...
* AI_FLAG_SMART_SWITCHING also sets AI_FLAG_SMART_MON_CHOICES
* Disable AI_FLAG_SMART_MON_CHOICES in doubles
2024-04-18 23:16:36 +02:00
Eduardo Quezada
159eb1aea9
Untag release
2024-04-15 17:51:27 -04:00
Eduardo Quezada
ab5c2d9161
Version 1.8.2 ( #4394 )
2024-04-15 17:47:50 -04:00
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB ( #4355 )
...
* Change Frostbite abbreviation from FSB to FRB
* Melted the ice is actually the one used
* Update moves_info.h
* Update moves_info.h
* Update items.h
2024-04-10 09:16:32 +02:00
DizzyEggg
46e6324fe2
Fix White Herb Known Failing tests ( #4258 )
...
* Fix White Herb Known Failing tests
* get out agbcc
* remove unneeded white herb test
2024-03-29 17:43:05 +01:00
Eduardo Quezada
9b2feafdf2
Non-tagged
2024-03-24 17:52:47 -03:00
Eduardo Quezada
024848a9e9
Version 1.8.1 (hotfix) ( #4303 )
2024-03-24 16:07:49 -03:00
Eduardo Quezada
3623694789
Actually remove unused STATUS3_CANT_SCORE_A_CRIT ( #4293 )
2024-03-20 23:19:18 +01:00
Eduardo Quezada
6b28350649
Non-tagged
2024-03-17 13:19:32 -03:00
Eduardo Quezada
331efedf7e
Version 1.8.0
2024-03-16 19:56:31 -03: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
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
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
Alex
57e0d7b20b
Partial fix for Teeter Dance and Ability Dancer interaction ( #4129 )
...
* Parial fix for Teeter Dance and Ability Dancer interaction
* Removes rest of teeter dance checks and make it work with effect_confuse
* Update test/battle/ability/dancer.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update test/battle/ability/dancer.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2024-02-19 13:36:21 +01:00
Eduardo Quezada
5be97faf9d
Non-tagged
2024-02-18 22:09:08 -03:00
Eduardo Quezada D'Ottone
bb01ab6ff1
Version 1.7.4 ( #4203 )
...
* Version 1.7.4
2024-02-18 21:53:12 -03:00
Alex
cd596fdd80
Adds Tidy Up + minor Dragon Cheer follow up ( #4136 )
...
* Adds Tidy Up + minor Dragon Cheer follow up
* improve tidy up script
* Add IncreaseTidyUpScore function
* remove useless calls
* 2 small tests and a correction for IncreasyTidyUpScore
2024-02-18 20:00:36 +01:00
Alex
7694628296
Adds Powerful status move flag ( #4125 )
...
* Adds Powerful status move flag
* fix flag
* fixed final issues
* review changes
2024-02-18 15:05:08 +01:00
Eduardo Quezada D'Ottone
3d2e0d2065
Fixed Ursaluna's cry using P_GEN_9_CROSS_EVOS ( #4210 )
2024-02-18 10:21:56 +01:00
LOuroboros
1f349e0fb9
Renamed NUM_ABILITY_VANILLA to NUM_ABILITY_PERSONALITY ( #4196 )
2024-02-15 15:22:25 +01:00
LOuroboros
eb7ddeb66c
Updated the way in which ScriptGiveMonParameterized and ScrCmd_givemon chooe a default ability ( #4192 )
...
* Updated the way in which ScrCmd_givemon and ScriptGiveMon assign a default ability
When an abilityNum is not assigned in a call to givemon performed inside of an overworld script, ScriptGiveMonParameterized will make sure to generate an abilityNum of 0 or 1 in the same way vanilla does it; by defaulting to 0, and then tweaking it based on the least relevant bit of the Pokémon's personality.
ScriptGiveMon will set the default ability of a Pokémon in the same way now too, because even though it was rewritten in #3924 , it should ideally produce a Pokémon in a similar way than vanilla does it.
* Removed pointless abilityNum setup in ScriptGiveMonParameterized
2024-02-15 08:01:34 +01:00
psf
7f6e1e2aea
Add configs for measurement systems and decimal separators ( #4183 )
...
* Allow developers to choose metric or imperial, and their decimal seperator of choice for Pokédex entries
- Creates which cleans up the existing implementing of printing height and weight to the pokedex
- Developers can choose to use metric or imperial units of measurement in the Pokédex
- - Developers can choose to use any character as a decimal seperator in the Pokédex
- Allows users to define units and decimal seperators independently
- Fixes a bug in Lotad / Seedot house
* Fixed compilation issue with agbcc
* Updated to include HGSS Dex and address PR Feedback
2024-02-14 10:17:23 +01:00
ghoulslash
ce99db0086
Generic Starting Battle Status Variable ( #4176 )
...
* setup generic starting battle status variable, ABILITYEFFECT_SWITCH_IN_STATUSES
* fix B_ANIM_TAILWIND, assign to starting statuses, and change B_VAR_STARTING_STATUS check for only the variable and not trainers
* Update src/battle_main.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Update src/battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* style fixes
* General_Room naims play SE
* fix sText_BizarreArenaCreated
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-14 10:05:37 +01:00
LOuroboros
e73c58ed2e
Made EFFECT_WRING_OUT read the max power from the move's argument field ( #4180 )
...
* Made EFFECT_WRING_OUT read the max power from the move's argument field
* Renamed EFFECT_WRING_OUT to EFFECT_VARY_POWER_BASED_ON_HP
2024-02-12 22:39:15 +01:00
Eduardo Quezada
ec83b11354
Merge branch '_pret/master' into _RHH/pr/upcoming/pret_20240210
...
# Conflicts:
# gflib/malloc.c
2024-02-10 18:05:20 -03:00
