ultima-soul
|
7369f60c06
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-12-03 17:30:45 -08:00 |
|
ultima-soul
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08:00 |
|
Eduardo Quezada D'Ottone
|
14f974c9a9
|
Merge pull request #1954 from ghoulslash/be/aifix
revert ai item usage code
|
2021-11-30 14:06:25 -03:00 |
|
GriffinR
|
83be1bfc8f
|
Remove sFiller from malloc.c
|
2021-11-29 11:19:30 -05:00 |
|
ghoulslash
|
d108f77aa4
|
revert ai item usage code
|
2021-11-28 13:12:56 -05:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
GriffinR
|
4c64863bc5
|
Merge pull request #1567 from LOuroboros/sBattleTerrainTable
Renamed gBattleTerrainTable
|
2021-11-27 23:43:22 -05:00 |
|
GriffinR
|
01859a63ff
|
Merge pull request #1566 from cbt6/move-speed
Rename speed parameter to distance in jump functions
|
2021-11-27 23:37:50 -05:00 |
|
LOuroboros
|
b042eb6436
|
gBattleTerrainTable -> sBattleTerrainTable
|
2021-11-28 01:22:27 -03:00 |
|
cbt6
|
c59c7b0518
|
Use enums for jump distances
|
2021-11-28 12:01:29 +08:00 |
|
cbt6
|
b6430098d4
|
Rename speed parameter to distance in jump functions
|
2021-11-28 12:01:29 +08:00 |
|
GriffinR
|
e677a00676
|
Merge pull request #1560 from GriffinRichards/retire-ok
Retire OK bot
|
2021-11-27 21:27:14 -05:00 |
|
GriffinR
|
e0fae879da
|
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
|
2021-11-22 19:10:49 -05:00 |
|
ghoulslash
|
3ac480076c
|
Merge pull request #1933 from BuffelSaft/brick-break
Fix Brick Break
|
2021-11-21 22:30:38 -05:00 |
|
BuffelSaft
|
8118f3bb44
|
Fix Brick Break
Should remove the target's screens, not the attacker's.
|
2021-11-22 16:17:10 +13:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
Eduardo Quezada D'Ottone
|
0f801b110b
|
Merge pull request #1696 from ghoulslash/battle_ai
AI Item Usage Considers Move Choice
|
2021-11-21 14:51:20 -03:00 |
|
Eduardo Quezada D'Ottone
|
dee7f97a8d
|
Merge branch 'battle_engine' into battle_ai
|
2021-11-21 14:46:09 -03:00 |
|
Eduardo Quezada D'Ottone
|
30a4ef3723
|
Merge pull request #1924 from ghoulslash/be/wish
Fix wish
|
2021-11-21 14:04:06 -03:00 |
|
GriffinR
|
f81565163e
|
Retire OK bot
|
2021-11-21 11:48:50 -05:00 |
|
GriffinR
|
5cb875b6cb
|
Merge pull request #1559 from GriffinRichards/remove-flower
Fix incorrect flower animation palettes
|
2021-11-21 11:29:11 -05:00 |
|
GriffinR
|
23dd1dad7f
|
Fix incorrect palettes in Mauville flower tileset anims
|
2021-11-21 11:23:03 -05:00 |
|
ghoulslash
|
3404039330
|
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
|
2021-11-21 08:12:21 -05:00 |
|
Eduardo Quezada D'Ottone
|
29172d6357
|
Merge pull request #1925 from ghoulslash/be/rampage
fix rampage cancelling
|
2021-11-21 00:15:53 -03:00 |
|
ghoulslash
|
3fb62f74c6
|
fix rampage cancelling
|
2021-11-20 18:35:56 -05:00 |
|
ghoulslash
|
37ab20e29c
|
fix wish
|
2021-11-20 16:49:04 -05:00 |
|
kleeenexfeu
|
62b31aec55
|
syntax
|
2021-11-20 02:12:43 +01:00 |
|
kleeenexfeu
|
da20dae9c3
|
Only recalculate speed for battler choosing a move
Other actions have priority
|
2021-11-20 02:09:33 +01:00 |
|
kleeenexfeu
|
6402a7ab6e
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:42:20 +01:00 |
|
kleeenexfeu
|
c1743db19a
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:30:45 +01:00 |
|
kleeenexfeu
|
acddeeb1f9
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:30:33 +01:00 |
|
Eduardo Quezada D'Ottone
|
377c313771
|
Merge pull request #1919 from ghoulslash/be/unseenfist
Fix unseen fist check
|
2021-11-19 18:48:58 -03:00 |
|
ghoulslash
|
fb468b6776
|
fix unseen fist check
|
2021-11-19 16:32:00 -05:00 |
|
kleeenexfeu
|
fa4d71817b
|
Spaces instead of tab
|
2021-11-19 22:30:30 +01:00 |
|
kleeenexfeu
|
03a9f3f413
|
Mega Evolution alters turn order
|
2021-11-19 22:03:10 +01:00 |
|
Eduardo Quezada D'Ottone
|
1696e60b9f
|
Merge pull request #1876 from ghoulslash/be/ai_updates
Some more CanAIFaintTarget checks and other AI updates
|
2021-11-19 17:33:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
ef3f573cc2
|
Merge pull request #1917 from BuffelSaft/unseen_fist
Implement Unseen Fist
|
2021-11-19 17:29:25 -03:00 |
|
GriffinR
|
42a83ee50e
|
Use STR_VAR names for apprentice_buff and frontier_gettrainername
|
2021-11-18 23:20:05 -05:00 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
BuffelSaft
|
c4f27174c3
|
Implement Unseen Fist
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
|
2021-11-19 16:21:33 +13:00 |
|
GriffinR
|
c57efdba5d
|
Allow compare + goto_if/call_if as a single statement
|
2021-11-18 22:06:53 -05:00 |
|
GriffinR
|
6c6487dd7a
|
Missing spaces to tabs in scripts files
|
2021-11-18 21:02:22 -05:00 |
|
GriffinR
|
591ab7241f
|
Macro comment typo fix, Object->object
|
2021-11-18 17:24:43 -05:00 |
|
GriffinR
|
c89dfd9f56
|
Finish updating macro comments
|
2021-11-18 01:47:58 -05:00 |
|
GriffinR
|
b5b5d95de6
|
Distinguish 'virtual object' names from object events
|
2021-11-17 23:40:53 -05:00 |
|
GriffinR
|
1b35f9adad
|
Use specific name limits for string limit functions
|
2021-11-17 22:11:03 -05:00 |
|
GriffinR
|
b9fa18bdd4
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros
|
2021-11-17 22:03:37 -05:00 |
|
GriffinR
|
c4f8f4d11a
|
Add STR_VAR_# ids to string buffer macros
|
2021-11-17 22:00:44 -05:00 |
|
GriffinR
|
c940b67716
|
Continue macro comment updating
|
2021-11-17 17:45:59 -05:00 |
|
GriffinR
|
700425ef5f
|
Index sMapHealLocations
|
2021-11-17 15:52:04 -05:00 |
|