ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,587 Commits 1 Branch 0 Tags 235 MiB
86e322dcea
Commit Graph

11587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
86e322dcea Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2022-11-01 22:41:31 -03: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
Eduardo Quezada D'Ottone
ebc9fc31d2
Merge pull request #2416 from DizzyEggg/fix_palace 
Fix battle palace bug
 2022-11-01 12:16:55 -03:00
DizzyEggg
51d8b57dcc restore deleted line 2022-10-31 13:19:10 +01:00
DizzyEggg
ea43b7732c Fix battle tent again 2022-10-31 13:16:48 +01:00
Eduardo Quezada D'Ottone
9d64c838cf
Merge pull request #2424 from LOuroboros/getItemId 
Actually removed ItemId_GetId
 2022-10-31 07:15:25 -03:00
Eduardo Quezada D'Ottone
dc4c5757f6
Merge pull request #2423 from LOuroboros/debugPCFlag 
Removed worthless DEBUG_FLAG_PC_FROM_DEBUG_MENU config
 2022-10-31 07:14:48 -03:00
LOuroboros
52dda5fc0f Actually removed ItemId_GetId 2022-10-30 22:52:22 -03: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
DizzyEggg
215604f5f7 fix battle palace bug 2022-10-27 20:44:43 +02: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
Eduardo Quezada D'Ottone
93dd8786ee
Merge pull request #2413 from kaisermg5/fix_tmhm_lock 
Fix lock when teaching a TM/HM after learning a move by level up.
 2022-10-26 22:27:19 -03: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
kaisermg5
2cd0a0f862 Fix lock when teaching a TM/HM after learning a move by level up. 2022-10-25 18:48:06 -03: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
7bca475d77 Add Misty Explosion to Parental Bond ban list 
Probably not needed, but just in case!
 2022-10-23 21:48:20 +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
Eduardo Quezada D'Ottone
449f4c0caa
Merge pull request #2408 from LOuroboros/patch-1 
Fixed CanFling
 2022-10-22 10:46:11 -03:00
LOuroboros
c267c615c1
Fixed CanFling 2022-10-22 10:38:39 -03: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
c57ab9e529
Merge pull request #2392 from gruxor/wait-fix 
Replaced busy-wait loops
 2022-10-17 15:34:22 -03:00
gruxor
610a8efb7d Replaced busy-wait loops 2022-10-17 11:21:06 -04:00
Eduardo Quezada D'Ottone
ffc5ffcfe5
Merge pull request #2390 from ghoulslash/be/psychocut 
Improve psycho cut anim
 2022-10-17 00:41:01 -03:00
ghoulslash
a585d56053 fix whitespace 2022-10-16 23:39:12 -04:00
ghoulslash
71023512fd update psycho cut anim 2022-10-16 19:20:24 -04:00
Eduardo Quezada D'Ottone
1607291982 Implemented Honey's Sweet Scent functionality 2022-10-16 20:20:13 -03:00
ghoulslash
ede6162724
Merge pull request #2388 from AsparagusEduardo/RHH/pr/running 
Config for running indoors
 2022-10-16 09:28:32 -04:00
ghoulslash
e3f37ad825
Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove 
Fixed Z-Move not being cleared if Pokémon faints
 2022-10-16 09:27:23 -04:00
Eduardo Quezada D'Ottone
dd2d6107bd Fixed Z-Move not being cleared if Pokémon faints 2022-10-16 09:57:21 -03:00
Eduardo Quezada D'Ottone
4cbc6d4de1 Config for running indoors 2022-10-14 22:31:45 -03:00
Eduardo Quezada D'Ottone
068422bc3f
Merge pull request #2386 from LOuroboros/patch-1 
Uncommented evo moves for each species
 2022-10-14 12:00:56 -03:00
LOuroboros
8a1a561b80
Uncommented evo moves for each species 2022-10-14 11:28:15 -03:00
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
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
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