8163 Commits

Author SHA1 Message Date
tennis
f79205af08 Fix bug where badge boost flag is inverted 2022-10-13 15:32:08 +01:00
Eduardo Quezada D'Ottone
2ce340e8e1
Merge pull request #2262 from LOuroboros/becomingAHero
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
2022-10-07 18:27:29 -03:00
LOuroboros
589c969e89 Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore 2022-10-07 18:20:00 -03:00
ghoulslash
06bddbac23
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
One for the go! (pret merge 2022/10/07)
2022-10-07 17:14:00 -04:00
ghoulslash
9164f03f96
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
Triple kick power calc rework
2022-10-07 16:31:50 -04:00
Eduardo Quezada
2a8048b677 Removed ItemId_GetId like in upstream 2022-10-07 14:53:58 -03:00
Eduardo Quezada
68b474c0f0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
# Conflicts:
#	include/constants/items.h
#	src/battle_interface.c
2022-10-07 14:52:32 -03:00
Eduardo Quezada
9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
# Conflicts:
#	src/data/pokemon/base_stats.h
2022-10-07 14:05:45 -03:00
LOuroboros
50ca188cb2 Replaced didMegaEvo with a shiny new species flag 2022-10-07 12:32:36 -03:00
LOuroboros
02c6bc64b2 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero 2022-10-07 12:20:52 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
2022-10-07 10:55:43 -04:00
ghoulslash
d7f7fa7d07
Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti
Changed ballMultiplier to account for future Hisuian ball multipliers
2022-10-07 10:48:02 -04:00
ghoulslash
1e04c80dfa
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
Special handling for Mew's Teachable moveset
2022-10-07 10:39:56 -04:00
ghoulslash
7c7eb8ac7f
Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide
Added missing Bide exception to Battle Arena Mind Points
2022-10-07 10:32:47 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
2022-10-07 10:25:59 -04:00
GriffinR
bb2e64b3fc
Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
2022-10-06 22:17:32 -04:00
tustin2121
ea168d1a6b Fix typo 2: revelations 2022-10-06 20:34:46 -04:00
tustin2121
f3bddd1ea6 Fix typo 2022-10-06 19:36:01 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
2022-10-06 17:24:53 -04:00
GriffinR
c6e4c29ea3
Merge pull request #1792 from GriffinRichards/display-tiles
Add DISPLAY_TILE_* constants
2022-10-05 20:44:28 -04:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
Eduardo Quezada
e8ed0bd9f2 Changed ballMultiplier to account for future Hisuian ball multipliers 2022-10-04 20:39:45 -03:00
Eduardo Quezada D'Ottone
d0895a7c32
Merge pull request #2370 from StephenLynx/master
Fixed berserk not activating if mon falls to exactly half HP.
2022-10-01 21:30:44 -03:00
Sérgio Augusto Vianna
764bed6580 Fixed berserk not activating if mon falls to exactly half HP. 2022-10-01 20:50:55 -03:00
Eduardo Quezada D'Ottone
af171eb4d4 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
# Conflicts:
#	src/pokemon_summary_screen.c
2022-10-01 17:32:32 -03:00
GriffinR
79a34411ce Add additional DISPLAY_TILE_WIDTH usage 2022-09-29 15:22:21 -04:00
sbird
8dad7cc649 [doc] clean up casts in decompress.c 2022-09-29 17:33:39 +02:00
Eduardo Quezada
90ad11278d Sorry Mewtwo ^^; 2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f Special handling for Mew's Teachable moveset 2022-09-28 09:04:31 -03:00
Eduardo Quezada
fb9105f8ac Added Mega Evolution flag 2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
# Conflicts:
#	src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada
5ca1b927e6 Added missing Bide exception to Battle Arena Mind Points 2022-09-27 08:13:32 -03:00
ghoulslash
253234378c trace records target ability 2022-09-26 23:46:41 -04:00
ghoulslash
6e276b5f4d
Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings
Extrapolated Battle Arena's move Mind ratings
2022-09-26 21:04:16 -04:00
Eduardo Quezada
ae21e1626e Reworked Mind Points 2022-09-26 21:20:08 -03:00
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -04:00
ghoulslash
ff42806e04
Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix
Multi battle interface fix
2022-09-26 09:12:40 -04:00
ghoulslash
8ecdf68491
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix
Fixes: Pokémon Debug isn't loading female icon palettes correctly
2022-09-26 09:09:14 -04:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
TheXaman
886a487bf1 Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes 2022-09-26 12:40:30 +02:00
Eduardo Quezada
5054cf3586 Documented unk40EF in Summary Screen 2022-09-25 21:33:20 -03:00
Eduardo Quezada
057f76bfe6 Cleaned up missing JOY macros 2022-09-25 13:05:18 -03:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
3b983aae14
Apply suggestions from code review 2022-09-25 08:31:24 -03:00
LOuroboros
a9ab3286ef Fixed IsPlayerInFrontOfPC 2022-09-25 05:51:08 -03:00
Eduardo Quezada
0f35f080ec Gender icon in naming screen based on Pokémon name length 2022-09-24 23:48:24 -03:00
LOuroboros
8e9bfda120
Update field_specials.c 2022-09-24 22:22:18 -03:00
Eduardo Quezada D'Ottone
13573b6e53
Merge pull request #2356 from LOuroboros/PeeC
Modified the debug menu's PC access
2022-09-24 22:18:21 -03:00
LOuroboros
00eb67608a Small tweak to the new check in PCTurnOffEffect 2022-09-24 22:10:46 -03:00
LOuroboros
5500e64a71 Reworked the debug menu's PC access 2022-09-24 17:26:41 -03:00