Commit Graph

9463 Commits

Author SHA1 Message Date
ghoulslash
36a824d8ab fix ability pop up for quick draw 2022-02-03 17:30:32 -05:00
GriffinR
7d2344c07b
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
2022-02-02 22:09:36 -05:00
Eduardo Quezada D'Ottone
5dc6f1caa4
Merge pull request #2047 from SubzeroEclipse/BE_decaps
Decapitalization of some battle strings
2022-02-01 14:57:52 -03:00
SubzeroEclipse
b946775e50 Fixed some new battle strings 2022-02-01 13:19:07 +01:00
GriffinR
f494238a9d
Merge pull request #1621 from GriffinRichards/constants-collision
Add missing collision constant usage
2022-01-30 23:00:05 -05:00
GriffinR
1ff0b0efa9 Add missing collision constant usage 2022-01-29 21:13:46 -05:00
ghoulslash
0046283c04
Merge pull request #2045 from LOuroboros/patch-2
Updated GetBallThrowableState
2022-01-29 11:55:04 -05:00
LOuroboros
ef3db02c22
Updated GetBallThrowableState 2022-01-29 12:30:40 -03:00
Eduardo Quezada D'Ottone
3b4f219180
Merge pull request #2044 from SubzeroEclipse/BE_MoveDescriptions
Fixed format of move descriptions' labels
2022-01-28 18:24:51 -03:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00
BuffelSaft
0a27b575dc Fix merge error in battle scripts 2022-01-27 17:24:11 +13:00
BuffelSaft
9d1800f53e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2 2022-01-27 17:18:51 +13:00
GriffinR
e30b16f0fd Fix Swap_HandleQuitSwappingResposne typo 2022-01-26 21:50:15 -05:00
LOuroboros
88b7326325 Ported the IE's flingPower item field and ItemId_GetFlingPower 2022-01-26 21:48:01 -03:00
LOuroboros
21244d6393 Modified and moved IsPinchBerryItemEffect 2022-01-26 21:45:24 -03:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
GriffinR
4188dd405c
Merge pull request #1620 from LOuroboros/gBallSpriteTemplates
Used ball constants in gBallSpriteTemplates
2022-01-26 17:44:26 -05:00
LOuroboros
6470b0d004 Used ball constants in gBallSpriteTemplates 2022-01-26 18:36:21 -03:00
LOuroboros
b33f7aed8d Oopsie 2022-01-25 23:31:23 -03:00
LOuroboros
7916ff5f47 Further updated CanFling 2022-01-25 21:02:26 -03:00
GriffinR
dc7d86f026 Add new macro comments 2022-01-23 19:30:39 -05:00
GriffinR
2495d18132 Add missing :req, remove old macros 2022-01-23 18:52:04 -05:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
LOuroboros
8eaf0718ec Review changes
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
2022-01-23 19:13:04 -03:00
ghoulslash
a165f9926d canbestatused for psycho shift 2022-01-23 13:46:30 -05:00
ghoulslash
3e1ddf6b93
Merge pull request #2042 from AsparagusEduardo/BE_unnerveChecks
Removed redundant checks for Unnerve
2022-01-23 13:22:52 -05:00
ghoulslash
8bca2f290d
Merge pull request #2041 from AsparagusEduardo/BE_getBattlerAbility
Optimized use of GetBattlerAbility
2022-01-23 13:16:01 -05:00
laqieer
dc2e210ade
Install libpng using pacman instead of manual build for msys2 2022-01-23 17:31:54 +08:00
LOuroboros
a8a8c7e2fa Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE 2022-01-23 02:37:07 -03:00
GriffinR
9f2b6ab2f2
Merge pull request #1613 from Kurausukun/m4asymbols
Move M4A Track Definitions
2022-01-22 21:41:37 -05:00
Kurausukun
2cc301603e lmao whitespace 2022-01-22 21:30:39 -05:00
Kurausukun
3b756bfb3d fix compilation on modern 2022-01-22 20:38:41 -05:00
Kurausukun
317e302147 fix inconsistent indentation 2022-01-22 19:43:11 -05:00
Kurausukun
04013fbdf2 forgot we could do this 2022-01-22 19:41:31 -05:00
Kurausukun
a83e41b2cc move m4a track definitions 2022-01-22 19:37:46 -05:00
Eduardo Quezada D'Ottone
60f46a710c Removed redundant checks for Unnerve 2022-01-22 21:04:59 -03:00
Eduardo Quezada D'Ottone
b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
88d4b188cc
Merge pull request #1943 from kleeenexfeu/be_recalc_turn_order_after_actions
Turn order is recalculated after some actions
2022-01-22 19:07:34 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
Eduardo Quezada D'Ottone
f42c4cd689
Merge pull request #1734 from ghoulslash/magician
Magician
2022-01-21 16:03:15 -03:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
79dfac92c9
Merge pull request #1604 from GriffinRichards/clean-spinda
Document Spinda spot algorithm
2022-01-21 09:55:43 -05:00
GriffinR
fb81d9ad4a Correct map data comment 2022-01-20 23:26:39 -05:00
ghoulslash
1710d3e2ed
Merge pull request #2038 from AsparagusEduardo/BE_PEFlag
Fixed Pokémon Expansion flag name in Battle Engine
2022-01-20 19:43:28 -05:00
GriffinR
8743172686
Merge pull request #1612 from AsparagusEduardo/pret_misc
Small documentation and cleanup
2022-01-20 12:11:27 -05:00
Eduardo Quezada D'Ottone
7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
2022-01-20 08:53:44 -05:00
GriffinR
a7e6045d71
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
2022-01-19 22:17:37 -05:00
GriffinR
c4f33f2b2b TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE 2022-01-19 12:54:55 -05:00
GriffinR
e682c12519 sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE 2022-01-19 12:39:11 -05:00