8381 Commits

Author SHA1 Message Date
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
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
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