Eduardo Quezada
1c8d3a4922
Removed unnecessary parenthesis
2022-08-27 11:19:50 -04:00
Eduardo Quezada
12b32606f5
Fixed PokemonSubstruct3 alignment
2022-08-27 03:05:06 -04:00
Eduardo Quezada
99fbad92e2
IS_BATTLER_OF_TYPE
2022-08-27 02:50:55 -04:00
Eduardo Quezada
69f4c226f0
Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs
...
# Conflicts:
# src/battle_ai_main.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_script_commands.c
# src/pokemon.c
# src/pokemon_summary_screen.c
2022-08-27 02:42:22 -04:00
Eduardo Quezada
866d916f2f
SpriteTemplate formatting
2022-08-27 02:07:58 -04:00
Eduardo Quezada
1f0a952546
Usage of BATTLE_OPPOSITE
2022-08-27 01:44:39 -04:00
Eduardo Quezada
15d611ba65
Usage of BATTLE_PARTNER
2022-08-27 01:26:13 -04:00
Eduardo Quezada
6c457f42af
Corrected uses of GetBattlerSide
2022-08-27 00:59:12 -04:00
Eduardo Quezada
0a34d47041
Merge remote-tracking branch 'pret/master' into pret_clean2
2022-08-27 00:56:00 -04:00
Eduardo Quezada
481210b7f3
Missing uses of MAX_SPRITES
2022-08-27 00:54:30 -04:00
GriffinR
8aead3b4c8
Merge pull request #1747 from GriffinRichards/contest-ai-bug
...
Incorporate commented bug fixes in contest AI scripts
2022-08-26 23:53:44 -04:00
Eduardo Quezada
7c86bd5d08
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
...
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone
e5288449b4
Merge pull request #2263 from ThirdLemon/escaperopefix
...
Fix Escape Rope Message when on gen 8 mechanics
2022-08-26 21:03:38 -04:00
SomeLoserThatCantPickOriginalUsernames
bd81841c30
Fix Escape Rope Message when on gen 8 mechanics
2022-08-26 17:47:45 -07:00
LOuroboros
922bbacd71
Updated GetMonFriendshipScore
...
-Moved it to src/pokemon.c
-Made a battle specific variant called GetBattlerFriendshipScore.
-Made that variant return 0 for Mega Evolved 'mons and if called on link battles.
2022-08-26 21:33:43 -03:00
GriffinR
578064d799
Add missing use of METATILE_ROW_WIDTH
2022-08-26 15:23:54 -04:00
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
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore
...
Added constants for GetLeadMonFriendshipScore
2022-08-26 14:52:10 -04:00
crater-git
f8fb4e8cf2
Renamed funcs, lists, etc. - Teach->Teachable
2022-08-26 14:48:06 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan
...
Add missing usage of SOUND_PAN_*
2022-08-26 14:47:24 -04:00
crater-git
b8a3cc2846
Consolidated funcs, renamed CanMonLearnMove
2022-08-26 11:07:08 -04:00
crater-git
54ee960970
Fixed Battle Frontier tutor move IDs
2022-08-26 10:12:11 -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
6331931ba3
Fix Magic Coat targets
2022-08-26 15:01:51 +02: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
GriffinR
005c46f0da
Merge pull request #1754 from AsparagusEduardo/pret_citySigns
...
Corrected Oldale Town Sign labels
2022-08-25 22:09:56 -04:00
Eduardo Quezada
6fb4da68f3
Corrected Oldale Town Sign labels
2022-08-25 22:00:24 -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
