Commit Graph

11684 Commits

Author SHA1 Message Date
Eduardo Quezada
6fb4da68f3 Corrected Oldale Town Sign labels 2022-08-25 22:00:24 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -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
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -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
LOuroboros
23bf67c63f Removed unnecessary inclusion of header in src/field_specials.c 2022-08-25 11:43:01 -03:00
DizzyEggg
a0ec8a5a80 4 digit hp in battle 2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
GriffinR
8a1130d046 Missing constant in friendshiptodamagecalculation 2022-08-25 10:21:41 -04: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
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -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
gruxor
d719510d32
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-08-24 22:31:52 -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
LOuroboros
1d512ed57d Updated Serene Grace checks in AI_CheckViability 2022-08-24 20:00:13 -03: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
4f790a6ec0 spaces 2022-08-24 23:47:42 +02:00
DizzyEggg
91b76e2e4f quash pr clean up 2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603 Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash 2022-08-24 23:35:42 +02:00
GriffinR
32ea55dcba
Merge pull request #1752 from LOuroboros/patch-4
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:08:15 -04:00
GriffinR
8cc520ccd7
Merge pull request #1751 from LOuroboros/patch-3
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:07:59 -04:00
GriffinR
eecf968390
Merge pull request #1750 from LOuroboros/patch-2
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:07:17 -04:00
DizzyEggg
7aa55f2753 better interface 1 player mon in double 2022-08-24 23:00:21 +02:00
LOuroboros
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL 2022-08-24 17:19:24 -03:00
LOuroboros
3a65529293
Fixed KeyInterCB_DeferToEventScript comment 2022-08-24 17:12:59 -03:00