ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 08:32:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,601 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

4735 Commits

Author SHA1 Message Date
BuffelSaft
c169a9523e
Merge branch 'upcoming' into fix-stat-boost-on-hit 2022-11-03 22:01:30 +13:00
BuffelSaft
736ca893b6 Fix abilities that raise target's stat after hit 
Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.
 2022-11-03 21:54:56 +13:00
Eduardo Quezada D'Ottone
b8371500d3
Merge pull request #1676 from BuffelSaft/multistrike 
Multi-hit refactor and Parental Bond
 2022-11-01 21:16:04 -03:00
ghoulslash
53061c7d62
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney 
Implemented Honey's Sweet Scent functionality
 2022-11-01 20:09:30 -04:00
ghoulslash
c6cb54b54e
Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
LOuroboros
5ebc996c51 Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config 2022-10-30 22:03:14 -03:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
BuffelSaft
224ca256ce Requested clean up 
Rename constants, remove white space, improve B_BEAT_UP description.

* Rename B_BEAT_UP_DMG to B_BEAT_UP
* Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG
* Remove trailing whitespace
* Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE
 2022-10-27 22:25:33 +13:00
BuffelSaft
3327758cdb Move B_BEAT_UP_DMG to other move settings 
This is more of a mechanical change like gen 8's change to Teleport, so it should go in the same block of settings.
 2022-10-26 23:29:09 +13:00
BuffelSaft
d9cc98a4fe Suggested changes 
- Various style fixes
- Add BATTLE_ALIVE_EXCEPT_ATTACKER case to CountAliveMonsInBattle
 2022-10-24 22:19:35 +13:00
BuffelSaft
a5ede1ee90 Move B_PARENTAL_BOND_DAMAGE to damage settings 
Title.
 2022-10-23 21:41:42 +13:00
BuffelSaft
9b076a9dcf Fix spread moves, tidy up CANCELLER_MULTIHIT_MOVES 
- Parental Bond spread moves should now strike twice whenever there is a single target, even if the target is the user's ally.
- Random chance to hit 2-5 times is now set in SetRandomMultiHitCounter().
 2022-10-23 21:40:04 +13:00
BuffelSaft
1b056f9044 Fix various Parental Bond issues 
- Dragon Tail and Circle Throw strike twice and then switch the target
- Z moves are unaffected by Parental Bond
- Renamed parentalBondOn to parentalBondState
- Added constants for possible values of parentalBondState
- Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP
 2022-10-23 17:37:23 +13:00
BuffelSaft
3775c5d00c Fix move effects 
Restore unintentionally removed MOVEEND_DEFROST, fix move effect definitions.
 2022-10-22 18:54:25 +13:00
BuffelSaft
6035c5a280 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-10-22 14:31:13 +13:00
Eduardo Quezada D'Ottone
1607291982 Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03: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
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
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
Eduardo Quezada
8ea060044a Battle text pauses config 2022-10-07 17:22:29 -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
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
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
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 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
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
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -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
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
17c8842ad4
Merge branch 'dev' into teleport 2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone
38df216ebd
Merge pull request #2355 from ghoulslash/be/aiparty 
Add overwrittenAbilities field
 2022-09-24 14:33:02 -03:00
ghoulslash
c22671d2a2 add overwrittenAbilities field 2022-09-24 12:12:31 -04:00
Eduardo Quezada D'Ottone
a483899043
Merge branch 'dev' into symbiosis 2022-09-24 11:58:35 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print 
[debug] add support for mgba printf
 2022-09-23 13:49:48 -04:00
sbird
343d7f7d26 [debug] do not use heap allocation for MgbaPrintf 2022-09-23 04:12:57 +02:00
sbird
12670e8e3e [debug] simplify macros, add EX versions 2022-09-23 03:48:58 +02:00
sbird
22329d3318 [debug] use boolean constants for nStopProgram 2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e [debug] fix AGBAssert for AGBPrintf debug block 2022-09-23 03:22:57 +02:00