Commit Graph

8493 Commits

Author SHA1 Message Date
LOuroboros
34cafa746c Implemented Electromorphosis' effect
Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied.
Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.)
As a result, the game will trigger the ability multiple times if they're hit by a multihit move.
This directive makes the code end the ability effect preemptively if the target does have the status flag applied.
2022-12-06 05:23:29 -03:00
LOuroboros
88cae380d0 Implemented Wind Power's effect 2022-12-06 05:23:29 -03:00
LOuroboros
c1e232cbf6 Implemented Rocky Payload's effect 2022-12-06 05:23:29 -03:00
LOuroboros
4dc44150c5 Implemented Wind Rider's effect 2022-12-06 05:23:29 -03:00
LOuroboros
ca656b63b9 Added Well Baked Body's effect and misc. changes
-Added a modifybattlerstatstage macro to handle stat stages in battle.
-Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.
2022-12-06 05:21:24 -03:00
Eduardo Quezada D'Ottone
3718f58a0a
Merge pull request #2469 from LOuroboros/patch-1
Updated TryChangeBattleTerrain
2022-12-05 23:40:52 -03:00
LOuroboros
f9458117ee
Updated TryChangeBattleTerrain 2022-12-05 23:31:41 -03:00
Eduardo Quezada
2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00
Bassoonian
8c77ae59d6 Use official Double Shock message 2022-12-04 21:57:02 +01:00
Bassoonian
06ab4fc842 Update move flags 2022-12-04 21:56:40 +01:00
Bassoonian
b0ead44ee8 Update battle_tv.c 2022-12-04 21:23:45 +01:00
Bassoonian
5bcb6b8afd Update B_METRONOME_MOVES 2022-12-04 18:16:15 +01:00
Bassoonian
dc97a31c31 Change battle_debug.c to MOVES_COUNT 2022-12-04 18:15:35 +01:00
Bassoonian
c14fa82f43 Fix Headlong Rush description 2022-12-04 18:14:27 +01:00
Bassoonian
051ad7bf69 Update src/data/text/move_descriptions.h
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-04 00:26:05 +01:00
GriffinR
f55443656f Add NUM_TILES_PER_METATILE 2022-12-03 17:29:02 -05:00
LOuroboros
eb082cd1a2 Implemented Purifying Salt's effect 2022-12-03 01:51:11 -03:00
LOuroboros
acb9c31bd4 Implemented Anger Shell's effect 2022-12-03 01:19:24 -03:00
LOuroboros
be71c4ca99 Implemented Thermal Exchange's effect 2022-12-03 01:15:31 -03:00
LOuroboros
b0027cb78b Implemented Seed Sower's effect 2022-12-02 23:31:41 -03:00
LOuroboros
8dd3fd025f Implemented Lingering Aroma's effect
And took the chance to tweak Mummy's.
2022-12-02 23:31:38 -03:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
ghoulslash
6140cacbef set BS_SCRIPING before BattleScript_TrainerSlideMsgRet 2022-11-29 18:28:33 -05:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	src/pokemon.c
2022-11-29 17:40:09 -03:00
ghoulslash
b869b836cc add callnative bs func, convert metal burst dmg calc 2022-11-28 10:34:27 -05:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP
Made Z-Moves unusable without PP
2022-11-28 09:52:28 -05:00
ghoulslash
ac30ebd5a4
Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny
Refactored Shiny configs + cleanup
2022-11-28 09:51:39 -05:00
tustin2121
cf6f343726 Use multi-include incbins for stormy_water
- Removes a special case rule from the make files.
2022-11-26 23:38:39 -05:00
LOuroboros
add75d84c0 Applied a couple of tweaks
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6 Allow Lv100 'mons to access level based evos 2022-11-25 17:34:11 -03:00
Eduardo Quezada
4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Bassoonian
4ac1e4fc61 Power Shift is now a clone of Power Trick 2022-11-19 13:41:56 +01:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
Bassoonian
4da9ecbcea Prepare FLAG_SLICING_MOVE for merger with abilities branch 2022-11-18 22:37:31 +01:00
Bassoonian
4034f18c0e Update PLA descriptions 2022-11-18 22:30:40 +01:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00
Bassoonian
29ae22183b Mystical Power effect 2022-11-18 22:17:08 +01:00
Bassoonian
9512b3a57a Implement Double Shock functionality with temporary string 2022-11-18 22:12:26 +01:00
Bassoonian
a250341e6c Forgot to reset Wicked Torque effect rate 2022-11-18 22:00:46 +01:00
Bassoonian
3ac3cb249e Wicked Torque effect 2022-11-18 22:00:21 +01:00
Bassoonian
d4c92a0a19 Fix Bitter Malice's effect 2022-11-18 21:54:46 +01:00
Bassoonian
ed33f2b9ce Change PLA moves to SV effects 2022-11-18 20:56:25 +01:00
Bassoonian
e279185152 Update move data to GEN9 (with config) 2022-11-18 12:22:15 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
GriffinR
df470b75dd
Merge pull request #1817 from GriffinRichards/sync-wireless
Add cursor kind constants, sync wireless improvements
2022-11-17 15:18:20 -05:00
Eduardo Quezada
791c547b2c Renamed missing overworld debug configs 2022-11-14 14:07:32 -03:00
Eduardo Quezada
540f4679bb Implemented uses of Shiny config 2022-11-14 11:56:02 -03:00
Eduardo Quezada
011ec16f1e Organized conffig files into their own folder and cleaned up 2022-11-14 11:03:49 -03:00
LOuroboros
31a602f3b6 Optimized Intimidate's code 2022-11-12 18:03:46 -03:00
eatthepear
bd4b660983
Fix Berries that were broken after Bug Bite fix
Issue #2448 
Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works.
I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).
2022-11-11 21:28:44 -05:00
LOuroboros
7260478c54 Uncommented level up moves 2022-11-11 01:31:22 -03:00
GriffinR
601bb0b578 Index gBattleFrontierHeldItems 2022-11-10 16:14:06 -05:00
GriffinR
3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
Eduardo Quezada
f2d0e547ac Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/rom_header_gf.c
2022-11-09 19:54:44 -03:00
Eduardo Quezada
bd63ef18af Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/pokemon_storage_system.c
2022-11-09 19:33:26 -03:00
GriffinR
e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR
431a7ef8dd Add missing cursorKind field usage 2022-11-09 15:37:47 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
LOuroboros
a35986fd9c Fixed indentation in ScrCmd_faceplayer 2022-11-08 21:01:50 -03:00
LOuroboros
999a53028a Updated AnimTask_PrimalReversion 2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone
e6ae0bd01e
Merge pull request #2434 from LOuroboros/badDreams
Optimized Bad Dreams' code
2022-11-08 08:16:07 -03:00
Eduardo Quezada
237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -03:00
BuffelSaft
1da4eb3b14
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
Config for Dark Void being only usable by Darkrai
2022-11-05 22:42:51 +13:00
BuffelSaft
bbd7b205fd
Merge pull request #2433 from ghoulslash/be/bug_bite
Redo Bug Bite
2022-11-05 22:08:47 +13:00
LOuroboros
f56df74576 Optimized Bad Dreams' code
Misc:
-Made the ability pop up stick around until the ability's effect ends just like in ORAS.
-Updated sText_BadDreamsDmg accordingly while I was at it.
2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone
fa8bf80905
Merge pull request #2420 from LOuroboros/teleport
Updated CanTeleport
2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone
2b5aff2764
Merge pull request #2426 from tustin2121-2/patch-linker
GF Header and Modern Builds
2022-11-04 12:27:13 -03:00
Eduardo Quezada
44bf4a15e3 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
# Conflicts:
#	include/constants/battle_config.h
#	include/constants/battle_move_effects.h
2022-11-04 12:19:40 -03:00
BuffelSaft
d05c74b9e9
Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams
Fixed Bad Dream's ability popup message
2022-11-05 03:42:44 +13:00
ghoulslash
7a0e541413 workaround for GetBattlerHoldEffectParam to handle bug bite different battler id 2022-11-04 10:29:05 -04:00
Eduardo Quezada
5b1552514e Review changes 2022-11-04 11:10:06 -03:00
ghoulslash
1e6903840a Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite 2022-11-04 09:29:45 -04:00
ghoulslash
d13431b4ab merge w rhh master 2022-11-04 09:29:39 -04:00
Eduardo Quezada
8c66b318eb Fixed Bad Dream's ability popup message 2022-11-04 00:46:07 -03:00
Eduardo Quezada
d23b5c95c9 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations
# Conflicts:
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/pokemon.c
2022-11-03 23:31:20 -03:00
Eduardo Quezada
edf4e45c4d Config for Dark Void being only usable by Darkrai 2022-11-03 21:36:12 -03:00
BuffelSaft
c169a9523e
Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00
BuffelSaft
736ca893b6 Fix abilities that raise target's stat after hit
Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.
2022-11-03 21:54:56 +13:00
tustin2121
b32413d11e Restoring the GFHeader
- Also adding comment about what the header does and how to maintain it.
2022-11-02 12:45:36 -04:00
tustin2121
fd87c97ef8 Adding documentation about GFHeader 2022-11-02 12:42:58 -04:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike
Multi-hit refactor and Parental Bond
2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney
Implemented Honey's Sweet Scent functionality
2022-11-01 20:09:30 -04:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures
Implemented Lures and Repel/Lure "use another" menu
2022-11-01 20:05:15 -04:00
Eduardo Quezada D'Ottone
ebc9fc31d2
Merge pull request #2416 from DizzyEggg/fix_palace
Fix battle palace bug
2022-11-01 12:16:55 -03:00
DizzyEggg
51d8b57dcc restore deleted line 2022-10-31 13:19:10 +01:00
DizzyEggg
ea43b7732c Fix battle tent again 2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone
9d64c838cf
Merge pull request #2424 from LOuroboros/getItemId
Actually removed ItemId_GetId
2022-10-31 07:15:25 -03:00
LOuroboros
52dda5fc0f Actually removed ItemId_GetId 2022-10-30 22:52:22 -03:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
14e85249d1 Review changes 2022-10-30 17:12:13 -03:00
Eduardo Quezada
d02fc43703 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 13:38:25 -03:00
GriffinR
d90132842a Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
2022-10-30 12:30:38 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures
# Conflicts:
#	src/pokemon.c
2022-10-30 12:16:09 -03:00
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5
Update for Porymap 5.0.0
2022-10-30 11:01:37 -04:00
LOuroboros
a74a8fa134 Updated CanTeleport 2022-10-29 16:13:40 -03:00
LOuroboros
bdd082f869 Made Z-Moves unusable without PP 2022-10-29 12:07:59 -03:00
DizzyEggg
215604f5f7 fix battle palace bug 2022-10-27 20:44:43 +02:00
Eduardo Quezada
85c0d2dac8 Review changes 2022-10-27 11:26:09 -03:00
BuffelSaft
224ca256ce Requested clean up
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
2022-10-27 22:25:33 +13:00
Eduardo Quezada D'Ottone
93dd8786ee
Merge pull request #2413 from kaisermg5/fix_tmhm_lock
Fix lock when teaching a TM/HM after learning a move by level up.
2022-10-26 22:27:19 -03:00
kaisermg5
2cd0a0f862 Fix lock when teaching a TM/HM after learning a move by level up. 2022-10-25 18:48:06 -03:00
Eduardo Quezada
85ce30b1d6 Created macros for Bard Sounds 2022-10-25 14:33:02 -03:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
BuffelSaft
d9cc98a4fe Suggested changes
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
2022-10-24 22:19:35 +13:00
BuffelSaft
7bca475d77 Add Misty Explosion to Parental Bond ban list
Probably not needed, but just in case!
2022-10-23 21:48:20 +13:00
BuffelSaft
9b076a9dcf Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
2022-10-23 21:40:04 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
2022-10-23 17:37:23 +13:00
LOuroboros
c267c615c1
Fixed CanFling 2022-10-22 10:38:39 -03:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
GriffinR
e752c8a2f9
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately
Document seldom-used trigger functionality
2022-10-20 11:45:35 -04:00
Eduardo Quezada D'Ottone
18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
GriffinR
3e8baa5b04
Merge branch 'master' into porymap-5 2022-10-18 22:54:25 -04:00
GriffinR
a418f8d976
Merge pull request #1755 from GriffinRichards/map-dynamic
Rename special map constants, treat warp ids as strings
2022-10-18 22:45:56 -04:00
tustin2121
4730870646 VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY
Getting rid of the VAR_ prefix, to avoid the porymap problem.
2022-10-18 21:12:31 -04:00
GriffinR
e33581ff9c
Merge pull request #1671 from sphericalice/heal-location-none
Add the HEAL_LOCATION_NONE constant
2022-10-18 18:41:04 -04:00
Abaresk
7f09894045 Merge branch 'master' into thunder 2022-10-18 04:37:56 +00:00
Marcus Huderle
0d0a9bd31d Update src/overworld.c
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
2022-10-17 17:41:27 -07:00
Marcus Huderle
48ab684b48 Fix weather color map documentation 2022-10-17 17:41:27 -07:00
GriffinR
716025395c
Merge pull request #1802 from abaresk/wild-encounters
Document new metatile wild encounter odds
2022-10-17 18:56:58 -04:00
Eduardo Quezada D'Ottone
c57ab9e529
Merge pull request #2392 from gruxor/wait-fix
Replaced busy-wait loops
2022-10-17 15:34:22 -03:00
gruxor
610a8efb7d Replaced busy-wait loops 2022-10-17 11:21:06 -04:00
tustin2121
327c648e87 Document seldom-used trigger functionality
Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.
2022-10-16 20:46:50 -04:00
Eduardo Quezada D'Ottone
1607291982 Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
ghoulslash
ede6162724
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running
Config for running indoors
2022-10-16 09:28:32 -04:00
Eduardo Quezada D'Ottone
dd2d6107bd Fixed Z-Move not being cleared if Pokémon faints 2022-10-16 09:57:21 -03:00
Abaresk
e67d55bfc4 Fix names 2022-10-15 13:37:24 +00:00
Abaresk
b538239f18 Add more documentation to thunder weather 2022-10-15 04:25:35 +00:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
LOuroboros
8a1a561b80
Uncommented evo moves for each species 2022-10-14 11:28:15 -03:00
ghoulslash
d64e18d0b4
Merge pull request #2385 from LOuroboros/trainerClassBasedBalls
Added class-based Poké Balls for trainers
2022-10-14 10:19:20 -04:00
LOuroboros
90f79999bb Added class-based Poké Balls for trainers
Thanks to Ghoulslash for helping me optimizing things.
2022-10-14 11:14:30 -03:00
GriffinR
2e128e3282
Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
2022-10-13 14:30:18 -04:00
GriffinR
722e501b7c
Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled
Documented missing gSoftResetDisabled uses
2022-10-13 14:29:43 -04:00
Eduardo Quezada D'Ottone
71dad6aec9
Merge pull request #2384 from May8th1995/confuseAI
Fix AI issue giving decrementing score to confuse hit instead of confuse
2022-10-13 12:16:00 -03:00
tennis
db013aab0b Fix AI issue giving decrementing score to confuse hit instead of confuse 2022-10-13 15:58:57 +01:00
tennis
f79205af08 Fix bug where badge boost flag is inverted 2022-10-13 15:32:08 +01:00
Abaresk
af081b08ee Make related func names more concise 2022-10-12 04:35:23 +00:00
Abaresk
11e3f03bd8 Document new metatile wild encounter odds 2022-10-12 04:03:02 +00:00
Kurausukun
dc97eca92d combine "unused" field into tile buffer 2022-10-10 21:00:31 -04:00
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c
Convert tilesets.s to C
2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
2022-10-07 18:27:29 -03:00
LOuroboros
589c969e89 Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore 2022-10-07 18:20:00 -03:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
One for the go! (pret merge 2022/10/07)
2022-10-07 17:14:00 -04:00
ghoulslash
9164f03f96
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
Triple kick power calc rework
2022-10-07 16:31:50 -04:00