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

8643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
86ad65df76
Merge pull request #1675 from AsparagusEduardo/booleanStandard 
Using boolean for flags
 2021-11-03 19:52:52 -04:00
Eduardo Quezada D'Ottone
6ee2a3aba1 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
 2021-11-03 20:44:25 -03:00
LOuroboros
f6628e301f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry 2021-11-03 20:43:33 -03:00
BuffelSaft
6132f9a9fe
Merge pull request #1750 from ghoulslash/mirror_armor 
Mirror Armor
 2021-11-04 11:43:59 +13:00
BuffelSaft
5a855db4ad Fix prototype of CanBePoisoned 2021-11-04 11:08:37 +13:00
LOuroboros
f0d7c75ec8 Syntax corrections 2021-11-03 17:48:04 -03:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
ghoulslash
7e6e23005b fix clear body 2021-11-03 13:59:26 -04:00
LOuroboros
af6e72ecfe Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser 2021-11-03 08:56:01 -03:00
Blackforest92
b9c23f7c62 Update waterfall, trick room, & focus blast BG 2021-11-03 16:29:09 +07:00
BuffelSaft
5141e84296 Fix base stats 
Clean up mess from testing.
 2021-11-03 20:01:09 +13:00
BuffelSaft
6ce1f01b8c Hunger Switch and Aura Wheel 
Implement the ability Hunger Switch and the move Aura Wheel.
 2021-11-03 19:45:03 +13:00
BuffelSaft
18b87416d5 Fixes 
- Fix Sheer Force interaction (needed after adding | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN)
- Fix "X Transformed!" target
- Allow switching between both forms
- Allow form change if target is KO'ed
 2021-11-03 17:56:16 +13:00
BuffelSaft
74c85b5818 Implement Relic Song's form change 
Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.
 2021-11-03 17:23:33 +13:00
BuffelSaft
d33bcc335b Revert Poison Touch target check 
This would prevent Poison Touch activating if the target hurt itself.
 2021-11-03 14:49:14 +13:00
BuffelSaft
f323e2c047 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil 2021-11-03 14:18:28 +13:00
Eduardo Quezada D'Ottone
11e93aee69
Merge pull request #1848 from SBird1337/fix/ub 
[battle_debug] fix charbase overflow
 2021-11-02 21:24:46 -03:00
sbird
5bfb3096ad [battle_debug] fix charbase overflow 2021-11-02 23:53:03 +00:00
BuffelSaft
d99fd30e4d Looping battle script, correct message 
Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"
 2021-11-03 11:51:20 +13:00
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
ghoulslash
4c9f48e9d8
Merge pull request #1842 from AsparagusEduardo/be_Gen8ContestData 
Added Gen 8 contest data
 2021-11-02 12:50:45 -04:00
ghoulslash
592a1dab63 fix mirror armor setstatchanger, handle reflected stat blockage 2021-11-02 12:02:58 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
BuffelSaft
4668e11765 Looping battlescript version 1 
Would be better if it simply updated the target, cured the status and returned I think, needs testing.
 2021-11-03 00:45:24 +13:00
BuffelSaft
95435b5f7f Pastel Veil switchin effect attempt 
Battle script isn't working for partner for some reason.
 2021-11-02 23:06:10 +13:00
BuffelSaft
40bced517a Pastel Veil blocks poison for whole side 
Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.
 2021-11-02 20:00:57 +13:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine 
Edit Spacial Rend and Hurricane background
 2021-11-02 17:11:47 +13:00
BuffelSaft
8af882348a Fix Parental Bond Super Fang 
Min damage should be 2
 2021-11-02 16:56:12 +13:00
BuffelSaft
b97a250acc
Merge pull request #1512 from ghoulslash/utility_umbrella 
Utility Umbrella
 2021-11-02 16:28:52 +13:00
Eduardo Quezada D'Ottone
10306d046c Fixed Steam Roller's define 2021-11-01 22:07:54 -03:00
Eduardo Quezada D'Ottone
8332bfae46 Gen 8 combo moves 2021-11-01 21:59:34 -03:00
Eduardo Quezada D'Ottone
c4aa2a1e92 Added Gen 8 contest data (minus combos), also fixed Bubble's category 2021-11-01 21:36:08 -03:00
ghoulslash
25f200d7ce
Merge pull request #1840 from LOuroboros/patch-2 
Fixed battlerId in Poison Touch's confusionSelfDmg check
 2021-11-01 11:39:51 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
ghoulslash
6357b21202 fix leaf guard ability pop up 2021-11-01 11:32:13 -04:00
LOuroboros
30a8281d32
Fixed battlerId in Poison Touch's confusionSeldDmg check 2021-11-01 11:56:25 -03:00
BuffelSaft
4edee8f5d4
Merge pull request #1839 from AsparagusEduardo/BE_fixPlasmaFists 
Fixed Plasma Fists target
 2021-11-01 20:09:41 +13:00
Eduardo Quezada D'Ottone
d4638eaf1a Fixed Plasma Fists target 2021-10-31 19:50:31 -03:00
BuffelSaft
fbce8b2ff0
Merge pull request #1749 from ghoulslash/wandering_spirit 
Wandering Spirit
 2021-11-01 11:26:53 +13:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
Blackforest92
e59d0dd5cf clean Spacial Rend background 2021-10-31 22:58:43 +07:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
e9f6fd9766
Merge pull request #1837 from Blackforest92/battle_engine 
Minor fix to Steel Beam
 2021-10-31 11:37:58 -04:00
ghoulslash
dfb92fa74e fix VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 2021-10-31 11:12:17 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
Blackforest92
c87e2433a7 Minor fix to Steel Beam 2021-10-31 21:41:39 +07:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics 
Implement Gorilla Tactics
 2021-10-30 21:44:33 -04:00
Eduardo Quezada D'Ottone
31e62e9321
Merge pull request #1835 from LOuroboros/bgTilemapsFix 
Fixed new BG tilemaps
 2021-10-30 21:41:32 -03:00
BuffelSaft
2282c4fb5c Fix MOVEEND_CHOICE_MOVE 
Oops
 2021-10-31 12:09:40 +13:00
ghoulslash
de6140193a
Merge pull request #1833 from LOuroboros/patch-2 
Fixed Move_SPECIAL_REND typo
 2021-10-30 11:34:54 -04:00