ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-08 02:23:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,030 Commits 1 Branch 0 Tags 235 MiB
5c9c425590
Commit Graph

5573 Commits

Author SHA1 Message Date
ghoulslash
5c9c425590 fix power herb actiation message 2021-09-09 10:03:24 -04:00
DizzyEggg
4c9660bff1
Merge pull request #1579 from ghoulslash/embargo 
Add Embargo Effect
 2021-09-08 20:03:08 +02:00
DizzyEggg
decf65a025
Merge pull request #1580 from ghoulslash/water_bubble 
Water Bubble Prevents Burn
 2021-09-08 20:00:45 +02:00
BuffelSaft
bd92552fb6 Add new line to burn was healed string 2021-09-07 16:39:42 +12:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
ghoulslash
e93ad2e255 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into water_bubble 2021-09-06 09:24:28 -04:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost 
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
 2021-09-06 11:32:53 +02:00
BuffelSaft
734e0aa74d Add brackets 
Oops!
 2021-09-06 20:56:02 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2 
Fix many Disguise bugs
 2021-09-06 10:32:37 +02:00
DizzyEggg
fa081d1fc5
Merge pull request #1618 from BuffelSaft/protect-like 
Fix protect-like moves
 2021-09-06 10:24:29 +02:00
DizzyEggg
67fd379771
Merge pull request #1632 from BuffelSaft/hammer-arm 
Fix Hammer arm's effect chance
 2021-09-06 10:16:47 +02:00
BuffelSaft
4c8a12006c Fix Hammer Arm's effect chance 2021-09-06 19:45:30 +12:00
BuffelSaft
bdbb4b5f7e Fix many Disguise bugs 
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
 2021-09-06 18:27:42 +12:00
ghoulslash
b362ce7f33
Merge pull request #1621 from BuffelSaft/move-data 
Correct Liquidation and Sparkling Aria move data
 2021-09-03 13:02:33 -06:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07:00
BuffelSaft
13636f8691 Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE 
moneyMultiplier should only ever be 1, 2 or 4. This adds some flags to moneyMultiplier that prevent HOLD_EFFECT_DOUBLE_PRIZE and Happy Hour from infinitely increasing it.
 2021-09-02 16:15:58 +12:00
BuffelSaft
7d251c39f7 Correct Liquidation and Sparkling Aria 
Liquidation is affected by Sheer Force, Sparkling Aria should hit both foes and ally.
 2021-09-02 16:05:36 +12:00
BuffelSaft
3371773e5c Move touchedProtectLike to protect structs 
This makes more sense than putting it in DisableStruct.
 2021-09-01 21:34:47 +12:00
BuffelSaft
eb0f0b7ce8 Fix Sucker Punch vs Protect moves 
Might as well do this here too. Sucker Punch should fail against Protect, not trigger Protect's effects.
 2021-09-01 21:32:07 +12:00
BuffelSaft
ea6ce80ad4 Fix protect-like moves 
Make Protect-like moves (King's Shield etc.) activate only if the attacker would've touched the target.
This does not handle Sucker Punch, because that's not working correctly with Protect currently and will need to be addressed separately.
 2021-09-01 19:57:03 +12:00
LOuroboros
d60545af7a Fixed U-turn and Choice Items interaction 2021-08-31 23:49:23 -03:00
ExpoSeed
a58641cd70
Merge pull request #1603 from LOuroboros/megaEvoString 
Tweaked sText_MegaEvoEvolved
 2021-08-26 19:33:39 -05:00
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
BuffelSaft
bb89d03a1d Fix Venoshock 
Damage should double if target is poisoned, not attacker.
 2021-08-25 22:57:10 +12:00
LOuroboros
e42d329fc6 Small tweak 2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b Corrected CanEvolve function 2021-08-25 01:56:25 -03:00
LOuroboros
2c35006627 Tweaked sText_MegaEvoEvolved 2021-08-24 18:33:56 -03:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2 
Document item menu
 2021-08-15 12:01:57 -04:00
ghoulslash
7b0e60c705 some tweaks 2021-08-12 12:44:53 -06:00
ghoulslash
e3d30602d9 record item effect with trick 2021-08-12 01:29:52 -04:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound 
Fix CgbSound Fakematches (Thanks to Revo)
 2021-08-11 19:55:44 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363 Use tag constants in region_map.c 2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961 unsigned int -> u32 2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d oops 2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046 rename variable 2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c port cgb fakematching fixes (thanks to revo) 2021-08-08 20:33:21 -04:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
GriffinR
459b20d762
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos 
Flatten pos fields in struct Sprite
 2021-07-27 18:02:00 -04:00
ghoulslash
fd61770c34 water bubble prevents burn 2021-07-25 07:53:44 -06:00