ghoulslash
|
d64e18d0b4
|
Merge pull request #2385 from LOuroboros/trainerClassBasedBalls
Added class-based Poké Balls for trainers
|
2022-10-14 10:19:20 -04:00 |
|
LOuroboros
|
90f79999bb
|
Added class-based Poké Balls for trainers
Thanks to Ghoulslash for helping me optimizing things.
|
2022-10-14 11:14:30 -03:00 |
|
GriffinR
|
2e128e3282
|
Merge pull request #1799 from AsparagusEduardo/pret/pr/recordedInvalid
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
|
2022-10-13 14:30:18 -04:00 |
|
GriffinR
|
722e501b7c
|
Merge pull request #1800 from AsparagusEduardo/pret/pr/gSoftResetDisabled
Documented missing gSoftResetDisabled uses
|
2022-10-13 14:29:43 -04:00 |
|
Eduardo Quezada D'Ottone
|
71dad6aec9
|
Merge pull request #2384 from May8th1995/confuseAI
Fix AI issue giving decrementing score to confuse hit instead of confuse
|
2022-10-13 12:16:00 -03:00 |
|
tennis
|
db013aab0b
|
Fix AI issue giving decrementing score to confuse hit instead of confuse
|
2022-10-13 15:58:57 +01:00 |
|
Eduardo Quezada D'Ottone
|
839d7063fe
|
Merge pull request #2383 from May8th1995/badgeFlagBug
Fix bug where badge boosts apply in all gens but gen 3.
|
2022-10-13 11:45:18 -03:00 |
|
tennis
|
f79205af08
|
Fix bug where badge boost flag is inverted
|
2022-10-13 15:32:08 +01:00 |
|
GriffinR
|
a10ec0487e
|
Color rotating gate pngs
|
2022-10-12 19:19:42 -04:00 |
|
Abaresk
|
af081b08ee
|
Make related func names more concise
|
2022-10-12 04:35:23 +00:00 |
|
Abaresk
|
11e3f03bd8
|
Document new metatile wild encounter odds
|
2022-10-12 04:03:02 +00:00 |
|
GriffinR
|
bbb4ee32ca
|
Merge pull request #1801 from Kurausukun/storage_struct
Combine "Unused" Field into Tile Buffer
|
2022-10-10 21:10:25 -04:00 |
|
Kurausukun
|
dc97eca92d
|
combine "unused" field into tile buffer
|
2022-10-10 21:00:31 -04:00 |
|
GriffinR
|
bd023b1c6c
|
Merge pull request #1796 from GriffinRichards/tilesets-c
Convert tilesets.s to C
|
2022-10-10 12:47:47 -04:00 |
|
GriffinR
|
65d3944a93
|
Give tileset palettes proper type, name compressed secret base tiles
|
2022-10-08 02:02:12 -04:00 |
|
ghoulslash
|
6363e61043
|
Merge pull request #2381 from AsparagusEduardo/RHH/1.2.0
Version 1.2.0
|
2022-10-07 18:33:00 -04: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
|
1a9f6abe99
|
Merge pull request #2380 from AsparagusEduardo/RHH/pr/feature/bWaitTime
Config for Battle text pause times
|
2022-10-07 16:32:29 -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
|
8ea060044a
|
Battle text pauses config
|
2022-10-07 17:22:29 -03:00 |
|
Eduardo Quezada
|
044898fe95
|
Documented missing gSoftResetDisabled uses
|
2022-10-07 15:56:00 -03:00 |
|
Eduardo Quezada
|
453da8aa8c
|
Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID
|
2022-10-07 15:49:00 -03: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 |
|
ghoulslash
|
5f6e97af7f
|
Merge pull request #2283 from AsparagusEduardo/RHH/pr/pokemonConfig
Toggles for Pokémon species by generation
|
2022-10-07 13:24:13 -04: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 |
|
GriffinR
|
cefbf5986c
|
Merge pull request #1797 from AsparagusEduardo/pret/pr/item
Removed unused functions in item header
|
2022-10-04 22:42:42 -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 |
|
GriffinR
|
1ae5010233
|
Merge pull request #1794 from SBird1337/doc/decompress-casts
[doc] clean up casts in decompress.c
|
2022-09-29 11:40:02 -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 |
|