ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,463 Commits 1 Branch 0 Tags 235 MiB
fe42eacdf0
Commit Graph

9463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sneed
fe42eacdf0 tabs over spaces 2022-05-22 05:23:06 +03:00
sneed
cb1c6ffbd2 comment out placeholders 2022-05-22 03:46:39 +03:00
Sneed69
d0a2be9630 weather forms fixes and config 2022-05-22 03:20:48 +03:00
Eduardo Quezada D'Ottone
6be8151981
Merge pull request #2146 from Sneed69/castform_battle 
Fix castform battle interactions
 2022-05-20 10:54:49 -04:00
Eduardo Quezada D'Ottone
df55a185ae
Merge pull request #2147 from Sneed69/r-ball-pike 
Disable last used ball in battle pike
 2022-05-19 22:04:21 -04:00
sneed
d8d31b7972 disable last used ball in bpike 2022-05-20 04:57:32 +03:00
sneed
881e7e70ec Generalize usage of castformPalette 
https://github.com/pret/pokeemerald/pull/1663
 2022-05-19 15:23:09 +03:00
sneed
928d3c5a28 change form on weather fade 2022-05-19 15:08:03 +03:00
sneed
0424e37252 Fix cherrim + castform interaction 2022-05-19 14:20:34 +03:00
Eduardo Quezada D'Ottone
671323c3e2
Merge pull request #2139 from ghoulslash/be/wildmon 
prevent overwriting wild mon held items
 2022-05-13 21:07:46 -04:00
ghoulslash
7dd6988b2b fix args to GetMonData 2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e prevent overwriting wild mon held items 2022-05-13 20:05:52 -04:00
Eduardo Quezada D'Ottone
9685afd981
Merge pull request #2127 from Sneed69/evolution-after-whiteout 
Allow evolutions after whiting out
 2022-05-10 07:49:17 -04:00
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle 
Gen 8 Evolution Mechanics (Battle Engine)
 2022-05-09 17:40:19 -04:00
AgustinGDLV
9bb5db2275 removed duplicate define 2022-05-08 21:23:51 -07:00
AgustinGDLV
277f4a3751
niceties 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-08 21:23:06 -07:00
Eduardo Quezada D'Ottone
78cbbb51bb
Merge pull request #2124 from ghoulslash/be/innerfocus 
add inner focus ability popup msg
 2022-05-08 20:37:35 -04:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle 
Update Confuse Berry Hold Effect (Battle Engine)
 2022-05-08 09:02:33 -04:00
Eduardo Quezada D'Ottone
989ec641f4
Merge pull request #2120 from ghoulslash/be/healblock 
Heal Block AI and Pollen Puff Selection Prevention
 2022-05-07 19:29:24 -04:00
sneed
f83875cf0f remove item expansion check 2022-05-07 23:34:38 +03:00
sneed
c6b529ed50 add missing constant 2022-05-07 22:09:08 +03:00
sneed
4c8770fdc2 Update battle_util.c 2022-05-07 21:57:50 +03:00
AgustinGDLV
017f44f5ac
Apply suggestions from code review 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-07 09:35:00 -07:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs 
Once again, Battle Configs
 2022-05-07 11:31:25 -04:00
ghoulslash
5456a87b83 fix pollen puff heal blocked battler in CanTargetBattler 2022-05-07 11:27:32 -04:00
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks 
Primal Reversion Tweaks
 2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone
096fe3c11d Removed unecessary B_LEEK_ALWAYS_CRIT config 2022-05-07 10:56:31 -04:00
Eduardo Quezada D'Ottone
89816b62ba Added Sheer Cold accuracy change to ShouldTryOHKO 2022-05-07 10:38:16 -04:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
ghoulslash
07579bd42b prevent ally pollen puff selection under heal block. add some ai checks for heal block 2022-05-07 09:56:32 -04:00
ghoulslash
adfb336a3f
Merge pull request #2105 from Sneed69/healblock 
Add missing Heal Block functionalities
 2022-05-07 09:13:18 -04:00
ghoulslash
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam 
Steel Beam Move Effect Implementation
 2022-05-07 08:40:34 -04:00
ghoulslash
a88ed6562e
Merge pull request #2115 from AgustinGDLV/spotlight 
fixed spotlight function
 2022-05-07 08:23:13 -04:00
ghoulslash
f63a451517
Merge pull request #2110 from Sneed69/gen8rattled 
Gen 8 Intimidate triggers Rattled
 2022-05-07 08:20:39 -04:00
ghoulslash
52dff039b9
Merge pull request #2114 from AgustinGDLV/shed_shell 
fixed shed shell
 2022-05-07 08:15:10 -04:00
ghoulslash
f821bd313e
Merge pull request #2116 from AgustinGDLV/bolt_beak 
fixed bolt beak switch-in boost
 2022-05-07 08:13:05 -04:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
AgustinGDLV
382cd41d12 realized hold effect is defined already 2022-05-05 22:49:46 -07:00
AgustinGDLV
74cc8c5ecb fixed bolt beak switch-in boost 2022-05-05 22:37:28 -07:00
AgustinGDLV
aff1d3949f fixed spotlight function 2022-05-05 21:58:16 -07:00
AgustinGDLV
07b42d62ef fixed shed shell 2022-05-05 20:46:45 -07:00
AgustinGDLV
e730d64945 corrections 2022-05-05 15:54:33 -07:00
AgustinGDLV
e343c73cd8 fixed compile error + small tweaks 2022-05-05 15:17:31 -07:00
AgustinGDLV
6235970722 added special battle evo changes 2022-05-05 11:41:27 -07:00
sneed
6c23eb431d Heal Pulse and Pollen Puff 2022-05-05 13:56:59 +03:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00