LOuroboros
de9b0328ec
Corrections to Steam Engine
2021-01-07 16:33:52 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
3d124944b3
Review correction to B_X_ITEMS_BUFF's comment
2021-01-07 16:09:23 -03:00
LOuroboros
cb22cbd3f6
Tweaked preprocessor constant in include/constants/item_effects.h
2021-01-07 16:06:55 -03:00
LOuroboros
8d9c10224d
Removed pointless EmptyString print
2021-01-07 15:51:52 -03:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
Evan
aac3f9c3db
kee, maranga, sitrus beries
2021-01-06 13:07:18 -07:00
Evan
c3615485f3
merge in berry branch
2021-01-06 12:54:02 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
d3ae05189d
resist berry ripen boost
2021-01-05 22:21:38 -07:00
Evan
b3a6df8d57
stat raising berries
2021-01-05 22:13:32 -07:00
Evan
f046a25ce0
ripen & hp restoring berries
2021-01-05 21:15:21 -07:00
Evan
4c1e8f2f2e
add curious medicine
2021-01-05 20:02:11 -07:00
Evan
0a3908ee92
add neigh and as one abilities
2021-01-05 19:37:23 -07:00
luckytyphlosion
44bd156f26
Actually test out that it builds.
2021-01-05 20:10:43 -05:00
luckytyphlosion
a5f75b4949
Fix issue with diffs being incorrect with extreme values.
2021-01-05 19:53:41 -05:00
LOuroboros
3246c20be5
Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers
2021-01-05 19:51:52 -03:00
Evan
4923af960e
steely spirit, screen cleaner, transistor, dragon's maw
2021-01-05 15:44:12 -07:00
luckytyphlosion
8855623ad0
Fix choice of delta sign.
...
Ensure that the delta goes in the correct direction (i.e. use positive delta for prev <= sample, and negative delta for prev > sample)
2021-01-05 13:56:26 -05:00
luckytyphlosion
fb396395e9
Fix bug in pcm delta compression.
...
error wasn't being correctly calculated for when new_sample was negative and sample was positive.
2021-01-05 11:34:38 -05:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind
...
Fix sPyramindFloorNames typo
2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875
Fix sPyramindFloorNames typo
2021-01-04 23:58:33 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu
...
Remove unnecessary subtraction in switch
2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master
...
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
Sierraffinity
a982e6ab88
Make div by zero fix more concice
2021-01-04 16:39:47 -08:00
Sierraffinity
67a656a4df
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 16:26:28 -08:00
GriffinR
5cf5adf7d7
Merge pull request #1290 from LOuroboros/bugs_doc_update
...
Updated the bag flickering fix
2021-01-04 18:21:16 -05:00
LOuroboros
09fc94677b
Updated the bag flickering fix
...
Originally submitted by MEATLOAF#4302
2021-01-04 19:39:13 -03:00
GriffinR
0ca76fc179
Some decoration labels, use constant for tileset size
2021-01-04 16:27:57 -06:00
GriffinR
039108284d
Clean up gDecorations with gItems format
2021-01-04 16:27:57 -06:00
GriffinR
bec799ef72
Merge pull request #1288 from GriffinRichards/substitute
...
Fix substitute back sprite
2021-01-04 12:50:55 -05:00
GriffinR
e0c0143f41
Fix substitute back sprite
2021-01-04 10:14:01 -05:00
LOuroboros
adf039fe12
Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7
...
Also turned sText_StatSharply into gText_StatSharply.
2021-01-04 07:41:56 -03:00
LOuroboros
be46ed84ea
Made the old X Items buff code make use of B_X_ITEMS_BUFF
2021-01-04 04:15:58 -03:00
LOuroboros
dbc3690282
Tweaked preprocessor directives
...
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE
2021-01-03 22:05:14 -03:00
amiosi
19b82dcf57
tabs -> spaces
2021-01-03 19:12:47 -05:00
ghoulslash
73a7800f72
Merge pull request #1272 from BuffelSaft/Batte_Engine_Only
...
Fix Jump Kick
2021-01-03 16:50:15 -07:00
ExpoSeed
7dadcb94b8
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only
2021-01-04 10:55:30 +13:00
GriffinR
dbccb759ba
Merge pull request #1287 from GriffinRichards/string
...
Remove unnecessary string.h includes
2021-01-03 13:44:50 -05:00
GriffinR
06af0f0fe5
Remove unnecessary string.h includes
2021-01-03 13:36:07 -05:00
LOuroboros
da1f525d45
Made Alolan Marowak be affected by Thick Club
2021-01-03 09:58:19 -03:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr
...
Minor field_screen_effect / field_player_avatar documentation
2021-01-03 01:59:36 -05:00
ultima-soul
c2a3c5687b
Add Fairy-type icon to fix Fairy TM info icon being blank.
2021-01-02 21:11:47 -08:00
surskitty
a96179a308
Changed Neutralizing Gas.
2021-01-02 17:16:44 -05:00
