Commit Graph

7690 Commits

Author SHA1 Message Date
GriffinR
4620992f07
Merge pull request #1368 from GriffinRichards/fix-fightanim
Fix out of bounds access for fighting anims
2021-03-09 12:48:01 -05:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Eduardo Quezada D'Ottone
c91413300d
Merge pull request #1392 from ghoulslash/hp_boxes
Fix HP Boxes not Dissapearing with Certian Moves
2021-03-09 08:11:53 -03:00
ghoulslash
68388f633f merge with be 2021-03-08 18:58:16 -07:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only
Fix Spiky Shield/Jump Kick freeze
2021-03-08 17:24:36 -06:00
ExpoSeed
9ec04fcce8
Merge pull request #1397 from ghoulslash/escape
Fix Ghost Types Unable to Escape
2021-03-08 17:24:00 -06:00
GriffinR
6274acfe5f Fix out of bounds access for fighting anims 2021-03-08 14:32:20 -05:00
GriffinR
ba1e006a64 Move webhook env vars, drop unnecessary secrets 2021-03-07 22:40:09 -05:00
GriffinR
fd42e02af4 Move webhook event check to workflow 2021-03-07 17:35:56 -05:00
GriffinR
2bba2ce1a1 Link .text.unlikely for modern 2021-03-07 17:24:30 -05:00
GriffinR
1dc12890d1 Update event name in webhook 2021-03-07 15:33:14 -06:00
GriffinR
c05f529a19 Replace Travis CI with Github workflow 2021-03-07 15:33:14 -06:00
BuffelSaft
1f54233953 Fix powder immunity for self-targeting moves
Example: Because Rage Powder targets the user, this check is needed to allow grass types to use it.
2021-03-07 11:00:52 +13:00
N
94a883d600 Fix space 2021-03-04 19:36:44 -06:00
N
99c6a504e0 Finish renaming functions 2021-03-04 19:36:44 -06:00
N
b9b33b6f2b Some renaming 2021-03-04 19:36:44 -06:00
N
7b046ebd1d rename gBerryCrushGame 2021-03-04 19:36:44 -06:00
N
e79048e8ee Remove unneeded bitwise operations 2021-03-04 19:35:25 -06:00
N
d5a63681e8 Fixed faulty define 2021-03-04 19:33:40 -06:00
N
d63431ae88 Fix comment 2021-03-04 19:33:40 -06:00
N
a2f757c7a6 Document BG_PLTT usage in Agb_Main 2021-03-04 19:33:40 -06:00
N
b86b66660c Revert void change 2021-03-04 19:32:36 -06:00
N
8f5bd2fb33 Fix prefixes of variable names
Many static variables in this function are falsely labeled with a g prefix, as if it were global, when they are in fact state variables.
2021-03-04 19:32:36 -06:00
Kurausukun
204e95dfea remove unnecessary changes 2021-03-04 19:32:16 -06:00
Kurausukun
dec5e8eee5 steal matching from #1333 2021-03-04 19:32:16 -06:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
GriffinR
734a15135f Clean up a few unlabeled scripts 2021-03-04 19:30:19 -06:00
GriffinR
69f7882b5e Label missed pokemon jump anims 2021-03-03 14:32:09 -05:00
GriffinR
b9c733495b Document dodrio berry picking 2021-03-03 14:26:05 -05:00
Evan
41d47a867e format fixes 2021-03-03 10:48:57 -07:00
ghoulslash
f83e8b4f94
Update src/battle_message.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:17 -07:00
ghoulslash
5207d48b21
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:11 -07:00
ghoulslash
6739433e9e
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:48:05 -07:00
ghoulslash
64e3f7dc24
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 10:47:59 -07:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
99c8bd19ca
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:25 -07:00
ghoulslash
3edb7ede29
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:20 -07:00
ghoulslash
43ec4e1041
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:14 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:00 -07:00
ghoulslash
63b1a02c28
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:56 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
ultima-soul
255a635237
Merge pull request #1295 from ghoulslash/terrain
Various Terrain Effects and Fixes
2021-03-01 10:38:36 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55649a67cc Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain 2021-03-01 11:23:05 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes
Magic Room Affects Macho Brace/Power Item Speed Drop
2021-03-01 08:50:59 -08:00
GriffinR
91ab30fa71 Rename mon markings struct 2021-02-28 17:11:46 -06:00