Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
...
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
ghoulslash
ae2ff4c1d8
Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix
...
Enable BUGFIX by default
2022-08-26 09:56:19 -04:00
DizzyEggg
3facc4875a
Merge pull request #2259 from AsparagusEduardo/RHH_fixNetBall
...
Fixed Net Ball Gen 7+ multiplier
2022-08-26 09:11:04 +02:00
Eduardo Quezada
77e2a2da32
Fixed Net Ball Gen 7+ multiplier
2022-08-25 23:19:46 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
...
Gen 8 EXP Candies
2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
57d583b783
Fixed call to sExpCandyExperienceTable
2022-08-25 22:49:23 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-08-25 22:40:19 -04:00
Eduardo Quezada
4c999b40b1
Enable BUGFIX by default
2022-08-25 22:35:33 -04:00
Eduardo Quezada D'Ottone
0095b3181b
Merge pull request #2256 from DizzyEggg/hp
...
4digits HP display
2022-08-25 20:42:50 -04:00
LOuroboros
410045028a
Optimized General_AffectionHangedOn
2022-08-25 20:01:14 -03:00
AgustinGDLV
e204527f43
changed candy item parameters
2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
LOuroboros
7539051942
Further tweaked the affection animation
2022-08-25 17:05:57 -03:00
ghoulslash
552d1f3d7b
Merge pull request #2237 from gruxor/compat_define
...
Reworked branch defines into single compatibility define
2022-08-25 15:36:01 -04:00
ghoulslash
15a368163d
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
...
LoadSpecialPokePic adjustments
2022-08-25 15:35:21 -04:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
ghoulslash
b45e1887d8
Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower
...
Fixed creation trio orbs not boosting power for non-base forms.
2022-08-25 15:18:02 -04:00
LOuroboros
5dd143f19d
Applied Blackforest's changes to General_AffectionHangedOn
2022-08-25 13:07:52 -03:00
LOuroboros
1bfff42ad2
Fixed ENDTURN_STATUS_HEAL
2022-08-25 12:38:47 -03:00
DizzyEggg
1b9c2816c2
fix updatehptextinhealthbox arguments
2022-08-25 17:37:47 +02:00
DizzyEggg
63370b065d
Party menu supports 4digit hp
2022-08-25 17:31:14 +02:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
ghoulslash
90ae339cac
Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge
...
Included PR #2219 that was accidentally merged into BE
2022-08-25 08:47:38 -04:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi
...
Wild multi battles and doubles 2 vs 1 interface
2022-08-25 08:47:02 -04:00
Eduardo Quezada
af137c9b9d
Multiple changes
...
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
2022-08-25 03:42:41 -04:00
DizzyEggg
c17db6d2d5
Merge pull request #2245 from AsparagusEduardo/RHH_criticalCaptureBool
...
Fixed critical capture fields not using TRUE or FALSE
2022-08-25 08:56:57 +02:00
Eduardo Quezada
b2af7a1b47
Fixed critical capture fields not using TRUE or FALSE
2022-08-25 01:17:17 -04:00
Eduardo Quezada
045dbcf81e
Fixed creation trio orbs not boosting power for non-base forms.
2022-08-25 00:48:35 -04:00
Eduardo Quezada D'Ottone
a210e45c61
Merge pull request #2234 from rh-hideout/DizzyEggg-abilpopup
...
Ability pop-up displays properly long abilities
2022-08-25 00:17:38 -04:00
Eduardo Quezada D'Ottone
5659f6178f
Optimized x adjustment
2022-08-25 00:03:43 -04:00
Eduardo Quezada D'Ottone
b4b0c6b885
Merge pull request #2241 from LOuroboros/patch-lmao
...
Fixed P_UPDATED_ABILITIES's comment
2022-08-24 19:47:07 -04:00
LOuroboros
7b7ba93d45
Fixed P_UPDATED_ABILITIES's comment
2022-08-24 20:35:13 -03:00
crater-git
6012731f27
Removed redundant ifdef
2022-08-24 19:31:55 -04:00
Eduardo Quezada D'Ottone
62175cc655
Merge pull request #2235 from rh-hideout/DizzyEggg-patch-1
...
Get rid of garbage bytes in graphics.c
2022-08-24 18:56:08 -04:00
Eduardo Quezada D'Ottone
1a9a2a2c29
Merge pull request #2236 from rh-hideout/DizzyEggg-patch-2
...
ENDTURN_WISH resets gBattleStruct->turnSideTracker
2022-08-24 18:40:12 -04:00
Eduardo Quezada
30594a9773
Included PR that was accidentally merged into BE
2022-08-24 18:37:25 -04:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
crater-git
940f9f1726
Moved branch defs to config.h, now only for compat
2022-08-24 16:10:32 -04:00
DizzyEggg
e3ab439ec0
Fix multi wild battles
2022-08-24 21:56:24 +02:00
DizzyEggg
cc8dd92247
ENDTURN_WISH resets gBattleStruct->turnSideTracker
2022-08-24 20:48:47 +02:00
DizzyEggg
0bf2b26491
Get rid of garbage bytes in graphics.c
2022-08-24 20:36:49 +02:00
DizzyEggg
17b47de90d
Ability pop-up displays properly long abilities
2022-08-24 20:20:44 +02:00
Eduardo Quezada D'Ottone
21fe205f0f
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
...
Fix multiple pokemon icons & tidying pokemon graphic folders
2022-08-24 00:52:49 -04:00
Eduardo Quezada D'Ottone
8f12e1f5c6
Merge pull request #2125 from ghoulslash/be/escapepreventionfix
...
fix IsAbilityPreventingEscape message in party menu
2022-08-24 00:48:57 -04:00
Eduardo Quezada D'Ottone
33e1562253
Merge pull request #2219 from aarant/battle_engine
...
Fixed Gen5+ multihit odds.
2022-08-24 00:34:58 -04:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
