Commit Graph

11942 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada D'Ottone
34d27eca0e
Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown
Removed Unown hack
2023-01-04 18:57:28 -03:00
Eduardo Quezada D'Ottone
11c3e9c7f8
Merge pull request #2318 from AsparagusEduardo/RHH/pr/palleteConversion2
Gen 1-5 Palette Conversion Redemption
2023-01-04 18:03:07 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-01-04 17:58:54 -03:00
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
# Conflicts:
#	include/config/pokemon.h
2023-01-04 16:19:57 -03:00
ghoulslash
1d2cb49bc6
Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg
Config to restore Gen 3's damage reduction to multi target moves
2023-01-04 09:18:39 -05:00
ghoulslash
a425de77a6
Merge pull request #2446 from LOuroboros/primal
Updated AnimTask_PrimalReversion
2023-01-04 09:16:28 -05:00
ghoulslash
6ea9a34036
Merge pull request #2561 from AsparagusEduardo/RHH/pr/fix/repels
Fixed reusable repels/lures function forcefully using items while menu config is on
2023-01-04 09:15:30 -05:00
ghoulslash
a6269f8cc7
Merge pull request #2559 from AsparagusEduardo/RHH/pr/sync/pretmerge_20230103
For me, it was tuesday. (pret merge 2023/01/03)
2023-01-04 09:15:08 -05:00
Eduardo Quezada
ada47831aa Fixed reusable repels/lures function forcefully using items while menu config is on 2023-01-04 00:00:13 -03:00
Eduardo Quezada D'Ottone
41d846c74c
Merge pull request #2551 from ghoulslash/be/frontier_bp
Reshape sBattlePointAwards to be easier to read
2023-01-03 21:48:08 -03:00
ghoulslash
2ee26c6240 align cols 2023-01-03 19:36:19 -05:00
Eduardo Quezada
b897b7787e Applied bugfix from upstream 2023-01-03 15:41:03 -03:00
Eduardo Quezada
e0802f13a2 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20230103
# Conflicts:
#	include/link_rfu.h
2023-01-03 15:40:33 -03:00
Eduardo Quezada D'Ottone
10bfc2a91f
Merge pull request #2557 from LOuroboros/patch-1
Updated HOLD_EFFECT_ZOOM_LENS check
2023-01-03 06:43:29 -03:00
LOuroboros
bb218b1616
Updated HOLD_EFFECT_ZOOM_LENS check 2023-01-03 01:10:21 -03:00
ghoulslash
2944ebfe7b
Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances
Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+
2023-01-02 13:55:36 -05:00
ghoulslash
8b28d4329b
Merge pull request #2525 from AsparagusEduardo/RHH/pr/fix/FixFrontierTutor2
Fixed right Frontier move tutor not loading their move list correctly.
2023-01-02 13:55:00 -05:00
ghoulslash
f5687de182
Merge pull request #2552 from LOuroboros/patch-1
Updated B_DOUBLE_WILD_CHANCE
2023-01-02 13:49:44 -05:00
LOuroboros
cdfec0fc05
Updated B_DOUBLE_WILD_CHANCE 2023-01-02 15:42:30 -03:00
ghoulslash
759ee8854a
Merge pull request #2470 from LOuroboros/dev_gen9_abilities
Implemented the majority of the Gen. 9 Abilities
2023-01-02 13:39:38 -05:00
ghoulslash
a06135b2f4
Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg
Fixed Eggs sometimes reading garbage graphic data.
2023-01-02 13:27:28 -05:00
ghoulslash
82bf76588c move challengeNum index to end of sBattlePointAwards, explicitly call out frontier facilities, modes 2023-01-02 13:12:46 -05:00
LOuroboros
13d8c0d167 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2023-01-02 14:34:24 -03:00
LOuroboros
ca32d43433 Streamlined ability-on-weather changes
Also renamed activateweatherabilities and activateterrainabilities.
2023-01-02 14:32:56 -03:00
Eduardo Quezada D'Ottone
682bcd4554
Merge pull request #2548 from LOuroboros/clearBody
Made Clear Body and similar abilities be normally affected by their own stat stage reductions
2023-01-01 11:37:11 -03:00
LOuroboros
d3443396e2 Made Clear Body and similar abilities be normally affected by their own stat stage reductions 2023-01-01 10:45:38 -03:00
Eduardo Quezada
965e2c3394 Newline fix 2023-01-01 10:31:09 -03:00
Eduardo Quezada D'Ottone
a3411d0771
Merge pull request #2545 from Bassoonian/gen9moves
Fix faulty gBaseStats reference
2022-12-30 22:58:50 -03:00
Bassoonian
453aa2ffe7 Fix faulty gBaseStats reference 2022-12-31 02:01:56 +01:00
Eduardo Quezada D'Ottone
0e1836d42b
Merge pull request #2106 from Sneed69/PartyBattlerShouldAvoidHazards
PartyBattlerShouldAvoidHazards rewrite
2022-12-30 17:55:53 -03:00
Eduardo Quezada D'Ottone
2d222ad0a9
Merge pull request #2544 from LOuroboros/miscs
Applied minor tweaks
2022-12-30 17:51:55 -03:00
Eduardo Quezada D'Ottone
4dc72dcfc1
Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2
Implementing Teatime effect
2022-12-30 17:49:54 -03:00
LOuroboros
e8dfb66c30 Adding ability effect triggers for terrains and weather
A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change.

Misc. changes:
-EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN
 -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all.
 -The main reason for the rename was the inconsistency with the battle script's label.
-Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in c8abf00c.
2022-12-30 03:25:16 -03:00
GriffinR
8c61869638
Merge pull request #1835 from Jaizu/patch-29
Fix ANIM_SPRITE on regular builds with BUGFIX.
2022-12-29 10:17:57 -05:00
Jaizu
c40c7e7e65
Fix breaking modern, correct labels. 2022-12-29 16:11:17 +01:00
Jaizu
e2d47a07f5
Fix ANIM_SPRITE on regular builds with BUGFIX.
Dicussion about this being a BUGFIX define instead limiting it only to modern.
Credit SBird.
2022-12-29 12:28:44 +01:00
LOuroboros
0ef148dfbb Applied more corrections
-Removed BattleScript_WindRiderActivatesEnd2
-Tweaked the condition of Wind Power in AbilityBattleEffects
-Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier
2022-12-28 08:50:15 -03:00
LOuroboros
9bad91b167 Applied minor tweaks
-Made setbeakblast affect a specified battler instead of the gBattlerAttacker to justify the macro's layout.
-Added Shell Trap to the list of moves unaffected by Encore.
-Renamed CheckFocusPunch_ClearVarsBeforeTurnStarts into CheckChosenMoveForEffectsBeforeTurnStarts because that function doesn't just check for Focus Punch anymore, and it doesn't clear any variables either.
2022-12-28 08:33:31 -03:00
GriffinR
d02d518917
Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding
Documenting padding in structs used by Saveblocks
2022-12-27 20:50:37 -05:00
GriffinR
a3d09af095
Merge pull request #1832 from AsparagusEduardo/pret/pr2/doc/summaryTypes
Added TYPE_ICON_SPRITE_COUNT to Summary documentation
2022-12-27 20:49:59 -05:00
GriffinR
0947e792bf
Merge pull request #1833 from SBird1337/doc/writesequencetobgtilemapbuffer
[doc] remove mislabled metatile attributes in bg.c
2022-12-27 20:49:38 -05:00
Eduardo Quezada
1fc86e52b5 Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+ 2022-12-27 21:18:20 -03:00
Eduardo Quezada
95f39c8c81 Config to restore Gen 3's damage reduction to multi target moves 2022-12-27 15:24:43 -03:00
Eduardo Quezada D'Ottone
d120f2f183
Merge pull request #2541 from sphericalice/beat-up
Fix Beat Up's battle script to avoid an out-of-bounds array access
2022-12-27 13:32:05 -03:00
sbird
214718110a [doc] remove mislabled metatile attributes from WriteSequenceToBgTilemapBuffer 2022-12-27 15:38:13 +01:00
SphericalIce
200b71be02 Fix Beat Up's battle script to avoid an out-of-bounds array access 2022-12-27 10:49:57 +00:00
Eduardo Quezada
b0127428c6 Review suggestions. 2022-12-27 00:04:46 -03:00
Eduardo Quezada
701179eb1f Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1 2022-12-26 21:05:18 -03:00
GriffinR
7355c9c1d7
Merge pull request #1831 from sphericalice/caught-icon-rename
Rename ball_display_unused_extra
2022-12-26 12:01:56 -05:00