Alex
b9edbb429b
Adds combined pledge move effects ( #3336 )
...
* Adds combined pledge move effects
* added pledge status and various other fixes
* leftover
* fix triple arrow test tag
* pledge moves can not be redirected by absorbing abilities
* more pledge changes
* remove duplicate test
* Stab boost, Rainbow anim and new SeaOfFire anim
* leftover
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 16:23:22 +01:00
Bassoonian
cb245a00c6
Includes older item and move names as variants ( #3580 )
...
* Item name variants
* Updated move names
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-11-20 18:35:00 +01:00
Nephrite
1dadc79b8b
Triple Arrows redo
...
Sorry, Lunos
2023-11-20 19:39:13 +09:00
Alex
4cb03d4add
Adds Raging Bull and various fixes ( #3552 )
...
* Adds Raging Bull and various fixes
* fix compiling on abgcc
* syrup bomb anim fix
* sticky syrup anim in link battles
* fix sticky syrup in link battles
* fix battler index
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-19 17:45:58 +01:00
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song ( #3476 )
...
* Adds Glaive Rush
* Fixes: Glaive Rush status is removed until users next turn
* Glaive Rush no affect
* simplify glaive rush script
* simlify script further
* leftover
* Fix Plasma Fists and Relic Song + tests
* Callnative for Plasma Fists
* Use Status Field Ion Deludge for Plasma Fists
* add assumes for flinch_status
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-18 15:19:38 +01:00
SnorlaxMonster
190e77e9c8
Rename HITMARKER_IGNORE_SAFEGUARD
...
Rename HITMARKER_IGNORE_SAFEGUARD to HITMARKER_STATUS_ABILITY_EFFECT.
This flag is used exclusively by status-inflicting Abilities,
and has 3 main functions:
- Whether the effect bypasses Shield Dust
- Whether the effect bypasses Safeguard
- Which text string to display when the status condition is inflicted
(i.e. whether it was inflicted by a move or Ability)
I believe this new name better represents what the flag actually does.
This name was structured to parallel HITMARKER_SYNCHRONISE_EFFECT.
2023-11-18 13:57:50 +11:00
Eduardo Quezada D'Ottone
c46f9ec6a5
Form changing method for Shaymin Sky into Land at night ( #1690 )
...
* Form changing method for Shaymin Sky into Land at night
* Ordered form change tables
* Refactored form change type to support both night and day
* Removed added space
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-17 00:09:43 +01:00
kittenchilly
85e75a72c6
Update affection mechanics to gen 8+ ( #3495 )
...
* Update affection mechanics to gen 8+
* Update battle.h
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-14 21:29:38 +01:00
Eduardo Quezada D'Ottone
93c7a70caa
Species Simplifier™ - Part 2 ( #3546 )
...
* Gen 1 and 2 families + fixes
- Fixed mixed identation.
- Fixed Azurill being Normal/Water type in Pre-Gen6 setting.
- Fixed Wobbuffett being before Wynaut
- Fixed Dudunsparce's macro being out of order
* Updated macros of Megas that shared held item with base forms
* Gen 3 families
* Separated Latis macro
* Gen 4 families
* Moved Misc Info to the top of arrays
* Renamed FAMILY_x to P_FAMILY_x
* Gen 5 families
* Gen 6 families
* Gen 7 families
* Gen 8 families
* Gen 9 families
* Mega Evolutions
* Gigantamax Form toggles
* Alolan Forms
* Galarian Forms
* Added missing comments
* Hisuian Forms
* Paldean Forms
* Fixed missing Paldean form flags
* Fixed order
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-14 16:40:26 +01:00
kittenchilly
c1cdc320bb
Implement Rotom Catalog and Zygarde Cube ( #3284 )
...
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-13 17:46:25 -03:00
Pawkkie
b93dfb9d59
Smarter SwitchAI Mon Choices | HasBadOdds Switch Check ( #3253 )
...
* SwitchAI makes much smarter mon choices
* Add HasHadOdds check to ShouldSwitch decision
* Remove early return
* Rework Baton Pass check as per discussion with Alex
* Forgot to adjust a comment
* Don't program before breakfast lol (if / else if fix)
* Switch AI_CalcDamage for AI_DATA->simulatedDmg in HasBadOdds
Thanks Alex! :D
* Typo in a hitToKO comparison
* Remove and replace AI_CalcPartyMonBestMoveDamage and IsAiPartyMonOHKOBy from https://github.com/rh-hideout/pokeemerald-expansion/pull/3146
See https://discord.com/channels/419213663107416084/1144447521960251472 for details
* Major refactor, new struct, switchin considers damage / healing from hazards / status / held item / weather
* Forgot Snow exists and heals Ice Body, haven't played Switch games lol
* (766a1a27a7
) Compatibility, use new struct field instead of function call
* Fixing oversight from previous upstream merge
* Improve TSpikes handling to make GetSwitchinHazardDamage more applicable
Small fixes:
- EFFECT_EXPLOSION typo (!= to ==)
- Order of if statements near bestResistEffective
- Spacing of terms in big HasBadOdds if statements
* Forgot to uncomment blocks disabled for debugging what turned out to be vanilla behaviour lol
* Remove another holdover from debugging, sorry :/
* Lastly, undoing my debug trainer
* Type matchup based on species type rather than current type
Suggested by BLourenco on Discord, the idea is that a mon that's had its type affected by a move like Soak will still have moves as though it was its regular typing, and so prioritizing the temporary typing wouldn't be ideal.
https://discord.com/channels/419213663107416084/1144447521960251472/1146644578141736970
* gActiveBattler upcoming merge fixes
* Egg changes part 1
* Egg changes part 2, just need to address EWRAM still
* Move SwitchinCandidate struct to AiLogicData
* Consider Steel type when checking TSpikes
* Comment about CanBePoisoned compatibility
* Changes for Egg's 2nd review
* Put period back in comment, whoops lol
* Latest upcoming merge fixes
* Missed a few u32 updates
* Combine GetBestMonIntegrate functions / flags, some modularization
* Fix merge error
* Make modern fixes
* Two tests done, two to go
* Accidentally pushed reference test, removing it
* Type matchup switching tests
* Tests for defensive vs offense switches
---------
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-11 14:37:35 +01:00
Martin Griffin
3fc47d137a
Defines for Expansion version number ( #3454 )
2023-11-10 08:08:36 -03:00
Frank DeBlasio
b5b67973bd
Fixes Stantler's evolution's boolean ( #3548 )
...
* Stantler's evolution now has the proper gen boolean
* Fixed comment for new evo methods
2023-11-10 00:11:29 +01:00
Frank DeBlasio
33815079ae
Added missing cross-gen evolutions ( #3547 )
...
* Added missing cross-gen evolutions
* Added forms for evos
* Converted some EVO_NONEs into EVO_MOVE
* Moved Ursaring's evolution up
* Added evolution methods for Dudunsparce and Maushold
2023-11-09 23:29:22 +01:00
Alex
e79583be63
Remove function GetMoveDamageResult ( #3536 )
...
* Remove function GetMoveDamageResult
* fix test
* test clean up
---------
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-11-09 20:53:14 +01:00
Alex
4b3c96a89b
Adds ability Zero to Hero ( #3542 )
2023-11-09 08:25:46 -03:00
GriffinR
12a64fecb4
Merge pull request #1936 from GriffinRichards/doc-datahpupdate
...
Document datahpupdate
2023-11-07 12:25:26 -05:00
Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration
2023-11-06 13:49:02 -03:00
Eduardo Quezada
57c1dd97bb
Merge branch 'RHH/master' into RHH/upcoming
2023-11-03 21:59:08 -03:00
Eduardo Quezada D'Ottone
820be61c9f
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4
2023-11-02 21:32:23 -04:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
2023-11-02 21:28:53 -04:00
DizzyEggg
7eb1b12224
Fix Knock Off healing berries ( #3509 )
2023-11-01 14:47:31 +01:00
Alex
64ba52d214
Remove redundant AI score increases ( #3504 )
...
* Remove redundant AI score increases
* review applied
* fix score
2023-10-31 13:41:22 +01:00
kittenchilly
c0c100d90d
Base friendship Gen 8+ config ( #3491 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-30 16:45:52 -03:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms ( #3469 )
...
* Alcremie form sprites
Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>
# Conflicts:
# graphics/pokemon/alcremie/lemon_cream/front.png
# graphics/pokemon/alcremie/matcha_cream/back.png
# graphics/pokemon/alcremie/matcha_cream/front.png
# graphics/pokemon/alcremie/mint_cream/front.png
# graphics/pokemon/alcremie/ruby_cream/front.png
# graphics/pokemon/alcremie/salted_cream/front.png
# include/graphics.h
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/footprint_table.h
# src/data/pokemon_graphics/front_pic_anims.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon.c
* Fixed cries
* Removed Todos
* Temp: all forms use the same icon
* Grouped form data + Fixed missing Level up and Teachable learnsets
* Added missing data for form changes and back animations
* Grouped defines together
* Fixed compile
---------
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Bassoonian
f472d768dd
Rename Undiscovered to No Eggs Discovered
2023-10-28 16:32:55 +02:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A ( #3474 )
2023-10-27 19:14:45 -03:00
leo60228
a505afac1d
address review
2023-10-26 18:57:06 -04:00
kittenchilly
5cbcf60c7e
Begin some stuff
2023-10-26 17:34:18 -04:00
kittenchilly
86917f1453
Update species.h
2023-10-26 17:33:20 -04:00
Alex
f6781a77d4
merge rhh/upcoming
2023-10-25 09:42:19 +02:00
Eduardo Quezada
ed3e2f8e09
Gen 9 form order
2023-10-23 13:30:32 -03:00
Eduardo Quezada
174ad11535
SPECIES_GIMMIGHOUL_CHEST
2023-10-23 12:09:44 -03:00
Eduardo Quezada
2e9e157cf8
SPECIES_DUDUNSPARCE_TWO_SEGMENT
2023-10-23 11:45:15 -03:00
Eduardo Quezada
be921c57fc
SPECIES_TATSUGIRI_CURLY
2023-10-23 11:26:50 -03:00
Eduardo Quezada
82bb758d19
SPECIES_PALAFIN_ZERO
2023-10-23 11:08:06 -03:00
Eduardo Quezada
792aee86ea
SPECIES_SQUAWKABILLY_GREEN_PLUMAGE
2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73
Maushold Family of Three define
2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c
Oinkologne Male define
2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df
Fixed Paldean Tauros Combat Breed order and data names
2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
...
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names ( #3248 )
...
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup ( #3435 )
...
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
kittenchilly
d495e177b9
Add Snow weather animation ( #3440 )
...
* Snow weather animation
* Update battle_anim_scripts.s
* Apply changes from review
2023-10-22 21:15:07 +02:00
GriffinR
ffdc2456cb
Document datahpupdate
2023-10-20 12:50:32 -04:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move ( #3425 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-10-19 20:16:37 -03:00
Alex
ceb6beb254
merge upcoming
2023-10-19 12:30:55 +02:00
leo60228
87a03c3c73
Fix Paldean form order
2023-10-18 14:44:30 -04:00
leo60228
ba0534386d
Address review
2023-10-18 14:37:29 -04:00
leo60228
b3e5c3179f
Revert "reorder species.h"
...
This reverts commit d68eb27bbe906eb80c55dd2988c8af4e4970cf72.
2023-10-18 14:37:27 -04:00
leo60228
3e1ecec800
revert SPECIES_DARMANITAN_GALARIAN_* renames
2023-10-18 14:37:27 -04:00
leo60228
61d3cdd8da
revert separate SPECIES_UNOWN
2023-10-18 14:37:21 -04:00
Eduardo Quezada D'Ottone
6df433735e
reorder species.h
2023-10-18 14:37:01 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
...
Add gen 9 Pokémon data
(cherry picked from commit cd3e65f5c9
)
2023-10-18 14:33:56 -04:00
Alex
91b6722322
Octolock, more tests
2023-10-18 20:25:34 +02:00
Eduardo Quezada
c0540a3559
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
2023-10-15 00:30:00 -03:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern ( #3412 )
...
* Fix Wall Werror errors
* fix hgss pokedex modern errors
* tests build on modern
* learnset change
* Update src/battle_ai_util.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/battle_anim_new.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/debug.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* Update src/pokedex_plus_hgss.c
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
* review changes
* unused cmd args
* various args back
---------
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-10-13 18:39:35 +02:00
Alex
0b9126ff53
Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel ( #3402 )
...
* initial commit
* done
* clean up
2023-10-11 11:09:50 +02:00
Eduardo Quezada
3cb29f87a6
gBattleCommunication ids
2023-10-10 19:53:56 -03:00
Eduardo Quezada
f830b0725a
GMAX -> GIGANTAMAX
2023-10-10 18:07:12 -03:00
ghoulslash
70fbf9e9df
Opportunist Ability ( #2994 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-10-09 22:35:00 -03:00
Eduardo Quezada
92301398bc
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data ( #3349 )
2023-10-08 15:56:09 -03:00
DizzyEggg
be5683e899
AI battle tests + AI logic fixes ( #3361 )
2023-10-04 18:53:29 +01:00
Eduardo Quezada
ca81aba3b6
Merge branch 'RHH/master' into RHH/upcoming
2023-10-02 14:11:24 -03:00
DizzyEggg
10adba3af4
Fixed entry hazards switch in issue ( #3316 )
...
* fix entry hazards switch in issue
* accidental known failing fix
2023-10-01 10:30:41 -03:00
DizzyEggg
2fcb9bbc9b
Wild battle tests + tests for exp points ( #3342 )
...
* Add WIld Battles to test runner + exp tests
2023-09-27 08:35:05 +01:00
kittenchilly
baca050724
Allow Sliggoo to evolve during overworld fog ( #3343 )
2023-09-26 17:05:44 -03:00
Eduardo Quezada
566ec93492
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
2023-09-24 20:32:45 -03:00
LOuroboros
35e76e9868
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN ( #3247 )
...
Co-authored-by: Alex <alexthenotes@gmail.com>
2023-09-24 00:01:18 -03:00
Alex
a073e7bd59
Adds Gigaton Hammer and Salt Cure ( #3297 )
2023-09-15 11:18:47 -03:00
ghoulslash
582cfb0ae7
Convert various to callnatives - Part 1 ( #3269 )
2023-09-11 09:19:56 -04:00
Eduardo Quezada
755e260da4
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# include/constants/battle_move_effects.h
# test/battle/move_effect/multi_hit.c
2023-09-10 18:38:46 -03:00
Alex
18577ce598
Fix Scale Shot bug and use Canceller Multihit Moves ( #3290 )
2023-09-10 11:57:19 -03:00
psf
75d06bb599
Generation 6 Experience Share ( #3276 )
2023-09-07 23:18:18 -03:00
Eduardo Quezada
3333395ff7
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/variousGone1
...
# Conflicts:
# include/constants/battle_script_commands.h
# src/battle_script_commands.c
2023-09-07 15:54:55 -03:00
Eduardo Quezada
820113d883
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle_scripts.h
# include/battle_util.h
# src/battle_script_commands.c
# src/battle_util.c
2023-09-07 15:13:06 -03:00
DizzyEggg
cfd802423b
Fling fixes and tests ( #3191 )
...
* begin fling tests
* fling fixes and tests
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/move_effect_fling.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* scripts names change
* fix fling's test file
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-09-05 06:56:36 -03:00
DizzyEggg
7c2ad314d4
merge with upcoming
2023-09-04 09:40:48 +02:00
Eduardo Quezada
66710ac22a
Updated various defines
2023-08-31 23:54:11 -04:00
Eduardo Quezada
c4553c71aa
5 more callnatives
...
- jumpifshelltrap
- jumpifemergencyexited
- jumpifrodaffected
- jumpifabsorbaffected
- jumpifmotoraffected
2023-08-31 23:43:48 -04:00
Eduardo Quezada
4ac61ad15f
handleultraburst, handleprimalreversion, handlemegaevo
2023-08-31 22:34:57 -04:00
Eduardo Quezada D'Ottone
c4e88760f5
Pret merge (2023/08/31) ( #3268 )
2023-08-31 14:52:18 -04:00
Eduardo Quezada
0d5b00aaf2
Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
...
# Conflicts:
# README.md
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# data/maps/BattleFrontier_Lounge7/scripts.inc
# include/battle_anim.h
# include/battle_message.h
# include/constants/items.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_anim_throw.c
# src/battle_anim_utility_funcs.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/party_menu.h
# src/data/pokemon/tmhm_learnsets.h
# src/daycare.c
# src/field_specials.c
# src/hall_of_fame.c
# src/party_menu.c
# src/pokemon.c
# src/tv.c
2023-08-31 14:28:01 -04:00
DizzyEggg
493c330cbd
merge with upcoming
2023-08-30 13:23:55 +02:00
DizzyEggg
c29f8259f6
remove gActiveBattler entirely
2023-08-30 12:46:22 +02:00
DizzyEggg
a7615f9649
remove almost all usage of active battler
2023-08-30 11:21:10 +02:00
kittenchilly
48d6fe2e64
Merge branch 'upcoming' into ultraburst
2023-08-26 14:43:31 -05:00
GriffinR
aca7998b93
Add missing use of ALL_MOVES_MASK
2023-08-16 14:33:15 -04:00
GriffinR
10a10e914b
Merge pull request #1910 from GriffinRichards/misc-constants
...
Use miscellaneous missing constants
2023-08-15 17:53:41 -04:00
sbird
6a622eb006
Merge remote-tracking branch 'pret/master' into feature/dynmulti
2023-08-14 13:20:03 +02:00
GriffinR
4c2b12541b
Merge pull request #1908 from GriffinRichards/name-buffer
...
Automatically update nickname buffer sizes
2023-08-12 23:36:19 -04:00
kittenchilly
2b27b0bf00
Constants
2023-08-12 12:30:36 -05:00
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias
...
Add temp flag and var aliases
2023-08-11 15:45:00 -04:00
Eduardo Quezada
f026b51b48
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
...
# Conflicts:
# src/battle_main.c
# src/battle_tower.c
# src/match_call.c
2023-08-11 11:41:44 -04:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx
...
Fix some frontier gfx, adjacent cleanup
2023-08-10 14:49:44 -04:00
GriffinR
18319e8da3
Misc missing constant use
2023-08-10 01:42:18 -04:00
kittenchilly
c3e31af5f3
Ultra burst trigger
2023-08-09 22:12:26 -05:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number ( #1732 )
2023-08-09 10:51:01 -04:00
GriffinR
65fee186f8
Automatically update nickname buffer sizes
2023-08-08 16:28:09 -04:00
Alex
8ee3a3c5bb
solve conflics
2023-08-07 14:25:30 +02:00
GriffinR
866c32a735
Add temp var aliases
2023-08-04 14:17:28 -04:00
GriffinR
6d4dadd7b5
Add temp flag aliases
2023-08-03 15:55:06 -04:00
GriffinR
16c0be7ed2
Fix some frontier gfx, adjacent cleanup
2023-08-03 11:15:15 -04:00
Eduardo Quezada
f94efa94e1
Merge branch 'RHH/master' into RHH/upcoming
2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5
MOVE_CORROSIVE_GAS Effect ( #3152 )
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
2023-08-02 01:05:54 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul ( #3192 )
...
* [battle, anim] woodhammer animation overhaul
* squashme: timings
---------
Co-authored-by: sbird <sbird@no.tld>
2023-08-01 19:10:18 -04:00
DizzyEggg
5eec3b2fc3
fix various issues with primal weather blocking water/fire type moves ( #3138 )
...
* fix various issues with primal weather blocking water/fire type moves
* forgot to change return to effect=1
* fix bugs
2023-07-30 10:50:51 -04:00
Alex
bca29d8586
Adds Mortal Spin and Population Bomb
2023-07-26 17:37:56 +02:00
Eduardo Quezada
ad78dfcf68
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# src/battle_script_commands.c
# src/battle_util.c
2023-07-25 14:38:53 -04:00
DizzyEggg
fc37345c29
Fix wrong color in stat move animation
2023-07-21 10:42:39 +02:00
Alex
6b5d1e7577
Adds some gen9 moves ( #3147 )
...
* Adds some gen9 moves
* Fix Test + Tabs
* Collision Course boost changed to 1.3333
2023-07-19 13:25:20 +02:00
Eduardo Quezada D'Ottone
6fec0e4dd1
Ported TheXaman's latest changes to the Debug Menu ( #2815 )
...
* Added option for generating incrementing pokemon in pc boxes
# Conflicts:
# src/debug.c
* added submenu arrows, increased menu high to full screen
# Conflicts:
# src/debug.c
* combined flags and vars into one submenu
# Conflicts:
# src/debug.c
* added new window to flags/vars showing the current state and added submenu indicator
# Conflicts:
# src/debug.c
* added alligned arrows for debug submenus
# Conflicts:
# src/debug.c
* used {CLEAR_TO X} instead of manual spaces
# Conflicts:
# src/debug.c
* renamed gDebugText to proper sDebugText
# Conflicts:
# src/debug.c
* added Fill submenu, added fill function for PC items and all bag pockets @LOuroboros
# Conflicts:
# src/debug.c
* put cheat start into utility
# Conflicts:
# src/debug.c
* put fill submenu into main menu
# Conflicts:
# src/debug.c
* tiny fix
* renaming and reordering
# Conflicts:
# src/debug.c
* Added reset pokedex flags for @AsparagusEduardo
* made flag toggle list dynamic
# Conflicts:
# src/debug.c
* initial battle debug menu WIP
# Conflicts:
# src/debug.c
# src/wild_encounter.c
* fix visual bug
* added battle start
# Conflicts:
# include/debug.h
# src/battle_ai_script_commands.c
* Added faster way to add initial movesets to mon
* Added waiting music for the slow box filling
* Simplified the call to scripts
* Simplified debug scripts
* Disabled Battle Test for now
* Fixed personality on fast PC fill being always 0
* Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT
* Added missing return TRUE
* Sets nickname
* Changed how GetSpeciesName to how it's used upstream
---------
Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>
2023-07-18 09:17:03 +02:00
Eduardo Quezada
adfc0af372
Mon graphics are now loaded depending on their availability
...
- If it has a female sprite/palette, it's loaded.
- If it the species is enabled and it has a sprite/palette, it's loaded.
- Otherwise, load the SPECIES_NONE graphics.
2023-07-07 14:36:30 -04:00
Eduardo Quezada
4405f79d24
Merge branch 'RHH/master' into RHH/upcoming
2023-07-06 13:15:06 -04:00
Eduardo Quezada
f21953f254
Merge remote-tracking branch 'pret/master' into RHH/master
2023-07-06 13:06:31 -04:00
Eduardo Quezada
2f9e0ecd9f
Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED
2023-07-05 18:22:48 -04:00
Eduardo Quezada
9c961b4fd5
Removed TrainerMonNoItemCustomMoves
2023-07-04 21:22:27 -04:00
Eduardo Quezada
1ef56f6ae1
Removed TrainerMonItemDefaultMoves
2023-07-04 21:16:47 -04:00
Eduardo Quezada D'Ottone
1fa9a05470
Convert move flags and bans into GCC bitfields ( #2952 )
...
* Slicing moves to new bitfield
* Wind moves to new bitfield
* Two-strike moves to new bitfield
* Forgot to add flagTwoStrikes to battle_moves.h
* Removed "flag" from field names
* FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER
* Airborne moves
* FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE
* FLAG_BALLISTIC and FLAG_PROTECTION_MOVE
* Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c
* FLAG_SOUND
* FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER
* FLAG_DMG_MINIMIZE
* Cleanup
* FLAG_STAT_STAGES_IGNORED
* Updated Pollen Puff's ballistic flag
* FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST
* thaw
* FLAG_THREE_STRIKES
* FLAG_IRON_FIST_BOOST
* FLAG_RECKLESS_BOOST
* FLAG_HIGH_CRIT
* Removed empty flags
* Moves that fail when called by Me First + added missing Shell Trap
* Moves that fail when Gravity is active
* Better names for banned fields
* Moves that fail when called by Instruct
* Cleanup
* Contact Moves + Fixed Wandering Spirit skipping contact checks
* Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect.
* Simplified B_MOVE_FLAGS configs
* FORBIDDEN_METRONOME
* Renamed hitsPastSubstitute to ignoresSubstitute
* FORBIDDEN_PARENTAL_BOND
* Struggle uncallable by Metronome
* FORBIDDEN_MIMIC
* FLAG_KINGS_ROCK_AFFECTED
* Made a single config for move flags
* Macro for checking move flags
* FLAG_MAGIC_COAT_AFFECTED
* Fixed HasMagicCoatAffectedMove
* FLAG_SNATCH_AFFECTED
* Removed unused EFFECT_FLINCH_MINIMIZE_HIT
* Fixed Stench/King's Rock interaction
* Removed sMovesNotAffectedByStench in favor of checking move effects
* Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT
* Changed Gen2 configs to less than Gen 3
* FORBIDDEN_SLEEP_TALK
* Cleanup
* Inverted FLAG_MIRROR_MOVE_AFFECTED
* FLAG_SHEER_FORCE_BOOST
* Ordered
* FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT
* Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field
* Fixed Triple Arrows test
2023-07-03 10:01:59 +02:00
Eduardo Quezada D'Ottone
81e59ace25
Cleaned up remaining Castform hack stuff ( #3063 )
...
* Removed gCastformFrontSpriteCoords
* Removed sCastformElevations and IsCastformForm
* Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct
* Scrubbed unused BS commands
* Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants
* Removed redundant function in Pokémon Debug menu
* Removed handling in animation scripts
* Removed gBattleMonForms
* Reduced MAX_MON_PIC_FRAMES to 2
* Removed Castform/Cherrim makefile stuff
* Fixed weather form change tests not checking species.
* Fixed Castform palettes after Lunos' PR
2023-06-30 09:58:07 +02:00
ghoulslash
7371a9e401
Add many gen 8 move animations ( #2861 )
...
* port many gen8 and 9 move anims from cfru
* fix thunder cage, shell smash, shelter anims. update anim credits
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-21 13:19:54 -04:00
Eduardo Quezada
6342da3b58
Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming
2023-06-20 15:41:30 -04:00
Eduardo Quezada D'Ottone
b01f7927cf
Fixed Sylveon's evolution method ( #3048 )
2023-06-19 16:17:51 -04:00
LOuroboros
313f522622
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-06-13 05:44:37 -03:00
Eduardo Quezada
601a96f34a
Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly
2023-06-06 08:01:29 -04:00
Bassoonian
7bf34448e4
Rename GAME_STAT_FISHING_CAPTURES to GAME_STAT_FISHING_ENCOUNTERS
2023-06-05 14:15:07 +02:00
AgustinGDLV
3d4789c492
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-28 11:10:50 -07:00
ghoulslash
a929ae8b48
Replace launchtemplate and launchtask in battle anims ( #2640 )
...
* replace launchtemplate with createsprite using fix_launchtemplate.py
* tidy up script
* fix comment handing in fix_launchtemplate.py
* fix double comma after sprite template
* remove py script
* convert launchtask -> createvisualtask
* fix launchtask->createvisualtask issue
* fix ANIM_PAL ORs
* remove launchtemplate, launchtask macros
* fix pal macros in z moves
* fix bloom doom
* add F_PAL_ALL_BUT_DEF
* remove all ANIM_PAL_ usages
* devestating drake fix
* convert launchsoundtask and setblends
* Reworked CFRU macro PR
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2023-05-27 17:32:53 -04:00
AgustinGDLV
5a8715e608
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-23 16:10:44 -07:00
LOuroboros
29d2d4202e
Evolution updates ( #3009 )
...
* Add Hisuian Sneasel's evolution to gEvolutionTable
* Updates
-Added EVO_ITEM_NIGHT, (it's like EVO_ITEM_DAY but nighttime specific)
-Added EVO_ITEM_HOLD (it's like the day based variations, but day agnostic)
-Turned the trade evo items into regular evolution items
-Ditched the config for the Razor Claw by request
-Updated every entry in gEvolutionTable for species that could only evolve via EVO_TRADE_ITEM to LA's standard
* Review corrections (extrapolations)
* Post Cherrypick corrections
* Corrected the description of EVO_ITEM_NIGHT
* Added a config for the new items' field-evolving functionality
2023-05-18 06:39:14 -04:00
AgustinGDLV
d133564e21
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-16 21:57:06 -07:00
AgustinGDLV
785b100693
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix
2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf
reworked weather form reversion + added more tests
2023-05-16 16:24:25 -07:00
ghoulslash
60710f823e
merge w upcoming
2023-05-15 13:13:28 -04:00
AgustinGDLV
e47eca1c5a
mid converting script commands to callnative
2023-05-13 22:07:04 -07:00
Bassoonian
c05404e772
Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge
2023-05-12 13:48:52 +02:00
AgustinGDLV
aec51b5b04
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-05-11 20:02:06 -07:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb ( #2873 )
2023-05-06 21:20:37 -04:00
GriffinR
dd65eddbdd
Merge pull request #1883 from GriffinRichards/doc-mod
...
Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS
2023-05-05 02:38:30 -04:00
CallmeEchoo
eb5b81684c
refactored snow into damaging weather
...
this is necessary for ice body to properly work.
doesnt actually do any damage
2023-05-05 01:38:12 +02:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather
2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4
ad suggested changes
2023-05-02 21:17:14 +02:00
Alex
dd43d62a12
Fixes Triple Dive effect ( #2947 )
2023-05-02 15:06:21 -04:00
CallmeEchoo
76721b16f8
add snow weather
2023-05-02 16:25:26 +02:00
ghoulslash
445e9c4b8b
merge w upcoming
2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status ( #2942 )
2023-05-01 09:45:47 -04:00
GriffinR
c2dad5ac44
Redefine TV_SHOWS_COUNT
2023-04-27 13:59:09 -04:00
Bassoonian
c279830892
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution
2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix
2023-04-26 14:25:36 -04:00
Salem
78c4d07b23
Add Berserk Gene Item ( #2893 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev
2023-04-25 19:50:26 +02:00
Bassoonian
2aa4d2da38
Fix Ice Heal message
2023-04-25 19:38:47 +02:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs ( #2941 )
2023-04-24 14:35:42 -04:00
sbird
12d4b43755
Merge remote-tracking branch 'pret/master' into feature/dynmulti
2023-04-24 18:30:30 +02:00
LOuroboros
a128192bfe
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
2023-04-24 09:36:09 -03:00
Bassoonian
f13c39d784
Thawing out for frostbite
2023-04-23 21:20:23 +02:00
Bassoonian
13f6acf9a1
General mechanics
2023-04-23 19:20:48 +02:00
Bassoonian
a561c6da6a
Add config to Frostbite & allow it to be inflicted
2023-04-22 23:14:49 +02:00
Bassoonian
f50bfb3770
Frostbite hurts at the end of the turn and halves SpA
2023-04-22 18:47:36 +02:00
Bassoonian
623e7c5f25
Add Frostbite status
2023-04-22 18:23:08 +02:00
citrusbolt
6c7f5881e4
Add two EV-related configs ( #2825 )
2023-04-20 10:05:32 -04:00
LOuroboros
2043380ee2
Oopsie
2023-04-18 10:34:39 -03:00
LOuroboros
28ce87f6d3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2
2023-04-18 07:35:59 -03:00
AgustinGDLV
2eabcea86e
Battle Item Refactor ( #2902 )
...
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
Eduardo Quezada
11beec62ee
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/evolution.h
# src/field_poison.c
2023-04-14 11:31:02 -04:00
Eduardo Quezada
7c29a24110
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect ( #2883 )
...
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
ghoulslash
5f4bfd9bb4
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag
2023-04-10 09:48:49 -04:00
aaghaht
bd54c70020
Add PLA evo items
2023-04-10 10:47:31 +05:30
ghoulslash
afc4b4cdee
add mirror herb
2023-03-28 15:07:37 -04:00
ghoulslash
00d695ac2b
add AI_FLAG_OMNISCIENT
2023-03-28 10:38:48 -04:00
AgustinGDLV
504ec36b2b
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-27 16:22:11 -07:00
AgustinGDLV
2017bee3f8
fixed Castform + Cherrim
2023-03-27 11:35:23 -07:00
Eduardo Quezada
3888b10769
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
2023-03-27 10:55:38 -03:00
LOuroboros
000077f671
Implemented Axe Kick's effect
2023-03-26 20:05:30 -03:00
LOuroboros
8ae57dc912
Implemented Take Heart's effect
2023-03-26 20:05:13 -03:00
LOuroboros
05a34edb7d
Implemented Infernal Parade's effect
2023-03-26 20:04:55 -03:00
LOuroboros
1595a66559
Implemented Triple Arrows' effect
2023-03-26 20:04:36 -03:00
ghoulslash
6574e01e73
Gen. 9 Move Effects, 1st batch ( #2534 )
2023-03-26 16:20:47 -04:00
ghoulslash
dc9f0b5107
Implement Customizable NPC Trainer Parties ( #2733 )
2023-03-26 09:32:51 -04:00
sbird
aea5d79aa2
[trainer_parties] implement fully customizable npc trainer parties
...
fix nature related bug, fix hash generation, add tests
2023-03-25 20:00:04 +01:00
AgustinGDLV
5d508f7963
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-24 22:40:51 -07:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings
...
Document the trendy sayings word group
2023-03-24 08:05:51 -04:00
Zunawe
492422b6bd
Fix scanner item flag name
2023-03-23 21:47:26 -07:00
Bassoonian
e601719c91
Add new PLA form change items
2023-03-24 00:04:08 +01:00
Bassoonian
80d0efae0c
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhhupcomingdev
2023-03-23 23:04:23 +01:00
LOuroboros
7ce5c5fc66
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1
2023-03-23 06:27:09 -03:00
Eduardo Quezada D'Ottone
2658fe32c2
Removed ITEM_HAS_EFFECT ( #2840 )
2023-03-23 10:02:32 +01:00
AgustinGDLV
6233627a57
more tests + fixed hp reversion issues
2023-03-22 17:04:05 -07:00
Eduardo Quezada
ef914a2fac
Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
2023-03-21 16:13:27 -03:00
AgustinGDLV
69fd63a922
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax
2023-03-21 09:56:58 -07:00
AgustinGDLV
5a9e1de836
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax
2023-03-20 21:14:33 -07:00
AgustinGDLV
7d70222770
added most Dynamax immunities/interactions + tests + fixed some move selection bugs
2023-03-20 16:40:05 -07:00
Eduardo Quezada
51b716c9d9
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319
...
# Conflicts:
# data/battle_scripts_2.s
# include/constants/battle_string_ids.h
# include/constants/songs.h
# src/battle_message.c
# src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
Bassoonian
372c6a1afa
Add new item variables and defines
2023-03-19 20:55:39 +01:00
LOuroboros
f4e8389779
Added Psyblade and Hydro Steam
2023-03-17 09:25:39 -03:00
Eduardo Quezada
0a9ab96390
Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments
2023-03-14 08:54:49 -03:00
GriffinR
0c380862d6
Document the trendy saying word group
2023-03-13 15:58:40 -04:00