ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-11 06:05:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,403 Commits 1 Branch 0 Tags 235 MiB
017f44f5ac
Commit Graph

9403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
2e75325806
Merge pull request #1764 from BuffelSaft/storm_drain 
Fix Storm Drain/Dive bug
 2021-10-14 10:17:35 -04:00
GriffinR
ceb871e3fa Process calcrom options first 2021-10-14 10:15:08 -04:00
GriffinR
2f6928f016 Make calcrom data info optional 2021-10-14 09:52:33 -04:00
GriffinR
a8aef03a21
Merge pull request #1517 from GriffinRichards/fix-mapscriptdoc 
Small correction to map script comments
 2021-10-14 00:05:53 -04:00
BuffelSaft
85dd7ff63c Fix Storm Drain/Dive bug 
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
 2021-10-14 16:40:18 +13:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
GriffinR
9ab03f454d Small correction to map script comments 2021-10-13 23:24:10 -04:00
BuffelSaft
bb8d0e3d6b Fix Battle Bond 
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
 2021-10-14 16:18:11 +13:00
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller 
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
 2021-10-13 22:45:50 -03:00
PikalaxALT
e12c7c07ac New move tilemap bins are easier to edit 2021-10-13 21:01:47 -04:00
Eduardo Quezada D'Ottone
567dd9a8a4
Merge pull request #1754 from ghoulslash/terrain 
Terrain Fixes
 2021-10-13 21:36:01 -03:00
ghoulslash
7f2efb6619 format fixes, fix healing berries from printing message at full hp 2021-10-13 18:40:45 -04:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
GriffinR
b9f6dd128d
Merge pull request #1515 from GriffinRichards/fix-saveblockchunk 
Disallow negative sizes in SAVEBLOCK_CHUNK
 2021-10-13 13:30:53 -04:00
GriffinR
5860e0e937 Disallow negative sizes in SAVEBLOCK_CHUNK 2021-10-13 13:19:15 -04:00
ghoulslash
5108d173fc fix protect struct fields being set during ai calcs 2021-10-13 10:11:02 -04:00
ghoulslash
b447d582cd fix terrain timer decrementing and bg changing with anims disabled 2021-10-13 09:04:03 -04:00
ghoulslash
3248bd796a add quick draw 2021-10-12 21:49:18 -04:00
ghoulslash
f9272a89fa add mirror armor check to two-stage stat decrease effects 2021-10-12 21:09:27 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00
ghoulslash
c0f3b7c3b4 record abilities from wandering spirit 2021-10-12 11:58:37 -04:00
ghoulslash
25a4da71fe remove unused macro 2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
ghoulslash
11626d5043 fix memento fail condition 2021-10-12 07:53:28 -04:00
GriffinR
b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00
ghoulslash
791a899eed fix sand spit + primal weather 2021-10-11 21:29:08 -04:00
ghoulslash
e66820e646
Merge pull request #1744 from AsparagusEduardo/BE_configHiddenPow 
Setting for pre-Gen6 Hidden Power Damage.
 2021-10-11 15:13:16 -04:00
GriffinR
f23e0beeba Rename battle anim cmds, move its data, name remaining symbols 2021-10-11 13:18:21 -04:00
GriffinR
f55a8cb688
Merge pull request #1513 from GriffinRichards/fix-keyboarchars 
Convert sKeyboardChars to 3D array
 2021-10-11 11:47:30 -04:00
GriffinR
a556856ce9 Convert sKeyboardChars to 3D array 2021-10-11 11:09:15 -04:00
GriffinR
3a7995bc7c Fix misleading RecordMixTrainerNames name 2021-10-11 10:39:37 -04:00
GriffinR
b8a44bf10a Calculate pokemon substruct size, missing MON_PIC_SIZE 2021-10-11 10:35:53 -04:00
LOuroboros
6c550cd749 Implemented Retaliate's effect 2021-10-11 03:19:21 -03:00
ghoulslash
6212a3c431
Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries 
Fixed confuse berries affecting the wrong battler.
 2021-10-10 20:21:03 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad handle rototiller + prankster 2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
3f51132af2
Merge pull request #1733 from ghoulslash/substitute_fix 
Fix DoesSubstituteBlockMove calls
 2021-10-10 18:53:44 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles 
Fix Safety Googles
 2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
01f563cb5e Fix infinite loop 2021-10-10 08:46:31 -03:00
BuffelSaft
8a7e6379b6
Merge pull request #1732 from ghoulslash/perish_song 
Fix Soundproof cancelling out user's Perish Song
 2021-10-10 22:55:20 +13:00
Eduardo Quezada D'Ottone
cf6e3873b4 Moved Electrified to Status4. 2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone
3add4d6a17 Added some status3 options to debug menu 2021-10-10 00:46:59 -03:00
Eduardo Quezada D'Ottone
4572e62669 Gen 5 Scald effect 2021-10-09 23:56:07 -03:00
Eduardo Quezada D'Ottone
903c4cbf68 Config for Blizzard + Hail 2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball 
add last used ball
 2021-10-09 17:27:28 -03:00
GriffinR
b01213b8bc Some constants in wild_encounter.c, document Feebas spot generation 2021-10-09 15:23:59 -04:00
GriffinR
ff01eb951b Use TRACKS constants for sGroundEffectTracksFuncs 2021-10-09 13:21:14 -04:00