2188 Commits

Author SHA1 Message Date
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
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
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Alex
8ee3a3c5bb solve conflics 2023-08-07 14:25:30 +02:00
sbird
1d8ad1b756 [battle, movesets] revert bulbasaur's level up change 2023-08-02 09:51:45 +02: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
Alex
bca29d8586 Adds Mortal Spin and Population Bomb 2023-07-26 17:37:56 +02:00
Eduardo Quezada
47cea526ec Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	src/battle_util.c
2023-07-19 23:22:07 -04: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
Eclipse
ca792d43cc
Gender differences sprites, final part (#3122)
* The last survivors

* Tweaked Numel, Milotic and Relicanth
Updated their sprites according to their current depictions.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-07-18 21:31:22 -04:00
Eduardo Quezada D'Ottone
43ad1a4d3b
Unified multi-strike move flags (#3126)
* Unified twoStrikes and threeStrikes flags into strikeCount

* Decreased strikeCount max from 255 to 15.
2023-07-18 09:07:14 +02:00
Alex
38655b9d1f
Fix gem boost on multi hit moves and config for gem param (#3144) 2023-07-18 06:11:54 +01:00
SonikkuA-DatH
6382640f8a
Castform, Cherrim Sun, Spinda, and Spheal Graphical Tweaks (#3127)
* Casrform graphics. Palette changes, edited backs, and 2 Frame anims

* Castform Graphics

* Cherrim graphics, and Castform redefinitions

* Spheal and Spinda Graphic edits. Spheal mouth adjustment, Spinda 2 frame and palette

* Revised Spinda Spot drawing function, removed tabs

* Animations for Castform forms, Spinda, Cherrim Sun, and Spheal set

* Spacing

* Forgot shiny pal. Fixed

* Delete .vs directory

* remove vs ref
2023-07-14 11:45:40 -04:00
Eduardo Quezada
3aaa89ce71 Changed all instances of gSpeciesNames so that it uses GetSpeciesName 2023-07-07 14:37:51 -04: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
b10b5fd9c3 EVERYTHING_CUSTOMIZED -> TRAINER_PARTY 2023-07-05 18:31:08 -04:00
Eduardo Quezada
e8487961c7 TrainerMonCustomized -> TrainerMon 2023-07-05 18:29:28 -04:00
Eduardo Quezada
b86184a4f6 Removed TrainerMonPtr 2023-07-05 18:23:18 -04:00
Eduardo Quezada
2f9e0ecd9f Removed uses of F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED 2023-07-05 18:22:48 -04:00
Eduardo Quezada
0b3c7b7d3b Converted IV fields to the current system 2023-07-04 21:49:06 -04:00
Eduardo Quezada
3dd7a2c09e Removed TrainerMonNoItemDefaultMoves 2023-07-04 21:29:58 -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
c201cae2ee Removed TrainerMonItemCustomMoves 2023-07-04 21:06:55 -04:00
Eduardo Quezada D'Ottone
862602233d
Gender differences sprites, part 3 (#3095) 2023-07-04 11:36:24 -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
SubzeroEclipse
23d51df7c0 Added Hisuian Sneasel 2023-07-01 11:16:31 +02:00
SubzeroEclipse
d202bdd09c Added even more gender difference sprites, 2/2 2023-07-01 10:25:17 +02:00
Eduardo Quezada D'Ottone
2100a760ad
A selection of animation frames (redone) (#3090)
* Applin Family

* Placeholder single frames to macro

* Stufful/Bewear

* Chewtle/Drednaw

* Rookidee/Corvisquire/Corviknight

* Rolycoly/Carkol/Coalossal

* Missing animations

* Grubbin/Charjabug/Vikavolt

* Turtonator and Wimpod/Golisopod

* Jangmo-O/Hakamo-O/Kommo-O

* Pyukumuku and Dewpider/Araquanid

* Fixed Charjabug/Vikavolt palettes

* Pincurchin and Sizzlipede/Centiscorch

* Alolan Exeggutor and Salandit/Salazzle

* Reverted PLACEHOLDER_ONE_FRAME_ANIMATION for a separate PR

* Forgot Pyukumuku's animation
2023-06-30 14:13:42 +02:00
SubzeroEclipse
0733e0908c Added even more gender difference sprites, 1/2 2023-06-30 10:40:46 +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
Eclipse
fc52414383
Added many more gender differences sprites (#3082)
Added sprites for the remaining Gen1 mons and a couple of evolutions.
2023-06-27 21:11:01 -04:00
Eclipse
a44af6f06f
Gender differences sprites, part 1 (#3070)
* Added some gender difference sprites
Added sprites for:
- Pikachu/Raichu
- Doduo/Dodrio
- Goldeen/Seaking
- Xatu
- Politoed
- Meditite/Medicham
- Gible/Gabite/Garchomp

NOTE: I had to tweak Doduo's palette file because it wasn't matching the normal one and a result Doduo's beak looked weird.

* Swapped Pikachu sprites
Replaced them with the ones provided by CyanSixFour because they looked better than the ones that I had.

* Added Gloom and Vileplume

* Fixed Pikachu forms
Edited the macros so that only base Pikachu would show different forms based on gender. Big thanks to AsparagusEduardo for helping with this.

* Swapped a few more sprites
Replaced Goldeen (female back), Politoad (female back), Medicham (female all) sprites with those provided by CyanSixFour because they looked better. Also tweaked my male Meditite back
2023-06-26 19:04:19 -04:00
PacFire
4b3b9b5e0a
Added icon for Clear Amulet (#3078)
* Update graphics.h

* Update item_icon_table.h

* Update items.h

* Add files via upload

added icon for clear amulet, shards still missing.

* Add files via upload

added clear amulet's palette

* Update graphics.h
2023-06-26 18:19:33 -04: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
Alex
43821d606f
Fix Baton Pass for when Ace mon is the last alive (#3067)
* Updated preproc config for Diamond Storm

* Fix baton pass bug with IsAceMon

remove not needed check

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-06-21 11:11:06 -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
9984a9e096
Update src/data/battle_moves.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-15 09:59:25 -03:00
LOuroboros
9896f20eb8 Applied fixes and corrections (Jun 2023) 2023-06-15 09:22:26 -03: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
LOuroboros
8efbe825db Updated preproc config for Diamond Storm 2023-06-09 14:32:10 -07:00
Eduardo Quezada
601a96f34a Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly 2023-06-06 08:01:29 -04:00
Eduardo Quezada
271bca6a3d Fixed Staraptor using Staravia's footprint 2023-06-02 11:56:36 -04:00
AgustinGDLV
3d4789c492 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-28 11:10:50 -07:00
Eduardo Quezada D'Ottone
c3527dc01e
Fixed Throat Spray's description 2023-05-26 09:24:23 -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