Eduardo Quezada D'Ottone
|
e6f8d57f08
|
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
# Conflicts:
# include/constants/battle_string_ids.h
|
2020-11-10 17:28:17 -03:00 |
|
ExpoSeed
|
429df3c319
|
Merge pull request #571 from LOuroboros/new_surf_pal
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
|
2020-11-10 11:37:07 -06:00 |
|
ExpoSeed
|
17f7af747c
|
Merge pull request #569 from LOuroboros/anim_settings_label_fixes
Fixed anim. settings labels in src/battle_anim.c
|
2020-11-10 11:36:27 -06:00 |
|
ghoulslash
|
6b6750028a
|
Merge pull request #1216 from LOuroboros/intimidate
Tweaked Intimidate a little
|
2020-11-10 10:34:36 -07:00 |
|
LOuroboros
|
bb4f00737e
|
B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE
|
2020-11-10 14:26:47 -03:00 |
|
LOuroboros
|
a25190f357
|
A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
|
2020-11-10 10:34:51 -03:00 |
|
LOuroboros
|
e179b9b5fe
|
Updated Intimidate to Gen. 8 standard
|
2020-11-10 10:18:16 -03:00 |
|
ExpoSeed
|
ebaeeb7594
|
Merge pull request #1213 from AsparagusEduardo/BE-GlobalDefine
Moved BATTLE_ENGINE define to global.h to fix reading from other bran…
|
2020-11-09 12:01:44 -06:00 |
|
Eduardo Quezada D'Ottone
|
33ed87e2cb
|
Capitalization
|
2020-11-09 14:52:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a984136e7
|
Updated comment.
|
2020-11-09 14:50:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
df4d927e31
|
Moved BATTLE_ENGINE define to global.h to fix reading from other branches
|
2020-11-09 12:45:31 -03:00 |
|
Eduardo Quezada D'Ottone
|
ddb6142709
|
Review changes 3.
|
2020-11-08 21:08:58 -03:00 |
|
Eduardo Quezada D'Ottone
|
255a14affb
|
Review changes 2.
|
2020-11-08 21:03:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
35d5324324
|
Review changes.
|
2020-11-08 21:02:34 -03:00 |
|
ultima-soul
|
8e30647ca1
|
Merge pull request #1205 from ultima-soul/battle_engine_sync
Sync Battle Engine Upgrade to Upstream
|
2020-11-08 14:18:16 -08:00 |
|
ultima-soul
|
99fdc13e61
|
Merge branch 'master' into battle_engine_sync
|
2020-11-07 15:59:20 -08:00 |
|
ExpoSeed
|
31b19400f9
|
Merge pull request #568 from LOuroboros/hurricane
Changed Hurricane's animation
|
2020-11-07 14:44:49 -06:00 |
|
Eduardo Quezada D'Ottone
|
09a5d6c722
|
Implemented Wish Mega Evolution
|
2020-11-07 10:13:32 -03:00 |
|
LOuroboros
|
ea99195194
|
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
|
2020-11-06 22:29:20 -03:00 |
|
LOuroboros
|
d66b2fc820
|
Fixed anim. settings labels in src/battle_anim.c
|
2020-11-06 21:37:04 -03:00 |
|
LOuroboros
|
c66b77fbf8
|
Changed Hurricane's animation
|
2020-11-06 21:06:04 -03:00 |
|
ultima-soul
|
7fb457a30e
|
Merge pull request #564 from LOuroboros/patch-1
Fixed the descriptions of Freeze Dry and Flying Press
|
2020-11-06 15:56:37 -08:00 |
|
GriffinR
|
8b1c2c946b
|
Merge pull request #1247 from PidgeyALT/attemptcountfix
use constants for ball throw count
|
2020-11-06 15:41:25 -05:00 |
|
PikalaxALT
|
75b12b86dc
|
Merge pull request #1246 from PikalaxALT/simplify_ram_reset
Simplify RAM reset adaptation for modern
|
2020-11-06 15:00:40 -05:00 |
|
MCboy
|
e31158d017
|
add spaces around - and remove comment from include in battle.h
|
2020-11-06 23:29:52 +03:30 |
|
MCboy
|
3b91735e63
|
use constants for ball throw count
|
2020-11-06 22:59:46 +03:30 |
|
LOuroboros
|
93d9ad0997
|
Fixed the descriptions of Freeze Dry and Flying Press
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
|
2020-11-06 15:24:00 -03:00 |
|
PikalaxALT
|
3112cf5726
|
swi --> svc
|
2020-11-06 12:34:57 -05:00 |
|
PikalaxALT
|
c70c44fa48
|
Simplify RAM reset adaptation for modern
|
2020-11-06 12:29:40 -05:00 |
|
GriffinR
|
42b7f11db0
|
Merge pull request #1245 from GriffinRichards/modernfactoryfix
Fix battle factory on gcc 10
|
2020-11-04 18:34:53 -05:00 |
|
GriffinR
|
1220f0655c
|
Revert to original battle factory gcc 10 fix
|
2020-11-04 17:46:07 -05:00 |
|
GriffinR
|
c3080a5a2a
|
Fix typo
|
2020-11-04 16:46:26 -05:00 |
|
GriffinR
|
70ff0d1735
|
Condense fix for battle factory on gcc 10
|
2020-11-04 16:43:59 -05:00 |
|
GriffinR
|
c59a818462
|
Fix battle factory on gcc 10
|
2020-11-04 15:35:22 -05:00 |
|
PikalaxALT
|
99dd461bef
|
Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
|
2020-11-03 09:28:45 -05:00 |
|
aaaaaa123456789
|
ca950a8daf
|
Solve merge conflicts from previous commit
|
2020-11-02 22:18:26 -03:00 |
|
aaaaaa123456789
|
bacc831aa9
|
Re-apply joypad macros (minus merge conflicts)
|
2020-11-02 22:02:39 -03:00 |
|
Kurausukun
|
6545745e59
|
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
|
2020-11-02 18:43:40 -05:00 |
|
Kurausukun
|
8bf401c227
|
address comments
|
2020-11-02 18:43:11 -05:00 |
|
Eduardo Quezada D'Ottone
|
3af9a65506
|
Fix ability description strings (#553) from ghoulslash
|
2020-11-01 19:45:51 -03:00 |
|
Eduardo Quezada D'Ottone
|
5a201f006f
|
More exp options in battle_config (#530) from MandL27
|
2020-11-01 19:41:29 -03:00 |
|
Evan
|
6c39977a8d
|
HGSS supereffective change
|
2020-11-01 15:16:51 -07:00 |
|
MandL27
|
5c6b8376fc
|
long equations on one line
|
2020-11-01 11:45:01 -05:00 |
|
Evan
|
9ad9dbff9f
|
fix ability descriptions
|
2020-11-01 09:22:28 -07:00 |
|
ExpoSeed
|
1b65e1a1f0
|
Merge pull request #520 from ghoulslash/battle_engine
Add Toggle Healthbox Visibility Feature
|
2020-10-31 23:07:39 -05:00 |
|
GriffinR
|
9e55ae22b1
|
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons
Use constants for menu info icon table
|
2020-10-29 23:50:43 -04:00 |
|
GriffinR
|
fbff087e9a
|
Merge pull request #1238 from ketsuban/master
Eliminate goto in ItemUseCB_Medicine
|
2020-10-29 23:50:17 -04:00 |
|
GriffinR
|
be1685c87f
|
Use constants for menu info icon table
|
2020-10-29 16:34:33 -04:00 |
|
ultima-soul
|
ae892febba
|
Merge pull request #15 from AsparagusEduardo/PR-MoveSplitOption
Option to use Gen 3 Physical/Special split.
|
2020-10-29 09:14:08 -07:00 |
|
aaaaaa123456789
|
9794b077b5
|
Update src/digit_obj_util.c
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
|
2020-10-26 19:14:08 -03:00 |
|