ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,947 Commits 1 Branch 0 Tags 235 MiB
d72a3731d4
Commit Graph

11947 Commits

This Branch
This Branch
All Branches
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
tustin2121
116364334d Fix build of jsonproc 
- Changing uint to unsigned int, as uint is not standard.
 2022-11-02 19:51:43 -05:00
tustin2121
b32413d11e Restoring the GFHeader 
- Also adding comment about what the header does and how to maintain it.
 2022-11-02 12:45:36 -04:00
tustin2121
e698a6506f Pinning GFHeader to front of modern 
- Pinning the GF Header, crt0, and main to the front of the ROM when building modern.
- Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).
 2022-11-02 12:44:32 -04:00
tustin2121
fd87c97ef8 Adding documentation about GFHeader 2022-11-02 12:42:58 -04:00
tustin2121
8ff5ae7eb4 Pinning the GF header to the front of modern 
- Pinning the GF Header, crt0, and main to the front of the ROM when building modern.
- Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).
 2022-11-02 12:42:26 -04:00
tustin2121
f4f9329653 Fix build of jsonproc 
- Changing uint to unsigned int, as uint is not standard.
 2022-11-02 12:39:32 -04: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
14e85249d1 Review changes 2022-10-30 17:12:13 -03:00
Eduardo Quezada
d02fc43703 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 13:38:25 -03:00
GriffinR
d90132842a Update gitignore/spacing for new region map data 2022-10-30 12:22:41 -04:00
Eduardo Quezada
e4a439aa46 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
 2022-10-30 12:30:38 -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
GriffinR
c76beed989
Merge pull request #1807 from pret/porymap-5 
Update for Porymap 5.0.0
 2022-10-30 11:01:37 -04:00
GriffinR
01c71b4ce1 Fix more text and movements labeled as scripts 2022-10-30 03:27:28 -04:00
GriffinR
f439a2dee7 Fix EventScript_WroteSecretCodeLockOpened typo 2022-10-30 03:14:47 -04:00
LOuroboros
a74a8fa134 Updated CanTeleport 2022-10-29 16:13:40 -03:00
LOuroboros
bdd082f869 Made Z-Moves unusable without PP 2022-10-29 12:07:59 -03:00
DizzyEggg
215604f5f7 fix battle palace bug 2022-10-27 20:44:43 +02:00
GriffinR
b035fc1f42
Merge pull request #1811 from AsparagusEduardo/pret/pr/BardSounds 
Cleaned up Bard Sounds
 2022-10-27 14:01:48 -04:00
Eduardo Quezada
85c0d2dac8 Review changes 2022-10-27 11:26: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
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
Eduardo Quezada
85ce30b1d6 Created macros for Bard Sounds 2022-10-25 14:33:02 -03:00
Eduardo Quezada
3ed485632f Renamed gBaseStats to gSpeciesInfo 2022-10-24 17:01:48 -03:00
GriffinR
cc182bf05e Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04: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
Marcus Huderle
ae6ec3b1b8 Change cleanString() to convert invalid chars to underscores 2022-10-22 15:09:37 -05: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
GriffinR
e752c8a2f9
Merge pull request #1805 from tustin2121/tustin2121-patch-runimmedeately 
Document seldom-used trigger functionality
 2022-10-20 11:45:35 -04:00
GriffinR
fad92ec906
Merge pull request #1803 from abaresk/thunder 
Add more documentation to thunder weather effect
 2022-10-20 11:36:10 -04:00